Update tests

thirdweb-dev · Oct 29, 2023 · e5dadd7 · e5dadd7
1 parent be8dc11
commit e5dadd7
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/src/test/benchmark/AccountBenchmark.t.sol b/src/test/benchmark/AccountBenchmark.t.sol
@@ -50,7 +50,7 @@ contract AccountBenchmarkTest is BaseTest {
     address private nonSigner;
 
     // UserOp terminology: `sender` is the smart wallet.
-    address private sender = 0x0df2C3523703d165Aa7fA1a552f3F0B56275DfC6;
+    address private sender = 0xDD1d01438DcF28eb45a611c7faBD716B0dECE259;
     address payable private beneficiary = payable(address(0x45654));
 
     bytes32 private uidCache = bytes32("random uid");

diff --git a/src/test/smart-wallet/Account.t.sol b/src/test/smart-wallet/Account.t.sol
@@ -50,7 +50,7 @@ contract SimpleAccountTest is BaseTest {
     address private nonSigner;
 
     // UserOp terminology: `sender` is the smart wallet.
-    address private sender = 0x0df2C3523703d165Aa7fA1a552f3F0B56275DfC6;
+    address private sender = 0xDD1d01438DcF28eb45a611c7faBD716B0dECE259;
     address payable private beneficiary = payable(address(0x45654));
 
     bytes32 private uidCache = bytes32("random uid");
@@ -292,7 +292,7 @@ contract SimpleAccountTest is BaseTest {
     }
 
     /// @dev Create an account via Entrypoint.
-    function test_state_createAccount_viaEntrypoint() public {
+    function test_state_createAccount_viaEntrypointSingle() public {
         bytes memory initCallData = abi.encodeWithSignature("createAccount(address,bytes)", accountAdmin, bytes(""));
         bytes memory initCode = abi.encodePacked(abi.encodePacked(address(accountFactory)), initCallData);
 

diff --git a/src/test/smart-wallet/AccountVulnPOC.t.sol b/src/test/smart-wallet/AccountVulnPOC.t.sol
@@ -74,7 +74,7 @@ contract SimpleAccountVulnPOCTest is BaseTest {
     address private nonSigner;
 
     // UserOp terminology: `sender` is the smart wallet.
-    address private sender = 0x0df2C3523703d165Aa7fA1a552f3F0B56275DfC6;
+    address private sender = 0xDD1d01438DcF28eb45a611c7faBD716B0dECE259;
     address payable private beneficiary = payable(address(0x45654));
 
     bytes32 private uidCache = bytes32("random uid");

diff --git a/src/test/smart-wallet/DynamicAccount.t.sol b/src/test/smart-wallet/DynamicAccount.t.sol
@@ -66,7 +66,7 @@ contract DynamicAccountTest is BaseTest {
     bytes internal data = bytes("");
 
     // UserOp terminology: `sender` is the smart wallet.
-    address private sender = 0x78b942FBC9126b4Ed8384Bb9dd1420Ea865be91a;
+    address private sender = 0x96b1d554981298ED415f2D5788A6D093A39eECfF;
     address payable private beneficiary = payable(address(0x45654));
 
     bytes32 private uidCache = bytes32("random uid");
@@ -410,7 +410,7 @@ contract DynamicAccountTest is BaseTest {
     }
 
     /// @dev Create an account via Entrypoint.
-    function test_state_createAccount_viaEntrypoint() public {
+    function test_state_createAccount_viaEntrypointSingle() public {
         bytes memory initCallData = abi.encodeWithSignature("createAccount(address,bytes)", accountAdmin, data);
         bytes memory initCode = abi.encodePacked(abi.encodePacked(address(accountFactory)), initCallData);
 

diff --git a/src/test/smart-wallet/ManagedAccount.t.sol b/src/test/smart-wallet/ManagedAccount.t.sol
@@ -67,7 +67,7 @@ contract ManagedAccountTest is BaseTest {
     address private nonSigner;
 
     // UserOp terminology: `sender` is the smart wallet.
-    address private sender = 0xbEA1Fa134A1727187A8f2e7E714B660f3a95478D;
+    address private sender = 0x48670c84959b8854A9036D88a020382bA89a47Ce;
     address payable private beneficiary = payable(address(0x45654));
 
     bytes32 private uidCache = bytes32("random uid");
@@ -327,7 +327,7 @@ contract ManagedAccountTest is BaseTest {
                 address(
                     new TWProxy(
                         factoryImpl,
-                        abi.encodeWithSignature("initialize(address,string)", deployer, "https://example.com")
+                        abi.encodeWithSignature("initialize(address,string)", factoryDeployer, "https://example.com")
                     )
                 )
             )
@@ -413,7 +413,7 @@ contract ManagedAccountTest is BaseTest {
     }
 
     /// @dev Create an account via Entrypoint.
-    function test_state_createAccount_viaEntrypoint() public {
+    function test_state_createAccount_viaEntrypointSingle() public {
         bytes memory initCallData = abi.encodeWithSignature("createAccount(address,bytes)", accountAdmin, data);
         bytes memory initCode = abi.encodePacked(abi.encodePacked(address(accountFactory)), initCallData);
 

diff --git a/src/test/smart-wallet/account-core/isValidSigner.t.sol b/src/test/smart-wallet/account-core/isValidSigner.t.sol
@@ -208,7 +208,7 @@ contract AccountCoreTest_isValidSigner is BaseTest {
         address accountImpl = address(new MyDynamicAccount(IEntryPoint(payable(address(entrypoint))), extensions));
         address _account = Clones.cloneDeterministic(accountImpl, "salt");
         account = MyDynamicAccount(payable(_account));
-        account.initialize(accountAdmin, "");
+        account.initialize(accountAdmin, address(this), "");
     }
 
     function test_isValidSigner_whenSignerIsAdmin() public {

diff --git a/src/test/smart-wallet/account-permissions/setPermissionsForSigner.t.sol b/src/test/smart-wallet/account-permissions/setPermissionsForSigner.t.sol
@@ -74,7 +74,7 @@ contract AccountPermissionsTest_setPermissionsForSigner is BaseTest {
     bytes internal data = bytes("");
 
     // UserOp terminology: `sender` is the smart wallet.
-    address private sender = 0x78b942FBC9126b4Ed8384Bb9dd1420Ea865be91a;
+    address private sender = 0x96b1d554981298ED415f2D5788A6D093A39eECfF;
     address payable private beneficiary = payable(address(0x45654));
 
     bytes32 private uidCache = bytes32("random uid");