feat: Hashi DVN Adapter offchain logic

.env.example

@@ -1,2 +1,8 @@
 SEPOLIA_ALCHEMY_KEY=
-DEPLOYER_PRIV_KEY=
+PRIVATE_KEY=
+
+ETHERSCAN_API_KEY=
+GNOSISSCAN_API_KEY=
+
+SOURCE_CHAIN=
+DESTINATION_CHAIN=

.github/workflows/test.yml

@@ -0,0 +1,34 @@
+name: test
+
+on: workflow_dispatch
+
+env:
+  FOUNDRY_PROFILE: ci
+
+jobs:
+  check:
+    strategy:
+      fail-fast: true
+
+    name: Foundry project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+
+      - name: Run Forge build
+        run: |
+          forge --version
+          forge build --sizes
+        id: build
+
+      - name: Run Forge tests
+        run: |
+          forge test -vvv
+        id: test

config.js

@@ -0,0 +1,96 @@
+module.exports = { chainConfig: {
+    chainAddress: {
+        // gnosis: {
+        //     chainId: 100,
+        //     endpointId: 30145,
+        //     endpoint: "0x1a44076050125825900e736c501f859c50fe728c",
+        //     send301: "0x42b4e9c6495b4cfdae024b1ec32e09f28027620e",
+        //     send302: "0x3c156b1f625d2b4e004d43e91ac2c3a719c29c7b",
+        //     receive301: "0xaDDed4478B423d991C21E525Cd3638FBce1AaD17",
+        //     receive302: "0x9714Ccf1dedeF14BaB5013625DB92746C1358cb4",
+        //     yaho: "",
+        //     hashi: "",
+        //     hashiRegistry: "",
+        //     hashiDVNAdapter: "",
+        //     hashiDVNFeeLib: "",
+        //     executor: "",
+        //     oapp: "",
+        //     messageRelay: "",
+        //     messageAdapter: ""
+        // },
+        // ethereum: {
+        //     chainId: 1,
+        //     endpointId: 30101,
+        //     endpoint: "0x1a44076050125825900e736c501f859c50fe728c",
+        //     send301: "0xD231084BfB234C107D3eE2b22F97F3346fDAF705",
+        //     send302: "0xbB2Ea70C9E858123480642Cf96acbcCE1372dCe1",
+        //     receive301: "0x245B6e8FFE9ea5Fc301e32d16F66bD4C2123eEfC",
+        //     receive302: "0xc02Ab410f0734EFa3F14628780e6e695156024C2",
+        //     yaho: "0x8b3e9dC69E599b21CC24498AD77C5DB83174b832",
+        //     hashi: "0xDcFCeDD553fE943e8F4E2503354797Cb0c323f46",
+        //     hashiRegistry: "0x0478c703fCf87F469608C2E2535113d3AA17629C",
+        //     hashiDVNAdapter: "0x26aAa3F808a9a9b3399DEbdC0ad76Ab085d23697",
+        //     hashiDVNFeeLib: "0x0F5f7920abB2E968651DE60c5bf1C75a600E7F16",
+        //     executor: "0xfF8c7A74978001C91FF5B6D5335Dd7D6A5aDAae4",
+        //     oapp: "0x81E34D168e955DC11378b79db69463b2addb6B32",
+        //     messageRelay: "",
+        //     messageAdapter: "0x26c8700Bd2a58aBF3532628acA18547133C62CCc"
+        // },
+        sepolia: {
+            chainId: 11155111,
+            endpointId: 40161,
+            endpoint: "0x6edce65403992e310a62460808c4b910d972f10f",
+            send301: "0x6862b19f6e42a810946b9c782e6ebe26ad266c84",
+            send302: "0xcc1ae8cf5d3904cef3360a9532b477529b177cce",
+            receive301: "0x5937A5fe272fbA38699A1b75B3439389EEFDb399",
+            receive302: "0xdAf00F5eE2158dD58E0d3857851c432E34A3A851",
+            yaho: "0x927FB99eF4E79d1e520121847048119BF7b3EDDd",
+            hashi: "0xf6f67cebcbb7571B1B2FeD17345012Cb423FB39e",
+            hashiRegistry: "0xEAa1De9739E3799AC6f77bF85aD6894F4269378B",
+            hashiDVNAdapter: "0x7928cdDcE9f4658FB0317ECb32d0E6cA7610E236",
+            hashiDVNFeeLib: "0x9b4cf3038fC791ec4F3BFB4A2F0a9ccaA41Dd8c5",
+            executor: "0xB7822a62aaCEE16a74AdFB73c97B2bCb127C58cD",
+            oapp: "0xFa08FE09a7C537aF96de76C2Bb2607D6288d7644",
+            messageAdapter: "0x8a098e32c4e05041A2F17821E7d9a3dA3451f69c",
+            messageRelay: "0x9a9fc484D3F83B489bc58c2A3EeeA8331F21796B"
+        },
+        // chiado: {
+        //     chainId: 10200,
+        //     endpointId: 40145,
+        //     endpoint: "0x6edce65403992e310a62460808c4b910d972f10f",
+        //     send301: "0x97237b7daff151eb9793aa749b487b8ba157e465",
+        //     send302: "0xddf3266feaa899accf805f4379e5137144cb0a7d",
+        //     receive301: "0x9c79B1B82Ab36FbDf927afbD653Ebb6b9cd11121",
+        //     receive302: "0xC22825d9982365d31E63CC3b5589B17067e795b1",
+        //     yaho: "0x97DeA672bc2477f4b45F1867f29f12749ecb96ad",
+        //     hashi: "0x727CA7B66bc9B118120DbB0aB97955047DFc8303",
+        //     hashiRegistry: "0x3cAA366dFdB7fF8b114F5C78587793A390Ed870c",
+        //     hashiDVNAdapter: "0xD92c0484775998FCDa481c1B5b7aA7e224Ba738B",
+        //     hashiDVNFeeLib: "0x95Bc706B2b844B8fE003952366704b1f9AA3cdC9",
+        //     executor: "0x1487C6D8E5465e5fBdeb22Bb98774ca0D17264b1",
+        //     oapp: "0xFcAAb83DABa843C225f17ecF67634cD89caF4FB4",
+        //     messageRelay: "0xDF2292e99ec656DD59ffb3C040524D22c92DbD5b",
+        //     messageAdapter: "0xB71AFC6a867a63E1E68289ADCDEC245E5C5d68A0"
+        // },
+        mumbai: {
+            chainId: 80001,
+            endpointId: 40109,
+            endpoint: "0x6edce65403992e310a62460808c4b910d972f10f",
+            send301: "0x927587ea40d0539dd4becd0e18e8ef47791d31ab",
+            send302: "0x5d9f8bcf9e07babf517f2988986ff3bb7b233bc1",
+            receive301: "0xaa5c6aF22CFC46DB8ba2c1A1c5ea6131b10ff575",
+            receive302: "0xfa4Fbda8E809150eE1676ce675AC746Beb9aF379",
+            yaho: "0x0dA983BBa33C13614e70CCF113817001bE094E8c",
+            hashi: "0x93b0E122617634C2797b42e12eb221185eBa2d93",
+            hashiRegistry: "0x894ecd5C2cAA118FdB94146fF112eFfe2856a071",
+            hashiDVNAdapter: "0x6ebdac052a2042F8E35f5174A964a13C96544DE8",
+            hashiDVNFeeLib: "0x0E5714419b2c7D0b0Ef0985baacEE32a623708B2",
+            executor: "0x4e803bAb0e235C4CAf62dF49Dda17F5F732F03Bf",
+            oapp: "0xD3c993fB9510019fc0b87a3b50DBa53876901649",
+            messageRelay: "0xf28257310e5b22e6f86ADEb407088ceF01Da1846",
+            messageAdapter: "0x619EfED966a1D4a6902bF789D2b5520EE3Ed55C0"
+        },
+
+    }
+}
+}

contracts/HashiDVNAdapter.sol

@@ -2,8 +2,8 @@
 
 pragma solidity ^0.8.20;
 
-import {DVNAdapterBase} from "./layerzero-v2/messagelib/uln/dvn/adapters/DVNAdapterBase.sol";
-import {DVNAdapterMessageCodec} from "./layerzero-v2/messagelib/uln/dvn/adapters/libs/DVNAdapterMessageCodec.sol";
+import {DVNAdapterBase} from "@layerzerolabs/lz-evm-messagelib-v2/contracts/uln/dvn/adapters/DVNAdapterBase.sol";
+import {DVNAdapterMessageCodec} from "@layerzerolabs/lz-evm-messagelib-v2/contracts/uln/dvn/adapters/libs/DVNAdapterMessageCodec.sol";
 import {Yaho} from "./hashi/Yaho.sol";
 import {Hashi} from "./hashi/Hashi.sol";
 import {Message} from "./hashi/interfaces/IMessageDispatcher.sol";
@@ -158,7 +158,7 @@ contract HashiDVNAdapter is DVNAdapterBase, IHashiDVNAdapter {
     function verifyMessageHash(
         bytes32 messageId,
         bytes calldata message
-    ) external onlyRole(ADMIN_ROLE) returns (uint256) {
+    ) external onlyRole(ADMIN_ROLE) returns (bool) {
         (
             address receiveLib,
             bytes memory packetHeader,
@@ -200,13 +200,11 @@ contract HashiDVNAdapter is DVNAdapterBase, IHashiDVNAdapter {
             emit LogError(error);
         }
 
-        /// 2nd verification from LZ payload passed
-        if (payloadHash == reportedHash) {
-            _decodeAndVerify(message);
-            emit MessageVerified(nonce, reportedHash);
-        } else {
-            revert HashiMismatch();
-        }
+        _decodeAndVerify(message);
+        emit MessageVerified(nonce, reportedHash);
+        return true;
+
+
     }
 
     /// @notice decode data from packetHeader
@@ -233,4 +231,13 @@ contract HashiDVNAdapter is DVNAdapterBase, IHashiDVNAdapter {
             receiver := mload(add(packetHeader, 81)) // 8 + 64 + 32 +256 + 32 + 256
         }
     }
+
+    function decodePacketHeader(bytes memory packetHeader) external pure returns (uint64 nonce, uint32 srcEid, uint32 dstEid, bytes32 receiver){
+        assembly {
+            nonce := mload(add(packetHeader, 9)) // 8 + 64
+            srcEid := mload(add(packetHeader, 13)) // 8 + 64 + 32
+            dstEid := mload(add(packetHeader, 49)) // 8 + 64 + 32 +256 + 32
+            receiver := mload(add(packetHeader, 81)) // 8 + 64 + 32 +256 + 32 + 256
+        }
+    }
 }