Zksync scripts finalization #53
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Cycxyz
changed the title
🔮 Coverage report
|
🔧 Build logsCompiling 87 files with Solc 0.8.28
installing solc version "0.8.28"
Successfully installed solc 0.8.28
Solc 0.8.28 finished in 3.54s
Compiler run successful with warnings:
Warning (5667): Unused function parameter. Remove or comment out the variable name to silence this warning.
--> src/mocks/ERC721.sol:933:23:
|
933 | function tokenURI(uint256 id) public view override returns (string memory) {
| ^^^^^^^^^^
Warning (2018): Function state mutability can be restricted to pure
--> src/mocks/ERC721.sol:923:5:
|
923 | function name() public view override returns (string memory) {
| ^ (Relevant source part starts here and spans across multiple lines).
Warning (2018): Function state mutability can be restricted to pure
--> src/mocks/ERC721.sol:928:5:
|
928 | function symbol() public view override returns (string memory) {
| ^ (Relevant source part starts here and spans across multiple lines).
Warning (2018): Function state mutability can be restricted to pure
--> src/mocks/ERC721.sol:933:5:
|
933 | function tokenURI(uint256 id) public view override returns (string memory) {
| ^ (Relevant source part starts here and spans across multiple lines).
Warning (2018): Function state mutability can be restricted to view
--> test/PermissionlessRescuable.t.sol:63:3:
|
63 | function test_whoShouldReceiveFunds() public {
| ^ (Relevant source part starts here and spans across multiple lines).
Warning (2018): Function state mutability can be restricted to view
--> test/UpgradeableOwnableWithGuardian.t.sol:29:3:
|
29 | function test_initializer() external {
| ^ (Relevant source part starts here and spans across multiple lines).
| Contract | Runtime Size (B) | Initcode Size (B) | Runtime Margin (B) | Initcode Margin (B) |
|-----------------------------|------------------|-------------------|--------------------|---------------------|
| Address | 85 | 135 | 24,491 | 49,017 |
| ChainHelpers | 85 | 135 | 24,491 | 49,017 |
| ChainIds | 85 | 135 | 24,491 | 49,017 |
| Create2Utils | 162 | 212 | 24,414 | 48,940 |
| Create3 | 85 | 135 | 24,491 | 49,017 |
| Create3Factory | 1,094 | 1,122 | 23,482 | 48,030 |
| ERC1967Proxy | 163 | 1,014 | 24,413 | 48,138 |
| ERC1967Utils | 85 | 135 | 24,491 | 49,017 |
| ERC20 | 2,331 | 3,020 | 22,245 | 46,132 |
| EnumerableSet | 85 | 135 | 24,491 | 49,017 |
| ImplOwnableWithGuardian | 1,464 | 1,492 | 23,112 | 47,660 |
| MockContract | 759 | 1,021 | 23,817 | 48,131 |
| MockERC721 | 2,421 | 2,449 | 22,155 | 46,703 |
| MockImpl | 465 | 690 | 24,111 | 48,462 |
| PermissionlessRescuable | 1,908 | 2,081 | 22,668 | 47,071 |
| ProxyAdmin | 1,039 | 1,275 | 23,537 | 47,877 |
| Rescuable | 1,807 | 1,958 | 22,769 | 47,194 |
| Rescuable721 | 2,043 | 2,201 | 22,533 | 46,951 |
| RescuableACL | 1,695 | 1,827 | 22,881 | 47,325 |
| SafeCast | 85 | 135 | 24,491 | 49,017 |
| SafeERC20 | 85 | 135 | 24,491 | 49,017 |
| StorageSlot | 85 | 135 | 24,491 | 49,017 |
| TestNetChainIds | 85 | 135 | 24,491 | 49,017 |
| TransparentProxyFactory | 5,314 | 5,342 | 19,262 | 43,810 |
| TransparentUpgradeableProxy | 1,137 | 2,266 | 23,439 | 46,886 |🔧 Build logs zksyncCompiling 45 files with zksolc and ZKsync solc 0.8.24
zksolc and ZKsync solc 0.8.24 finished in 11.20s
Compiler run successful with warnings:
Warning (2519)
Warning: This declaration shadows an existing declaration.
--> zksync/test/TransparentProxyFactoryZkSync.t.sol:88:5:
|
88 | address proxyAdmin = factory.createDeterministicProxyAdmin(proxyAdminOwner, proxyAdminSalt);
| ^^^^^^^^^^^^^^^^^^
Note: The shadowed declaration is here:
--> zksync/test/TransparentProxyFactoryZkSync.t.sol:14:3:
|
14 | ProxyAdmin internal proxyAdmin;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Warning (2519)
Warning: This declaration shadows an existing declaration.
--> zksync/test/TransparentProxyFactoryZkSync.t.sol:106:5:
|
106 | address proxyAdmin = factory.createDeterministicProxyAdmin(proxyAdminOwner, proxyAdminSalt);
| ^^^^^^^^^^^^^^^^^^
Note: The shadowed declaration is here:
--> zksync/test/TransparentProxyFactoryZkSync.t.sol:14:3:
|
14 | ProxyAdmin internal proxyAdmin;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Warning
┌──────────────────────────────────────────────────────────────────────────────────────────────────┐
│ Warning: Your code or one of its dependencies uses the 'extcodesize' instruction, which is │
│ usually needed in the following cases: │
│ 1. To detect whether an address belongs to a smart contract. │
│ 2. To detect whether the deploy code execution has finished. │
│ zkSync Era comes with native account abstraction support (so accounts are smart contracts, │
│ including private-key controlled EOAs), and you should avoid differentiating between contracts │
│ and non-contract addresses. │
└──────────────────────────────────────────────────────────────────────────────────────────────────┘
--> lib/forge-std/src/StdCheats.sol
Warning
┌──────────────────────────────────────────────────────────────────────────────────────────────────┐
│ Warning: Your code or one of its dependencies uses the 'extcodesize' instruction, which is │
│ usually needed in the following cases: │
│ 1. To detect whether an address belongs to a smart contract. │
│ 2. To detect whether the deploy code execution has finished. │
│ zkSync Era comes with native account abstraction support (so accounts are smart contracts, │
│ including private-key controlled EOAs), and you should avoid differentiating between contracts │
│ and non-contract addresses. │
└──────────────────────────────────────────────────────────────────────────────────────────────────┘
--> lib/forge-std/src/StdUtils.sol
Warning
┌──────────────────────────────────────────────────────────────────────────────────────────────────┐
│ Warning: It looks like you are using 'ecrecover' to validate a signature of a user account. │
│ zkSync Era comes with native account abstraction support, therefore it is highly recommended NOT │
│ to rely on the fact that the account has an ECDSA private key attached to it since accounts might│
│ implement other signature schemes. │
│ Read more about Account Abstraction at https://v2-docs.zksync.io/dev/developer-guides/aa.html │
└──────────────────────────────────────────────────────────────────────────────────────────────────┘
--> lib/forge-std/src/mocks/MockERC20.sol
Warning
┌──────────────────────────────────────────────────────────────────────────────────────────────────┐
│ Warning: Your code or one of its dependencies uses the 'extcodesize' instruction, which is │
│ usually needed in the following cases: │
│ 1. To detect whether an address belongs to a smart contract. │
│ 2. To detect whether the deploy code execution has finished. │
│ zkSync Era comes with native account abstraction support (so accounts are smart contracts, │
│ including private-key controlled EOAs), and you should avoid differentiating between contracts │
│ and non-contract addresses. │
└──────────────────────────────────────────────────────────────────────────────────────────────────┘
--> lib/forge-std/src/mocks/MockERC721.sol
| Contract | Runtime Size (B) | Initcode Size (B) | Runtime Margin (B) | Initcode Margin (B) |
|-------------------------------|------------------|-------------------|--------------------|---------------------|
| Address | 224 | 224 | 450,775 | 450,775 |
| Create2UtilsZkSync | 544 | 544 | 450,455 | 450,455 |
| ERC1967Proxy | 4,192 | 4,192 | 446,807 | 446,807 |
| ERC1967Utils | 224 | 224 | 450,775 | 450,775 |
| MockImpl | 2,272 | 2,272 | 448,727 | 448,727 |
| ProxyAdmin | 4,512 | 4,512 | 446,487 | 446,487 |
| StorageSlot | 224 | 224 | 450,775 | 450,775 |
| TransparentProxyFactoryZkSync | 7,776 | 7,776 | 443,223 | 443,223 |
| TransparentUpgradeableProxy | 7,136 | 7,136 | 443,863 | 443,863 | |
🌈 Test ResultsNo files changed, compilation skipped
Ran 1 test for test/ChainHelperTest.t.sol:TestChainHelpers
[PASS] test_selectChain_shouldRevert() (gas: 3293)
Suite result: ok. 1 passed; 0 failed; 0 skipped; finished in 357.30µs (109.44µs CPU time)
Ran 6 tests for test/PermissionlessRescuable.t.sol:PermissionlessRescuableTest
[PASS] test_emergencyEtherTransfer() (gas: 59257)
[PASS] test_emergencyEtherTransferInsufficientBalance_shouldRevert() (gas: 45456)
[PASS] test_emergencyTokenTransfer() (gas: 81017)
[PASS] test_emergencyTokenTransferInsufficientBalance_shouldRevert() (gas: 21438)
[PASS] test_emergencyTokenTransfer_withTransferRestriction() (gas: 115750)
[PASS] test_whoShouldReceiveFunds() (gas: 12734)
Suite result: ok. 6 passed; 0 failed; 0 skipped; finished in 947.33µs (557.61µs CPU time)
Ran 5 tests for test/Rescuable.t.sol:RescueTest
[PASS] testEmergencyEtherTransfer() (gas: 57744)
[PASS] testEmergencyEtherTransferWhenNotOwner() (gas: 17666)
[PASS] testEmergencyTokenTransfer() (gas: 231216)
[PASS] testEmergencyTokenTransferWhenNotOwner() (gas: 203504)
[PASS] testToken() (gas: 2392)
Suite result: ok. 5 passed; 0 failed; 0 skipped; finished in 2.41ms (2.04ms CPU time)
Ran 6 tests for test/OwnableWithGuardian.t.sol:TestOfOwnableWithGuardian
[PASS] testConstructorLogic() (gas: 18202)
[PASS] testGuardianUpdateNoAccess() (gas: 14902)
[PASS] testGuardianUpdateViaGuardian(address) (runs: 256, μ: 19408, ~: 19419)
[PASS] testGuardianUpdateViaOwner(address) (runs: 256, μ: 19236, ~: 19236)
[PASS] test_onlyGuardianGuard() (gas: 12577)
[PASS] test_onlyGuardianGuard_shouldRevert() (gas: 10566)
Suite result: ok. 6 passed; 0 failed; 0 skipped; finished in 28.74ms (25.21ms CPU time)
Ran 3 tests for test/Rescuable721.t.sol:Rescue721Test
[PASS] testFuzzEmergencyTokenTransfer(address) (runs: 256, μ: 79081, ~: 79081)
[PASS] testFuzzEmergencyTokenTransferWhenNotOwner(address,address) (runs: 256, μ: 71859, ~: 71859)
[PASS] testToken() (gas: 2458)
Suite result: ok. 3 passed; 0 failed; 0 skipped; finished in 60.92ms (60.55ms CPU time)
Ran 5 tests for test/RescuableACL.t.sol:RescueACLTest
[PASS] testEmergencyEtherTransfer() (gas: 57746)
[PASS] testEmergencyEtherTransferWhenNotOwner() (gas: 17659)
[PASS] testEmergencyTokenTransfer() (gas: 231235)
[PASS] testEmergencyTokenTransferWhenNotOwner() (gas: 203516)
[PASS] testToken() (gas: 2392)
Suite result: ok. 5 passed; 0 failed; 0 skipped; finished in 2.47ms (2.11ms CPU time)
Ran 6 tests for test/UpgradeableOwnableWithGuardian.t.sol:TestOfUpgradableOwnableWithGuardian
[PASS] test_initializer() (gas: 18304)
[PASS] test_onlyGuardian() (gas: 11066)
[PASS] test_onlyOwnerOrGuardian() (gas: 13262)
[PASS] test_updateGuardian_eoa(address,address) (runs: 256, μ: 18703, ~: 18703)
[PASS] test_updateGuardian_guardian(address) (runs: 256, μ: 19684, ~: 19684)
[PASS] test_updateGuardian_owner(address) (runs: 256, μ: 19400, ~: 19400)
Suite result: ok. 6 passed; 0 failed; 0 skipped; finished in 66.52ms (66.31ms CPU time)
Ran 2 tests for test/create3Test.t.sol:Create3FactoryTest
[PASS] testCreate3WithValue(address,address,address) (runs: 256, μ: 280857, ~: 280857)
[PASS] testCreate3WithoutValue(address,address,bytes32) (runs: 256, μ: 283786, ~: 283786)
Suite result: ok. 2 passed; 0 failed; 0 skipped; finished in 104.99ms (110.18ms CPU time)
Ran 4 tests for test/TransparentProxyFactory.t.sol:TestTransparentProxyFactory
[PASS] testCreateDeterministic(address,bytes32) (runs: 256, μ: 384826, ~: 384826)
[PASS] testCreateDeterministicProxyAdmin(address,bytes32) (runs: 256, μ: 282376, ~: 282376)
[PASS] testCreateDeterministicWithDeterministicProxy(bytes32,bytes32) (runs: 256, μ: 391377, ~: 391377)
[PASS] testCreateProxyAdmin(address,bytes32) (runs: 256, μ: 276438, ~: 276438)
Suite result: ok. 4 passed; 0 failed; 0 skipped; finished in 148.67ms (222.83ms CPU time)
Ran 9 test suites in 150.63ms (416.03ms CPU time): 38 tests passed, 0 failed, 0 skipped (38 total tests)🌈 Test Results zksyncCompiling 43 files with Solc 0.8.24
Solc 0.8.24 finished in 1.52s
Compiler run successful with warnings:
Warning (2519): This declaration shadows an existing declaration.
--> zksync/test/TransparentProxyFactoryZkSync.t.sol:88:5:
|
88 | address proxyAdmin = factory.createDeterministicProxyAdmin(proxyAdminOwner, proxyAdminSalt);
| ^^^^^^^^^^^^^^^^^^
Note: The shadowed declaration is here:
--> zksync/test/TransparentProxyFactoryZkSync.t.sol:14:3:
|
14 | ProxyAdmin internal proxyAdmin;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Warning (2519): This declaration shadows an existing declaration.
--> zksync/test/TransparentProxyFactoryZkSync.t.sol:106:5:
|
106 | address proxyAdmin = factory.createDeterministicProxyAdmin(proxyAdminOwner, proxyAdminSalt);
| ^^^^^^^^^^^^^^^^^^
Note: The shadowed declaration is here:
--> zksync/test/TransparentProxyFactoryZkSync.t.sol:14:3:
|
14 | ProxyAdmin internal proxyAdmin;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
No files changed, compilation skipped
Ran 5 tests for zksync/test/TransparentProxyFactoryZkSync.t.sol:TestTransparentProxyFactoryZkSync
[PASS] testCreate() (gas: 343998)
[PASS] testCreateDeterministic(bytes32) (runs: 256, μ: 577061, ~: 577061)
[PASS] testCreateDeterministicProxyAdmin(address,bytes32) (runs: 256, μ: 466597, ~: 471484)
[PASS] testCreateDeterministicWithDeterministicProxy(bytes32,bytes32) (runs: 256, μ: 688155, ~: 688155)
[PASS] testCreateProxyAdmin(address,bytes32) (runs: 256, μ: 355093, ~: 359879)
Suite result: ok. 5 passed; 0 failed; 0 skipped; finished in 9.79s (31.29s CPU time)
Ran 1 test suite in 9.79s (9.79s CPU time): 5 tests passed, 0 failed, 0 skipped (5 total tests) |
⛽ Gas reportCreate3Factory
ProxyAdmin
TransparentProxyFactory
TransparentUpgradeableProxy
ERC20
MockERC721
MockImpl
ImplOwnableWithGuardian
PermissionlessRescuable
Rescuable
Rescuable721
RescuableACL
ImplOwnableWithGuardian
MockContract
|
Cycxyz
force-pushed
the
zksync_scripts
branch
from
7f0bc75 to
a412f78
Compare
Cycxyz
force-pushed
the
zksync_scripts
branch
from
a412f78 to
a160c2c
Compare
Comment on lines
13
to
16
| * a deterministic address, you need to provide not the contract creation code, but the hash of the contract bytecode. | ||
| * Then zkSync tries to match the provided bytecode hash with contracts that already exist on the network. If it finds one, | ||
| * the contract will be deployed. These utils use the Create2Factory contract, so before trying to deploy a contract with a | ||
| * deterministic address, you first need to deploy it at a random address to let zkSync remember its bytecode. |
There was a problem hiding this comment.
This way for every contract deployment using create2 we first need to deploy the contract using create1 so that the bytecode hash is known, although it works but it is not efficient imo and could be done in a single step.
Deploying via create2 on zksync, we need to pass the bytecode hash from our side and the contract bytecode which needs to be passed via the factory_deps is the job of foundry-zksync to handle internally.
Thus deploying the contract using create1 from our end so that the bytecode hash is known is not needed and should be done by foundry-zksync.
There was a problem hiding this comment.
Exactly, but foundry doesn't provide EIP 712 transaction type to make it possible
| * @param data The bytecode from which to extract the hash. | ||
| * @return The extracted 32-byte hash. | ||
| */ | ||
| function getBytecodeHashFromBytecode(bytes memory data) internal pure returns (bytes32) { |
There was a problem hiding this comment.
I would not name this method as getBytecodeHashFromBytecode because this method is not actually converting the contract bytecode to bytecodeHash but rather is just sanitizing the bytecodeHash being received.
As foundry-zksync, when type(Contract).creationCode is used in script does not return the contract bytecode but rather the unformatted / unsanitized bytecodeHash
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.