WIP - New contracts and contracts-sdk packages

packages/contracts/Dockerfile

@@ -10,7 +10,7 @@ WORKDIR /root
 COPY . .
 
 # install contracts package dependencies
-RUN npm install
-RUN npm install -D @nomicfoundation/hardhat-toolbox solidity-coverage dotenv
+RUN npm install --force
+RUN npm install -D @nomicfoundation/hardhat-toolbox @openzeppelin/hardhat-upgrades @layerzerolabs/lz-evm-oapp-v2 solidity-coverage dotenv --force
 
 ENTRYPOINT [ "/bin/bash", "entrypoint.sh" ]

packages/contracts/entrypoint.sh

@@ -2,8 +2,11 @@
 
 tmux new -d -s hardhat npx hardhat node
 
+# Wait for the node to start, ignition was failing without waiting
+sleep 5
+
 # deploy the scripts to the running instance
-npx hardhat run scripts/deploy-factory-and-consent.cts --network localhost
+npx hardhat ignition deploy ignition/modules/SnickerdoodleFactory.ts --network hardhat
 
 # keeps main thread of execution from exiting
 tail -f /dev/null

packages/contracts/ignition/modules/OperatorGateway.ts

@@ -6,6 +6,8 @@ const OperatorGatewayModule = buildModule("OperatorGatewayModule", (m) => {
   // Change the params here based on the chain to deploy on
   const operatorGatewayImpl = m.contract("OperatorGateway", []);
   m.call(operatorGatewayImpl, "initialize", [
+    "",
+    [owner],
     [owner],
     "0x000000000000000000000000000000000000dEaD",
   ]);

packages/contracts/ignition/modules/SnickerdoodleFactory.ts

@@ -4,13 +4,24 @@ import hre from "hardhat"; // Import hre directly
 import { getChainIdByChainName, getLzEndpointByChainId } from "./helpers";
 import OperatorGatewayModule from "./OperatorGateway";
 import SnickerdoodleWalletModule from "./SnickerdoodleWallet";
+import EndpointV2MockModule from "./mock/EndpointV2Mock";
 
 const SnickerdoodleFactoryModule = buildModule(
   "SnickerdoodleFactoryModule",
   (m) => {
     // Get the owner account
     const proxyAdminOwner = m.getAccount(0);
 
+    let layerZeroEndpointAddress = null;
+
+    if (hre.network.name === "hardhat") {
+      // This makes the module flexible for local testing
+      // If it's a localhost testing, deploy a mock EndpointV2Mock so that we can initialize the SnickerdoodleFactory with a endpointv2 contract that exists
+      // It reverts otherwise
+      layerZeroEndpointAddress =
+        m.useModule(EndpointV2MockModule).endpointV2Mock;
+    }
+
     // Use dependent modules to get beacon addresses
     const { snickerdoodleWalletBeacon } = m.useModule(
       SnickerdoodleWalletModule,
@@ -47,7 +58,10 @@ const SnickerdoodleFactoryModule = buildModule(
 
     // Initialize the implementation contract through the proxy
     m.call(snickerdoodleFactoryProxy, "initialize", [
-      getLzEndpointByChainId(getChainIdByChainName(hre.network.name)), // Operator
+      // For local testing if there's an endpoint mock, use its address, otherwise use the official chain's endpoint addresses
+      layerZeroEndpointAddress
+        ? layerZeroEndpointAddress
+        : getLzEndpointByChainId(getChainIdByChainName(hre.network.name)), // Layer Zero endpoint
       proxyAdminOwner, // Proxy admin owner
       snickerdoodleWalletBeacon, // Wallet beacon
       operatorGatewayBeacon, // Operator gateway beacon

packages/contracts/ignition/modules/mock/EndpointV2Mock.ts

@@ -0,0 +1,9 @@
+import { buildModule } from "@nomicfoundation/hardhat-ignition/modules";
+
+const EndpointV2MockModule = buildModule("EndpointV2MockModule", (m) => {
+  const endpointV2Mock = m.contract("EndpointV2Mock", []);
+
+  return { endpointV2Mock };
+});
+
+export default EndpointV2MockModule;