Skip to content

Add ability to create clones with initial value in Clones.sol #4936

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
ernestognw merged 21 commits into from
Mar 6, 2024
Merged

Add ability to create clones with initial value in Clones.sol #4936

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c1d093d
Add Clones lib ability to support non-zero value
k06a Feb 29, 2024
1052cb1
add Clones testing with value & create utils/Errors.sol
Amxx Mar 1, 2024
6aab488
fix lint
Amxx Mar 1, 2024
9618bcd
simplify
Amxx Mar 1, 2024
d0f9186
fix tests
Amxx Mar 1, 2024
a41bc51
fix upgradeable patch
Amxx Mar 1, 2024
4676598
Apply PR suggestions
ernestognw Mar 5, 2024
463ff75
Apply PR suggestions
ernestognw Mar 5, 2024
132bccb
Fix docs
ernestognw Mar 5, 2024
fcc327b
add warning
Amxx Mar 5, 2024
d2fcabf
Rename FailedInnerCall → FailedCall
Amxx Mar 5, 2024
e8eb625
Apply suggestions
ernestognw Mar 5, 2024
3f820b2
Merge branch 'feature/clones-value' of https://github.com/1inch/openz…
Amxx Mar 5, 2024
27015a6
fix lint
Amxx Mar 5, 2024
79c4c86
Mer branch 'feature/clones-value' of https://github.com/1inch/openzep…
Amxx Mar 5, 2024
6942c46
re-fix lint
Amxx Mar 5, 2024
524ccb6
fix merge conflict
Amxx Mar 5, 2024
f02beb7
Document error changes
ernestognw Mar 5, 2024
64d394f
Merge branch 'master' into feature/clones-value
ernestognw Mar 6, 2024
a24f2b2
Merge branch 'master' into feature/clones-value
ernestognw Mar 6, 2024
528ebdc
fixing: how could that happen? good thing we have tests!
Amxx Mar 6, 2024
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
Prev Previous commit
Next Next commit
re-fix lint
  • Loading branch information
@Amxx
Amxx committed Mar 5, 2024
commit 6942c467c0b8a891fa112cc257d3730dc0e3937d
14 changes: 0 additions & 14 deletions test/utils/Address.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,7 @@ describe('Address', function () {
it('reverts when the called function reverts with no reason', async function () {
const call = this.target.interface.encodeFunctionData('mockFunctionRevertsNoReason');

<<<<<<< HEAD
await expect(this.mock.$functionCall(this.target, call)).to.be.revertedWithCustomError(this.mock, 'FailedCall');
=======
await expect(this.mock.$functionCall(this.target, call)).to.be.revertedWithCustomError(
this.mock,
'FailedCall',
);
>>>>>>> e8eb6251e0707dc2fff4a7d6eaf9e53593d8c2e4
});

it('reverts when the called function reverts, bubbling up the revert reason', async function () {
Expand Down Expand Up @@ -136,14 +129,7 @@ describe('Address', function () {
const interface = new ethers.Interface(['function mockFunctionDoesNotExist()']);
const call = interface.encodeFunctionData('mockFunctionDoesNotExist');

<<<<<<< HEAD
await expect(this.mock.$functionCall(this.target, call)).to.be.revertedWithCustomError(this.mock, 'FailedCall');
=======
await expect(this.mock.$functionCall(this.target, call)).to.be.revertedWithCustomError(
this.mock,
'FailedCall',
);
>>>>>>> e8eb6251e0707dc2fff4a7d6eaf9e53593d8c2e4
});
});

Expand Down