@snowbridge/contract-types 0.2.8 → 0.2.10

package/.turbo/turbo-build.log

@@ -12,6 +12,30 @@ note[mixed-case-variable]: mutable variables should use mixedCase
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
+warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
+  --> /home/runner/work/snowbridge/snowbridge/contracts/scripts/DeployLocal.sol:84:9
+   |
+84 |         weth.transfer(user, 10 ether);
+   |         -----------------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:57:16
+   |
+57 |         uint64 validatorSetID;
+   |                --------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:69:16
+   |
+69 |         bytes2 payloadID;
+   |                ---------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
 note[unused-import]: unused imports should be removed
  --> /home/runner/work/snowbridge/snowbridge/contracts/scripts/upgrade/DeployGateway202509.sol:7:9
   |
@@ -20,21 +44,85 @@ note[unused-import]: unused imports should be removed
   |
   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
-  --> /home/runner/work/snowbridge/snowbridge/contracts/scripts/DeployLocal.sol:84:9
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/scripts/DeployLocal.sol:17:9
    |
-84 |         weth.transfer(user, 10 ether);
-   |         -----------------------------
+17 | import {UD60x18, ud60x18} from "prb/math/src/UD60x18.sol";
+   |         -------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[screaming-snake-case-immutable]: immutables should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Token.sol:17:30
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:19:14
    |
-17 |     address public immutable gateway;
-   |                              -------
+19 |     function H160(address account) internal pure returns (bytes memory) {
+   |              ----
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-immutable
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:23:14
+   |
+23 |     function VecU8(bytes memory input) internal pure returns (bytes memory) {
+   |              -----
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:33:14
+   |
+33 |     function None() internal pure returns (bytes memory) {
+   |              ----
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:42:14
+   |
+42 |     function RegisterToken(address token, uint128 fee) internal view returns (bytes memory) {
+   |              -------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:57:14
+   |
+57 |     function SendTokenToAssetHubAddress32(
+   |              ----------------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:76:14
+   |
+76 |     function SendTokenToAddress32(
+   |              --------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:78:16
+   |
+78 |         ParaID paraID,
+   |                ------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:99:14
+   |
+99 |     function SendTokenToAddress20(
+   |              --------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:101:16
+    |
+101 |         ParaID paraID,
+    |                ------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[unused-import]: unused imports should be removed
  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Types.sol:5:9
@@ -180,45 +268,77 @@ note[unused-import]: unused imports should be removed
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:19:14
-   |
-19 |     function H160(address account) internal pure returns (bytes memory) {
-   |              ----
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/Initializer.sol:5:9
+  |
+5 | import {AgentExecutor} from "./AgentExecutor.sol";
+  |         -------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:23:14
-   |
-23 |     function VecU8(bytes memory input) internal pure returns (bytes memory) {
-   |              -----
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/interfaces/IERC20Metadata.sol:7:8
+  |
+7 | import "./IERC20.sol";
+  |        --------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
 
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:33:14
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:31:34
    |
-33 |     function None() internal pure returns (bytes memory) {
-   |              ----
+31 |     function ensureAgent(bytes32 agentID) internal view returns (address agent) {
+   |                                  -------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:42:14
-   |
-42 |     function RegisterToken(address token, uint128 fee) internal view returns (bytes memory) {
-   |              -------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:121:14
+    |
+121 |     function SendForeignTokenToAssetHubAddress32(
+    |              -----------------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:122:17
+    |
+122 |         bytes32 tokenID,
+    |                 -------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:57:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:140:14
+    |
+140 |     function SendForeignTokenToAddress32(
+    |              ---------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:141:17
+    |
+141 |         bytes32 tokenID,
+    |                 -------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:142:16
+    |
+142 |         ParaID paraID,
+    |                ------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[screaming-snake-case-immutable]: immutables should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Token.sol:17:30
    |
-57 |     function SendTokenToAssetHubAddress32(
-   |              ----------------------------
+17 |     address public immutable gateway;
+   |                              -------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-immutable
 
 note[screaming-snake-case-immutable]: immutables should use SCREAMING_SNAKE_CASE
   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Token.sol:18:28
@@ -228,6 +348,14 @@ note[screaming-snake-case-immutable]: immutables should use SCREAMING_SNAKE_CASE
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-immutable
 
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/Initializer.sol:7:24
+  |
+7 | import {OperatingMode, ParaID, TokenInfo, Channel, ChannelID} from "./Types.sol";
+  |                        ------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
 note[mixed-case-variable]: mutable variables should use mixedCase
    --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:249:47
     |
@@ -252,77 +380,61 @@ note[mixed-case-variable]: mutable variables should use mixedCase
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:39:38
+   |
+39 |     function ensureChannel(ChannelID channelID) internal view returns (Channel storage ch) {
+   |                                      ---------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
 note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:287:14
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Token.sol:81:14
+   |
+81 |     function DOMAIN_SEPARATOR() external view returns (bytes32) {
+   |              ----------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[pascal-case-struct]: structs should use PascalCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:109:12
     |
-287 |     function queryForeignTokenID(address token) external view returns (bytes32) {
-    |              -------------------
+109 |     struct MMRLeaf {
+    |            -------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#pascal-case-struct
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:324:37
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:117:16
     |
-324 |     function tokenAddressOf(bytes32 tokenID) external view returns (address) {
-    |                                     -------
+117 |         uint64 nextAuthoritySetID;
+    |                ------------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:333:14
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:155:20
     |
-333 |     function v1_handleAgentExecute(bytes calldata data) external onlySelf {
-    |              ---------------------
+155 |     bytes32 public latestMMRRoot;
+    |                    -------------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/src/Initializer.sol:5:9
-  |
-5 | import {AgentExecutor} from "./AgentExecutor.sol";
-  |         -------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[pascal-case-struct]: structs should use PascalCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:24:12
-   |
-24 |     struct MMRLeafPartial {
-   |            --------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#pascal-case-struct
-
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/scripts/DeployLocal.sol:17:9
-   |
-17 | import {UD60x18, ud60x18} from "prb/math/src/UD60x18.sol";
-   |         -------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:76:14
-   |
-76 |     function SendTokenToAddress32(
-   |              --------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:78:16
-   |
-78 |         ParaID paraID,
-   |                ------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[screaming-snake-case-immutable]: immutables should use SCREAMING_SNAKE_CASE
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:182:30
+    |
+182 |     uint256 public immutable randaoCommitDelay;
+    |                              -----------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-immutable
 
-note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/src/Initializer.sol:7:24
-  |
-7 | import {OperatingMode, ParaID, TokenInfo, Channel, ChannelID} from "./Types.sol";
-  |                        ------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[screaming-snake-case-immutable]: immutables should use SCREAMING_SNAKE_CASE
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:190:30
+    |
+190 |     uint256 public immutable randaoCommitExpiration;
+    |                              ----------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-immutable
 
 note[unused-import]: unused imports should be removed
  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Initializer.sol:7:52
@@ -348,85 +460,61 @@ note[unused-import]: unused imports should be removed
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:99:14
+note[pascal-case-struct]: structs should use PascalCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:24:12
    |
-99 |     function SendTokenToAddress20(
-   |              --------------------
+24 |     struct MMRLeafPartial {
+   |            --------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#pascal-case-struct
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:101:16
-    |
-101 |         ParaID paraID,
-    |                ------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/storage/AssetsStorage.sol:13:16
+   |
+13 |         ParaID assetHubParaID;
+   |                --------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:121:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:163:14
     |
-121 |     function SendForeignTokenToAssetHubAddress32(
-    |              -----------------------------------
+163 |     function SendForeignTokenToAddress20(
+    |              ---------------------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:122:17
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:164:17
     |
-122 |         bytes32 tokenID,
+164 |         bytes32 tokenID,
     |                 -------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:28:16
-   |
-28 |         uint64 nextAuthoritySetID;
-   |                ------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:338:14
-    |
-338 |     function v1_handleUpgrade(bytes calldata data) external onlySelf {
-    |              ----------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:343:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:165:16
     |
-343 |     function v1_handleSetOperatingMode(bytes calldata data) external onlySelf {
-    |              -------------------------
+165 |         ParaID paraID,
+    |                ------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:348:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:287:14
     |
-348 |     function v1_handleSetTokenTransferFees(bytes calldata data) external onlySelf {
-    |              -----------------------------
+287 |     function queryForeignTokenID(address token) external view returns (bytes32) {
+    |              -------------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Token.sol:81:14
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/interfaces/IGatewayBase.sol:34:50
    |
-81 |     function DOMAIN_SEPARATOR() external view returns (bytes32) {
-   |              ----------------
+34 |     event ForeignTokenRegistered(bytes32 indexed tokenID, address token);
+   |                                                  -------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/src/interfaces/IERC20Metadata.sol:7:8
-  |
-7 | import "./IERC20.sol";
-  |        --------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-function]: function names should use mixedCase
   --> /home/runner/work/snowbridge/snowbridge/contracts/src/interfaces/IERC20Permit.sol:11:14
@@ -436,54 +524,46 @@ note[mixed-case-function]: function names should use mixedCase
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:140:14
+note[screaming-snake-case-immutable]: immutables should use SCREAMING_SNAKE_CASE
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:196:30
     |
-140 |     function SendForeignTokenToAddress32(
-    |              ---------------------------
+196 |     uint256 public immutable minNumRequiredSignatures;
+    |                              ------------------------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-immutable
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:141:17
-    |
-141 |         bytes32 tokenID,
-    |                 -------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/upgrade/Gateway202509.sol:5:8
+  |
+5 | import "../Gateway.sol";
+  |        ----------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:57:16
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/types/Common.sol:14:13
    |
-57 |         uint64 validatorSetID;
-   |                --------------
+14 |     bytes32 foreignID;
+   |             ---------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:69:16
+warning[incorrect-shift]: the order of args in a shift operation is incorrect
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/utils/Math.sol:82:60
    |
-69 |         bytes2 payloadID;
-   |                ---------
+82 |             return result + (unsignedRoundsUp(rounding) && 1 << result < value ? 1 : 0);
+   |                                                            -----------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#incorrect-shift
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:142:16
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:315:17
     |
-142 |         ParaID paraID,
-    |                ------
+315 |         bytes32 ticketID = createTicketID(msg.sender, commitmentHash);
+    |                 --------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/types/Common.sol:14:13
-   |
-14 |     bytes32 foreignID;
-   |             ---------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
 note[unused-import]: unused imports should be removed
  --> /home/runner/work/snowbridge/snowbridge/contracts/src/types/Common.sol:5:9
   |
@@ -492,230 +572,118 @@ note[unused-import]: unused imports should be removed
   |
   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:353:14
-    |
-353 |     function v1_handleSetPricingParameters(bytes calldata data) external onlySelf {
-    |              -----------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:358:14
-    |
-358 |     function v1_handleUnlockNativeToken(bytes calldata data) external onlySelf {
-    |              --------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/interfaces/IGatewayBase.sol:34:50
+warning[incorrect-shift]: the order of args in a shift operation is incorrect
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/utils/SparseBitmap.sol:12:20
    |
-34 |     event ForeignTokenRegistered(bytes32 indexed tokenID, address token);
-   |                                                  -------
+12 |     uint256 mask = 1 << (index & 0xff);
+   |                    -------------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#incorrect-shift
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:31:34
+warning[incorrect-shift]: the order of args in a shift operation is incorrect
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/utils/SparseBitmap.sol:18:20
    |
-31 |     function ensureAgent(bytes32 agentID) internal view returns (address agent) {
-   |                                  -------
+18 |     uint256 mask = 1 << (index & 0xff);
+   |                    -------------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/src/upgrade/Gateway202509.sol:5:8
-  |
-5 | import "../Gateway.sol";
-  |        ----------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
-
-note[pascal-case-struct]: structs should use PascalCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:109:12
-    |
-109 |     struct MMRLeaf {
-    |            -------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#pascal-case-struct
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#incorrect-shift
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:117:16
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:324:37
     |
-117 |         uint64 nextAuthoritySetID;
-    |                ------------------
+324 |     function tokenAddressOf(bytes32 tokenID) external view returns (address) {
+    |                                     -------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:155:20
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:333:14
     |
-155 |     bytes32 public latestMMRRoot;
-    |                    -------------
+333 |     function v1_handleAgentExecute(bytes calldata data) external onlySelf {
+    |              ---------------------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[screaming-snake-case-immutable]: immutables should use SCREAMING_SNAKE_CASE
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:182:30
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:338:14
     |
-182 |     uint256 public immutable randaoCommitDelay;
-    |                              -----------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-immutable
-
-note[screaming-snake-case-immutable]: immutables should use SCREAMING_SNAKE_CASE
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:190:30
-    |
-190 |     uint256 public immutable randaoCommitExpiration;
-    |                              ----------------------
+338 |     function v1_handleUpgrade(bytes calldata data) external onlySelf {
+    |              ----------------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-immutable
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[screaming-snake-case-immutable]: immutables should use SCREAMING_SNAKE_CASE
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:196:30
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:343:14
     |
-196 |     uint256 public immutable minNumRequiredSignatures;
-    |                              ------------------------
+343 |     function v1_handleSetOperatingMode(bytes calldata data) external onlySelf {
+    |              -------------------------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-immutable
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/storage/AssetsStorage.sol:13:16
-   |
-13 |         ParaID assetHubParaID;
-   |                --------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
 note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:363:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:348:14
     |
-363 |     function v1_handleRegisterForeignToken(bytes calldata data) external onlySelf {
+348 |     function v1_handleSetTokenTransferFees(bytes calldata data) external onlySelf {
     |              -----------------------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
 note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:368:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:353:14
     |
-368 |     function v1_handleMintForeignToken(ChannelID channelID, bytes calldata data)
-    |              -------------------------
+353 |     function v1_handleSetPricingParameters(bytes calldata data) external onlySelf {
+    |              -----------------------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:368:50
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:116:17
     |
-368 |     function v1_handleMintForeignToken(ChannelID channelID, bytes calldata data)
-    |                                                  ---------
+116 |         bytes32 foreignTokenID,
+    |                 --------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:394:14
-    |
-394 |     function v1_transactionBaseGas() internal pure returns (uint256) {
-    |              ---------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:51:16
-   |
-51 |         bytes4 consensusEngineID;
-   |                -----------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:159:40
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:136:39
     |
-159 |     function channelNoncesOf(ChannelID channelID) external view returns (uint64, uint64) {
-    |                                        ---------
+136 |     function mintForeignToken(bytes32 foreignTokenID, address recipient, uint128 amount)
+    |                                       --------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:164:47
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:148:44
     |
-164 |     function channelOperatingModeOf(ChannelID channelID) external view returns (OperatingMode) {
-    |                                               ---------
+148 |     function _ensureTokenAddressOf(bytes32 tokenID) internal view returns (address) {
+    |                                            -------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:170:37
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Handlers.sol:120:41
     |
-170 |     function tokenAddressOf(bytes32 tokenID) external view returns (address) {
-    |                                     -------
+120 |     function mintForeignToken(ChannelID channelID, bytes calldata data) external {
+    |                                         ---------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-warning[incorrect-shift]: the order of args in a shift operation is incorrect
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/utils/Math.sol:82:60
-   |
-82 |             return result + (unsignedRoundsUp(rounding) && 1 << result < value ? 1 : 0);
-   |                                                            -----------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#incorrect-shift
-
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:108:16
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:159:40
     |
-108 |         bytes4 encodedParaID,
-    |                -------------
+159 |     function channelNoncesOf(ChannelID channelID) external view returns (uint64, uint64) {
+    |                                        ---------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-warning[incorrect-shift]: the order of args in a shift operation is incorrect
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/utils/SparseBitmap.sol:12:20
-   |
-12 |     uint256 mask = 1 << (index & 0xff);
-   |                    -------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#incorrect-shift
-
-warning[incorrect-shift]: the order of args in a shift operation is incorrect
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/utils/SparseBitmap.sol:18:20
-   |
-18 |     uint256 mask = 1 << (index & 0xff);
-   |                    -------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#incorrect-shift
-
 note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:163:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:358:14
     |
-163 |     function SendForeignTokenToAddress20(
-    |              ---------------------------
+358 |     function v1_handleUnlockNativeToken(bytes calldata data) external onlySelf {
+    |              --------------------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:164:17
-    |
-164 |         bytes32 tokenID,
-    |                 -------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:165:16
-    |
-165 |         ParaID paraID,
-    |                ------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:211:19
-    |
-211 |         ChannelID channelID = ticket.dest.into();
-    |                   ---------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
 note[mixed-case-variable]: mutable variables should use mixedCase
   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:20:27
    |
@@ -732,38 +700,6 @@ note[mixed-case-variable]: mutable variables should use mixedCase
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:242:17
-    |
-242 |         bytes32 messageID = keccak256(abi.encodePacked(channelID, channel.outboundNonce));
-    |                 ---------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:205:53
-    |
-205 |     function createParachainHeaderMerkleLeaf(bytes4 encodedParaID, ParachainHeader calldata header)
-    |                                                     -------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:13:10
-   |
-13 | function ParaIDEq(ParaID a, ParaID b) pure returns (bool) {
-   |          --------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:39:38
-   |
-39 |     function ensureChannel(ChannelID channelID) internal view returns (Channel storage ch) {
-   |                                      ---------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
 note[mixed-case-variable]: mutable variables should use mixedCase
   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:25:27
    |
@@ -772,22 +708,6 @@ note[mixed-case-variable]: mutable variables should use mixedCase
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:116:17
-    |
-116 |         bytes32 foreignTokenID,
-    |                 --------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Handlers.sol:120:41
-    |
-120 |     function mintForeignToken(ChannelID channelID, bytes calldata data) external {
-    |                                         ---------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
 note[mixed-case-variable]: mutable variables should use mixedCase
   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:25:68
    |
@@ -804,30 +724,6 @@ note[mixed-case-variable]: mutable variables should use mixedCase
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:355:17
-    |
-355 |         bytes32 foreignID,
-    |                 ---------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:315:17
-    |
-315 |         bytes32 ticketID = createTicketID(msg.sender, commitmentHash);
-    |                 --------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:410:14
-    |
-410 |     function v2_submit(
-    |              ---------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
 note[mixed-case-variable]: mutable variables should use mixedCase
   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:42:30
    |
@@ -844,30 +740,6 @@ note[mixed-case-variable]: mutable variables should use mixedCase
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:214:43
-    |
-214 |     function createParachainHeader(bytes4 encodedParaID, ParachainHeader calldata header)
-    |                                           -------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:243:14
-    |
-243 |     function createMMRLeaf(MMRLeafPartial memory leaf, bytes32 parachainHeadsRoot)
-    |              -------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Handlers.sol:13:9
-   |
-13 | import {AgentExecutor} from "../AgentExecutor.sol";
-   |         -------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-
 note[mixed-case-variable]: mutable variables should use mixedCase
   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:46:40
    |
@@ -876,45 +748,93 @@ note[mixed-case-variable]: mutable variables should use mixedCase
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:14:9
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:28:16
    |
-14 | import {AgentExecutor} from "../AgentExecutor.sol";
-   |         -------------
+28 |         uint64 nextAuthoritySetID;
+   |                ------------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:15:9
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:51:16
    |
-15 | import {Agent} from "../Agent.sol";
-   |         -----
+51 |         bytes4 consensusEngineID;
+   |                -----------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:16:9
-   |
-16 | import {Call} from "../utils/Call.sol";
-   |         ----
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:363:14
+    |
+363 |     function v1_handleRegisterForeignToken(bytes calldata data) external onlySelf {
+    |              -----------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:25:5
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:368:14
+    |
+368 |     function v1_handleMintForeignToken(ChannelID channelID, bytes calldata data)
+    |              -------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:368:50
+    |
+368 |     function v1_handleMintForeignToken(ChannelID channelID, bytes calldata data)
+    |                                                  ---------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:394:14
+    |
+394 |     function v1_transactionBaseGas() internal pure returns (uint256) {
+    |              ---------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:410:14
+    |
+410 |     function v2_submit(
+    |              ---------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:13:10
    |
-25 |     AgentExecuteCommand,
-   |     -------------------
+13 | function ParaIDEq(ParaID a, ParaID b) pure returns (bool) {
+   |          --------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:31:18
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:164:47
+    |
+164 |     function channelOperatingModeOf(ChannelID channelID) external view returns (OperatingMode) {
+    |                                               ---------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:170:37
+    |
+170 |     function tokenAddressOf(bytes32 tokenID) external view returns (address) {
+    |                                     -------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:86:14
    |
-31 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
-   |                  -------
+86 |     function queryForeignTokenID(address token) external view returns (bytes32);
+   |              -------------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
 note[mixed-case-function]: function names should use mixedCase
    --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:444:14
@@ -940,29 +860,21 @@ note[mixed-case-function]: function names should use mixedCase
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:464:14
-    |
-464 |     function v2_registerToken(
-    |              ----------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:475:14
-    |
-475 |     function v2_createAgent(bytes32 id) external {
-    |              --------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Handlers.sol:13:9
+   |
+13 | import {AgentExecutor} from "../AgentExecutor.sol";
+   |         -------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:484:14
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:211:19
     |
-484 |     function v2_handleUpgrade(bytes calldata data) external onlySelf {
-    |              ----------------
+211 |         ChannelID channelID = ticket.dest.into();
+    |                   ---------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-function]: function names should use mixedCase
    --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Calls.sol:139:14
@@ -981,53 +893,21 @@ note[mixed-case-variable]: mutable variables should use mixedCase
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:362:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:108:16
     |
-362 |         bool is_next_session = false;
-    |              ---------------
+108 |         bytes4 encodedParaID,
+    |                -------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:373:17
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:117:37
     |
-373 |         bytes32 newMMRRoot = ensureProvidesMMRRoot(commitment);
-    |                 ----------
+117 |     function tokenAddressOf(bytes32 tokenID) external view returns (address);
+    |                                     -------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:17:10
-   |
-17 | function ParaIDNe(ParaID a, ParaID b) pure returns (bool) {
-   |          --------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:21:22
-   |
-21 | function into(ParaID paraID) pure returns (ChannelID) {
-   |                      ------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:29:10
-   |
-29 | function ChannelIDEq(ChannelID a, ChannelID b) pure returns (bool) {
-   |          -----------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:33:10
-   |
-33 | function ChannelIDNe(ChannelID a, ChannelID b) pure returns (bool) {
-   |          -----------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
 note[unused-import]: unused imports should be removed
   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Handlers.sol:13:9
    |
@@ -1036,30 +916,6 @@ note[unused-import]: unused imports should be removed
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:136:39
-    |
-136 |     function mintForeignToken(bytes32 foreignTokenID, address recipient, uint128 amount)
-    |                                       --------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:148:44
-    |
-148 |     function _ensureTokenAddressOf(bytes32 tokenID) internal view returns (address) {
-    |                                            -------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:405:14
-    |
-405 |     function verifyMMRLeafProof(bytes32 leafHash, bytes32[] calldata proof, uint256 proofOrder)
-    |              ------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
 note[unused-import]: unused imports should be removed
   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Calls.sol:29:9
    |
@@ -1084,62 +940,6 @@ note[unused-import]: unused imports should be removed
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:28:20
-   |
-28 |     uint8 constant Upgrade = 0;
-   |                    -------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
-
-note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:30:20
-   |
-30 |     uint8 constant SetOperatingMode = 1;
-   |                    ----------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
-
-note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:32:20
-   |
-32 |     uint8 constant UnlockNativeToken = 2;
-   |                    -----------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
-
-note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:34:20
-   |
-34 |     uint8 constant RegisterForeignToken = 3;
-   |                    --------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
-
-note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:36:20
-   |
-36 |     uint8 constant MintForeignToken = 4;
-   |                    ----------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
-
-note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:38:20
-   |
-38 |     uint8 constant CallContract = 5;
-   |                    ------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:53:15
-   |
-53 |     ChannelID channelID;
-   |               ---------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
 note[mixed-case-variable]: mutable variables should use mixedCase
   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/IGateway.sol:22:30
    |
@@ -1156,16 +956,72 @@ note[mixed-case-variable]: mutable variables should use mixedCase
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:242:17
+    |
+242 |         bytes32 messageID = keccak256(abi.encodePacked(channelID, channel.outboundNonce));
+    |                 ---------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
 note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/IGateway.sol:51:14
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:17:10
    |
-51 |     function v2_submit(
-   |              ---------
+17 | function ParaIDNe(ParaID a, ParaID b) pure returns (bool) {
+   |          --------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/IGateway.sol:81:14
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:21:22
+   |
+21 | function into(ParaID paraID) pure returns (ChannelID) {
+   |                      ------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:464:14
+    |
+464 |     function v2_registerToken(
+    |              ----------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:475:14
+    |
+475 |     function v2_createAgent(bytes32 id) external {
+    |              --------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:484:14
+    |
+484 |     function v2_handleUpgrade(bytes calldata data) external onlySelf {
+    |              ----------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:489:14
+    |
+489 |     function v2_handleSetOperatingMode(bytes calldata data) external onlySelf {
+    |              -------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/IGateway.sol:51:14
+   |
+51 |     function v2_submit(
+   |              ---------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/IGateway.sol:81:14
    |
 81 |     function v2_sendMessage(
    |              --------------
@@ -1204,67 +1060,67 @@ note[mixed-case-function]: function names should use mixedCase
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:86:14
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:28:20
    |
-86 |     function queryForeignTokenID(address token) external view returns (bytes32);
-   |              -------------------
+28 |     uint8 constant Upgrade = 0;
+   |                    -------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:451:14
-    |
-451 |     function createTicketID(address account, bytes32 commitmentHash)
-    |              --------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/Agent.t.sol:4:8
-  |
-4 | import "forge-std/Test.sol";
-  |        --------------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
 
-note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/Agent.t.sol:5:8
-  |
-5 | import "forge-std/console.sol";
-  |        -----------------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:30:20
+   |
+30 |     uint8 constant SetOperatingMode = 1;
+   |                    ----------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:108:13
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:362:14
     |
-108 |     bytes32 agentID;
-    |             -------
+362 |         bool is_next_session = false;
+    |              ---------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:153:13
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:373:17
     |
-153 |     bytes32 agentID;
-    |             -------
+373 |         bytes32 newMMRRoot = ensureProvidesMMRRoot(commitment);
+    |                 ----------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:165:13
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:355:17
     |
-165 |     bytes32 foreignTokenID;
-    |             --------------
+355 |         bytes32 foreignID,
+    |                 ---------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:32:20
+   |
+32 |     uint8 constant UnlockNativeToken = 2;
+   |                    -----------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
+
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:34:20
+   |
+34 |     uint8 constant RegisterForeignToken = 3;
+   |                    --------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
+
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:177:13
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:205:53
     |
-177 |     bytes32 foreignTokenID;
-    |             --------------
+205 |     function createParachainHeaderMerkleLeaf(bytes4 encodedParaID, ParachainHeader calldata header)
+    |                                                     -------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
@@ -1276,221 +1132,229 @@ note[mixed-case-variable]: mutable variables should use mixedCase
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/Bitfield.t.sol:5:9
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Agent.t.sol:4:8
   |
-5 | import {console} from "forge-std/console.sol";
-  |         -------
+4 | import "forge-std/Test.sol";
+  |        --------------------
   |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
 
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:489:14
-    |
-489 |     function v2_handleSetOperatingMode(bytes calldata data) external onlySelf {
-    |              -------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Agent.t.sol:5:8
+  |
+5 | import "forge-std/console.sol";
+  |        -----------------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
 
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:494:14
-    |
-494 |     function v2_handleUnlockNativeToken(bytes calldata data) external onlySelf {
-    |              --------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:36:20
+   |
+36 |     uint8 constant MintForeignToken = 4;
+   |                    ----------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
 
 note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:68:20
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:38:20
    |
-68 |     uint8 constant Raw = 0;
-   |                    ---
+38 |     uint8 constant CallContract = 5;
+   |                    ------------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
 
 note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/BeefyClient.t.sol:167:14
-    |
-167 |     function decodeMMRLeaf(string memory beefyCommitmentRaw) internal {
-    |              -------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/BeefyClient.t.sol:171:16
-    |
-171 |         uint64 nextAuthoritySetID =
-    |                ------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:29:10
+   |
+29 | function ChannelIDEq(ChannelID a, ChannelID b) pure returns (bool) {
+   |          -----------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:8:9
-  |
-8 | import {SubstrateTypes} from "./SubstrateTypes.sol";
-  |         --------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:33:10
+   |
+33 | function ChannelIDNe(ChannelID a, ChannelID b) pure returns (bool) {
+   |          -----------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:503:17
-    |
-503 |         bytes32 ticketID,
-    |                 --------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:53:15
+   |
+53 |     ChannelID channelID;
+   |               ---------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:543:14
-    |
-543 |     function ensureProvidesMMRRoot(Commitment calldata commitment)
-    |              ---------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:68:20
+   |
+68 |     uint8 constant Raw = 0;
+   |                    ---
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
 
 note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:33:31
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:70:20
    |
-33 |     address constant internal assetHubAgent = 0xd803472c47a87D7B63E888DE53f03B4191B846a8;
-   |                               -------------
+70 |     uint8 constant CreateAsset = 1;
+   |                    -----------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
 
 note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:499:14
-    |
-499 |     function v2_handleRegisterForeignToken(bytes calldata data) external onlySelf {
-    |              -----------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:81:10
+   |
+81 | function makeRawXCM(bytes memory xcm) pure returns (Xcm memory) {
+   |          ----------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
 note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:504:14
-    |
-504 |     function v2_handleMintForeignToken(bytes calldata data) external onlySelf {
-    |              -------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:85:10
+   |
+85 | function makeCreateAssetXCM(address token, Network network) pure returns (Xcm memory) {
+   |          ------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:509:14
-    |
-509 |     function v2_handleCallContract(bytes32 origin, bytes calldata data) external onlySelf {
-    |              ---------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:98:20
+   |
+98 |     uint8 constant NativeTokenERC20 = 0;
+   |                    ----------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
+
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:99:20
+   |
+99 |     uint8 constant ForeignTokenERC20 = 1;
+   |                    -----------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
 
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/BeefyClient.t.sol:11:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:14:9
    |
-11 | import {ScaleCodec} from "../src/utils/ScaleCodec.sol";
-   |         ----------
+14 | import {AgentExecutor} from "../AgentExecutor.sol";
+   |         -------------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:117:37
-    |
-117 |     function tokenAddressOf(bytes32 tokenID) external view returns (address);
-    |                                     -------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:15:9
+   |
+15 | import {Agent} from "../Agent.sol";
+   |         -----
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:5:9
-  |
-5 | import {TokenInfo, OperatingMode} from "../types/Common.sol";
-  |         ---------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:16:9
+   |
+16 | import {Call} from "../utils/Call.sol";
+   |         ----
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:6:9
-  |
-6 | import {MultiAddress} from "./MultiAddress.sol";
-  |         ------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:25:5
+   |
+25 |     AgentExecuteCommand,
+   |     -------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:85:20
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:31:18
    |
-85 |     bytes32 public dotTokenID;
-   |                    ----------
+31 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
+   |                  -------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:566:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/BeefyClient.t.sol:167:14
     |
-566 |     function v2_dispatch(InboundMessageV2 calldata message) internal returns (bool) {
-    |              -----------
+167 |     function decodeMMRLeaf(string memory beefyCommitmentRaw) internal {
+    |              -------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:70:20
-   |
-70 |     uint8 constant CreateAsset = 1;
-   |                    -----------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
-
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:81:10
-   |
-81 | function makeRawXCM(bytes memory xcm) pure returns (Xcm memory) {
-   |          ----------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:214:43
+    |
+214 |     function createParachainHeader(bytes4 encodedParaID, ParachainHeader calldata header)
+    |                                           -------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:85:10
-   |
-85 | function makeCreateAssetXCM(address token, Network network) pure returns (Xcm memory) {
-   |          ------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:243:14
+    |
+243 |     function createMMRLeaf(MMRLeafPartial memory leaf, bytes32 parachainHeadsRoot)
+    |              -------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
 note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:5:9
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Bitfield.t.sol:5:9
   |
-5 | import {Strings} from "openzeppelin/utils/Strings.sol";
+5 | import {console} from "forge-std/console.sol";
   |         -------
   |
   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:6:9
-  |
-6 | import {console} from "forge-std/console.sol";
-  |         -------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:33:31
+   |
+33 |     address constant internal assetHubAgent = 0xd803472c47a87D7B63E888DE53f03B4191B846a8;
+   |                               -------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
 
-note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/Math.t.sol:4:8
-  |
-4 | import "forge-std/Test.sol";
-  |        --------------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+note[pascal-case-struct]: structs should use PascalCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:103:8
+    |
+103 | struct AsNativeTokenERC20 {
+    |        ------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#pascal-case-struct
 
-note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/Math.t.sol:5:8
-  |
-5 | import "forge-std/console.sol";
-  |        -----------------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+note[pascal-case-struct]: structs should use PascalCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:109:8
+    |
+109 | struct AsForeignTokenERC20 {
+    |        -------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#pascal-case-struct
 
-note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/MMRProof.t.sol:5:9
-  |
-5 | import {console} from "forge-std/console.sol";
-  |         -------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:110:13
+    |
+110 |     bytes32 foreignID;
+    |             ---------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:405:14
+    |
+405 |     function verifyMMRLeafProof(bytes32 leafHash, bytes32[] calldata proof, uint256 proofOrder)
+    |              ------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:494:14
+    |
+494 |     function v2_handleUnlockNativeToken(bytes calldata data) external onlySelf {
+    |              --------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
 note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:68:8
@@ -1532,101 +1396,93 @@ note[mixed-case-variable]: mutable variables should use mixedCase
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:98:20
-   |
-98 |     uint8 constant NativeTokenERC20 = 0;
-   |                    ----------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
-
-note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:99:20
-   |
-99 |     uint8 constant ForeignTokenERC20 = 1;
-   |                    -----------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
-
-note[pascal-case-struct]: structs should use PascalCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:103:8
-    |
-103 | struct AsNativeTokenERC20 {
-    |        ------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#pascal-case-struct
-
-note[pascal-case-struct]: structs should use PascalCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:109:8
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:139:16
     |
-109 | struct AsForeignTokenERC20 {
-    |        -------------------
+139 |         ParaID paraID = ParaID.wrap(1000);
+    |                ------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#pascal-case-struct
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:110:13
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:108:13
     |
-110 |     bytes32 foreignID;
-    |             ---------
+108 |     bytes32 agentID;
+    |             -------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:8:9
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:8:9
   |
-8 | import {BeefyClient} from "../src/BeefyClient.sol";
-  |         -----------
+8 | import {SubstrateTypes} from "./SubstrateTypes.sol";
+  |         --------------
   |
   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:12:9
-   |
-12 | import {IInitializable} from "../src/interfaces/IInitializable.sol";
-   |         --------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:13:9
-   |
-13 | import {IUpgradable} from "../src/interfaces/IUpgradable.sol";
-   |         -----------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:103:20
+    |
+103 |     bytes32 public messageID = keccak256("cabbage");
+    |                    ---------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:14:9
-   |
-14 | import {Gateway} from "../src/Gateway.sol";
-   |         -------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:499:14
+    |
+499 |     function v2_handleRegisterForeignToken(bytes calldata data) external onlySelf {
+    |              -----------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:16:9
-   |
-16 | import {MockGatewayV2} from "./mocks/MockGatewayV2.sol";
-   |         -------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:504:14
+    |
+504 |     function v2_handleMintForeignToken(bytes calldata data) external onlySelf {
+    |              -------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:21:9
-   |
-21 | import {Agent} from "../src/Agent.sol";
-   |         -----
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:509:14
+    |
+509 |     function v2_handleCallContract(bytes32 origin, bytes calldata data) external onlySelf {
+    |              ---------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:23:9
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:85:20
    |
-23 | import {SubstrateTypes} from "./../src/SubstrateTypes.sol";
-   |         --------------
+85 |     bytes32 public dotTokenID;
+   |                    ----------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:451:14
+    |
+451 |     function createTicketID(address account, bytes32 commitmentHash)
+    |              --------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:153:13
+    |
+153 |     bytes32 agentID;
+    |             -------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/BeefyClient.t.sol:171:16
+    |
+171 |         uint64 nextAuthoritySetID =
+    |                ------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-variable]: mutable variables should use mixedCase
    --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:121:35
@@ -1636,32 +1492,64 @@ note[mixed-case-variable]: mutable variables should use mixedCase
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:590:14
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:159:13
     |
-590 |     function encodeMMRLeaf(MMRLeaf calldata leaf) internal pure returns (bytes memory) {
-    |              -------------
+159 |     bytes32 foreignTokenID;
+    |             --------------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:103:20
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:165:13
     |
-103 |     bytes32 public messageID = keccak256("cabbage");
-    |                    ---------
+165 |     bytes32 foreignTokenID;
+    |             --------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:120:20
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:177:13
     |
-120 |     bytes32 public dotTokenID;
-    |                    ----------
+177 |     bytes32 foreignTokenID;
+    |             --------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:5:9
+  |
+5 | import {TokenInfo, OperatingMode} from "../types/Common.sol";
+  |         ---------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:6:9
+  |
+6 | import {MultiAddress} from "./MultiAddress.sol";
+  |         ------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:171:13
+    |
+171 |     bytes32 foreignTokenID;
+    |             --------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/MMRProof.t.sol:5:9
+  |
+5 | import {console} from "forge-std/console.sol";
+  |         -------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
 note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/SparseBitmap.t.sol:4:8
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Math.t.sol:4:8
   |
 4 | import "forge-std/Test.sol";
   |        --------------------
@@ -1669,7 +1557,7 @@ note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." a
   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
 
 note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/SparseBitmap.t.sol:5:8
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Math.t.sol:5:8
   |
 5 | import "forge-std/console.sol";
   |        -----------------------
@@ -1677,205 +1565,285 @@ note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." a
   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
 
 note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:8:9
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:5:9
   |
-8 | import {AgentExecutor} from "./AgentExecutor.sol";
-  |         -------------
+5 | import {Strings} from "openzeppelin/utils/Strings.sol";
+  |         -------
   |
   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:29:9
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:6:9
+  |
+6 | import {console} from "forge-std/console.sol";
+  |         -------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:8:9
+  |
+8 | import {BeefyClient} from "../src/BeefyClient.sol";
+  |         -----------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:12:9
    |
-29 | import {Upgrade} from "./Upgrade.sol";
+12 | import {IInitializable} from "../src/interfaces/IInitializable.sol";
+   |         --------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:13:9
+   |
+13 | import {IUpgradable} from "../src/interfaces/IUpgradable.sol";
+   |         -----------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:14:9
+   |
+14 | import {Gateway} from "../src/Gateway.sol";
    |         -------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:41:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:16:9
    |
-41 | import {PricingStorage} from "./storage/PricingStorage.sol";
+16 | import {MockGatewayV2} from "./mocks/MockGatewayV2.sol";
+   |         -------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:21:9
+   |
+21 | import {Agent} from "../src/Agent.sol";
+   |         -----
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:23:9
+   |
+23 | import {SubstrateTypes} from "./../src/SubstrateTypes.sol";
    |         --------------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:44:18
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:24:24
    |
-44 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
-   |                  -------
+24 | import {OperatingMode, ParaID, CommandV2, CommandKind, InboundMessageV2} from "../src/Types.sol";
+   |                        ------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:4:8
-  |
-4 | import "forge-std/Test.sol";
-  |        --------------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:26:9
+   |
+26 | import {NativeTransferFailed} from "../src/utils/SafeTransfer.sol";
+   |         --------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:5:8
-  |
-5 | import "forge-std/console.sol";
-  |        -----------------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:27:9
+   |
+27 | import {PricingStorage} from "../src/storage/PricingStorage.sol";
+   |         --------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:139:16
-    |
-139 |         ParaID paraID = ParaID.wrap(1000);
-    |                ------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:29:9
+   |
+29 | import {TokenLib} from "../src/TokenLib.sol";
+   |         --------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:36:5
+   |
+36 |     UpgradeParams,
+   |     -------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:46:5
+   |
+46 |     Xcm,
+   |     ---
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:51:5
+   |
+51 |     AgentExecuteCommand,
+   |     -------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:52:5
+   |
+52 |     InboundMessage,
+   |     --------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:54:5
+   |
+54 |     ParaID,
+   |     ------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:55:5
+   |
+55 |     Command
+   |     -------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:59:9
+   |
+59 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
+   |         -------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:59:27
+   |
+59 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
+   |                           -------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:44:27
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/BeefyClient.t.sol:11:9
    |
-44 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
-   |                           -------
+11 | import {ScaleCodec} from "../src/utils/ScaleCodec.sol";
+   |         ----------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/ScaleCodec.t.sol:4:8
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/SparseBitmap.t.sol:4:8
   |
 4 | import "forge-std/Test.sol";
   |        --------------------
   |
   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
 
-note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/ScaleCodec.t.sol:5:8
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:4:9
   |
-5 | import "forge-std/console.sol";
-  |        -----------------------
+4 | import {Vm} from "forge-std/Vm.sol";
+  |         --
   |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:624:17
-    |
-624 |         bytes32 ticketID,
-    |                 --------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:63:9
-   |
-63 |         token.transfer(receiver, transferAmount);
-   |         ----------------------------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:173:17
-    |
-173 |         bytes32 agentID,
-    |                 -------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:187:17
-    |
-187 |         bytes32 agentID,
-    |                 -------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/Verification.t.sol:4:8
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:6:9
   |
-4 | import "openzeppelin/utils/Strings.sol";
-  |        --------------------------------
+6 | import {stdJson} from "forge-std/StdJson.sol";
+  |         -------
   |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/Uint16Array.t.sol:4:8
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:7:9
   |
-4 | import "forge-std/Test.sol";
-  |        --------------------
+7 | import {console} from "forge-std/console.sol";
+  |         -------
   |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:605:16
-    |
-605 |         ParaID paraID = ParaID.wrap(1000);
-    |                ------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:102:9
-    |
-102 |         token.transferFrom(owner, receiver, transferAmount);
-    |         ---------------------------------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/Uint16Array.t.sol:5:8
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:8:18
   |
-5 | import "forge-std/console.sol";
-  |        -----------------------
+8 | import {UD60x18, ud60x18, unwrap} from "prb/math/src/UD60x18.sol";
+  |                  -------
   |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:24:24
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:13:9
    |
-24 | import {OperatingMode, ParaID, CommandV2, CommandKind, InboundMessageV2} from "../src/Types.sol";
-   |                        ------
+13 | import {Gateway} from "../src/Gateway.sol";
+   |         -------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:26:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:16:24
    |
-26 | import {NativeTransferFailed} from "../src/utils/SafeTransfer.sol";
-   |         --------------------
+16 | import {UpgradeParams, SetOperatingModeParams, OperatingMode, RegisterForeignTokenParams} from "../src/v1/Types.sol";
+   |                        ----------------------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:27:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:16:48
    |
-27 | import {PricingStorage} from "../src/storage/PricingStorage.sol";
-   |         --------------
+16 | import {UpgradeParams, SetOperatingModeParams, OperatingMode, RegisterForeignTokenParams} from "../src/v1/Types.sol";
+   |                                                -------------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:29:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:16:63
    |
-29 | import {TokenLib} from "../src/TokenLib.sol";
-   |         --------
+16 | import {UpgradeParams, SetOperatingModeParams, OperatingMode, RegisterForeignTokenParams} from "../src/v1/Types.sol";
+   |                                                               --------------------------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:36:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:17:28
    |
-36 |     UpgradeParams,
-   |     -------------
+17 | import {ChannelID, ParaID, OperatingMode, InboundMessage, Command, TokenInfo} from "../src/v1/Types.sol";
+   |                            -------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:17:68
+   |
+17 | import {ChannelID, ParaID, OperatingMode, InboundMessage, Command, TokenInfo} from "../src/v1/Types.sol";
+   |                                                                    ---------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:631:16
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:503:17
     |
-631 |         ParaID paraID = ParaID.wrap(1000);
-    |                ------
+503 |         bytes32 ticketID,
+    |                 --------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Verification.t.sol:4:8
+  |
+4 | import "openzeppelin/utils/Strings.sol";
+  |        --------------------------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+
 note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
  --> /home/runner/work/snowbridge/snowbridge/contracts/test/Verification.t.sol:5:8
   |
@@ -1892,6 +1860,30 @@ note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." a
   |
   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
 
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/SparseBitmap.t.sol:5:8
+  |
+5 | import "forge-std/console.sol";
+  |        -----------------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:4:8
+  |
+4 | import "forge-std/Test.sol";
+  |        --------------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:5:8
+  |
+5 | import "forge-std/console.sol";
+  |        -----------------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+
 note[mixed-case-variable]: mutable variables should use mixedCase
   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Verification.t.sol:17:19
    |
@@ -1901,140 +1893,172 @@ note[mixed-case-variable]: mutable variables should use mixedCase
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:656:16
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:120:20
     |
-656 |         ParaID paraID = ParaID.wrap(1000);
-    |                ------
+120 |     bytes32 public dotTokenID;
+    |                    ----------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:674:16
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:566:14
     |
-674 |         ParaID paraID = ParaID.wrap(1000);
-    |                ------
+566 |     function v2_dispatch(InboundMessageV2 calldata message) internal returns (bool) {
+    |              -----------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/Uint16Array.t.sol:98:16
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Uint16Array.t.sol:4:8
+  |
+4 | import "forge-std/Test.sol";
+  |        --------------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Uint16Array.t.sol:5:8
+  |
+5 | import "forge-std/console.sol";
+  |        -----------------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:6:8
+  |
+6 | import "forge-std/console.sol";
+  |        -----------------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+
+warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:63:9
    |
-98 |         uint16 new_value = counters.get(index);
-   |                ---------
+63 |         token.transfer(receiver, transferAmount);
+   |         ----------------------------------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:159:13
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:543:14
     |
-159 |     bytes32 foreignTokenID;
-    |             --------------
+543 |     function ensureProvidesMMRRoot(Commitment calldata commitment)
+    |              ---------------------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:20:14
+   |
+20 |     function v1_handleAgentExecute_public(bytes calldata params) external {
+   |              ----------------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:24:14
+   |
+24 |     function v1_handleUpgrade_public(bytes calldata params) external {
+   |              -----------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:28:14
+   |
+28 |     function v1_handleSetOperatingMode_public(bytes calldata params) external {
+   |              --------------------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:171:13
-    |
-171 |     bytes32 foreignTokenID;
-    |             --------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:32:14
+   |
+32 |     function v1_handleSetTokenTransferFees_public(bytes calldata params) external {
+   |              ------------------------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:46:5
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:36:14
    |
-46 |     Xcm,
-   |     ---
+36 |     function v1_handleSetPricingParameters_public(bytes calldata params) external {
+   |              ------------------------------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:51:5
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:40:14
    |
-51 |     AgentExecuteCommand,
-   |     -------------------
+40 |     function v1_handleUnlockNativeToken_public(bytes calldata params) external {
+   |              ---------------------------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:52:5
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:44:14
    |
-52 |     InboundMessage,
-   |     --------------
+44 |     function v1_handleRegisterForeignToken_public(bytes calldata params) external {
+   |              ------------------------------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:54:5
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:8:9
+  |
+8 | import {AgentExecutor} from "./AgentExecutor.sol";
+  |         -------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:29:9
    |
-54 |     ParaID,
-   |     ------
+29 | import {Upgrade} from "./Upgrade.sol";
+   |         -------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:55:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:41:9
    |
-55 |     Command
-   |     -------
+41 | import {PricingStorage} from "./storage/PricingStorage.sol";
+   |         --------------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:59:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:44:18
    |
-59 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
-   |         -------
+44 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
+   |                  -------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:59:27
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:44:27
    |
-59 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
+44 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
    |                           -------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:990:20
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:173:17
     |
-990 |     bytes32 public expectChannelIDBytes =
-    |                    --------------------
+173 |         bytes32 agentID,
+    |                 -------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:994:16
-    |
-994 |         ParaID para_id = ParaID.wrap(1000);
-    |                -------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:140:9
-    |
-140 |         token.transferFrom(owner, receiver, transferAmount);
-    |         ---------------------------------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
-
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:20:14
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/Uint16Array.t.sol:98:16
    |
-20 |     function v1_handleAgentExecute_public(bytes calldata params) external {
-   |              ----------------------------
+98 |         uint16 new_value = counters.get(index);
+   |                ---------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:6:8
-  |
-6 | import "forge-std/console.sol";
-  |        -----------------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[unused-import]: unused imports should be removed
  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/ReantrantAttacker.sol:7:9
@@ -2044,165 +2068,205 @@ note[unused-import]: unused imports should be removed
   |
   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/utils/ForkTestFixtures.sol:33:24
-   |
-33 |     Vm public constant vm = Vm(0x7109709ECfa91a80626fF3989D68f67F5b1DD12D);
-   |                        --
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
+note[mixed-case-variable]: mutable variables should use mixedCase
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/VerificationWrapper.sol:8:16
+  |
+8 |         bytes4 encodedParachainID,
+  |                ------------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:24:14
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:24:14
    |
-24 |     function v1_handleUpgrade_public(bytes calldata params) external {
+24 |     function encodeCommitment_public(Commitment calldata commitment)
    |              -----------------------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:995:19
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:590:14
     |
-995 |         ChannelID channel_id = para_id.into();
-    |                   ----------
+590 |     function encodeMMRLeaf(MMRLeaf calldata leaf) internal pure returns (bytes memory) {
+    |              -------------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:4:9
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:48:14
+   |
+48 |     function v1_handleMintForeignToken_public(ChannelID channelID, bytes calldata params)
+   |              --------------------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:48:57
+   |
+48 |     function v1_handleMintForeignToken_public(ChannelID channelID, bytes calldata params)
+   |                                                         ---------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:58:14
+   |
+58 |     function prank_registerNativeToken(address token) external {
+   |              -------------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:62:14
+   |
+62 |     function prank_registerForeignToken(
+   |              --------------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:63:17
+   |
+63 |         bytes32 foreignTokenID,
+   |                 --------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:40:14
+   |
+40 |     function initialize_public(
+   |              -----------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/ScaleCodec.t.sol:4:8
   |
-4 | import {Vm} from "forge-std/Vm.sol";
-  |         --
+4 | import "forge-std/Test.sol";
+  |        --------------------
   |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
 
-note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:6:9
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/ScaleCodec.t.sol:5:8
   |
-6 | import {stdJson} from "forge-std/StdJson.sol";
-  |         -------
+5 | import "forge-std/console.sol";
+  |        -----------------------
   |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
 
 note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:7:9
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:7:20
   |
-7 | import {console} from "forge-std/console.sol";
-  |         -------
+7 | import {ChannelID, ParaID, OperatingMode} from "../../src/Types.sol";
+  |                    ------
   |
   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:8:18
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:7:28
   |
-8 | import {UD60x18, ud60x18, unwrap} from "prb/math/src/UD60x18.sol";
-  |                  -------
+7 | import {ChannelID, ParaID, OperatingMode} from "../../src/Types.sol";
+  |                            -------------
   |
   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:13:9
-   |
-13 | import {Gateway} from "../src/Gateway.sol";
-   |         -------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:16:24
-   |
-16 | import {UpgradeParams, SetOperatingModeParams, OperatingMode, RegisterForeignTokenParams} from "../src/v1/Types.sol";
-   |                        ----------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:16:48
-   |
-16 | import {UpgradeParams, SetOperatingModeParams, OperatingMode, RegisterForeignTokenParams} from "../src/v1/Types.sol";
-   |                                                -------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:9:9
+  |
+9 | import {CoreStorage} from "../../src/storage/CoreStorage.sol";
+  |         -----------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:16:63
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:11:9
    |
-16 | import {UpgradeParams, SetOperatingModeParams, OperatingMode, RegisterForeignTokenParams} from "../src/v1/Types.sol";
-   |                                                               --------------------------
+11 | import {IInitializable} from "../../src/interfaces/IInitializable.sol";
+   |         --------------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:17:28
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:13:9
    |
-17 | import {ChannelID, ParaID, OperatingMode, InboundMessage, Command, TokenInfo} from "../src/v1/Types.sol";
-   |                            -------------
+13 | import {UD60x18} from "prb/math/src/UD60x18.sol";
+   |         -------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:17:68
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:85:14
    |
-17 | import {ChannelID, ParaID, OperatingMode, InboundMessage, Command, TokenInfo} from "../src/v1/Types.sol";
-   |                                                                    ---------
+85 |     function computeNumRequiredSignatures_public(
+   |              -----------------------------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 
-warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:165:9
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:93:14
+   |
+93 |     function computeQuorum_public(uint256 numValidators) public pure returns (uint256) {
+   |              --------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:187:17
     |
-165 |         token.transferFrom(owner, address(0), amount);
-    |         ---------------------------------------------
+187 |         bytes32 agentID,
+    |                 -------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:196:9
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:624:17
     |
-196 |         token.transferFrom(owner, receiver, transferAmount);
-    |         ---------------------------------------------------
+624 |         bytes32 ticketID,
+    |                 --------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:205:9
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:102:9
     |
-205 |         token.transferFrom(owner, receiver, allowanceAmount);
-    |         ----------------------------------------------------
+102 |         token.transferFrom(owner, receiver, transferAmount);
+    |         ---------------------------------------------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
 
-note[mixed-case-variable]: mutable variables should use mixedCase
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/VerificationWrapper.sol:8:16
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:5:9
   |
-8 |         bytes4 encodedParachainID,
-  |                ------------------
+5 | import {Uint16Array, createUint16Array} from "../../src/utils/Uint16Array.sol";
+  |         -----------
   |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:28:14
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/utils/ForkTestFixtures.sol:33:24
    |
-28 |     function v1_handleSetOperatingMode_public(bytes calldata params) external {
-   |              --------------------------------
+33 |     Vm public constant vm = Vm(0x7109709ECfa91a80626fF3989D68f67F5b1DD12D);
+   |                        --
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
 
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:24:14
-   |
-24 |     function encodeCommitment_public(Commitment calldata commitment)
-   |              -----------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:140:9
+    |
+140 |         token.transferFrom(owner, receiver, transferAmount);
+    |         ---------------------------------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
 
 warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
-    --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:1058:9
-     |
-1058 |         token.transfer(address(assetHubAgent), 200);
-     |         -------------------------------------------
-     |
-     = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:165:9
+    |
+165 |         token.transferFrom(owner, address(0), amount);
+    |         ---------------------------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
 
 note[mixed-case-variable]: mutable variables should use mixedCase
    --> /home/runner/work/snowbridge/snowbridge/contracts/test/utils/ForkTestFixtures.sol:132:15
@@ -2212,6 +2276,22 @@ note[mixed-case-variable]: mutable variables should use mixedCase
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
+warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:196:9
+    |
+196 |         token.transferFrom(owner, receiver, transferAmount);
+    |         ---------------------------------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+
+warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:205:9
+    |
+205 |         token.transferFrom(owner, receiver, allowanceAmount);
+    |         ----------------------------------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+
 warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
    --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:230:9
     |
@@ -2220,45 +2300,13 @@ warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls sho
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
 
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:32:14
-   |
-32 |     function v1_handleSetTokenTransferFees_public(bytes calldata params) external {
-   |              ------------------------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:36:14
-   |
-36 |     function v1_handleSetPricingParameters_public(bytes calldata params) external {
-   |              ------------------------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:40:14
-   |
-40 |     function v1_handleUnlockNativeToken_public(bytes calldata params) external {
-   |              ---------------------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:44:14
-   |
-44 |     function v1_handleRegisterForeignToken_public(bytes calldata params) external {
-   |              ------------------------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
-    --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:1251:9
-     |
-1251 |         token.transfer(address(assetHubAgent), 200);
-     |         -------------------------------------------
-     |
-     = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:605:16
+    |
+605 |         ParaID paraID = ParaID.wrap(1000);
+    |                ------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[unused-import]: unused imports should be removed
  --> /home/runner/work/snowbridge/snowbridge/contracts/test/utils/ForkTestFixtures.sol:5:9
@@ -2284,54 +2332,6 @@ note[unused-import]: unused imports should be removed
   |
   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:40:14
-   |
-40 |     function initialize_public(
-   |              -----------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:48:14
-   |
-48 |     function v1_handleMintForeignToken_public(ChannelID channelID, bytes calldata params)
-   |              --------------------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:249:17
-    |
-249 |         bytes32 PERMIT_TYPEHASH = keccak256(
-    |                 ---------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:85:14
-   |
-85 |     function computeNumRequiredSignatures_public(
-   |              -----------------------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:93:14
-   |
-93 |     function computeQuorum_public(uint256 numValidators) public pure returns (uint256) {
-   |              --------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:5:9
-  |
-5 | import {Uint16Array, createUint16Array} from "../../src/utils/Uint16Array.sol";
-  |         -----------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-
 note[unused-import]: unused imports should be removed
   --> /home/runner/work/snowbridge/snowbridge/contracts/test/utils/ForkTestFixtures.sol:12:5
    |
@@ -2389,28 +2389,44 @@ note[unused-import]: unused imports should be removed
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:48:57
-   |
-48 |     function v1_handleMintForeignToken_public(ChannelID channelID, bytes calldata params)
-   |                                                         ---------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:631:16
+    |
+631 |         ParaID paraID = ParaID.wrap(1000);
+    |                ------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:286:17
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:249:17
     |
-286 |         bytes32 PERMIT_TYPEHASH = keccak256(
+249 |         bytes32 PERMIT_TYPEHASH = keccak256(
     |                 ---------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-variable]: mutable variables should use mixedCase
-    --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:1283:16
-     |
-1283 |         ParaID paraID = ParaID.wrap(1000);
-     |                ------
-     |
-     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:656:16
+    |
+656 |         ParaID paraID = ParaID.wrap(1000);
+    |                ------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:674:16
+    |
+674 |         ParaID paraID = ParaID.wrap(1000);
+    |                ------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:286:17
+    |
+286 |         bytes32 PERMIT_TYPEHASH = keccak256(
+    |                 ---------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
 note[mixed-case-variable]: mutable variables should use mixedCase
    --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:317:17
@@ -2420,14 +2436,14 @@ note[mixed-case-variable]: mutable variables should use mixedCase
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:58:14
-   |
-58 |     function prank_registerNativeToken(address token) external {
-   |              -------------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:990:20
+    |
+990 |     bytes32 public expectChannelIDBytes =
+    |                    --------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
 warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
    --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:503:9
     |
@@ -2452,6 +2468,22 @@ warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls sho
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
 
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:994:16
+    |
+994 |         ParaID para_id = ParaID.wrap(1000);
+    |                -------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:995:19
+    |
+995 |         ChannelID channel_id = para_id.into();
+    |                   ----------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
 warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
    --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:588:9
     |
@@ -2484,6 +2516,78 @@ warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls sho
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
 
+warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
+    --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:1058:9
+     |
+1058 |         token.transfer(address(assetHubAgent), 200);
+     |         -------------------------------------------
+     |
+     = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+
+warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:649:9
+    |
+649 |         token.transferFrom(owner, pool, firstAmount);
+    |         --------------------------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+
+warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:658:9
+    |
+658 |         token.transferFrom(owner, pool, secondAmount);
+    |         ---------------------------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+
+warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
+    --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:1251:9
+     |
+1251 |         token.transfer(address(assetHubAgent), 200);
+     |         -------------------------------------------
+     |
+     = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+
+warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:705:9
+    |
+705 |         token.transferFrom(user, pool, amount1);
+    |         ---------------------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+
+warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:706:9
+    |
+706 |         token.transferFrom(user, pool2, amount2);
+    |         ----------------------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:684:17
+    |
+684 |         bytes32 PERMIT_TYPEHASH = keccak256(
+    |                 ---------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[mixed-case-variable]: mutable variables should use mixedCase
+    --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:1283:16
+     |
+1283 |         ParaID paraID = ParaID.wrap(1000);
+     |                ------
+     |
+     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:10:9
+   |
+10 | import {TokenLib} from "../src/TokenLib.sol";
+   |         --------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+
 note[unused-import]: unused imports should be removed
  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:5:9
   |
@@ -2564,110 +2668,6 @@ note[unused-import]: unused imports should be removed
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 
-warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:649:9
-    |
-649 |         token.transferFrom(owner, pool, firstAmount);
-    |         --------------------------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
-
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:62:14
-   |
-62 |     function prank_registerForeignToken(
-   |              --------------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:63:17
-   |
-63 |         bytes32 foreignTokenID,
-   |                 --------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:658:9
-    |
-658 |         token.transferFrom(owner, pool, secondAmount);
-    |         ---------------------------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
-
-note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:7:20
-  |
-7 | import {ChannelID, ParaID, OperatingMode} from "../../src/Types.sol";
-  |                    ------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-
-note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:7:28
-  |
-7 | import {ChannelID, ParaID, OperatingMode} from "../../src/Types.sol";
-  |                            -------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-
-note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:9:9
-  |
-9 | import {CoreStorage} from "../../src/storage/CoreStorage.sol";
-  |         -----------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:11:9
-   |
-11 | import {IInitializable} from "../../src/interfaces/IInitializable.sol";
-   |         --------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:13:9
-   |
-13 | import {UD60x18} from "prb/math/src/UD60x18.sol";
-   |         -------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-
-warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:705:9
-    |
-705 |         token.transferFrom(user, pool, amount1);
-    |         ---------------------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
-
-warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:706:9
-    |
-706 |         token.transferFrom(user, pool2, amount2);
-    |         ----------------------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
-
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:684:17
-    |
-684 |         bytes32 PERMIT_TYPEHASH = keccak256(
-    |                 ---------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:10:9
-   |
-10 | import {TokenLib} from "../src/TokenLib.sol";
-   |         --------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-
 note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
    --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:211:16
     |
@@ -2677,37 +2677,21 @@ note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
 
 note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:283:34
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:242:29
     |
-283 |         bytes32 commitmentHash = keccak256(encodeCommitment(commitment));
-    |                                  ---------------------------------------
+242 |         bytes32 messageID = keccak256(abi.encodePacked(channelID, channel.outboundNonce));
+    |                             -------------------------------------------------------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
 
 note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:358:34
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:283:34
     |
-358 |         bytes32 commitmentHash = keccak256(encodeCommitment(commitment));
+283 |         bytes32 commitmentHash = keccak256(encodeCommitment(commitment));
     |                                  ---------------------------------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
 
-note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:158:28
-    |
-158 |         bytes32 leafHash = keccak256(abi.encode(message));
-    |                            ------------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
-
-note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:422:28
-    |
-422 |         bytes32 leafHash = keccak256(abi.encode(message));
-    |                            ------------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
-
 note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
    --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:257:16
     |
@@ -2717,10 +2701,10 @@ note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
 
 note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:616:30
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:158:28
     |
-616 |         bytes32 hashedLeaf = keccak256(abi.encodePacked(account));
-    |                              ------------------------------------
+158 |         bytes32 leafHash = keccak256(abi.encode(message));
+    |                            ------------------------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
 
@@ -2751,10 +2735,26 @@ note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
 
 note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:242:29
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:422:28
     |
-242 |         bytes32 messageID = keccak256(abi.encodePacked(channelID, channel.outboundNonce));
-    |                             -------------------------------------------------------------
+422 |         bytes32 leafHash = keccak256(abi.encode(message));
+    |                            ------------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
+
+note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:358:34
+    |
+358 |         bytes32 commitmentHash = keccak256(encodeCommitment(commitment));
+    |                                  ---------------------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
+
+note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:616:30
+    |
+616 |         bytes32 hashedLeaf = keccak256(abi.encodePacked(account));
+    |                              ------------------------------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256