Migrate/v2

.github/workflows/check-contracts-clients.yml

@@ -0,0 +1,52 @@
+# Check if Go clients consistent with contracts
+name: Check Contracts Clients
+
+on:
+  pull_request:
+    # TODO: Remove test branch after testing
+    branches: ["tanssi-main"]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  check-contracts-clients:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Check jq
+        run: jq --version
+
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.23"
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: "v1.1.0"
+
+      - name: Show Forge version
+        run: forge --version
+
+      - name: Install abigen
+        run: go install github.com/ethereum/go-ethereum/cmd/abigen@v1.14.11
+
+      - name: Check abigen
+        run: abigen --version
+
+      - name: Build Contracts
+        working-directory: contracts
+        run: |
+          forge build
+
+      - name: Generate clients
+        working-directory: relayer
+        run: |
+          go generate ./...
+
+      - name: Check if go contract bindings are up-to-date
+        run: git diff --exit-code ./relayer/contracts || (echo "The contract bindings are not up-to-date against contracts." && exit 1)

.github/workflows/contracts.yml

@@ -12,9 +12,13 @@ on:
       - "contracts/**"
       - "!contracts/**/README.md"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
-    runs-on: snowbridge-runner
+    runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v1
@@ -25,9 +29,13 @@ jobs:
       - name: Test
         working-directory: contracts
         run: forge test
+        env:
+          RPC_URL: ${{ secrets.RPC_URL }}
       - name: Coverage
         working-directory: contracts
         run: forge coverage --report=lcov --via-ir
+        env:
+          RPC_URL: ${{ secrets.RPC_URL }}
       - name: Upload coverage reports to Codecov with GitHub Action
         uses: codecov/codecov-action@v3
         with:

.github/workflows/control.yml

@@ -10,9 +10,13 @@ on:
     paths:
       - "control/**"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   control:
-    runs-on: snowbridge-runner
+    runs-on: ubuntu-latest
     env:
       CARGO_INCREMENTAL: 0
       RUST_BACKTRACE: 1
@@ -59,4 +63,3 @@ jobs:
       - name: Build Westend
         run: |
           nix develop -c sh -c 'cd control && cargo build --features westend'
-

.github/workflows/labels.yml

@@ -5,11 +5,12 @@ on:
 
 jobs:
   labeler:
+    if: false
     permissions:
       contents: read
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
       - uses: actions/labeler@v5
         with:
-         sync-labels: true
+          sync-labels: true

.github/workflows/npm-publish.yml

@@ -10,6 +10,7 @@ env:
 
 jobs:
   publish:
+    if: false
     runs-on: snowbridge-runner
     timeout-minutes: 15
     steps:

.github/workflows/relayer.yml

@@ -10,9 +10,13 @@ on:
     paths:
       - "relayer/**"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
-    runs-on: snowbridge-runner
+    runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v1
@@ -22,7 +26,7 @@ jobs:
       - name: setup go
         uses: actions/checkout@v4
         with:
-          go-version: '^1.20.1'
+          go-version: "^1.22.5"
 
       - name: check go version
         run: go version

.github/workflows/release-relayer.yml

@@ -13,6 +13,7 @@ env:
   IMAGE_NAME: snowfork/snowbridge-relay
 
 jobs:
+  if: false
   release-relayer:
     runs-on: snowbridge-runner
     timeout-minutes: 15

.github/workflows/smoke-tests.yml

@@ -7,11 +7,15 @@ on:
   workflow_dispatch:
   schedule:
     # Runs at 8:00 AM every day
-    - cron: '0 8 * * *'
+    - cron: "0 8 * * *"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   smoketests:
-    runs-on: snowbridge-runner
+    runs-on: ubuntu-latest
     env:
       CARGO_INCREMENTAL: 0
       RUST_BACKTRACE: 1
@@ -40,7 +44,7 @@ jobs:
         run: echo "POLKADOT_SDK_DIR=./polkadot-sdk" >> $GITHUB_ENV
       - name: Create directories
         run: mkdir -p $OUTPUT_DIR &&  mkdir -p $LOG_DIR
-      - uses: actions/cache@v1
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/registry

.gitignore

@@ -16,6 +16,9 @@ node_modules/
 /relaychain/
 .vscode
 
+.history/
+.env
+
 /.rustup/
 .cargo/
 !.cargo/config.toml

codecov.yml

@@ -3,7 +3,7 @@ coverage:
     project: off
     patch: off
 github_checks:
-    annotations: false
+  annotations: false
 ignore:
   - "contracts/test/mocks"
   - "contracts/src/utils"
@@ -15,3 +15,5 @@ flags:
     paths:
       - contracts
     carryforward: true
+fixes:
+  - "::contracts/"

contracts/.gitignore

@@ -12,7 +12,7 @@ coverage/
 out/
 cache/
 broadcast/
-types/
+/types/
 tsconfig.tsbuildinfo
 lcov.info
 tenderly.yaml

contracts/foundry.toml

@@ -24,3 +24,7 @@ via_ir = true
 
 [profile.production.etherscan]
 mainnet = { key = "${ETHERSCAN_API_KEY}" }
+
+[fmt]
+number_underscore = "thousands"
+line_length = 99

contracts/scripts/DeployBeefyClient.sol

@@ -18,7 +18,7 @@ contract DeployBeefyClient is Script {
     function readConfig() internal pure returns (Config memory config) {
         // Checkpoint generated using the script `./beefy-checkpoint.js` script in Polkadot-JS.
         config = Config({
-            startBlock: 21087413,
+            startBlock: 21_087_413,
             current: BeefyClient.ValidatorSet({
                 id: 644,
                 length: 297,

contracts/scripts/DeployBeefyLocal.sol

@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
+pragma solidity 0.8.28;
+
+import {Script, console2} from "forge-std/Script.sol";
+import {stdJson} from "forge-std/StdJson.sol";
+
+import {BeefyClient} from "../src/BeefyClient.sol";
+import {HelperConfig} from "./HelperConfig.sol";
+
+contract DeployBeefyClient is Script {
+    using stdJson for string;
+
+    function setUp() public {}
+
+    function run() public {
+        HelperConfig helperConfig = new HelperConfig("");
+        HelperConfig.BeefyClientConfig memory beefyClientConfig =
+            helperConfig.getBeefyClientConfig();
+
+        vm.startBroadcast();
+
+        // BeefyClient
+        // Seems `fs_permissions` explicitly configured as absolute path does not work and only allowed from project root
+        string memory root = vm.projectRoot();
+        string memory beefyCheckpointFile = string.concat(root, "/beefy-state.json");
+        string memory beefyCheckpointRaw = vm.readFile(beefyCheckpointFile);
+        uint64 startBlock = uint64(beefyCheckpointRaw.readUint(".startBlock"));
+
+        BeefyClient.ValidatorSet memory current = BeefyClient.ValidatorSet(
+            uint128(beefyCheckpointRaw.readUint(".current.id")),
+            uint128(beefyCheckpointRaw.readUint(".current.length")),
+            beefyCheckpointRaw.readBytes32(".current.root")
+        );
+        BeefyClient.ValidatorSet memory next = BeefyClient.ValidatorSet(
+            uint128(beefyCheckpointRaw.readUint(".next.id")),
+            uint128(beefyCheckpointRaw.readUint(".next.length")),
+            beefyCheckpointRaw.readBytes32(".next.root")
+        );
+
+        BeefyClient beefyClient = new BeefyClient(
+            beefyClientConfig.randaoCommitDelay,
+            beefyClientConfig.randaoCommitExpiration,
+            beefyClientConfig.minimumSignatures,
+            startBlock,
+            current,
+            next
+        );
+
+        console2.log("BeefyClient: ", address(beefyClient));
+
+        vm.stopBroadcast();
+    }
+}

contracts/scripts/DeployGatewayUpgrade.sol

@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
+pragma solidity 0.8.28;
+
+import {console2} from "forge-std/console2.sol";
+import {Script} from "forge-std/Script.sol";
+import {stdJson} from "forge-std/StdJson.sol";
+
+import {GatewayTanssi202509} from "../src/upgrades/GatewayTanssi202509.sol";
+import {HelperConfig} from "./HelperConfig.sol";
+import {UpgradeParams} from "../src/v1/Types.sol";
+import {AgentExecutor} from "../src/AgentExecutor.sol";
+
+contract DeployLocal is Script {
+    using stdJson for string;
+
+    function setUp() public {}
+
+    function run() public {
+        HelperConfig helperConfig = new HelperConfig("");
+        _deploy(helperConfig);
+    }
+
+    function run(string calldata testnet) public {
+        HelperConfig helperConfig = new HelperConfig(testnet);
+        _deploy(helperConfig);
+    }
+
+    function _deploy(HelperConfig helperConfig) private {
+        vm.startBroadcast();
+        HelperConfig.GatewayConfig memory gatewayConfig = helperConfig.getGatewayConfig();
+
+        // Needed for the native transfer feature
+        AgentExecutor agentExecutor = new AgentExecutor();
+
+        GatewayTanssi202509 gatewayLogic =
+            new GatewayTanssi202509(address(gatewayConfig.beefyClient), address(agentExecutor));
+
+        console2.log("AgentExecutor: ", address(agentExecutor));
+        console2.log("Gateway logic impl: ", address(gatewayLogic));
+        console2.log("Gateway logic codehash: ");
+        console2.logBytes32(address(gatewayLogic).codehash);
+        UpgradeParams memory params = UpgradeParams({
+            impl: address(gatewayLogic),
+            implCodeHash: address(gatewayLogic).codehash,
+            initParams: bytes("")
+        });
+
+        console2.logBytes(abi.encode(params));
+        vm.stopBroadcast();
+    }
+}