npm - @snowbridge/contract-types - Versions diffs - 0.2.7 → 0.2.9 - Mend

@snowbridge/contract-types 0.2.7 → 0.2.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/.turbo/turbo-build.log +1405 -1405
package/package.json +2 -2

package/.turbo/turbo-build.log CHANGED Viewed

@@ -12,174 +12,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:31:34
-   |
-31 |     function ensureAgent(bytes32 agentID) internal view returns (address agent) {
-   |                                  -------
-   |
-   = 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
-  |
-7 | import {ParaID} 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/src/Initializer.sol:5:9
-  |
-5 | 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/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[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/src/Initializer.sol:7:52
-  |
-7 | import {OperatingMode, ParaID, TokenInfo, Channel, ChannelID} from "./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/src/Initializer.sol:16:18
-   |
-16 | 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/Initializer.sol:16:27
-   |
-16 | 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/src/Gateway.sol:249:47
-    |
-249 |     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/Gateway.sol:253:40
-    |
-253 |     function channelNoncesOf(ChannelID channelID) external view returns (uint64, uint64) {
-    |                                        ---------
-    |
-    = 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/Gateway.sol:257:30
-    |
-257 |     function agentOf(bytes32 agentID)
-    |                              -------
-    |
-    = 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
-    |
-287 |     function queryForeignTokenID(address token) 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/Verification.sol:24:12
-   |
-24 |     struct MMRLeafPartial {
-   |            --------------
-   |
-   = 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/Verification.sol:28:16
-   |
-28 |         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/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/Gateway.sol:324:37
-    |
-324 |     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/Gateway.sol:333:14
-    |
-333 |     function v1_handleAgentExecute(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: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
-    |
-343 |     function v1_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/Gateway.sol:348:14
-    |
-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: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
 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
    |
@@ -268,133 +100,189 @@ 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:363:14
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:122:17
     |
-363 |     function v1_handleRegisterForeignToken(bytes calldata data) external onlySelf {
-    |              -----------------------------
+122 |         bytes32 tokenID,
+    |                 -------
     |
-    = 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:368:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:140:14
     |
-368 |     function v1_handleMintForeignToken(ChannelID channelID, bytes calldata data)
-    |              -------------------------
+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/Gateway.sol:368:50
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:141:17
     |
-368 |     function v1_handleMintForeignToken(ChannelID channelID, bytes calldata data)
-    |                                                  ---------
+141 |         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/Gateway.sol:394:14
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:142:16
     |
-394 |     function v1_transactionBaseGas() internal pure returns (uint256) {
-    |              ---------------------
+142 |         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:410:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:163:14
     |
-410 |     function v2_submit(
-    |              ---------
+163 |     function SendForeignTokenToAddress20(
+    |              ---------------------------
     |
     = 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
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:164:17
     |
-444 |     function v2_outboundNonce() external view returns (uint64) {
-    |              ----------------
+164 |         bytes32 tokenID,
+    |                 -------
     |
-    = 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:448:14
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:165:16
     |
-448 |     function v2_isDispatched(uint64 nonce) external view returns (bool) {
-    |              ---------------
+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:453:14
-    |
-453 |     function v2_sendMessage(
-    |              --------------
-    |
-    = 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/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-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[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/src/Types.sol:5:9
+ --> /home/runner/work/snowbridge/snowbridge/contracts/scripts/upgrade/DeployGateway202509.sol:7:9
   |
-5 | import {TokenInfo, OperatingMode} from "./types/Common.sol";
-  |         ---------
+7 | import {ParaID} 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/src/Types.sol:5:20
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:31:34
+   |
+31 |     function ensureAgent(bytes32 agentID) internal view returns (address agent) {
+   |                                  -------
+   |
+   = 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/interfaces/IERC20Metadata.sol:7:8
   |
-5 | import {TokenInfo, OperatingMode} from "./types/Common.sol";
-  |                    -------------
+7 | import "./IERC20.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-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:249:47
+    |
+249 |     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/Gateway.sol:253:40
+    |
+253 |     function channelNoncesOf(ChannelID channelID) external view returns (uint64, uint64) {
+    |                                        ---------
+    |
+    = 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/Gateway.sol:257:30
+    |
+257 |     function agentOf(bytes32 agentID)
+    |                              -------
+    |
+    = 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
+    |
+287 |     function queryForeignTokenID(address token) external view returns (bytes32) {
+    |              -------------------
+    |
+    = 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/Types.sol:6:9
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/Initializer.sol:5:9
   |
-6 | import {UD60x18} from "prb/math/src/UD60x18.sol";
-  |         -------
+5 | 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/Types.sol:8:5
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/Initializer.sol:7:24
   |
-8 |     ParaID,
-  |     ------
+7 | import {OperatingMode, ParaID, TokenInfo, Channel, ChannelID} from "./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/src/Types.sol:9:5
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/Initializer.sol:7:52
   |
-9 |     ChannelID,
-  |     ---------
+7 | import {OperatingMode, ParaID, TokenInfo, Channel, ChannelID} from "./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/src/Types.sol:10:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Initializer.sol:16:18
    |
-10 |     Channel,
-   |     -------
+16 | 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/Types.sol:11:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Initializer.sol:16:27
    |
-11 |     InboundMessage as InboundMessageV1,
-   |     ----------------------------------
+16 | 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/Types.sol:12:5
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:39:38
    |
-12 |     Command as CommandV1,
-   |     --------------------
+39 |     function ensureChannel(ChannelID channelID) internal view returns (Channel storage ch) {
+   |                                      ---------
    |
-   = 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-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[screaming-snake-case-immutable]: immutables should use SCREAMING_SNAKE_CASE
   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Token.sol:17:30
@@ -412,43 +300,67 @@ 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/scripts/DeployLocal.sol:17:9
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:324:37
+    |
+324 |     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/Gateway.sol:333:14
+    |
+333 |     function v1_handleAgentExecute(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: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
+    |
+343 |     function v1_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/Gateway.sol:348:14
+    |
+348 |     function v1_handleSetTokenTransferFees(bytes calldata data) external onlySelf {
+    |              -----------------------------
+    |
+    = 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/Verification.sol:24:12
    |
-17 | import {UD60x18, ud60x18} from "prb/math/src/UD60x18.sol";
-   |         -------
+24 |     struct MMRLeafPartial {
+   |            --------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+   = 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/BeefyClient.sol:57:16
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:28:16
    |
-57 |         uint64 validatorSetID;
-   |                --------------
+28 |         uint64 nextAuthoritySetID;
+   |                ------------------
    |
    = 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/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/interfaces/IERC20Permit.sol:11:14
-   |
-11 |     function DOMAIN_SEPARATOR() external view returns (bytes32);
-   |              ----------------
-   |
-   = 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:69:16
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:51:16
    |
-69 |         bytes2 payloadID;
-   |                ---------
+51 |         bytes4 consensusEngineID;
+   |                -----------------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
@@ -461,140 +373,132 @@ note[pascal-case-struct]: structs should use PascalCase
     = 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:122:17
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:117:16
     |
-122 |         bytes32 tokenID,
-    |                 -------
+117 |         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/BeefyClient.sol:155:20
+    |
+155 |     bytes32 public latestMMRRoot;
+    |                    -------------
     |
     = 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:140:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:353:14
     |
-140 |     function SendForeignTokenToAddress32(
-    |              ---------------------------
+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/SubstrateTypes.sol:141:17
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:358:14
     |
-141 |         bytes32 tokenID,
-    |                 -------
+358 |     function v1_handleUnlockNativeToken(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[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[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/SubstrateTypes.sol:142:16
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:368:50
     |
-142 |         ParaID paraID,
-    |                ------
+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/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[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Types.sol:13:5
-   |
-13 |     MultiAddress
-   |     ------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+   --> /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[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Types.sol:15:9
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/interfaces/IGatewayBase.sol:34:50
    |
-15 | import {CallsV1} from "./v1/Calls.sol";
-   |         -------
+34 |     event ForeignTokenRegistered(bytes32 indexed tokenID, address token);
+   |                                                  -------
    |
-   = 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/Types.sol:16:9
-   |
-16 | import {HandlersV1} from "./v1/Handlers.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/Types.sol:17:9
-   |
-17 | import {IGatewayV1} from "./v1/IGateway.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/Types.sol:20:5
-   |
-20 |     InboundMessage as InboundMessageV2, Command as CommandV2, CommandKind
-   |     ----------------------------------
-   |
-   = 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/Types.sol:20:41
-   |
-20 |     InboundMessage as InboundMessageV2, Command as CommandV2, CommandKind
-   |                                         --------------------
-   |
-   = 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:182:30
+    |
+182 |     uint256 public immutable randaoCommitDelay;
+    |                              -----------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-immutable
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:464:14
+note[screaming-snake-case-immutable]: immutables should use SCREAMING_SNAKE_CASE
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:190:30
     |
-464 |     function v2_registerToken(
-    |              ----------------
+190 |     uint256 public immutable randaoCommitExpiration;
+    |                              ----------------------
     |
-    = 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-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:163:14
+note[screaming-snake-case-immutable]: immutables should use SCREAMING_SNAKE_CASE
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:196:30
     |
-163 |     function SendForeignTokenToAddress20(
-    |              ---------------------------
+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:164:17
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:116:17
     |
-164 |         bytes32 tokenID,
-    |                 -------
+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/SubstrateTypes.sol:165:16
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:136:39
     |
-165 |         ParaID paraID,
-    |                ------
+136 |     function mintForeignToken(bytes32 foreignTokenID, address recipient, uint128 amount)
+    |                                       --------------
     |
     = 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:20:63
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Token.sol:81:14
    |
-20 |     InboundMessage as InboundMessageV2, Command as CommandV2, CommandKind
-   |                                                               -----------
+81 |     function DOMAIN_SEPARATOR() 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-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/interfaces/IGatewayBase.sol:34:50
-   |
-34 |     event ForeignTokenRegistered(bytes32 indexed tokenID, address token);
-   |                                                  -------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:108:16
+    |
+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/storage/AssetsStorage.sol:13:16
@@ -604,70 +508,86 @@ 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
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/interfaces/IERC20Permit.sol:11:14
    |
-39 |     function ensureChannel(ChannelID channelID) internal view returns (Channel storage ch) {
-   |                                      ---------
+11 |     function DOMAIN_SEPARATOR() external view returns (bytes32);
+   |              ----------------
    |
-   = 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/src/Types.sol:22:9
-   |
-22 | import {CallsV2} from "./v2/Calls.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/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[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Types.sol:23:9
-   |
-23 | import {HandlersV2} from "./v2/Handlers.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:410:14
+    |
+410 |     function v2_submit(
+    |              ---------
+    |
+    = 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/Types.sol:24:9
-   |
-24 | import {IGatewayV2} from "./v2/IGateway.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:444:14
+    |
+444 |     function v2_outboundNonce() external view returns (uint64) {
+    |              ----------------
+    |
+    = 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:448:14
+    |
+448 |     function v2_isDispatched(uint64 nonce) external view 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/Gateway.sol:453:14
+    |
+453 |     function v2_sendMessage(
+    |              --------------
+    |
+    = 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-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:116:17
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:315:17
     |
-116 |         bytes32 foreignTokenID,
-    |                 --------------
+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/Functions.sol:136:39
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:205:53
     |
-136 |     function mintForeignToken(bytes32 foreignTokenID, address recipient, uint128 amount)
-    |                                       --------------
+205 |     function createParachainHeaderMerkleLeaf(bytes4 encodedParaID, ParachainHeader calldata header)
+    |                                                     -------------
     |
     = 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
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/utils/SparseBitmap.sol:12:20
    |
-82 |             return result + (unsignedRoundsUp(rounding) && 1 << result < value ? 1 : 0);
-   |                                                            -----------
+12 |     uint256 mask = 1 << (index & 0xff);
+   |                    -------------------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#incorrect-shift
-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-function]: function names should use mixedCase
    --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:475:14
     |
@@ -708,85 +628,109 @@ 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:504:14
-    |
-504 |     function v2_handleMintForeignToken(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:509:14
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:214:43
     |
-509 |     function v2_handleCallContract(bytes32 origin, bytes calldata data) external onlySelf {
-    |              ---------------------
+214 |     function createParachainHeader(bytes4 encodedParaID, ParachainHeader calldata header)
+    |                                           -------------
     |
-    = 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:566:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:243:14
     |
-566 |     function v2_dispatch(InboundMessageV2 calldata message) internal returns (bool) {
-    |              -----------
+243 |     function createMMRLeaf(MMRLeafPartial memory leaf, bytes32 parachainHeadsRoot)
+    |              -------------
     |
     = 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:117:16
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:359:17
     |
-117 |         uint64 nextAuthoritySetID;
-    |                ------------------
+359 |         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/v1/Handlers.sol:120:41
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:362:14
     |
-120 |     function mintForeignToken(ChannelID channelID, bytes calldata data) external {
-    |                                         ---------
+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/Calls.sol:159:40
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:373:17
     |
-159 |     function channelNoncesOf(ChannelID channelID) external view returns (uint64, uint64) {
-    |                                        ---------
+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/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[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/Types.sol:5:9
+  |
+5 | import {TokenInfo, OperatingMode} from "./types/Common.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/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[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/Types.sol:5:20
+  |
+5 | import {TokenInfo, OperatingMode} from "./types/Common.sol";
+  |                    -------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-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
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/Types.sol:6:9
+  |
+6 | 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/src/Types.sol:8:5
+  |
+8 |     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/src/Types.sol:9:5
+  |
+9 |     ChannelID,
+  |     ---------
+  |
+  = 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/Types.sol:10:5
    |
-12 |     uint256 mask = 1 << (index & 0xff);
-   |                    -------------------
+10 |     Channel,
+   |     -------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#incorrect-shift
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-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
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Types.sol:11:5
    |
-18 |     uint256 mask = 1 << (index & 0xff);
-   |                    -------------------
+11 |     InboundMessage as InboundMessageV1,
+   |     ----------------------------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#incorrect-shift
+   = 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/Types.sol:12:5
+   |
+12 |     Command as CommandV1,
+   |     --------------------
+   |
+   = 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/types/Common.sol:14:13
@@ -796,67 +740,147 @@ 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/types/Common.sol:5:9
+  |
+5 | import {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/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
+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[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
+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/BeefyClient.sol:155:20
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:159:40
     |
-155 |     bytes32 public latestMMRRoot;
-    |                    -------------
+159 |     function channelNoncesOf(ChannelID channelID) external view returns (uint64, uint64) {
+    |                                        ---------
     |
     = 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
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:164:47
     |
-148 |     function _ensureTokenAddressOf(bytes32 tokenID) internal view returns (address) {
-    |                                            -------
+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/Verification.sol:108:16
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:170:37
     |
-108 |         bytes4 encodedParaID,
-    |                -------------
+170 |     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/Gateway.sol:8:9
+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
   |
-8 | import {AgentExecutor} from "./AgentExecutor.sol";
-  |         -------------
+5 | import "../Gateway.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/src/Gateway.sol:29:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Types.sol:13:5
    |
-29 | import {Upgrade} from "./Upgrade.sol";
+13 |     MultiAddress
+   |     ------------
+   |
+   = 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/Types.sol:15:9
+   |
+15 | import {CallsV1} from "./v1/Calls.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/src/Types.sol:16:9
    |
-41 | import {PricingStorage} from "./storage/PricingStorage.sol";
-   |         --------------
+16 | import {HandlersV1} from "./v1/Handlers.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/src/Types.sol:17:9
    |
-44 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
-   |                  -------
+17 | import {IGatewayV1} from "./v1/IGateway.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/src/Types.sol:20:5
    |
-44 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
-   |                           -------
+20 |     InboundMessage as InboundMessageV2, Command as CommandV2, CommandKind
+   |     ----------------------------------
+   |
+   = 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/Types.sol:20:41
+   |
+20 |     InboundMessage as InboundMessageV2, Command as CommandV2, CommandKind
+   |                                         --------------------
+   |
+   = 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/Types.sol:20:63
+   |
+20 |     InboundMessage as InboundMessageV2, Command as CommandV2, CommandKind
+   |                                                               -----------
+   |
+   = 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/Types.sol:22:9
+   |
+22 | import {CallsV2} from "./v2/Calls.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/Types.sol:23:9
+   |
+23 | import {HandlersV2} from "./v2/Handlers.sol";
+   |         ----------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
@@ -868,21 +892,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/v1/Calls.sol:242:17
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:451:14
     |
-242 |         bytes32 messageID = keccak256(abi.encodePacked(channelID, channel.outboundNonce));
-    |                 ---------
+451 |     function createTicketID(address account, bytes32 commitmentHash)
+    |              --------------
     |
-    = 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/v2/Calls.sol:139:14
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Handlers.sol:120:41
     |
-139 |     function _handleAssetERC20(address token, uint128 amount) internal returns (Asset memory) {
-    |              -----------------
+120 |     function mintForeignToken(ChannelID channelID, bytes calldata data) external {
+    |                                         ---------
     |
-    = 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[unused-import]: unused imports should be removed
   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Handlers.sol:13:9
@@ -893,58 +917,106 @@ 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/Verification.sol:205:53
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:242:17
     |
-205 |     function createParachainHeaderMerkleLeaf(bytes4 encodedParaID, ParachainHeader calldata header)
-    |                                                     -------------
+242 |         bytes32 messageID = keccak256(abi.encodePacked(channelID, channel.outboundNonce));
+    |                 ---------
     |
     = 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/v2/Handlers.sol:13:9
-   |
-13 | import {IGatewayV2} from "./IGateway.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:182:30
-    |
-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
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:504:14
     |
-190 |     uint256 public immutable randaoCommitExpiration;
-    |                              ----------------------
+504 |     function v2_handleMintForeignToken(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:509:14
     |
-196 |     uint256 public immutable minNumRequiredSignatures;
-    |                              ------------------------
+509 |     function v2_handleCallContract(bytes32 origin, 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[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/src/types/Common.sol:5:9
-  |
-5 | import {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/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-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/BeefyClient.sol:315:17
+  --> /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[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/v1/Calls.sol:355:17
     |
-315 |         bytes32 ticketID = createTicketID(msg.sender, commitmentHash);
-    |                 --------
+355 |         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/Gateway.sol:566:14
+    |
+566 |     function v2_dispatch(InboundMessageV2 calldata message) internal 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/Calls.sol:139:14
+    |
+139 |     function _handleAssetERC20(address token, uint128 amount) internal returns (Asset 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/v1/Types.sol:108:13
+    |
+108 |     bytes32 agentID;
+    |             -------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
@@ -1013,100 +1085,68 @@ 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/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-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:17:10
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:86:14
    |
-17 | function ParaIDNe(ParaID a, ParaID b) pure returns (bool) {
-   |          --------
+86 |     function queryForeignTokenID(address token) external view returns (bytes32);
+   |              -------------------
    |
    = 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
+   --> /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[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:33:10
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Types.sol:24:9
    |
-33 | function ChannelIDNe(ChannelID a, ChannelID b) pure returns (bool) {
-   |          -----------
+24 | import {IGatewayV2} from "./v2/IGateway.sol";
+   |         ----------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+   = 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/Types.sol:53:15
-   |
-53 |     ChannelID channelID;
-   |               ---------
-   |
-   = 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/Gateway.sol:8:9
+  |
+8 | import {AgentExecutor} from "./AgentExecutor.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/src/v2/Types.sol:28:20
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:29:9
    |
-28 |     uint8 constant Upgrade = 0;
-   |                    -------
+29 | import {Upgrade} from "./Upgrade.sol";
+   |         -------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
+   = 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:30:20
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:41:9
    |
-30 |     uint8 constant SetOperatingMode = 1;
-   |                    ----------------
+41 | import {PricingStorage} from "./storage/PricingStorage.sol";
+   |         --------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
+   = 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/IGateway.sol:22:30
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:44:18
    |
-22 |     function agentOf(bytes32 agentID) external view returns (address);
-   |                              -------
+44 | 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-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/IGateway.sol:29:32
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:44:27
    |
-29 |     event AgentCreated(bytes32 agentID, address agent);
-   |                                -------
+44 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
+   |                           -------
    |
-   = 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
+   = 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/v2/Calls.sol:29:9
@@ -1132,78 +1172,118 @@ 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: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
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Handlers.sol:13:9
    |
-38 |     uint8 constant CallContract = 5;
-   |                    ------------
+13 | import {IGatewayV2} from "./IGateway.sol";
+   |         ----------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
+   = 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/BeefyClient.sol:359:17
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:153:13
     |
-359 |         bytes32 ticketID = createTicketID(msg.sender, commitmentHash);
-    |                 --------
+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/src/BeefyClient.sol:362:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:165:13
     |
-362 |         bool is_next_session = false;
-    |              ---------------
+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/src/BeefyClient.sol:373:17
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:177:13
     |
-373 |         bytes32 newMMRRoot = ensureProvidesMMRRoot(commitment);
-    |                 ----------
+177 |     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/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-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:108:13
-    |
-108 |     bytes32 agentID;
-    |             -------
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/IGateway.sol:22:30
+   |
+22 |     function agentOf(bytes32 agentID) 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/v2/IGateway.sol:29:32
+   |
+29 |     event AgentCreated(bytes32 agentID, address agent);
+   |                                -------
+   |
+   = 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/Agent.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/Agent.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/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[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[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/BeefyClient.t.sol:43:12
+   |
+43 |     bytes2 mmrRootID = bytes2("mh");
+   |            ---------
+   |
+   = 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:503:17
+    |
+503 |         bytes32 ticketID,
+    |                 --------
     |
     = 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[mixed-case-function]: function names should use mixedCase
   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/IGateway.sol:51:14
    |
@@ -1236,301 +1316,341 @@ note[mixed-case-function]: function names should use mixedCase
     |
     = 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
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/IGateway.sol:108:14
     |
-153 |     bytes32 agentID;
-    |             -------
+108 |     function v2_outboundNonce() external view returns (uint64);
+    |              ----------------
     |
-    = 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/src/v1/Types.sol:165:13
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/IGateway.sol:111:14
     |
-165 |     bytes32 foreignTokenID;
-    |             --------------
+111 |     function v2_isDispatched(uint64 nonce) external view 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/src/v1/Types.sol:177:13
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:139:16
     |
-177 |     bytes32 foreignTokenID;
-    |             --------------
+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/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[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:590:14
+    |
+590 |     function encodeMMRLeaf(MMRLeaf calldata leaf) 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/v1/Types.sol:6:9
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Bitfield.t.sol:5:9
   |
-6 | import {MultiAddress} from "./MultiAddress.sol";
-  |         ------------
+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/Agent.t.sol:4:8
-  |
-4 | import "forge-std/Test.sol";
-  |        --------------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:68:8
+   |
+68 | import "./mocks/HighGasToken.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/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-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:74:19
+   |
+74 |     ParaID public bridgeHubParaID = ParaID.wrap(1013);
+   |                   ---------------
+   |
+   = 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
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:76:20
    |
-86 |     function queryForeignTokenID(address token) external view returns (bytes32);
-   |              -------------------
+76 |     bytes32 public bridgeHubAgentID =
+   |                    ----------------
    |
-   = 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/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
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:80:19
+   |
+80 |     ParaID public assetHubParaID = ParaID.wrap(1000);
+   |                   --------------
+   |
+   = 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[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:4:9
+  |
+4 | import {Vm} from "forge-std/Vm.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/Bitfield.t.sol:5:9
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:6:9
   |
-5 | import {console} from "forge-std/console.sol";
+6 | import {stdJson} from "forge-std/StdJson.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/Verification.sol:8:9
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:7:9
   |
-8 | import {SubstrateTypes} from "./SubstrateTypes.sol";
-  |         --------------
+7 | 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/test/BeefyClient.t.sol:43:12
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:81:20
    |
-43 |     bytes2 mmrRootID = bytes2("mh");
-   |            ---------
+81 |     bytes32 public assetHubAgentID =
+   |                    ---------------
    |
    = 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
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/BeefyClient.t.sol:167:14
     |
-355 |         bytes32 foreignID,
-    |                 ---------
+167 |     function decodeMMRLeaf(string memory beefyCommitmentRaw) internal {
+    |              -------------
     |
-    = 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/src/BeefyClient.sol:503:17
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:624:17
     |
-503 |         bytes32 ticketID,
+624 |         bytes32 ticketID,
     |                 --------
     |
     = 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:68:20
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:85:20
    |
-68 |     uint8 constant Raw = 0;
-   |                    ---
+85 |     bytes32 public dotTokenID;
+   |                    ----------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
+   = 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:70:20
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:8:18
+  |
+8 | import {UD60x18, ud60x18, unwrap} 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:13:9
    |
-70 |     uint8 constant CreateAsset = 1;
-   |                    -----------
+13 | import {Gateway} from "../src/Gateway.sol";
+   |         -------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
+   = 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/v2/Types.sol:81:10
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:16:24
    |
-81 | function makeRawXCM(bytes memory xcm) pure returns (Xcm memory) {
-   |          ----------
+16 | import {UpgradeParams, SetOperatingModeParams, OperatingMode, RegisterForeignTokenParams} from "../src/v1/Types.sol";
+   |                        ----------------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+   = 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/test/ForkUpgrade202509.t.sol:16:48
    |
-85 |     bytes32 public dotTokenID;
-   |                    ----------
+16 | import {UpgradeParams, SetOperatingModeParams, OperatingMode, RegisterForeignTokenParams} from "../src/v1/Types.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/v2/IGateway.sol:108:14
-    |
-108 |     function v2_outboundNonce() external view returns (uint64);
-    |              ----------------
-    |
-    = 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:16:63
+   |
+16 | import {UpgradeParams, SetOperatingModeParams, OperatingMode, RegisterForeignTokenParams} from "../src/v1/Types.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/v2/IGateway.sol:111:14
-    |
-111 |     function v2_isDispatched(uint64 nonce) external view 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/test/ForkUpgrade202509.t.sol:17:28
+   |
+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/src/v1/Calls.sol:14:9
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:5:9
+  |
+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/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
    |
-14 | import {AgentExecutor} from "../AgentExecutor.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/src/v1/Calls.sol:15:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:13:9
    |
-15 | import {Agent} from "../Agent.sol";
-   |         -----
+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/src/v1/Calls.sol:16:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:14:9
    |
-16 | import {Call} from "../utils/Call.sol";
-   |         ----
+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/v1/Calls.sol:25:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:16:9
    |
-25 |     AgentExecuteCommand,
-   |     -------------------
+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/src/v1/Calls.sol:31:18
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:21:9
    |
-31 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
-   |                  -------
+21 | import {Agent} from "../src/Agent.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/BeefyClient.t.sol:171:16
+    |
+171 |         uint64 nextAuthoritySetID =
+    |                ------------------
+    |
+    = 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/test/ForkUpgrade202509.t.sol:33:31
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:28:20
    |
-33 |     address constant internal assetHubAgent = 0xd803472c47a87D7B63E888DE53f03B4191B846a8;
-   |                               -------------
+28 |     uint8 constant Upgrade = 0;
+   |                    -------
    |
    = 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/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[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-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:85:10
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:32:20
    |
-85 | function makeCreateAssetXCM(address token, Network network) pure returns (Xcm memory) {
-   |          ------------------
+32 |     uint8 constant UnlockNativeToken = 2;
+   |                    -----------------
    |
-   = 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[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:98:20
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:34:20
    |
-98 |     uint8 constant NativeTokenERC20 = 0;
-   |                    ----------------
+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:99:20
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:36:20
    |
-99 |     uint8 constant ForeignTokenERC20 = 1;
-   |                    -----------------
+36 |     uint8 constant MintForeignToken = 4;
+   |                    ----------------
    |
    = 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[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[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[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[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[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-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:121:35
-    |
-121 | function makeForeignAsset(bytes32 foreignID, uint128 amount) pure returns (Asset memory) {
-    |                                   ---------
-    |
-    = 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[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:159:13
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:103:20
     |
-159 |     bytes32 foreignTokenID;
-    |             --------------
+103 |     bytes32 public messageID = keccak256("cabbage");
+    |                    ---------
     |
     = 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: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/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[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
@@ -1543,130 +1663,66 @@ note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." a
 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[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[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:5:9
-  |
-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/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";
-  |         -----------
+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/GatewayV2.t.sol:12:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:23:9
    |
-12 | import {IInitializable} from "../src/interfaces/IInitializable.sol";
+23 | import {SubstrateTypes} from "./../src/SubstrateTypes.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[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[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:590:14
-    |
-590 |     function encodeMMRLeaf(MMRLeaf calldata leaf) internal pure returns (bytes 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/BeefyClient.sol:624:17
-    |
-624 |         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/GatewayV1.t.sol:68:8
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:24:24
    |
-68 | import "./mocks/HighGasToken.sol";
-   |        --------------------------
+24 | import {OperatingMode, ParaID, CommandV2, CommandKind, InboundMessageV2} from "../src/Types.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[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:74:19
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:26:9
    |
-74 |     ParaID public bridgeHubParaID = ParaID.wrap(1013);
-   |                   ---------------
+26 | import {NativeTransferFailed} from "../src/utils/SafeTransfer.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-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:76:20
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:27:9
    |
-76 |     bytes32 public bridgeHubAgentID =
-   |                    ----------------
+27 | import {PricingStorage} from "../src/storage/PricingStorage.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-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:80:19
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:29:9
    |
-80 |     ParaID public assetHubParaID = ParaID.wrap(1000);
-   |                   --------------
+29 | import {TokenLib} from "../src/TokenLib.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-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:81:20
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:36:5
    |
-81 |     bytes32 public assetHubAgentID =
-   |                    ---------------
+36 |     UpgradeParams,
+   |     -------------
    |
-   = 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-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:46:5
+   |
+46 |     Xcm,
+   |     ---
+   |
+   = 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
@@ -1684,6 +1740,14 @@ 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[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[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
   |
@@ -1700,16 +1764,8 @@ 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[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:120:20
-    |
-120 |     bytes32 public dotTokenID;
-    |                    ----------
-    |
-    = 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/Token.t.sol:4:8
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/SparseBitmap.t.sol:4:8
   |
 4 | import "forge-std/Test.sol";
   |        --------------------
@@ -1717,7 +1773,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/Token.t.sol:5:8
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/SparseBitmap.t.sol:5:8
   |
 5 | import "forge-std/console.sol";
   |        -----------------------
@@ -1725,63 +1781,63 @@ 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/test/GatewayV2.t.sol:13:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/BeefyClient.t.sol:11:9
    |
-13 | import {IUpgradable} from "../src/interfaces/IUpgradable.sol";
-   |         -----------
+11 | import {ScaleCodec} from "../src/utils/ScaleCodec.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[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:120:20
+    |
+120 |     bytes32 public dotTokenID;
+    |                    ----------
+    |
+    = 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:16:9
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/Uint16Array.t.sol:98:16
    |
-16 | import {MockGatewayV2} from "./mocks/MockGatewayV2.sol";
-   |         -------------
+98 |         uint16 new_value = counters.get(index);
+   |                ---------
    |
-   = 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/test/GatewayV2.t.sol:21:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:51:5
    |
-21 | import {Agent} from "../src/Agent.sol";
-   |         -----
+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:23:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:52:5
    |
-23 | import {SubstrateTypes} from "./../src/SubstrateTypes.sol";
-   |         --------------
+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:24:24
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:54:5
    |
-24 | import {OperatingMode, ParaID, CommandV2, CommandKind, InboundMessageV2} from "../src/Types.sol";
-   |                        ------
+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:26:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:55:5
    |
-26 | import {NativeTransferFailed} from "../src/utils/SafeTransfer.sol";
-   |         --------------------
+55 |     Command
+   |     -------
    |
    = 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/Token.t.sol:4:8
   |
 4 | import "forge-std/Test.sol";
   |        --------------------
@@ -1789,44 +1845,28 @@ 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/Token.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/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
-  |
-5 | 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/Verification.t.sol:6:8
-  |
-6 | 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/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/Verification.t.sol:17:19
-   |
-17 |     bytes4 public encodedParachainID;
-   |                   ------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+   --> /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
 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
@@ -1836,85 +1876,69 @@ 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/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[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
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:24:14
    |
-36 |     UpgradeParams,
-   |     -------------
+24 |     function encodeCommitment_public(Commitment calldata commitment)
+   |              -----------------------
    |
-   = 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:46:5
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:40:14
    |
-46 |     Xcm,
-   |     ---
+40 |     function initialize_public(
+   |              -----------------
    |
-   = 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
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:59:9
    |
-51 |     AgentExecuteCommand,
-   |     -------------------
+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:52:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:59:27
    |
-52 |     InboundMessage,
-   |     --------------
+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:54:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:14:9
    |
-54 |     ParaID,
-   |     ------
+14 | 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/test/GatewayV2.t.sol:55:5
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:85:10
    |
-55 |     Command
-   |     -------
+85 | function makeCreateAssetXCM(address token, Network network) pure returns (Xcm memory) {
+   |          ------------------
    |
-   = 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:59:9
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:98:20
    |
-59 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
-   |         -------
+98 |     uint8 constant NativeTokenERC20 = 0;
+   |                    ----------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+   = 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/GatewayV2.t.sol:59:27
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:99:20
    |
-59 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
-   |                           -------
+99 |     uint8 constant ForeignTokenERC20 = 1;
+   |                    -----------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
 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
@@ -1924,29 +1948,37 @@ 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/Uint16Array.t.sol:98:16
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:15:9
    |
-98 |         uint16 new_value = counters.get(index);
-   |                ---------
+15 | import {Agent} from "../Agent.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-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[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/test/mocks/BeefyClientMock.sol:24:14
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:25:5
    |
-24 |     function encodeCommitment_public(Commitment calldata commitment)
-   |              -----------------------
+25 |     AgentExecuteCommand,
+   |     -------------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+   = 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/Calls.sol:31:18
+   |
+31 | 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/mocks/ReantrantAttacker.sol:7:9
@@ -1956,6 +1988,14 @@ 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/GatewayV1.t.sol:605:16
+    |
+605 |         ParaID paraID = ParaID.wrap(1000);
+    |                ------
+    |
+    = 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:20:14
    |
@@ -1980,110 +2020,70 @@ note[mixed-case-function]: function names should use mixedCase
    |
    = 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/BeefyClient.t.sol:11:9
-   |
-11 | import {ScaleCodec} from "../src/utils/ScaleCodec.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:4:9
-  |
-4 | import {Vm} from "forge-std/Vm.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:6:9
-  |
-6 | import {stdJson} from "forge-std/StdJson.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:7:9
-  |
-7 | 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/ForkUpgrade202509.t.sol:8:18
-  |
-8 | import {UD60x18, ud60x18, unwrap} 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: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
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:16:63
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:32:14
    |
-16 | import {UpgradeParams, SetOperatingModeParams, OperatingMode, RegisterForeignTokenParams} from "../src/v1/Types.sol";
-   |                                                               --------------------------
+32 |     function v1_handleSetTokenTransferFees_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/ForkUpgrade202509.t.sol:17:28
-   |
-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
+    |
+631 |         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/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
+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
 note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:40:14
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:85:14
    |
-40 |     function initialize_public(
-   |              -----------------
+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/MockGateway.sol:32:14
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:93:14
    |
-32 |     function v1_handleSetTokenTransferFees_public(bytes calldata params) external {
-   |              ------------------------------------
+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[mixed-case-variable]: mutable variables should use mixedCase
+   --> /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-function]: function names should use mixedCase
   --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:36:14
    |
@@ -2148,6 +2148,30 @@ 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/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/GatewayV1.t.sol:990:20
+    |
+990 |     bytes32 public expectChannelIDBytes =
+    |                    --------------------
+    |
+    = 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
 note[unused-import]: unused imports should be removed
  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:7:20
   |
@@ -2189,76 +2213,84 @@ 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:102:9
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:140:9
     |
-102 |         token.transferFrom(owner, receiver, transferAmount);
+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/BeefyClientMock.sol:85:14
-   |
-85 |     function computeNumRequiredSignatures_public(
-   |              -----------------------------------
-   |
-   = 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
+    |
+995 |         ChannelID channel_id = para_id.into();
+    |                   ----------
+    |
+    = 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: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[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[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[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[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:173:17
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:110:13
     |
-173 |         bytes32 agentID,
-    |                 -------
+110 |     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/test/GatewayV1.t.sol:187:17
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:121:35
     |
-187 |         bytes32 agentID,
-    |                 -------
+121 | function makeForeignAsset(bytes32 foreignID, uint128 amount) pure returns (Asset memory) {
+    |                                   ---------
     |
     = 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/mocks/VerificationWrapper.sol:8:16
+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
   |
-8 |         bytes4 encodedParachainID,
-  |                ------------------
+4 | import "openzeppelin/utils/Strings.sol";
+  |        --------------------------------
   |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+  = 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/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[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
+  |
+5 | 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/Verification.t.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:140:9
-    |
-140 |         token.transferFrom(owner, receiver, transferAmount);
-    |         ---------------------------------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+    --> /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:165:9
@@ -2269,10 +2301,18 @@ 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:605:16
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:159:13
     |
-605 |         ParaID paraID = ParaID.wrap(1000);
-    |                ------
+159 |     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/v2/Types.sol:171:13
+    |
+171 |     bytes32 foreignTokenID;
+    |             --------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
@@ -2292,6 +2332,30 @@ 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/mocks/VerificationWrapper.sol:8:16
+  |
+8 |         bytes4 encodedParachainID,
+  |                ------------------
+  |
+  = 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/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/Verification.t.sol:17:19
+   |
+17 |     bytes4 public encodedParachainID;
+   |                   ------------------
+   |
+   = 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:230:9
     |
@@ -2300,6 +2364,14 @@ 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/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-variable]: mutable variables should use mixedCase
    --> /home/runner/work/snowbridge/snowbridge/contracts/test/utils/ForkTestFixtures.sol:132:15
     |
@@ -2309,18 +2381,26 @@ 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:631:16
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:286:17
     |
-631 |         ParaID paraID = ParaID.wrap(1000);
-    |                ------
+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/GatewayV1.t.sol:656:16
+    --> /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[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:317:17
     |
-656 |         ParaID paraID = ParaID.wrap(1000);
-    |                ------
+317 |         bytes32 PERMIT_TYPEHASH = keccak256(
+    |                 ---------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
@@ -2341,117 +2421,149 @@ note[unused-import]: unused imports should be removed
   = 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:9:9
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:5:9
+  |
+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/test/GatewayV1.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/utils/ForkTestFixtures.sol:9:9
+  |
+9 | 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/utils/ForkTestFixtures.sol:12:5
+   |
+12 |     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/utils/ForkTestFixtures.sol:13:5
+   |
+13 |     SetOperatingModeParams,
+   |     ----------------------
+   |
+   = 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:14:5
+   |
+14 |     OperatingMode,
+   |     -------------
+   |
+   = 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:15:5
+   |
+15 |     RegisterForeignTokenParams,
+   |     --------------------------
+   |
+   = 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:17:5
+   |
+17 |     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/utils/ForkTestFixtures.sol:18:5
+   |
+18 |     OperatingMode,
+   |     -------------
+   |
+   = 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:21:5
+   |
+21 |     TokenInfo
+   |     ---------
+   |
+   = 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:8:9
   |
-9 | import {IUpgradable} from "../../src/interfaces/IUpgradable.sol";
+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/utils/ForkTestFixtures.sol:12:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:11:9
    |
-12 |     UpgradeParams,
-   |     -------------
+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/utils/ForkTestFixtures.sol:13:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:20:9
    |
-13 |     SetOperatingModeParams,
-   |     ----------------------
+20 | 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/utils/ForkTestFixtures.sol:14:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:22:9
    |
-14 |     OperatingMode,
-   |     -------------
+22 | 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/test/utils/ForkTestFixtures.sol:15:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:24:5
    |
-15 |     RegisterForeignTokenParams,
-   |     --------------------------
+24 |     Channel,
+   |     -------
    |
    = 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:17:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:25:5
    |
-17 |     ParaID,
-   |     ------
+25 |     InboundMessageV1,
+   |     ----------------
    |
    = 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:18:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:33:9
    |
-18 |     OperatingMode,
-   |     -------------
+33 | import {PricingStorage} from "../src/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/utils/ForkTestFixtures.sol:21:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:35:9
    |
-21 |     TokenInfo
-   |     ---------
+35 | import {TokenLib} from "../src/TokenLib.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/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-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
-    |
-317 |         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:990:20
-    |
-990 |     bytes32 public expectChannelIDBytes =
-    |                    --------------------
-    |
-    = 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:503:9
     |
@@ -2476,14 +2588,6 @@ 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: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
     |
@@ -2516,14 +2620,6 @@ 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
     |
@@ -2540,14 +2636,6 @@ 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: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
     |
@@ -2572,14 +2660,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/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
    |
@@ -2588,91 +2668,37 @@ note[unused-import]: unused imports should be removed
    |
    = 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
-  |
-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/test/GatewayV1.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/GatewayV1.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/GatewayV1.t.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/GatewayV1.t.sol:20:9
-   |
-20 | 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/GatewayV1.t.sol:22:9
-   |
-22 | 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/test/GatewayV1.t.sol:24:5
-   |
-24 |     Channel,
-   |     -------
-   |
-   = 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:25:5
-   |
-25 |     InboundMessageV1,
-   |     ----------------
-   |
-   = 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:33:9
-   |
-33 | import {PricingStorage} from "../src/storage/PricingStorage.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
+    |
+211 |         return keccak256(createParachainHeader(encodedParaID, header));
+    |                -------------------------------------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:35:9
+note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/TokenLib.sol:76:26
    |
-35 | import {TokenLib} from "../src/TokenLib.sol";
-   |         --------
+76 |           bytes32 digest = keccak256(
+   |  __________________________-
+77 | |             abi.encodePacked(
+...  |
+85 | |             )
+86 | |         );
+   | |_________-
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+   = 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:211:16
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/TokenLib.sol:99:16
     |
-211 |         return keccak256(createParachainHeader(encodedParaID, header));
-    |                -------------------------------------------------------
+ 99 |           return keccak256(
+    |  ________________-
+100 | |             abi.encode(
+...   |
+106 | |             )
+107 | |         );
+    | |_________-
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
@@ -2700,19 +2726,6 @@ 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/TokenLib.sol:76:26
-   |
-76 |           bytes32 digest = keccak256(
-   |  __________________________-
-77 | |             abi.encodePacked(
-...  |
-85 | |             )
-86 | |         );
-   | |_________-
-   |
-   = 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
     |
@@ -2745,19 +2758,6 @@ 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/TokenLib.sol:99:16
-    |
- 99 |           return keccak256(
-    |  ________________-
-100 | |             abi.encode(
-...   |
-106 | |             )
-107 | |         );
-    | |_________-
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
  WARN  Issue while reading "/home/runner/work/snowbridge/snowbridge/web/.npmrc". Failed to replace env in config: ${NPM_AUTH_TOKEN}
 > @snowbridge/contract-types@0.2.0 typechain /home/runner/work/snowbridge/snowbridge/web/packages/contract-types