Deployed to CarrChain Testnet

.env.example

@@ -30,6 +30,7 @@ BASE_RPC_URL=https://base.publicnode.com
 BASE_SEPOLIA_RPC_URL=https://sepolia.base.org
 BINANCE_RPC_URL=https://bsc.publicnode.com
 BINANCE_TESTNET_RPC_URL=https://bsc-testnet.publicnode.com
+CARR_CHAIN_TESTNET=https://rpc-testnet.carrchain.io/
 CELO_RPC_URL=https://forno.celo.org
 CELO_TESTNET_RPC_URL=https://alfajores-forno.celo-testnet.org
 CHIADO_RPC_URL=https://rpc.chiadochain.net

DEPLOYMENTS.md

@@ -116,6 +116,10 @@
 | `Bootstrap` | `binance_smart_chain_testnet` | [0x0D5154d7751b6e2fDaa06F0cC9B400549394C8AA](https://testnet.bscscan.com/address/0x0D5154d7751b6e2fDaa06F0cC9B400549394C8AA) | [0x616e148757c5b775d969a24ca26d7df8cbae1cc88f3b90ca5d8744480407984b](https://testnet.bscscan.com/tx/0x616e148757c5b775d969a24ca26d7df8cbae1cc88f3b90ca5d8744480407984b) |
 | `MultipleOwnerECDSAValidator` | `binance_smart_chain_testnet` | [0x0740Ed7c11b9da33d9C80Bd76b826e4E90CC1906](https://testnet.bscscan.com/address/0x0740Ed7c11b9da33d9C80Bd76b826e4E90CC1906) | [0x1c102366c5ac7af54a0671a4e07bbfc2caad76bc3d371c4f209243771e99871a](https://testnet.bscscan.com/tx/0x1c102366c5ac7af54a0671a4e07bbfc2caad76bc3d371c4f209243771e99871a) |
 | `ERC20SessionKeyValidator` | `binance_smart_chain_testnet` | [0x22A55192a663591586241D42E603221eac49ed09](https://testnet.bscscan.com/address/0x22A55192a663591586241D42E603221eac49ed09) | [0x9e3e2e09e8d0a53430759e297d7161d1c77ed6507b58331d2cc89e575129b5b7](https://testnet.bscscan.com/tx/0x9e3e2e09e8d0a53430759e297d7161d1c77ed6507b58331d2cc89e575129b5b7) |
+| `ModularEtherspotWallet` | `carr_chain_testnet` | [0xe893A26DD53b325BffAacDfA224692EfF4C448c4]() | [0x6e977ec173a17677eedbb8147e9e4d0fcd45da077a95023359d97465dbd626f4]() |
+| `ModularEtherspotWalletFactory` | `carr_chain_testnet` | [0xB3AD9B9B06c6016f81404ee8FcCD0526F018Cf0C]() | [0x4750a4696f29ed0d3aac43366984bec73e72e69c96d6e0889c1a2def81bb8118]() |
+| `Bootstrap` | `carr_chain_testnet` | [0x153e26707DF3787183945B88121E4Eb188FDCAAA]() | [0x72ba6efa5176a0f0ebbb736a8b6daf3ee987c3c18634986bb3364fe6d38b259a]() |
+| `MultipleOwnerECDSAValidator` | `carr_chain_testnet` | [0x810FA4C915015b703db0878CF2B9344bEB254a40]() | [0x62b3bbe95c097ae8931feeefaf2233b9c6f754738195726b77d45343999e44a8]() |
 | `ModularEtherspotWallet` | `celo_testnet` | [0x339eAB59e54fE25125AceC3225254a0cBD305A7b](https://alfajores.celoscan.io/address/0x339eAB59e54fE25125AceC3225254a0cBD305A7b) | [0xe1b345e2b9bfe9d437a624a4c740195a7d981bfbd060963cd59883fd65c8dadb](https://alfajores.celoscan.io/tx/0xe1b345e2b9bfe9d437a624a4c740195a7d981bfbd060963cd59883fd65c8dadb) |
 | `ModularEtherspotWalletFactory` | `celo_testnet` | [0x2A40091f044e48DEB5C0FCbc442E443F3341B451](https://alfajores.celoscan.io/address/0x2A40091f044e48DEB5C0FCbc442E443F3341B451) | [0x6da38276fd9c2a46b98e6e765f4454730cb386a9635c4af55ee599c51599e258](https://alfajores.celoscan.io/tx/0x6da38276fd9c2a46b98e6e765f4454730cb386a9635c4af55ee599c51599e258) |
 | `Bootstrap` | `celo_testnet` | [0x0D5154d7751b6e2fDaa06F0cC9B400549394C8AA](https://alfajores.celoscan.io/address/0x0D5154d7751b6e2fDaa06F0cC9B400549394C8AA) | [0xa5f4a00d9e17c1b38584d5a65d18fe658b71b24ee050832cca24a07068c5f9ce](https://alfajores.celoscan.io/tx/0xa5f4a00d9e17c1b38584d5a65d18fe658b71b24ee050832cca24a07068c5f9ce) |

foundry.toml

@@ -47,6 +47,7 @@ ancient8_testnet = "${ANCIENT8_TESTNET_RPC_URL}"
 arbitrum_sepolia = "${ARBITRUM_SEPOLIA_RPC_URL}"
 base_sepolia = "${BASE_SEPOLIA_RPC_URL}"
 binance_smart_chain_testnet = "${BINANCE_TESTNET_RPC_URL}"
+carr_chain_testnet = "${CARR_CHAIN_TESTNET}"
 celo = "${CELO_RPC_URL}"
 celo_testnet = "${CELO_TESTNET_RPC_URL}"
 chiado = "${CHIADO_RPC_URL}"

script/NonDeterministicDeployAllAndSetup.s.sol

@@ -7,7 +7,7 @@ import {IEntryPoint} from "ERC4337/interfaces/IEntryPoint.sol";
 import {IStakeManager} from "ERC4337/interfaces/IStakeManager.sol";
 import {ModularEtherspotWallet} from "../src/wallet/ModularEtherspotWallet.sol";
 import {ModularEtherspotWalletFactory} from "../src/wallet/ModularEtherspotWalletFactory.sol";
-import {Bootstrap} from "../src/erc7579-ref-impl/utils/Bootstrap.sol";
+import {Bootstrap} from "../src/ERC7579/utils/Bootstrap.sol";
 import {MultipleOwnerECDSAValidator} from "../src/modules/validators/MultipleOwnerECDSAValidator.sol";
 
 /**
@@ -21,16 +21,13 @@ import {MultipleOwnerECDSAValidator} from "../src/modules/validators/MultipleOwn
  * If error: Failed to get EIP-1559 fees: add --legacy tag
  * For certain chains (currently only mantle and mantle_sepolia): add --skip-simulation tag
  */
-
 contract NonDeterministicDeployAllAndSetupScript is Script {
-    address public constant ENTRY_POINT_07 =
-        0x0000000071727De22E5E9d8BAf0edAc6f37da032;
+    address public constant ENTRY_POINT_07 = 0x0000000071727De22E5E9d8BAf0edAc6f37da032;
 
     /*//////////////////////////////////////////////////////////////
                   Replace These Values With Your Own
     //////////////////////////////////////////////////////////////*/
-    address public constant DEPLOYER =
-        0x09FD4F6088f2025427AB1e89257A44747081Ed59;
+    address public constant DEPLOYER = 0x09FD4F6088f2025427AB1e89257A44747081Ed59;
     uint256 public constant FACTORY_STAKE = 1e16;
 
     function run() external {
@@ -48,19 +45,13 @@ contract NonDeterministicDeployAllAndSetupScript is Script {
         //////////////////////////////////////////////////////////////*/
         console2.log("Deploying ModularEtherspotWallet implementation...");
         implementation = new ModularEtherspotWallet();
-        console2.log(
-            "Wallet implementation deployed at address",
-            address(implementation)
-        );
+        console2.log("Wallet implementation deployed at address", address(implementation));
 
         /*//////////////////////////////////////////////////////////////
                       Deploy ModularEtherspotWalletFactory
         //////////////////////////////////////////////////////////////*/
         console2.log("Deploying ModularEtherspotWalletFactory...");
-        factory = new ModularEtherspotWalletFactory(
-            address(implementation),
-            DEPLOYER
-        );
+        factory = new ModularEtherspotWalletFactory(address(implementation), DEPLOYER);
         console2.log("Wallet factory deployed at address", address(factory));
 
         /*//////////////////////////////////////////////////////////////
@@ -75,19 +66,14 @@ contract NonDeterministicDeployAllAndSetupScript is Script {
         //////////////////////////////////////////////////////////////*/
         console2.log("Deploying MultipleOwnerECDSAValidator...");
         multipleOwnerECDSAValidator = new MultipleOwnerECDSAValidator();
-        console2.log(
-            "MultipleOwnerECDSAValidator deployed at address",
-            address(multipleOwnerECDSAValidator)
-        );
+        console2.log("MultipleOwnerECDSAValidator deployed at address", address(multipleOwnerECDSAValidator));
 
         /*//////////////////////////////////////////////////////////////
               Stake ModularEtherspotWalletFactory With EntryPoint
         //////////////////////////////////////////////////////////////*/
         console2.log("Staking factory contract with EntryPoint...");
         factory.addStake{value: FACTORY_STAKE}(address(entryPoint), 86400);
-        IStakeManager.DepositInfo memory info = entryPoint.getDepositInfo(
-            address(factory)
-        );
+        IStakeManager.DepositInfo memory info = entryPoint.getDepositInfo(address(factory));
         console2.log("Staked amount:", info.stake);
         console2.log("Factory staked!");