Merge tag 'relayer-v1.0.41' into tanssi-relay-overridden-contracts(4)

Author: girazoki

.github/workflows/npm-publish.yml

@@ -3,6 +3,7 @@ name: npm-publish
 on:
   release:
     types: [published]
+  workflow_dispatch:
 
 env:
   NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
@@ -29,28 +30,16 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20.x'
-          registry-url: 'https://registry.npmjs.org'
+          node-version: "20.x"
+          registry-url: "https://registry.npmjs.org"
 
       - name: Install pnpm
         uses: pnpm/action-setup@v3
         with:
           version: 8
 
-      - name: Build Contracts
-        working-directory: web/packages/contracts
-        run: |
-          pnpm build
-
-      - name: Build Contract Types
-        working-directory: web/packages/contract-types
-        run: |
-          pnpm install
-          pnpm typechain
-          pnpm build
-
-      - name: Build API
-        working-directory: web/packages/api
+      - name: Build
+        working-directory: web
         run: |
           pnpm install
           pnpm build
@@ -69,4 +58,3 @@ jobs:
         working-directory: web/packages/api
         run: |
           pnpm publish --no-git-checks --access public
-      

contracts/foundry.toml

@@ -1,5 +1,5 @@
 [profile.default]
-solc_version = "0.8.25"
+solc_version = "0.8.28"
 optimizer = true
 optimizer_runs = 20000
 via_ir = false
@@ -14,8 +14,12 @@ fs_permissions = [
 ignored_error_codes = [
     # DeployLocal.sol is never deployed
     5574,
+    # tstore
+    2394,
 ]
 
+evm_version = 'Cancun'
+
 [profile.production]
 via_ir = true
 

contracts/scripts/Deploy.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {Script} from "forge-std/Script.sol";
 import {GatewayProxy} from "../src/GatewayProxy.sol";

contracts/scripts/DeployBeefyClient.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {Script} from "forge-std/Script.sol";
 import {BeefyClient} from "../src/BeefyClient.sol";

contracts/scripts/DeployBeefyLocal.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {Script, console2} from "forge-std/Script.sol";
 import {stdJson} from "forge-std/StdJson.sol";

contracts/scripts/DeployGatewayUpgrade.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {console2} from "forge-std/console2.sol";
 import {Script} from "forge-std/Script.sol";

contracts/scripts/DeployLocal.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {Script} from "forge-std/Script.sol";
 import {stdJson} from "forge-std/StdJson.sol";
@@ -13,6 +13,7 @@ import {OperatingMode} from "../src/Types.sol";
 import {HelperConfig} from "./HelperConfig.sol";
 import {WETH9} from "canonical-weth/WETH9.sol";
 import {IGateway} from "../src/interfaces/IGateway.sol";
+import {MockGatewayV2} from "../test/mocks/MockGatewayV2.sol";
 
 contract DeployLocal is Script {
     using stdJson for string;
@@ -103,11 +104,15 @@ contract DeployLocal is Script {
         // Deploy WETH for testing
         new WETH9();
 
-        // Fund the gateway proxy contract. Used to reward relayers.
+        // Fund the gateway proxy contract. Used to reward relayers
+        // of messages originating from BridgeHub
         uint256 initialDeposit = vm.envUint("GATEWAY_PROXY_INITIAL_DEPOSIT");
 
         IGateway(address(gateway)).depositEther{value: initialDeposit}();
 
+        // Deploy MockGatewayV2 for testing
+        new MockGatewayV2();
+
         vm.stopBroadcast();
     }
 }

contracts/scripts/DeployLocalGateway.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {console2} from "forge-std/console2.sol";
 import {Script} from "forge-std/Script.sol";

contracts/scripts/DeployLocalGatewayLogic.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {AgentExecutor} from "../src/AgentExecutor.sol";
 import {Gateway} from "../src//Gateway.sol";

contracts/scripts/FundGateway.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {WETH9} from "canonical-weth/WETH9.sol";
 import {Script} from "forge-std/Script.sol";