Updated contract deploy script, fixed backward compatibility issues d…

…ue to CCIP router & link params to AccountFactory
thirdweb-dev · codypharm · Oct 16, 2023 · Oct 17, 2023 · Oct 20, 2023 · Oct 20, 2023
commit e838c6d5b59c01b80b78dac6d18d4163f38df6ec
diff --git a/Makefile b/Makefile
@@ -25,15 +25,15 @@ build:; forge build
 
 test :; forge test 
 
-test_anvil :; forge test --rpc-url $(ANVIL_RPC_URL)
+test_anvil :; forge test --rpc-url $(SEPOLIA_RPC_URL)
 
 snapshot :; forge snapshot
 
 format :; forge fmt
 
 anvil :; anvil -m 'test test test test test test test test test test test junk' --steps-tracing --block-time 1
 
-NETWORK_ARGS := --rpc-url $(ANVIL_RPC_URL) --private-key $(ANVIL_PRIVATE_KEY) --broadcast
+SEPOLIA_NETWORK_ARGS := --rpc-url $(SEPOLIA_RPC_URL) --private-key $(SEPOLIA_PRIVATE_KEY) --broadcast
 
 # ifeq ($(findstring --network sepolia,$(ARGS)),--network sepolia)
 # 	NETWORK_ARGS := --rpc-url $(SEPOLIA_RPC_URL) --private-key $(SEPOLIA_PRIVATE_KEY) --broadcast --verify --etherscan-api-key $(ETHERSCAN_API_KEY) -vvvv
@@ -44,4 +44,4 @@ NETWORK_ARGS := --rpc-url $(ANVIL_RPC_URL) --private-key $(ANVIL_PRIVATE_KEY) --
 # endif
 
 deploy:
-	@forge script scripts/DeploySmartAccountUtilContracts.s.sol:DeploySmartAccountUtilContracts $(NETWORK_ARGS)
+	@forge script scripts/DeploySmartAccountUtilContracts.s.sol:DeploySmartAccountUtilContracts $(SEPOLIA_NETWORK_ARGS)
diff --git a/contracts/prebuilts/account/non-upgradeable/AccountFactory.sol b/contracts/prebuilts/account/non-upgradeable/AccountFactory.sol
@@ -29,6 +29,9 @@ import "forge-std/console.sol";
 //    \____/ \__|  \__|\__|\__|       \_______| \_____\____/  \_______|\_______/
 
 contract AccountFactory is BaseAccountFactory, ContractMetadata, PermissionsEnumerable {
+    // Events //
+    event AccountFactoryContractDeployed(address indexed);
+
     /*///////////////////////////////////////////////////////////////
                             Constructor
     //////////////////////////////////////////////////////////////*/
@@ -39,6 +42,8 @@ contract AccountFactory is BaseAccountFactory, ContractMetadata, PermissionsEnum
         address _link
     ) BaseAccountFactory(address(new Account(_entrypoint, address(this))), address(_entrypoint), _router, _link) {
         _setupRole(DEFAULT_ADMIN_ROLE, msg.sender);
+
+        emit AccountFactoryContractDeployed(address(this));
     }
 
     ///@dev  returns cross chain contract details

diff --git a/contracts/prebuilts/account/utils/BaseAccountFactory.sol b/contracts/prebuilts/account/utils/BaseAccountFactory.sol
@@ -32,34 +32,47 @@ import { AccountRecovery } from "../utils/AccountRecovery.sol";
 abstract contract BaseAccountFactory is IAccountFactory, Multicall {
     using EnumerableSet for EnumerableSet.AddressSet;
 
+    // Events //
+
+    event GuardianContractDeployed(address indexed);
+    event AccountLockContractDeployed(address indexed);
+    event CrossChainTokenTransferContractDeployed(address indexed);
+    event CrossChainTokenTransferMasterContractDeployed(address indexed);
+    event AccountGuardianContractDeployed(address indexed);
+    event SmartAccountContractDeployed(address indexed);
+    event AccountRecoveryContractDeployed(address indexed);
     /*///////////////////////////////////////////////////////////////
                                 State
     //////////////////////////////////////////////////////////////*/
 
     address public immutable accountImplementation;
     address public immutable entrypoint;
-    Guardian public guardian = new Guardian();
-    AccountLock public accountLock = new AccountLock(guardian);
+    Guardian public guardian;
+    AccountLock public accountLock;
     AccountGuardian public accountGuardian;
     CrossChainTokenTransfer public crossChainTokenTransfer;
     CrossChainTokenTransferMaster public crossChainTokenTransferMaster;
     AccountRecovery public accountRecovery;
     EnumerableSet.AddressSet private allAccounts;
     mapping(address => EnumerableSet.AddressSet) internal accountsOfSigner;
 
-    event CrossChainData(address crossChainTokenTransfer, address crossChainTokenTransferMaster);
-
     /*///////////////////////////////////////////////////////////////
                             Constructor
     //////////////////////////////////////////////////////////////*/
 
     constructor(address _accountImpl, address _entrypoint, address _router, address _link) {
         accountImplementation = _accountImpl;
         entrypoint = _entrypoint;
+        guardian = new Guardian();
+        accountLock = new AccountLock(guardian);
         crossChainTokenTransfer = new CrossChainTokenTransfer(_router, _link);
         crossChainTokenTransferMaster = new CrossChainTokenTransferMaster();
-        // // emit the contract addresses
-        // emit CrossChainData(address(crossChainTokenTransfer), address(crossChainTokenTransferMaster));
+        // emit the contract addresses
+        emit SmartAccountContractDeployed(_accountImpl);
+        emit GuardianContractDeployed(address(guardian));
+        emit AccountLockContractDeployed(address(accountLock));
+        emit CrossChainTokenTransferContractDeployed(address(crossChainTokenTransfer));
+        emit CrossChainTokenTransferMasterContractDeployed(address(crossChainTokenTransferMaster));
     }
 
     /*///////////////////////////////////////////////////////////////
@@ -87,9 +100,11 @@ abstract contract BaseAccountFactory is IAccountFactory, Multicall {
 
         accountGuardian = new AccountGuardian(guardian, accountLock, account);
         guardian.linkAccountToAccountGuardian(account, address(accountGuardian));
+        emit AccountGuardianContractDeployed(address(accountGuardian));
 
         accountRecovery = new AccountRecovery(account, address(accountGuardian));
         guardian.linkAccountToAccountRecovery(account, address(accountRecovery));
+        emit AccountRecoveryContractDeployed(address(accountRecovery));
 
         return account;
     }

diff --git a/scripts/DeploySmartAccountUtilContracts.s.sol b/scripts/DeploySmartAccountUtilContracts.s.sol
@@ -8,21 +8,51 @@ import { AccountFactory } from "contracts/prebuilts/account/non-upgradeable/Acco
 import { Account } from "contracts/prebuilts/account/non-upgradeable/Account.sol";
 import { Guardian } from "contracts/prebuilts/account/utils/Guardian.sol";
 import { AccountGuardian } from "contracts/prebuilts/account/utils/AccountGuardian.sol";
+import { AccountRecovery } from "contracts/prebuilts/account/utils/AccountRecovery.sol";
+import { CrossChainTokenTransfer } from "contracts/prebuilts/account/utils/CrossChainTokenTransfer.sol";
+import { CrossChainTokenTransferMaster } from "contracts/prebuilts/account/utils/CrossChainTokenTransferMaster.sol";
 
 contract DeploySmartAccountUtilContracts is Script {
     address public admin = makeAddr("admin");
 
-    function run() external returns (AccountFactory, address, Guardian, AccountLock, AccountGuardian) {
-        vm.startBroadcast(vm.envUint("ANVIL_PRIVATE_KEY"));
+    function run()
+        external
+        returns (
+            AccountFactory,
+            address,
+            Guardian,
+            AccountLock,
+            AccountGuardian,
+            CrossChainTokenTransfer,
+            CrossChainTokenTransferMaster,
+            AccountRecovery
+        )
+    {
+        vm.startBroadcast(vm.envUint("SEPOLIA_PRIVATE_KEY"));
+        address router = address(0x0BF3dE8c5D3e8A2B34D2BEeB17ABfCeBaf363A59);
+        address link = address(0x779877A7B0D9E8603169DdbD7836e478b4624789);
+
         EntryPoint entryPoint = new EntryPoint();
-        AccountFactory accountFactory = new AccountFactory(entryPoint);
+        AccountFactory accountFactory = new AccountFactory(entryPoint, router, link);
         address account = accountFactory.createAccount(admin, "");
         vm.stopBroadcast();
 
         Guardian guardianContract = accountFactory.guardian();
         AccountLock accountLock = accountFactory.accountLock();
+        CrossChainTokenTransfer ccTokenTranferContract = accountFactory.crossChainTokenTransfer();
+        CrossChainTokenTransferMaster ccTokenTranferContractMaster = accountFactory.crossChainTokenTransferMaster();
         AccountGuardian accountGuardian = accountFactory.accountGuardian();
+        AccountRecovery accountRecovery = accountFactory.accountRecovery();
 
-        return (accountFactory, account, guardianContract, accountLock, accountGuardian);
+        return (
+            accountFactory,
+            account,
+            guardianContract,
+            accountLock,
+            accountGuardian,
+            ccTokenTranferContract,
+            ccTokenTranferContractMaster,
+            accountRecovery
+        );
     }
 }
diff --git a/src/test/benchmark/AccountBenchmark.t.sol b/src/test/benchmark/AccountBenchmark.t.sol
@@ -56,11 +56,9 @@ contract AccountBenchmarkTest is BaseTest {
 
     event AccountCreated(address indexed account, address indexed accountAdmin);
 
-    function _signSignerPermissionRequest(IAccountPermissions.SignerPermissionRequest memory _req)
-        internal
-        view
-        returns (bytes memory signature)
-    {
+    function _signSignerPermissionRequest(
+        IAccountPermissions.SignerPermissionRequest memory _req
+    ) internal view returns (bytes memory signature) {
         bytes32 typehashSignerPermissionRequest = keccak256(
             "SignerPermissionRequest(address signer,uint8 isAdmin,address[] approvedTargets,uint256 nativeTokenLimitPerTransaction,uint128 permissionStartTimestamp,uint128 permissionEndTimestamp,uint128 reqValidityStartTimestamp,uint128 reqValidityEndTimestamp,bytes32 uid)"
         );
@@ -180,8 +178,10 @@ contract AccountBenchmarkTest is BaseTest {
 
         // Setup contracts
         entrypoint = new EntryPoint();
+        address router = address(0x0BF3dE8c5D3e8A2B34D2BEeB17ABfCeBaf363A59);
+        address link = address(0x779877A7B0D9E8603169DdbD7836e478b4624789);
         // deploy account factory
-        accountFactory = new AccountFactory(IEntryPoint(payable(address(entrypoint))));
+        accountFactory = new AccountFactory(IEntryPoint(payable(address(entrypoint))), router, link);
         // deploy dummy contract
         numberContract = new Number();
     }

diff --git a/src/test/smart-wallet/Account.t.sol b/src/test/smart-wallet/Account.t.sol
@@ -183,8 +183,10 @@ contract SimpleAccountTest is BaseTest {
 
         // Setup contracts
         entrypoint = new EntryPoint();
+        address router = address(0x0BF3dE8c5D3e8A2B34D2BEeB17ABfCeBaf363A59);
+        address link = address(0x779877A7B0D9E8603169DdbD7836e478b4624789);
         // deploy account factory
-        accountFactory = new AccountFactory(IEntryPoint(payable(address(entrypoint))));
+        accountFactory = new AccountFactory(IEntryPoint(payable(address(entrypoint))), router, link);
         // deploy dummy contract
         numberContract = new Number();
     }

diff --git a/src/test/smart-wallet/AccountVulnPOC.t.sol b/src/test/smart-wallet/AccountVulnPOC.t.sol
@@ -35,11 +35,7 @@ contract Number {
         num += 1;
     }
 
-    function setNumBySignature(
-        address owner,
-        uint256 newNum,
-        bytes calldata signature
-    ) public {
+    function setNumBySignature(address owner, uint256 newNum, bytes calldata signature) public {
         if (owner.code.length == 0) {
             // Signature verification by ECDSA
         } else {
@@ -80,11 +76,9 @@ contract SimpleAccountVulnPOCTest is BaseTest {
 
     event AccountCreated(address indexed account, address indexed accountAdmin);
 
-    function _prepareSignature(IAccountPermissions.SignerPermissionRequest memory _req)
-        internal
-        view
-        returns (bytes32 typedDataHash)
-    {
+    function _prepareSignature(
+        IAccountPermissions.SignerPermissionRequest memory _req
+    ) internal view returns (bytes32 typedDataHash) {
         bytes32 typehashSignerPermissionRequest = keccak256(
             "SignerPermissionRequest(address signer,uint8 isAdmin,address[] approvedTargets,uint256 nativeTokenLimitPerTransaction,uint128 permissionStartTimestamp,uint128 permissionEndTimestamp,uint128 reqValidityStartTimestamp,uint128 reqValidityEndTimestamp,bytes32 uid)"
         );
@@ -115,11 +109,9 @@ contract SimpleAccountVulnPOCTest is BaseTest {
         typedDataHash = keccak256(abi.encodePacked("\x19\x01", domainSeparator, structHash));
     }
 
-    function _signSignerPermissionRequest(IAccountPermissions.SignerPermissionRequest memory _req)
-        internal
-        view
-        returns (bytes memory signature)
-    {
+    function _signSignerPermissionRequest(
+        IAccountPermissions.SignerPermissionRequest memory _req
+    ) internal view returns (bytes memory signature) {
         bytes32 typedDataHash = _prepareSignature(_req);
         (uint8 v, bytes32 r, bytes32 s) = vm.sign(accountAdminPKey, typedDataHash);
         signature = abi.encodePacked(r, s, v);
@@ -211,8 +203,10 @@ contract SimpleAccountVulnPOCTest is BaseTest {
 
         // Setup contracts
         entrypoint = new EntryPoint();
+        address router = address(0x0BF3dE8c5D3e8A2B34D2BEeB17ABfCeBaf363A59);
+        address link = address(0x779877A7B0D9E8603169DdbD7836e478b4624789);
         // deploy account factory
-        accountFactory = new AccountFactory(IEntryPoint(payable(address(entrypoint))));
+        accountFactory = new AccountFactory(IEntryPoint(payable(address(entrypoint))), router, link);
         // deploy dummy contract
         numberContract = new Number();
     }

diff --git a/src/test/smart-wallet/DeploySmartAccountUtilContractsTest.t.sol b/src/test/smart-wallet/DeploySmartAccountUtilContractsTest.t.sol
@@ -19,7 +19,7 @@ contract DeploySmartAccountUtilContractsTest is Test {
 
     function setUp() external {
         DeploySmartAccountUtilContracts deployer = new DeploySmartAccountUtilContracts();
-        (accountFactory, account, guardianContract, accountLock, accountGuardian) = deployer.run();
+        (accountFactory, account, guardianContract, accountLock, accountGuardian, , , ) = deployer.run();
     }
 
     function testIfSmartAccountUtilContractsDeployed() external {

diff --git a/src/test/smart-wallet/DynamicAccount.t.sol b/src/test/smart-wallet/DynamicAccount.t.sol
@@ -34,12 +34,7 @@ contract Number {
 }
 
 contract NFTRejector {
-    function onERC721Received(
-        address,
-        address,
-        uint256,
-        bytes memory
-    ) public virtual returns (bytes4) {
+    function onERC721Received(address, address, uint256, bytes memory) public virtual returns (bytes4) {
         revert("NFTs not accepted");
     }
 }
@@ -48,6 +43,8 @@ contract DynamicAccountTest is BaseTest {
     // Target contracts
     EntryPoint private entrypoint;
     DynamicAccountFactory private accountFactory;
+    address router = address(0x0BF3dE8c5D3e8A2B34D2BEeB17ABfCeBaf363A59);
+    address link = address(0x779877A7B0D9E8603169DdbD7836e478b4624789);
 
     // Mocks
     Number internal numberContract;
@@ -72,11 +69,9 @@ contract DynamicAccountTest is BaseTest {
 
     event AccountCreated(address indexed account, address indexed accountAdmin);
 
-    function _prepareSignature(IAccountPermissions.SignerPermissionRequest memory _req)
-        internal
-        view
-        returns (bytes32 typedDataHash)
-    {
+    function _prepareSignature(
+        IAccountPermissions.SignerPermissionRequest memory _req
+    ) internal view returns (bytes32 typedDataHash) {
         bytes32 typehashSignerPermissionRequest = keccak256(
             "SignerPermissionRequest(address signer,uint8 isAdmin,address[] approvedTargets,uint256 nativeTokenLimitPerTransaction,uint128 permissionStartTimestamp,uint128 permissionEndTimestamp,uint128 reqValidityStartTimestamp,uint128 reqValidityEndTimestamp,bytes32 uid)"
         );
@@ -107,11 +102,9 @@ contract DynamicAccountTest is BaseTest {
         typedDataHash = keccak256(abi.encodePacked("\x19\x01", domainSeparator, structHash));
     }
 
-    function _signSignerPermissionRequest(IAccountPermissions.SignerPermissionRequest memory _req)
-        internal
-        view
-        returns (bytes memory signature)
-    {
+    function _signSignerPermissionRequest(
+        IAccountPermissions.SignerPermissionRequest memory _req
+    ) internal view returns (bytes memory signature) {
         bytes32 typedDataHash = _prepareSignature(_req);
         (uint8 v, bytes32 r, bytes32 s) = vm.sign(accountAdminPKey, typedDataHash);
         signature = abi.encodePacked(r, s, v);
@@ -248,7 +241,7 @@ contract DynamicAccountTest is BaseTest {
         extensions[0] = defaultExtension;
 
         // deploy account factory
-        accountFactory = new DynamicAccountFactory(IEntryPoint(payable(address(entrypoint))), extensions);
+        accountFactory = new DynamicAccountFactory(IEntryPoint(payable(address(entrypoint))), extensions, router, link);
         // deploy dummy contract
         numberContract = new Number();
     }
@@ -305,7 +298,9 @@ contract DynamicAccountTest is BaseTest {
         // deploy account factory
         DynamicAccountFactory factory = new DynamicAccountFactory(
             IEntryPoint(payable(address(entrypoint))),
-            extensions
+            extensions,
+            router,
+            link
         );
     }