-
Notifications
You must be signed in to change notification settings - Fork 71
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix tests + include initial implementation in hash
- Loading branch information
1 parent
a87beb2
commit a1bb2e6
Showing
6 changed files
with
80 additions
and
66 deletions.
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -65,7 +65,7 @@ contract TestValidateUserOp is SmartWalletTestBase { | |
| r: uint256(r), | ||
| s: uint256(s) | ||
| }) | ||
| ) | ||
| ) | ||
| }) | ||
| ); | ||
|
|
||
|
|
||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,49 @@ | ||
| // SPDX-License-Identifier: UNLICENSED | ||
| // pragma solidity ^0.8.0; | ||
|
|
||
| // import {Test, console2} from "forge-std/Test.sol"; | ||
| // import {CoinbaseSmartWallet} from "../src/CoinbaseSmartWallet.sol"; | ||
| // import {CoinbaseSmartWalletFactory} from "../src/CoinbaseSmartWalletFactory.sol"; | ||
| // import {ERC1271InputGenerator} from "../src/utils/ERC1271InputGenerator.sol"; | ||
|
|
||
| // contract CoinbaseSmartWallet1271InputGeneratorTest is Test { | ||
| // CoinbaseSmartWalletFactory factory; | ||
| // CoinbaseSmartWallet implementation; | ||
| // CoinbaseSmartWallet deployedAccount; | ||
| // bytes[] owners; | ||
|
|
||
| // function setUp() public { | ||
| // implementation = new CoinbaseSmartWallet(); | ||
| // factory = new CoinbaseSmartWalletFactory(address(implementation)); | ||
| // } | ||
|
|
||
| // function testGetReplaySafeHashForDeployedAccount() public { | ||
| // owners.push(abi.encode(address(1))); | ||
| // deployedAccount = CoinbaseSmartWallet(payable(factory.createAccount(owners, 0))); | ||
|
|
||
| // bytes32 hash = 0x15fa6f8c855db1dccbb8a42eef3a7b83f11d29758e84aed37312527165d5eec5; | ||
| // bytes32 replaySafeHash = deployedAccount.replaySafeHash(hash); | ||
| // ERC1271InputGenerator generator = new ERC1271InputGenerator(deployedAccount, hash, address(0), ""); | ||
| // assertEq(bytes32(address(generator).code), replaySafeHash); | ||
| // } | ||
|
|
||
| // function testGetReplaySafeHashForUndeployedAccount() public { | ||
| // owners.push(abi.encode(address(1))); | ||
| // CoinbaseSmartWallet undeployedAccount = CoinbaseSmartWallet(payable(factory.getAddress(owners, 0))); | ||
| // bytes32 hash = 0x15fa6f8c855db1dccbb8a42eef3a7b83f11d29758e84aed37312527165d5eec5; | ||
| // ERC1271InputGenerator generator = new ERC1271InputGenerator( | ||
| // undeployedAccount, | ||
| // hash, | ||
| // address(factory), | ||
| // abi.encodeWithSignature("createAccount(bytes[],uint256)", owners, 0) | ||
| // ); | ||
|
|
||
| // // This is now deployed. | ||
| // bytes32 replaySafeHash = undeployedAccount.replaySafeHash(hash); | ||
|
|
||
| // assertEq(bytes32(address(generator).code), replaySafeHash); | ||
| // } | ||
| // } | ||
| // SPDX-License-Identifier: MIT | ||
| pragma solidity ^0.8.0; | ||
|
|
||
| import {Test, console2} from "forge-std/Test.sol"; | ||
| import {CoinbaseSmartWallet} from "../src/CoinbaseSmartWallet.sol"; | ||
| import {CoinbaseSmartWalletFactory} from "../src/CoinbaseSmartWalletFactory.sol"; | ||
| import {ERC1271InputGenerator} from "../src/utils/ERC1271InputGenerator.sol"; | ||
|
|
||
| contract CoinbaseSmartWallet1271InputGeneratorTest is Test { | ||
| CoinbaseSmartWalletFactory factory; | ||
| CoinbaseSmartWallet implementation; | ||
| CoinbaseSmartWallet deployedAccount; | ||
| bytes[] owners; | ||
|
|
||
| function setUp() public { | ||
| implementation = new CoinbaseSmartWallet(); | ||
| factory = new CoinbaseSmartWalletFactory(); | ||
| } | ||
|
|
||
| function testGetReplaySafeHashForDeployedAccount() public { | ||
| owners.push(abi.encode(address(1))); | ||
| deployedAccount = CoinbaseSmartWallet(payable(factory.createAccount(owners, 0, address(implementation)))); | ||
|
|
||
| bytes32 hash = 0x15fa6f8c855db1dccbb8a42eef3a7b83f11d29758e84aed37312527165d5eec5; | ||
| bytes32 replaySafeHash = deployedAccount.replaySafeHash(hash); | ||
| ERC1271InputGenerator generator = new ERC1271InputGenerator(deployedAccount, hash, address(0), ""); | ||
| assertEq(bytes32(address(generator).code), replaySafeHash); | ||
| } | ||
|
|
||
| function testGetReplaySafeHashForUndeployedAccount() public { | ||
| owners.push(abi.encode(address(1))); | ||
| CoinbaseSmartWallet undeployedAccount = | ||
| CoinbaseSmartWallet(payable(factory.getAddress(owners, 0, address(implementation)))); | ||
| bytes32 hash = 0x15fa6f8c855db1dccbb8a42eef3a7b83f11d29758e84aed37312527165d5eec5; | ||
| ERC1271InputGenerator generator = new ERC1271InputGenerator( | ||
| undeployedAccount, | ||
| hash, | ||
| address(factory), | ||
| abi.encodeWithSelector( | ||
| CoinbaseSmartWalletFactory.createAccount.selector, owners, 0, address(implementation) | ||
| ) | ||
| ); | ||
|
|
||
| // This is now deployed. | ||
| bytes32 replaySafeHash = undeployedAccount.replaySafeHash(hash); | ||
|
|
||
| assertEq(bytes32(address(generator).code), replaySafeHash); | ||
| } | ||
| } |