Skip to content

feat(ctp): use solmate instead of oz #2674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 2 commits into from
Jun 3, 2022
Merged

feat(ctp): use solmate instead of oz #2674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
982da27
feat(ctp): use solmate instead of oz
smartcontracts Jun 3, 2022
643348f
Merge branch 'develop' into sc/use-solmate
mergify[bot] Jun 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/contracts-periphery/contracts/universal/AssetReceiver.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.9;

import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
import { ERC20 } from "@rari-capital/solmate/src/tokens/ERC20.sol";
import { ERC721 } from "@rari-capital/solmate/src/tokens/ERC721.sol";
import { Transactor } from "./Transactor.sol";

/**
Expand Down
8 changes: 3 additions & 5 deletions packages/contracts-periphery/contracts/universal/Transactor.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.9;

import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
import { Owned } from "@rari-capital/solmate/src/auth/Owned.sol";

/**
* @title Transactor
* @notice Transactor is a minimal contract that can send transactions.
*/
contract Transactor is Ownable {
contract Transactor is Owned {
/**
* @param _owner Initial contract owner.
*/
constructor(address _owner) Ownable() {
transferOwnership(_owner);
}
constructor(address _owner) Owned(_owner) {}

/**
* Sends a CALL to a target address.
Expand Down
10 changes: 5 additions & 5 deletions packages/contracts-periphery/test/contracts/universal/AssetReceiver.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ describe('AssetReceiver', () => {
AssetReceiver.connect(signer2)['withdrawETH(address)'](
signer2.address
)
).to.be.revertedWith('Ownable: caller is not the owner')
).to.be.revertedWith('UNAUTHORIZED')
})
})
})
Expand Down Expand Up @@ -119,7 +119,7 @@ describe('AssetReceiver', () => {
DEFAULT_RECIPIENT,
DEFAULT_AMOUNT
)
).to.be.revertedWith('Ownable: caller is not the owner')
).to.be.revertedWith('UNAUTHORIZED')
})
})
})
Expand Down Expand Up @@ -156,7 +156,7 @@ describe('AssetReceiver', () => {
TestERC20.address,
DEFAULT_RECIPIENT
)
).to.be.revertedWith('Ownable: caller is not the owner')
).to.be.revertedWith('UNAUTHORIZED')
})
})
})
Expand Down Expand Up @@ -193,7 +193,7 @@ describe('AssetReceiver', () => {
AssetReceiver.connect(signer2)[
'withdrawERC20(address,address,uint256)'
](TestERC20.address, DEFAULT_RECIPIENT, DEFAULT_AMOUNT)
).to.be.revertedWith('Ownable: caller is not the owner')
).to.be.revertedWith('UNAUTHORIZED')
})
})
})
Expand Down Expand Up @@ -236,7 +236,7 @@ describe('AssetReceiver', () => {
DEFAULT_RECIPIENT,
DEFAULT_TOKEN_ID
)
).to.be.revertedWith('Ownable: caller is not the owner')
).to.be.revertedWith('UNAUTHORIZED')
})
})
})
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts-periphery/test/contracts/universal/Transactor.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ describe('AssetReceiver', () => {
gasLimit: 2_000_000,
}
)
).to.be.revertedWith('Ownable: caller is not the owner')
).to.be.revertedWith('UNAUTHORIZED')
})
})
})
Expand Down Expand Up @@ -109,7 +109,7 @@ describe('AssetReceiver', () => {
gasLimit: 2_000_000,
}
)
).to.be.revertedWith('Ownable: caller is not the owner')
).to.be.revertedWith('UNAUTHORIZED')
})
})
})
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts-periphery/test/contracts/universal/drippie/Drippie.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ describe('Drippie', () => {
DEFAULT_DRIP_NAME,
DEFAULT_DRIP_CONFIG
)
).to.be.revertedWith('Ownable: caller is not the owner')
).to.be.revertedWith('UNAUTHORIZED')
})
})
})
Expand Down Expand Up @@ -182,7 +182,7 @@ describe('Drippie', () => {
it('should revert', async () => {
await expect(
Drippie.connect(signer2).status(DEFAULT_DRIP_NAME, 1)
).to.be.revertedWith('Ownable: caller is not the owner')
).to.be.revertedWith('UNAUTHORIZED')
})
})
})
Expand Down