Chore/deploy

contracts/deploy/01-outbox/01-arb-sepolia-to-chiado-outbox.ts

@@ -12,7 +12,7 @@ enum ReceiverChains {
 const paramsByChainId = {
   GNOSIS_CHIADO: {
     deposit: parseEther("0.1"),
-    epochPeriod: 1800, // 30 min
+    epochPeriod: 300, // 5 min
     minChallengePeriod: 0, // 30 min
     numEpochTimeout: 10000000000000, // never
     amb: "0x8448E15d0e706C0298dECA99F0b4744030e59d7d", // https://docs.gnosischain.com/bridges/About%20Token%20Bridges/amb-bridge#key-contracts

contracts/deploy/01-outbox/01-arb-sepolia-to-sepolia-outbox.ts

@@ -13,7 +13,7 @@ const paramsByChainId = {
   ETHEREUM_SEPOLIA: {
     deposit: parseEther("0.001"),
     // Average happy path wait time is 1 hour (30 min, 90 min), happy path only
-    epochPeriod: 1800, // 30 min
+    epochPeriod: 300, // 5 min
     minChallengePeriod: 0, // 0 min
     numEpochTimeout: 10000000000000, // never
     maxMissingBlocks: 10000000000000,

contracts/deploy/01-outbox/01-chiado-to-arb-sepolia-outbox.ts

@@ -12,8 +12,8 @@ enum ReceiverChains {
 const paramsByChainId = {
   ARBITRUM_SEPOLIA: {
     deposit: parseEther("0.1"),
-    epochPeriod: 1800, // 30 min
-    challengePeriod: 0, // 30 min
+    epochPeriod: 300, // 5 min
+    challengePeriod: 0, // 0 min
     numEpochTimeout: 10000000000000, // never
     sequencerDelayLimit: 86400,
     sequencerFutureLimit: 3600,

contracts/deploy/02-inbox/02-arb-sepolia-to-chiado-inbox.ts

@@ -8,7 +8,7 @@ enum SenderChains {
 
 const paramsByChainId = {
   ARBITRUM_SEPOLIA: {
-    epochPeriod: 1800, // 1 hour
+    epochPeriod: 300, // 5 min
   },
   HARDHAT: {
     epochPeriod: 600, // 10 minutes

contracts/deploy/02-inbox/02-arb-sepolia-to-sepolia-inbox.ts

@@ -8,7 +8,7 @@ enum SenderChains {
 
 const paramsByChainId = {
   ARBITRUM_SEPOLIA: {
-    epochPeriod: 1800, // 1 hour
+    epochPeriod: 300, // 5 min
   },
   HARDHAT: {
     epochPeriod: 600, // 10 minutes

contracts/deploy/02-inbox/02-chiado-to-arb-sepolia-inbox.ts

@@ -9,7 +9,7 @@ enum SenderChains {
 
 const paramsByChainId = {
   GNOSIS_CHIADO: {
-    epochPeriod: 1800, // 30 minutes
+    epochPeriod: 300, // 5 minutes
     amb: "0x8448E15d0e706C0298dECA99F0b4744030e59d7d", // https://docs.gnosischain.com/bridges/About%20Token%20Bridges/amb-bridge#key-contracts
   },
   HARDHAT: {

contracts/hardhat.config.ts

@@ -69,12 +69,6 @@ const config: HardhatUserConfig = {
         sepolia: "sepolia",
         chiado: "chiado",
       },
-      verify: {
-        etherscan: {
-          apiUrl: "https://api-sepolia.arbiscan.io",
-          apiKey: process.env.ARBISCAN_API_KEY,
-        },
-      },
     },
     arbitrum: {
       chainId: 42161,
@@ -87,12 +81,6 @@ const config: HardhatUserConfig = {
         mainnet: "mainnet",
         gnosischain: "gnosischain",
       },
-      verify: {
-        etherscan: {
-          apiUrl: "https://api.arbiscan.io/api",
-          apiKey: process.env.ARBISCAN_API_KEY,
-        },
-      },
     },
     // OUTBOX ---------------------------------------------------------------------------------------
     chiado: {
@@ -121,11 +109,6 @@ const config: HardhatUserConfig = {
       companionNetworks: {
         arbitrumSepolia: "arbitrumSepolia",
       },
-      verify: {
-        etherscan: {
-          apiUrl: "https://blockscout.com/gnosis",
-        },
-      },
     },
     sepolia: {
       chainId: 11155111,

contracts/src/arbitrumToEth/VeaInboxArbToEth.sol

@@ -119,7 +119,7 @@ contract VeaInboxArbToEth is IVeaInbox {
         return oldCount;
     }
 
-    /// @dev Saves snapshot of state root. Snapshots can be saved a maximum of once per epoch.
+    /// @dev Saves snapshot of state root. Snapshots can be called multiple times per active epoch.
     ///      `O(log(count))` where count number of messages in the inbox.
     /// Note: See merkle tree docs for details how inbox manages state.
     function saveSnapshot() external {

contracts/src/arbitrumToGnosis/VeaInboxArbToGnosis.sol

@@ -119,7 +119,7 @@ contract VeaInboxArbToGnosis is IVeaInbox {
         return oldCount;
     }
 
-    /// @dev Saves snapshot of state root. Snapshots can be saved a maximum of once per epoch.
+    /// @dev Saves snapshot of state root. Snapshots can be saved multiple times per active epoch.
     ///      `O(log(count))` where count number of messages in the inbox.
     /// Note: See merkle tree docs for details how inbox manages state.
     function saveSnapshot() external {

contracts/src/gnosisToArbitrum/VeaInboxGnosisToArb.sol

@@ -120,7 +120,7 @@ contract VeaInboxGnosisToArb is IVeaInbox {
         return oldCount;
     }
 
-    /// @dev Saves snapshot of state root. Snapshots can be saved a maximum of once per epoch.
+    /// @dev Saves snapshot of state root. Snapshots can be saved multiple times per active epoch.
     ///      `O(log(count))` where count number of messages in the inbox.
     /// Note: See merkle tree docs for details how inbox manages state.
     function saveSnapshot() external {

contracts/src/test/ArbitrumToEth/VeaOutboxMockArbToEth.sol

@@ -23,8 +23,6 @@ contract VeaOutboxMockArbToEth is VeaOutboxArbToEth {
         bytes32 _stateRoot,
         Claim memory _claim
     ) external override OnlyBridgeRunning {
-        require(claimHashes[_epoch] == hashClaim(_claim), "Invalid claim.");
-
         require(msg.sender == address(arbSys), "Not from bridge.");
 
         if (_epoch > latestVerifiedEpoch) {
@@ -42,6 +40,9 @@ contract VeaOutboxMockArbToEth is VeaOutboxArbToEth {
                 _claim.honest = Party.Challenger;
             }
             claimHashes[_epoch] = hashClaim(_claim);
+            emit Verified(_epoch);
+        } else {
+            emit FailedResolution(_epoch);
         }
     }
 

contracts/test/integration/ArbToEth.ts

@@ -618,7 +618,145 @@ describe("Integration tests", async () => {
         .withArgs(epoch, ethers.encodeBytes32String("")); // ticketId is always 0x00..0
     });
 
-    it("challenger's deposit should be forfeited", async () => {
+    it("should be not able to resolve challenge for an invalid claim in fallback", async () => {
+      const data = 1121;
+
+      await senderGateway.sendMessage(data);
+      await veaInbox.connect(bridger).saveSnapshot();
+
+      const BatchOutgoing = veaInbox.filters.SnapshotSaved();
+      const batchOutGoingEvent = await veaInbox.queryFilter(BatchOutgoing);
+      const epochPeriod = Number(await veaInbox.epochPeriod());
+      const epoch = Math.floor((await batchOutGoingEvent[0].getBlock()).timestamp / epochPeriod);
+      const batchMerkleRoot = await veaInbox.snapshots(epoch);
+
+      await network.provider.send("evm_increaseTime", [epochPeriod]);
+      await network.provider.send("evm_mine");
+
+      // bridger tx starts - Honest Bridger
+      const bridgerClaimTx = await veaOutbox.connect(bridger).claim(epoch, batchMerkleRoot, { value: TEN_ETH });
+      const block = await ethers.provider.getBlock(bridgerClaimTx.blockNumber!);
+      if (!block) return;
+
+      const claim = {
+        stateRoot: batchMerkleRoot,
+        claimer: bridger.address,
+        timestampClaimed: block.timestamp,
+        timestampVerification: 0,
+        blocknumberVerification: 0,
+        honest: 0,
+        challenger: ethers.ZeroAddress,
+      };
+
+      await veaOutbox
+        .connect(challenger)
+        ["challenge(uint256,(bytes32,address,uint32,uint32,uint32,uint8,address))"](epoch, claim, { value: TEN_ETH });
+
+      claim.challenger = challenger.address;
+      await expect(veaOutbox.startVerification(epoch, claim)).to.be.revertedWith("Claim is challenged.");
+
+      const claimHashBeforeFallback = await veaOutbox.claimHashes(epoch);
+      const maliciousClaim = { ...claim };
+      maliciousClaim.claimer = challenger.address;
+      maliciousClaim.challenger = bridger.address;
+      // Sending a malicious claim
+      const sendSafeFallbackTx = await veaInbox
+        .connect(bridger)
+        .sendSnapshot(epoch, maliciousClaim, { gasLimit: 1000000 });
+
+      const claimHashAfterFallback = await veaOutbox.claimHashes(epoch);
+      await expect(sendSafeFallbackTx)
+        .to.emit(veaInbox, "SnapshotSent")
+        .withArgs(epoch, ethers.encodeBytes32String(""));
+
+      // The FailedResolution event will also be emitted in the sendSafeFallbackTx due to mock behaviour
+      await expect(sendSafeFallbackTx).to.emit(veaOutbox, "FailedResolution").withArgs(epoch);
+
+      // This ensure that the claim is not resolved and still disputed
+      expect(claimHashAfterFallback).to.equal(claimHashBeforeFallback);
+    });
+
+    it("should not update latestEpoch and stateRoot when resolving older dispute", async () => {
+      // sending two messages
+      const data = 1121;
+      await senderGateway.sendMessage(data);
+      await veaInbox.connect(bridger).saveSnapshot();
+
+      const BatchOutgoing = veaInbox.filters.SnapshotSaved();
+      const batchOutGoingEvent = await veaInbox.queryFilter(BatchOutgoing);
+      const epochPeriod = Number(await veaInbox.epochPeriod());
+      const epoch = Math.floor((await batchOutGoingEvent[0].getBlock()).timestamp / epochPeriod);
+      const batchMerkleRoot = await veaInbox.snapshots(epoch);
+
+      await network.provider.send("evm_increaseTime", [epochPeriod]);
+      await network.provider.send("evm_mine");
+
+      // bridger tx starts - Honest Bridger
+      const bridgerClaimTx = await veaOutbox.connect(bridger).claim(epoch, batchMerkleRoot, { value: TEN_ETH });
+      const block = await ethers.provider.getBlock(bridgerClaimTx.blockNumber!);
+      if (!block) return;
+
+      await veaOutbox.connect(challenger)["challenge(uint256,(bytes32,address,uint32,uint32,uint32,uint8,address))"](
+        epoch,
+        {
+          stateRoot: batchMerkleRoot,
+          claimer: bridger.address,
+          timestampClaimed: block.timestamp,
+          timestampVerification: 0,
+          blocknumberVerification: 0,
+          honest: 0,
+          challenger: ethers.ZeroAddress,
+        },
+        { value: TEN_ETH }
+      );
+
+      // save snapshot for new epoch
+      await veaInbox.connect(bridger).saveSnapshot();
+      // claim and verify the new epoch
+      await claimAndVerify({
+        veaInbox,
+        veaOutbox,
+        bridger,
+        epoch: epoch + 1,
+        batchMerkleRoot: await veaInbox.snapshots(epoch + 1),
+        ethers,
+        network,
+        mine,
+      });
+
+      // Send snapshot for the older disputed epoch
+      await veaInbox.connect(bridger).sendSnapshot(
+        epoch,
+        {
+          stateRoot: batchMerkleRoot,
+          claimer: bridger.address,
+          timestampClaimed: block.timestamp,
+          timestampVerification: 0,
+          blocknumberVerification: 0,
+          honest: 0,
+          challenger: challenger.address,
+        },
+        { gasLimit: 1000000 }
+      );
+
+      // Ensure that the latest epoch and state root is not updated
+      expect(await veaOutbox.latestVerifiedEpoch()).to.equal(epoch + 1);
+
+      // Verify if the claim is resolved in favour of the bridger
+      const outboxClaimHash = await veaOutbox.claimHashes(epoch);
+      const expectedClaimHash = await veaOutbox.hashClaim({
+        stateRoot: batchMerkleRoot,
+        claimer: bridger.address,
+        timestampClaimed: block.timestamp,
+        timestampVerification: 0,
+        blocknumberVerification: 0,
+        honest: 1, // Dispute resolved in favour of claimer
+        challenger: challenger.address,
+      });
+      expect(outboxClaimHash).to.equal(expectedClaimHash);
+    });
+
+    it("challenger's deposit should be forfeited and bridger should be able to withdraw", async () => {
       // sample data
       const data = 1121;
 

contracts/test/integration/ArbToGnosis.ts

@@ -483,6 +483,50 @@ describe("Arbitrum to Gnosis Bridge Tests", async () => {
       expect(await veaOutbox.latestVerifiedEpoch()).to.equal(epoch, "VeaOutbox latestVerifiedEpoch should be updated");
     });
 
+    it("should not be able to resolve dispute with invalid claim in fallback", async () => {
+      const { claimBlock } = await setupClaimAndChallenge(epoch, batchMerkleRoot, 0);
+      const maliciousClaim = {
+        stateRoot: batchMerkleRoot,
+        claimer: challenger.address, // Switched Addresses
+        timestampClaimed: claimBlock.timestamp,
+        timestampVerification: 0,
+        blocknumberVerification: 0,
+        honest: 0,
+        challenger: bridger.address, // Switched Addresses
+      };
+      const claim = { ...maliciousClaim };
+      claim.claimer = bridger.address;
+      claim.challenger = challenger.address;
+
+      await veaInbox.connect(bridger).sendSnapshot(epoch, 100000, maliciousClaim, { gasLimit: 100000 });
+
+      const callData = await veaInbox.connect(bridger).getCallData(epoch, 100000, maliciousClaim);
+      const routerAddress = await router.getAddress();
+      await bridgeMock.connect(bridger).executeL1Message(routerAddress, callData);
+
+      await network.provider.send("evm_increaseTime", [CHALLENGE_PERIOD + SEQUENCER_DELAY]);
+      await network.provider.send("evm_mine");
+
+      await expect(veaOutbox.startVerification(epoch, claim)).to.be.revertedWith("Claim is challenged.");
+
+      const events = await amb.queryFilter(amb.filters.MockedEvent());
+      const lastEvent = events[events.length - 1];
+      const claimHashBeforeFallback = await veaOutbox.claimHashes(epoch);
+      const fallbackExecutionTx = await amb.executeMessageCall(
+        veaOutbox.target,
+        router.target,
+        lastEvent.args._data,
+        lastEvent.args.messageId,
+        1000000
+      );
+
+      // The FailedResolution event will also be emitted in the sendSafeFallbackTx due to mock behaviour
+      await expect(fallbackExecutionTx).to.emit(veaOutbox, "FailedResolution").withArgs(epoch);
+
+      const claimHashAfterFallback = await veaOutbox.claimHashes(epoch);
+      expect(claimHashAfterFallback).to.equal(claimHashBeforeFallback);
+    });
+
     it("should not update latestEpoch and stateRoot when resolving older dispute", async () => {
       const { claimBlock } = await setupClaimAndChallenge(epoch, batchMerkleRoot, 0);
 

docker-compose.yml

@@ -0,0 +1,25 @@
+services:
+  validator:
+    build:
+      context: .
+      dockerfile: ./validator-cli/Dockerfile
+    command: yarn start --saveSnapshot 
+    env_file:
+      - path: ./validator-cli/.env
+        required: true
+    restart: unless-stopped
+    networks:
+      - vea-network
+
+  relayer:
+    build:
+      context: .
+      dockerfile: ./relayer-cli/Dockerfile
+    env_file:
+      - path: ./relayer-cli/.env
+        required: true
+    restart: unless-stopped
+    networks:
+      - vea-network
+networks:
+  vea-network:

package.json

@@ -26,7 +26,7 @@
   ],
   "packageManager": "yarn@4.6.0",
   "volta": {
-    "node": "22.14.0",
+    "node": "24.14.0",
     "yarn": "4.6.0"
   },
   "devDependencies": {

relayer-cli/.env.dist

@@ -21,4 +21,7 @@ TRANSACTION_BATCHER_CONTRACT_SEPOLIA=0xe7953da7751063d0a41ba727c32c762d3523ade8
 TRANSACTION_BATCHER_CONTRACT_CHIADO=0xcC0a08D4BCC5f91ee9a1587608f7a2975EA75d73
 
 # Ensure the path ends with a trailing slash ("/")
-STATE_DIR="/home/user/vea/relayer-cli/state/"
+STATE_DIR="/home/user/vea/relayer-cli/state/"
+
+# Hashi Executor enabler
+HASHI_EXECUTOR_ENABLED=true