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

@snowbridge/contract-types 0.2.9 → 0.2.10

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 +1523 -1523
package/package.json +2 -2

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

@@ -20,6 +20,38 @@ 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/src/BeefyClient.sol:57:16
+   |
+57 |         uint64 validatorSetID;
+   |                --------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:69:16
+   |
+69 |         bytes2 payloadID;
+   |                ---------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/scripts/upgrade/DeployGateway202509.sol:7:9
+  |
+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/scripts/DeployLocal.sol:17:9
+   |
+17 | import {UD60x18, ud60x18} from "prb/math/src/UD60x18.sol";
+   |         -------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 note[mixed-case-function]: function names should use mixedCase
   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:19:14
    |
@@ -92,6 +124,174 @@ 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.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/Types.sol:5:20
+  |
+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/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
+   |
+10 |     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/src/Types.sol:11:5
+   |
+11 |     InboundMessage as 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/src/Types.sol:12:5
+   |
+12 |     Command as CommandV1,
+   |     --------------------
+   |
+   = 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:13:5
+   |
+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/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[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
+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[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[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-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[mixed-case-function]: function names should use mixedCase
    --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:121:14
     |
@@ -132,117 +332,109 @@ 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/SubstrateTypes.sol:163:14
+note[screaming-snake-case-immutable]: immutables should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Token.sol:17:30
+   |
+17 |     address public immutable gateway;
+   |                              -------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-immutable
+note[screaming-snake-case-immutable]: immutables should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Token.sol:18:28
+   |
+18 |     uint8 public immutable decimals;
+   |                            --------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-immutable
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/Initializer.sol:7:24
+  |
+7 | import {OperatingMode, ParaID, TokenInfo, Channel, ChannelID} from "./Types.sol";
+  |                        ------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:249:47
     |
-163 |     function SendForeignTokenToAddress20(
-    |              ---------------------------
+249 |     function channelOperatingModeOf(ChannelID channelID) external view returns (OperatingMode) {
+    |                                               ---------
     |
-    = 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/SubstrateTypes.sol:164:17
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:253:40
     |
-164 |         bytes32 tokenID,
-    |                 -------
+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/SubstrateTypes.sol:165:16
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:257:30
     |
-165 |         ParaID paraID,
-    |                ------
+257 |     function agentOf(bytes32 agentID)
+    |                              -------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/scripts/DeployLocal.sol:17:9
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:39:38
    |
-17 | import {UD60x18, ud60x18} from "prb/math/src/UD60x18.sol";
-   |         -------
+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: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/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[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:31:34
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Token.sol:81:14
    |
-31 |     function ensureAgent(bytes32 agentID) internal view returns (address agent) {
-   |                                  -------
+81 |     function DOMAIN_SEPARATOR() external view returns (bytes32) {
+   |              ----------------
    |
-   = 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
+   = 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:249:47
+note[pascal-case-struct]: structs should use PascalCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:109:12
     |
-249 |     function channelOperatingModeOf(ChannelID channelID) external view returns (OperatingMode) {
-    |                                               ---------
+109 |     struct MMRLeaf {
+    |            -------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#pascal-case-struct
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:253:40
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:117:16
     |
-253 |     function channelNoncesOf(ChannelID channelID) external view returns (uint64, uint64) {
-    |                                        ---------
+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/Gateway.sol:257:30
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:155:20
     |
-257 |     function agentOf(bytes32 agentID)
-    |                              -------
+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/Gateway.sol:287:14
+note[screaming-snake-case-immutable]: immutables should use SCREAMING_SNAKE_CASE
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:182:30
     |
-287 |     function queryForeignTokenID(address token) external view returns (bytes32) {
-    |              -------------------
+182 |     uint256 public immutable randaoCommitDelay;
+    |                              -----------------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/src/Initializer.sol:5:9
-  |
-5 | import {AgentExecutor} from "./AgentExecutor.sol";
-  |         -------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-immutable
-note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/src/Initializer.sol:7:24
-  |
-7 | import {OperatingMode, ParaID, TokenInfo, Channel, ChannelID} from "./Types.sol";
-  |                        ------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[screaming-snake-case-immutable]: immutables should use SCREAMING_SNAKE_CASE
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:190:30
+    |
+190 |     uint256 public immutable randaoCommitExpiration;
+    |                              ----------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-immutable
 note[unused-import]: unused imports should be removed
  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Initializer.sol:7:52
@@ -268,37 +460,133 @@ note[unused-import]: unused imports should be removed
    |
    = 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/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/Functions.sol:39:38
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/storage/AssetsStorage.sol:13:16
    |
-39 |     function ensureChannel(ChannelID channelID) internal view returns (Channel storage ch) {
-   |                                      ---------
+13 |         ParaID assetHubParaID;
+   |                --------------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:163:14
+    |
+163 |     function SendForeignTokenToAddress20(
+    |              ---------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:69:16
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:164:17
+    |
+164 |         bytes32 tokenID,
+    |                 -------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/SubstrateTypes.sol:165:16
+    |
+165 |         ParaID paraID,
+    |                ------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-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[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/interfaces/IGatewayBase.sol:34:50
    |
-69 |         bytes2 payloadID;
-   |                ---------
+34 |     event ForeignTokenRegistered(bytes32 indexed tokenID, address token);
+   |                                                  -------
    |
    = 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
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/interfaces/IERC20Permit.sol:11:14
    |
-17 |     address public immutable gateway;
-   |                              -------
+11 |     function DOMAIN_SEPARATOR() external view returns (bytes32);
+   |              ----------------
    |
-   = 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/Token.sol:18:28
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:196:30
+    |
+196 |     uint256 public immutable minNumRequiredSignatures;
+    |                              ------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-immutable
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/upgrade/Gateway202509.sol:5:8
+  |
+5 | import "../Gateway.sol";
+  |        ----------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/types/Common.sol:14:13
    |
-18 |     uint8 public immutable decimals;
-   |                            --------
+14 |     bytes32 foreignID;
+   |             ---------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-immutable
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+warning[incorrect-shift]: the order of args in a shift operation is incorrect
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/utils/Math.sol:82:60
+   |
+82 |             return result + (unsignedRoundsUp(rounding) && 1 << result < value ? 1 : 0);
+   |                                                            -----------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#incorrect-shift
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:315:17
+    |
+315 |         bytes32 ticketID = createTicketID(msg.sender, commitmentHash);
+    |                 --------
+    |
+    = 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
+warning[incorrect-shift]: the order of args in a shift operation is incorrect
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/utils/SparseBitmap.sol:12:20
+   |
+12 |     uint256 mask = 1 << (index & 0xff);
+   |                    -------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#incorrect-shift
+warning[incorrect-shift]: the order of args in a shift operation is incorrect
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/utils/SparseBitmap.sol:18:20
+   |
+18 |     uint256 mask = 1 << (index & 0xff);
+   |                    -------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#incorrect-shift
 note[mixed-case-variable]: mutable variables should use mixedCase
    --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:324:37
@@ -340,61 +628,53 @@ note[mixed-case-function]: function names should use mixedCase
     |
     = 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[pascal-case-struct]: structs should use PascalCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:109:12
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:353:14
     |
-109 |     struct MMRLeaf {
-    |            -------
+353 |     function v1_handleSetPricingParameters(bytes calldata data) external onlySelf {
+    |              -----------------------------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#pascal-case-struct
+    = 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/Functions.sol:116:17
     |
-117 |         uint64 nextAuthoritySetID;
-    |                ------------------
+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/BeefyClient.sol:155:20
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:136:39
     |
-155 |     bytes32 public latestMMRRoot;
-    |                    -------------
+136 |     function mintForeignToken(bytes32 foreignTokenID, address recipient, uint128 amount)
+    |                                       --------------
     |
     = 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:353:14
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:148:44
     |
-353 |     function v1_handleSetPricingParameters(bytes calldata data) external onlySelf {
-    |              -----------------------------
+148 |     function _ensureTokenAddressOf(bytes32 tokenID) internal view returns (address) {
+    |                                            -------
     |
-    = 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/Handlers.sol:120:41
+    |
+120 |     function mintForeignToken(ChannelID channelID, bytes calldata data) external {
+    |                                         ---------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:159:40
+    |
+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-function]: function names should use mixedCase
    --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:358:14
@@ -404,6 +684,86 @@ 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/IGateway.sol:20:27
+   |
+20 |         ChannelID indexed channelID, uint64 nonce, bytes32 indexed messageID, bool success
+   |                           ---------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:20:68
+   |
+20 |         ChannelID indexed channelID, uint64 nonce, bytes32 indexed messageID, bool success
+   |                                                                    ---------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:25:27
+   |
+25 |         ChannelID indexed channelID, uint64 nonce, bytes32 indexed messageID, bytes payload
+   |                           ---------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:25:68
+   |
+25 |         ChannelID indexed channelID, uint64 nonce, bytes32 indexed messageID, bytes payload
+   |                                                                    ---------
+   |
+   = 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:32:47
+   |
+32 |     event AgentFundsWithdrawn(bytes32 indexed agentID, address indexed recipient, uint256 amount);
+   |                                               -------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:42:30
+   |
+42 |     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/v1/IGateway.sol:44:47
+   |
+44 |     function channelOperatingModeOf(ChannelID channelID) external view returns (OperatingMode);
+   |                                               ---------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:46:40
+   |
+46 |     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/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-function]: function names should use mixedCase
    --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:363:14
     |
@@ -436,101 +796,45 @@ 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/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
-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
-    |
-190 |     uint256 public immutable randaoCommitExpiration;
-    |                              ----------------------
-    |
-    = 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:196:30
-    |
-196 |     uint256 public immutable minNumRequiredSignatures;
-    |                              ------------------------
-    |
-    = 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/Functions.sol:116:17
-    |
-116 |         bytes32 foreignTokenID,
-    |                 --------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Functions.sol:136:39
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:410:14
     |
-136 |     function mintForeignToken(bytes32 foreignTokenID, address recipient, uint128 amount)
-    |                                       --------------
+410 |     function v2_submit(
+    |              ---------
     |
-    = 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/Token.sol:81:14
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:13:10
    |
-81 |     function DOMAIN_SEPARATOR() external view returns (bytes32) {
-   |              ----------------
+13 | function ParaIDEq(ParaID a, ParaID b) pure returns (bool) {
+   |          --------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:108:16
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:164:47
     |
-108 |         bytes4 encodedParaID,
-    |                -------------
+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/storage/AssetsStorage.sol:13:16
-   |
-13 |         ParaID assetHubParaID;
-   |                --------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/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/Functions.sol:148:44
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:170:37
     |
-148 |     function _ensureTokenAddressOf(bytes32 tokenID) internal view returns (address) {
-    |                                            -------
+170 |     function tokenAddressOf(bytes32 tokenID) external view returns (address) {
+    |                                     -------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:410:14
-    |
-410 |     function v2_submit(
-    |              ---------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:86:14
+   |
+86 |     function queryForeignTokenID(address token) external view returns (bytes32);
+   |              -------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 note[mixed-case-function]: function names should use mixedCase
    --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:444:14
@@ -556,101 +860,221 @@ 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/src/v1/Handlers.sol:13:9
+   |
+13 | import {AgentExecutor} from "../AgentExecutor.sol";
+   |         -------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:211:19
+    |
+211 |         ChannelID channelID = ticket.dest.into();
+    |                   ---------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:464:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Calls.sol:139:14
     |
-464 |     function v2_registerToken(
-    |              ----------------
+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/BeefyClient.sol:315:17
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:359:17
     |
-315 |         bytes32 ticketID = createTicketID(msg.sender, commitmentHash);
+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/Verification.sol:205:53
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:108:16
     |
-205 |     function createParachainHeaderMerkleLeaf(bytes4 encodedParaID, ParachainHeader calldata header)
-    |                                                     -------------
+108 |         bytes4 encodedParaID,
+    |                -------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-warning[incorrect-shift]: the order of args in a shift operation is incorrect
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/utils/SparseBitmap.sol:12:20
-   |
-12 |     uint256 mask = 1 << (index & 0xff);
-   |                    -------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#incorrect-shift
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:475:14
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:117:37
     |
-475 |     function v2_createAgent(bytes32 id) external {
-    |              --------------
+117 |     function tokenAddressOf(bytes32 tokenID) external view returns (address);
+    |                                     -------
     |
-    = 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/v2/Handlers.sol:13:9
+   |
+13 | import {IGatewayV2} from "./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/v2/Calls.sol:29:9
+   |
+29 | 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/v2/Calls.sol:29:18
+   |
+29 | 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/v2/Calls.sol:29:27
+   |
+29 | 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/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[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:242:17
+    |
+242 |         bytes32 messageID = keccak256(abi.encodePacked(channelID, channel.outboundNonce));
+    |                 ---------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:484:14
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:17:10
+   |
+17 | function ParaIDNe(ParaID a, ParaID b) pure returns (bool) {
+   |          --------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:21:22
+   |
+21 | function into(ParaID paraID) pure returns (ChannelID) {
+   |                      ------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:464:14
     |
-484 |     function v2_handleUpgrade(bytes calldata data) external onlySelf {
+464 |     function v2_registerToken(
     |              ----------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:489:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:475:14
     |
-489 |     function v2_handleSetOperatingMode(bytes calldata data) external onlySelf {
-    |              -------------------------
+475 |     function v2_createAgent(bytes32 id) external {
+    |              --------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:494:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:484:14
     |
-494 |     function v2_handleUnlockNativeToken(bytes calldata data) external onlySelf {
-    |              --------------------------
+484 |     function v2_handleUpgrade(bytes calldata data) external onlySelf {
+    |              ----------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:499:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:489:14
     |
-499 |     function v2_handleRegisterForeignToken(bytes calldata data) external onlySelf {
-    |              -----------------------------
+489 |     function v2_handleSetOperatingMode(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/Verification.sol:214:43
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/IGateway.sol:51:14
+   |
+51 |     function v2_submit(
+   |              ---------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/IGateway.sol:81:14
+   |
+81 |     function v2_sendMessage(
+   |              --------------
+   |
+   = 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:96:14
+   |
+96 |     function v2_registerToken(
+   |              ----------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/IGateway.sol:105:14
     |
-214 |     function createParachainHeader(bytes4 encodedParaID, ParachainHeader calldata header)
-    |                                           -------------
+105 |     function v2_createAgent(bytes32 id) external;
+    |              --------------
     |
-    = 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/Verification.sol:243:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/IGateway.sol:108:14
     |
-243 |     function createMMRLeaf(MMRLeafPartial memory leaf, bytes32 parachainHeadsRoot)
-    |              -------------
+108 |     function v2_outboundNonce() external view returns (uint64);
+    |              ----------------
     |
     = 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:359:17
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/IGateway.sol:111:14
     |
-359 |         bytes32 ticketID = createTicketID(msg.sender, commitmentHash);
-    |                 --------
+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[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:28:20
+   |
+28 |     uint8 constant Upgrade = 0;
+   |                    -------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:30:20
+   |
+30 |     uint8 constant SetOperatingMode = 1;
+   |                    ----------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
 note[mixed-case-variable]: mutable variables should use mixedCase
    --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:362:14
@@ -668,301 +1092,77 @@ 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.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/Types.sol:5:20
-  |
-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/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[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:355:17
+    |
+355 |         bytes32 foreignID,
+    |                 ---------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Types.sol:10:5
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:32:20
    |
-10 |     Channel,
-   |     -------
+32 |     uint8 constant UnlockNativeToken = 2;
+   |                    -----------------
    |
-   = 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/src/Types.sol:11:5
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:34:20
    |
-11 |     InboundMessage as InboundMessageV1,
-   |     ----------------------------------
+34 |     uint8 constant RegisterForeignToken = 3;
+   |                    --------------------
    |
-   = 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/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/Verification.sol:205:53
+    |
+205 |     function createParachainHeaderMerkleLeaf(bytes4 encodedParaID, ParachainHeader calldata header)
+    |                                                     -------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/types/Common.sol:14:13
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/BeefyClient.t.sol:43:12
    |
-14 |     bytes32 foreignID;
-   |             ---------
+43 |     bytes2 mmrRootID = bytes2("mh");
+   |            ---------
    |
    = 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
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Agent.t.sol:4:8
   |
-5 | import {UD60x18} from "prb/math/src/UD60x18.sol";
-  |         -------
+4 | import "forge-std/Test.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/v1/Calls.sol:159:40
-    |
-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/v1/Calls.sol:164:47
-    |
-164 |     function channelOperatingModeOf(ChannelID channelID) external view returns (OperatingMode) {
-    |                                               ---------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:170:37
-    |
-170 |     function tokenAddressOf(bytes32 tokenID) external view returns (address) {
-    |                                     -------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+  = 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/src/upgrade/Gateway202509.sol:5:8
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Agent.t.sol:5:8
   |
-5 | import "../Gateway.sol";
-  |        ----------------
+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/Types.sol:13:5
-   |
-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/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[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
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:211:19
-    |
-211 |         ChannelID channelID = ticket.dest.into();
-    |                   ---------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:451:14
-    |
-451 |     function createTicketID(address account, bytes32 commitmentHash)
-    |              --------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Handlers.sol:120:41
-    |
-120 |     function mintForeignToken(ChannelID channelID, bytes calldata data) external {
-    |                                         ---------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Handlers.sol:13:9
-   |
-13 | import {AgentExecutor} from "../AgentExecutor.sol";
-   |         -------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:242:17
-    |
-242 |         bytes32 messageID = keccak256(abi.encodePacked(channelID, channel.outboundNonce));
-    |                 ---------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/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
-    |
-509 |     function v2_handleCallContract(bytes32 origin, 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/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
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:36:20
    |
-17 | function ParaIDNe(ParaID a, ParaID b) pure returns (bool) {
-   |          --------
+36 |     uint8 constant MintForeignToken = 4;
+   |                    ----------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:21:22
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:38:20
    |
-21 | function into(ParaID paraID) pure returns (ChannelID) {
-   |                      ------
+38 |     uint8 constant CallContract = 5;
+   |                    ------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+   = 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/v1/Types.sol:29:10
@@ -988,362 +1188,114 @@ note[mixed-case-variable]: mutable variables should use mixedCase
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:355:17
-    |
-355 |         bytes32 foreignID,
-    |                 ---------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[mixed-case-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
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:20:27
-   |
-20 |         ChannelID indexed channelID, uint64 nonce, bytes32 indexed messageID, bool success
-   |                           ---------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:20:68
-   |
-20 |         ChannelID indexed channelID, uint64 nonce, bytes32 indexed messageID, bool success
-   |                                                                    ---------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:25:27
-   |
-25 |         ChannelID indexed channelID, uint64 nonce, bytes32 indexed messageID, bytes payload
-   |                           ---------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:25:68
-   |
-25 |         ChannelID indexed channelID, uint64 nonce, bytes32 indexed messageID, bytes payload
-   |                                                                    ---------
-   |
-   = 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:32:47
-   |
-32 |     event AgentFundsWithdrawn(bytes32 indexed agentID, address indexed recipient, uint256 amount);
-   |                                               -------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:42:30
-   |
-42 |     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/v1/IGateway.sol:44:47
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:68:20
    |
-44 |     function channelOperatingModeOf(ChannelID channelID) external view returns (OperatingMode);
-   |                                               ---------
+68 |     uint8 constant Raw = 0;
+   |                    ---
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
-note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:46:40
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:70:20
    |
-46 |     function channelNoncesOf(ChannelID channelID) external view returns (uint64, uint64);
-   |                                        ---------
+70 |     uint8 constant CreateAsset = 1;
+   |                    -----------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+   = 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/v1/IGateway.sol:86:14
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:81:10
    |
-86 |     function queryForeignTokenID(address token) external view returns (bytes32);
-   |              -------------------
+81 | function makeRawXCM(bytes memory xcm) pure returns (Xcm memory) {
+   |          ----------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/IGateway.sol:117:37
-    |
-117 |     function tokenAddressOf(bytes32 tokenID) external view returns (address);
-    |                                     -------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Types.sol:24:9
-   |
-24 | import {IGatewayV2} from "./v2/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:8:9
-  |
-8 | import {AgentExecutor} from "./AgentExecutor.sol";
-  |         -------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:29:9
-   |
-29 | import {Upgrade} from "./Upgrade.sol";
-   |         -------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:41:9
-   |
-41 | import {PricingStorage} from "./storage/PricingStorage.sol";
-   |         --------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:44:18
-   |
-44 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
-   |                  -------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:44:27
-   |
-44 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
-   |                           -------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Calls.sol:29:9
-   |
-29 | 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/v2/Calls.sol:29:18
-   |
-29 | 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/v2/Calls.sol:29:27
-   |
-29 | 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/v2/Handlers.sol:13:9
-   |
-13 | import {IGatewayV2} from "./IGateway.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/Types.sol:153:13
-    |
-153 |     bytes32 agentID;
-    |             -------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:165:13
-    |
-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/v1/Types.sol:177:13
-    |
-177 |     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/IGateway.sol:22:30
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:85:10
    |
-22 |     function agentOf(bytes32 agentID) external view returns (address);
-   |                              -------
+85 | function makeCreateAssetXCM(address token, Network network) pure returns (Xcm memory) {
+   |          ------------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-note[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);
-   |                                -------
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:98:20
    |
-   = 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
+98 |     uint8 constant NativeTokenERC20 = 0;
+   |                    ----------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
 note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:33:31
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:99:20
    |
-33 |     address constant internal assetHubAgent = 0xd803472c47a87D7B63E888DE53f03B4191B846a8;
-   |                               -------------
+99 |     uint8 constant ForeignTokenERC20 = 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/test/BeefyClient.t.sol:43:12
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:14:9
    |
-43 |     bytes2 mmrRootID = bytes2("mh");
-   |            ---------
+14 | import {AgentExecutor} from "../AgentExecutor.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/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
+   = 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:51:14
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:15:9
    |
-51 |     function v2_submit(
-   |              ---------
+15 | import {Agent} from "../Agent.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-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/IGateway.sol:81:14
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:16:9
    |
-81 |     function v2_sendMessage(
-   |              --------------
+16 | import {Call} from "../utils/Call.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-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/IGateway.sol:96:14
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:25:5
    |
-96 |     function v2_registerToken(
-   |              ----------------
+25 |     AgentExecuteCommand,
+   |     -------------------
    |
-   = 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:105:14
-    |
-105 |     function v2_createAgent(bytes32 id) external;
-    |              --------------
-    |
-    = 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-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/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[mixed-case-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/IGateway.sol:111:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/BeefyClient.t.sol:167:14
     |
-111 |     function v2_isDispatched(uint64 nonce) external view returns (bool);
-    |              ---------------
+167 |     function decodeMMRLeaf(string memory beefyCommitmentRaw) internal {
+    |              -------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:139:16
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:214:43
     |
-139 |         ParaID paraID = ParaID.wrap(1000);
-    |                ------
+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/BeefyClient.sol:590:14
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:243:14
     |
-590 |     function encodeMMRLeaf(MMRLeaf calldata leaf) internal pure returns (bytes memory) {
+243 |     function createMMRLeaf(MMRLeafPartial memory leaf, bytes32 parachainHeadsRoot)
     |              -------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
@@ -1356,6 +1308,54 @@ note[unused-import]: unused imports should be removed
   |
   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/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[pascal-case-struct]: structs should use PascalCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:103:8
+    |
+103 | struct AsNativeTokenERC20 {
+    |        ------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#pascal-case-struct
+note[pascal-case-struct]: structs should use PascalCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:109:8
+    |
+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/src/v2/Types.sol:110:13
+    |
+110 |     bytes32 foreignID;
+    |             ---------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:405:14
+    |
+405 |     function verifyMMRLeafProof(bytes32 leafHash, bytes32[] calldata proof, uint256 proofOrder)
+    |              ------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:494:14
+    |
+494 |     function v2_handleUnlockNativeToken(bytes calldata data) external onlySelf {
+    |              --------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:68:8
    |
@@ -1388,109 +1388,181 @@ note[mixed-case-variable]: mutable variables should use mixedCase
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/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[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:81:20
+   |
+81 |     bytes32 public assetHubAgentID =
+   |                    ---------------
+   |
+   = 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:6:9
-  |
-6 | import {stdJson} from "forge-std/StdJson.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-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
 note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:7:9
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:8:9
   |
-7 | import {console} from "forge-std/console.sol";
-  |         -------
+8 | import {SubstrateTypes} from "./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/GatewayV1.t.sol:81:20
-   |
-81 |     bytes32 public assetHubAgentID =
-   |                    ---------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+   --> /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[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:499:14
+    |
+499 |     function v2_handleRegisterForeignToken(bytes calldata data) external onlySelf {
+    |              -----------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+note[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
+    |
+509 |     function v2_handleCallContract(bytes32 origin, 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/test/GatewayV2.t.sol:85:20
+   |
+85 |     bytes32 public dotTokenID;
+   |                    ----------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:451:14
+    |
+451 |     function createTicketID(address account, bytes32 commitmentHash)
+    |              --------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:153:13
+    |
+153 |     bytes32 agentID;
+    |             -------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/BeefyClient.t.sol:171:16
+    |
+171 |         uint64 nextAuthoritySetID =
+    |                ------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:121:35
+    |
+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-function]: function names should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/BeefyClient.t.sol:167:14
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:159:13
     |
-167 |     function decodeMMRLeaf(string memory beefyCommitmentRaw) internal {
-    |              -------------
+159 |     bytes32 foreignTokenID;
+    |             --------------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:624:17
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:165:13
     |
-624 |         bytes32 ticketID,
-    |                 --------
+165 |     bytes32 foreignTokenID;
+    |             --------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 note[mixed-case-variable]: mutable variables should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:85:20
-   |
-85 |     bytes32 public dotTokenID;
-   |                    ----------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:177:13
+    |
+177 |     bytes32 foreignTokenID;
+    |             --------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:8:18
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Types.sol:5:9
   |
-8 | import {UD60x18, ud60x18, unwrap} from "prb/math/src/UD60x18.sol";
-  |                  -------
+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/test/ForkUpgrade202509.t.sol:13:9
-   |
-13 | import {Gateway} from "../src/Gateway.sol";
-   |         -------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+ --> /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[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[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:16:48
-   |
-16 | import {UpgradeParams, SetOperatingModeParams, OperatingMode, RegisterForeignTokenParams} from "../src/v1/Types.sol";
-   |                                                -------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/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[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[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Math.t.sol:4:8
+  |
+4 | import "forge-std/Test.sol";
+  |        --------------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
-note[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[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[unused-import]: unused imports should be removed
  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:5:9
@@ -1556,389 +1628,309 @@ 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/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/src/v2/Types.sol:28:20
-   |
-28 |     uint8 constant Upgrade = 0;
-   |                    -------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
-note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:30:20
-   |
-30 |     uint8 constant SetOperatingMode = 1;
-   |                    ----------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
-note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:32:20
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:23:9
    |
-32 |     uint8 constant UnlockNativeToken = 2;
-   |                    -----------------
+23 | import {SubstrateTypes} from "./../src/SubstrateTypes.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:34:20
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:24:24
    |
-34 |     uint8 constant RegisterForeignToken = 3;
-   |                    --------------------
+24 | import {OperatingMode, ParaID, CommandV2, CommandKind, InboundMessageV2} from "../src/Types.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:36:20
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:26:9
    |
-36 |     uint8 constant MintForeignToken = 4;
-   |                    ----------------
+26 | import {NativeTransferFailed} from "../src/utils/SafeTransfer.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:38:20
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:27:9
    |
-38 |     uint8 constant CallContract = 5;
-   |                    ------------
+27 | import {PricingStorage} from "../src/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[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:68:20
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:29:9
    |
-68 |     uint8 constant Raw = 0;
-   |                    ---
+29 | import {TokenLib} from "../src/TokenLib.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:70:20
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:36:5
    |
-70 |     uint8 constant CreateAsset = 1;
-   |                    -----------
+36 |     UpgradeParams,
+   |     -------------
    |
-   = 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[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
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:17:68
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:46:5
    |
-17 | import {ChannelID, ParaID, OperatingMode, InboundMessage, Command, TokenInfo} from "../src/v1/Types.sol";
-   |                                                                    ---------
+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/Math.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/Math.t.sol:5:8
-  |
-5 | import "forge-std/console.sol";
-  |        -----------------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:23:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:51:5
    |
-23 | import {SubstrateTypes} from "./../src/SubstrateTypes.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:24:24
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:52:5
    |
-24 | import {OperatingMode, ParaID, CommandV2, CommandKind, InboundMessageV2} from "../src/Types.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:26:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:54:5
    |
-26 | import {NativeTransferFailed} from "../src/utils/SafeTransfer.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:27:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:55:5
    |
-27 | import {PricingStorage} from "../src/storage/PricingStorage.sol";
-   |         --------------
+55 |     Command
+   |     -------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:29:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:59:9
    |
-29 | import {TokenLib} from "../src/TokenLib.sol";
-   |         --------
+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:36:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:59:27
    |
-36 |     UpgradeParams,
-   |     -------------
+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:46:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/BeefyClient.t.sol:11:9
    |
-46 |     Xcm,
-   |     ---
+11 | import {ScaleCodec} from "../src/utils/ScaleCodec.sol";
+   |         ----------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/ScaleCodec.t.sol:4:8
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/SparseBitmap.t.sol:4:8
   |
 4 | import "forge-std/Test.sol";
   |        --------------------
   |
   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
-note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/ScaleCodec.t.sol:5:8
-  |
-5 | import "forge-std/console.sol";
-  |        -----------------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/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
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:4:9
   |
-4 | import "forge-std/Test.sol";
-  |        --------------------
+4 | import {Vm} from "forge-std/Vm.sol";
+  |         --
   |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/Uint16Array.t.sol:5:8
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:6:9
   |
-5 | import "forge-std/console.sol";
-  |        -----------------------
+6 | import {stdJson} from "forge-std/StdJson.sol";
+  |         -------
   |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/SparseBitmap.t.sol:4:8
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:7:9
   |
-4 | import "forge-std/Test.sol";
-  |        --------------------
+7 | import {console} from "forge-std/console.sol";
+  |         -------
   |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+  = 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:5:8
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:8:18
   |
-5 | import "forge-std/console.sol";
-  |        -----------------------
+8 | import {UD60x18, ud60x18, unwrap} from "prb/math/src/UD60x18.sol";
+  |                  -------
   |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/BeefyClient.t.sol:11:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:13:9
    |
-11 | import {ScaleCodec} from "../src/utils/ScaleCodec.sol";
-   |         ----------
+13 | 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[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/test/ForkUpgrade202509.t.sol:16:24
    |
-98 |         uint16 new_value = counters.get(index);
-   |                ---------
+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[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/ForkUpgrade202509.t.sol:16:48
    |
-51 |     AgentExecuteCommand,
-   |     -------------------
+16 | import {UpgradeParams, SetOperatingModeParams, OperatingMode, RegisterForeignTokenParams} from "../src/v1/Types.sol";
+   |                                                -------------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:52:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:16:63
    |
-52 |     InboundMessage,
-   |     --------------
+16 | import {UpgradeParams, SetOperatingModeParams, OperatingMode, RegisterForeignTokenParams} from "../src/v1/Types.sol";
+   |                                                               --------------------------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:54:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:17:28
    |
-54 |     ParaID,
-   |     ------
+17 | import {ChannelID, ParaID, OperatingMode, InboundMessage, Command, TokenInfo} from "../src/v1/Types.sol";
+   |                            -------------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:55:5
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/ForkUpgrade202509.t.sol:17:68
    |
-55 |     Command
-   |     -------
+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/src/BeefyClient.sol:503:17
+    |
+503 |         bytes32 ticketID,
+    |                 --------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:4:8
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Verification.t.sol:4:8
   |
-4 | import "forge-std/Test.sol";
-  |        --------------------
+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/Token.t.sol:5:8
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Verification.t.sol:5:8
   |
-5 | import "forge-std/console.sol";
-  |        -----------------------
+5 | import "forge-std/Test.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/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
+ --> /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-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:24:14
-   |
-24 |     function encodeCommitment_public(Commitment calldata commitment)
-   |              -----------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/SparseBitmap.t.sol:5:8
+  |
+5 | import "forge-std/console.sol";
+  |        -----------------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
-note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:40:14
-   |
-40 |     function initialize_public(
-   |              -----------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:4:8
+  |
+4 | import "forge-std/Test.sol";
+  |        --------------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:59:9
-   |
-59 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
-   |         -------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:5:8
+  |
+5 | import "forge-std/console.sol";
+  |        -----------------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV2.t.sol:59:27
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/Verification.t.sol:17:19
    |
-59 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
-   |                           -------
+17 |     bytes4 public encodedParachainID;
+   |                   ------------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:14:9
-   |
-14 | import {AgentExecutor} from "../AgentExecutor.sol";
-   |         -------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:120:20
+    |
+120 |     bytes32 public dotTokenID;
+    |                    ----------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:85:10
-   |
-85 | function makeCreateAssetXCM(address token, Network network) pure returns (Xcm memory) {
-   |          ------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/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[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:98:20
-   |
-98 |     uint8 constant NativeTokenERC20 = 0;
-   |                    ----------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Uint16Array.t.sol:4:8
+  |
+4 | import "forge-std/Test.sol";
+  |        --------------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
-note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:99:20
-   |
-99 |     uint8 constant ForeignTokenERC20 = 1;
-   |                    -----------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/Uint16Array.t.sol:5:8
+  |
+5 | import "forge-std/console.sol";
+  |        -----------------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:6:8
+  |
+6 | import "forge-std/console.sol";
+  |        -----------------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
 warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:63:9
@@ -1948,53 +1940,13 @@ warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls sho
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:15:9
-   |
-15 | import {Agent} from "../Agent.sol";
-   |         -----
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:16:9
-   |
-16 | import {Call} from "../utils/Call.sol";
-   |         ----
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-note[unused-import]: unused imports should be removed
-  --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:25:5
-   |
-25 |     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/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
-  |
-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/GatewayV1.t.sol:605:16
+note[mixed-case-function]: function names should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:543:14
     |
-605 |         ParaID paraID = ParaID.wrap(1000);
-    |                ------
+543 |     function ensureProvidesMMRRoot(Commitment calldata commitment)
+    |              ---------------------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 note[mixed-case-function]: function names should use mixedCase
   --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:20:14
@@ -2028,85 +1980,117 @@ 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/test/GatewayV1.t.sol:631:16
-    |
-631 |         ParaID paraID = ParaID.wrap(1000);
-    |                ------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:102:9
-    |
-102 |         token.transferFrom(owner, receiver, transferAmount);
-    |         ---------------------------------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:36:14
+   |
+36 |     function v1_handleSetPricingParameters_public(bytes calldata params) external {
+   |              ------------------------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:85:14
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:40:14
    |
-85 |     function computeNumRequiredSignatures_public(
-   |              -----------------------------------
+40 |     function v1_handleUnlockNativeToken_public(bytes calldata params) external {
+   |              ---------------------------------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:93:14
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:44:14
    |
-93 |     function computeQuorum_public(uint256 numValidators) public pure returns (uint256) {
-   |              --------------------
+44 |     function v1_handleRegisterForeignToken_public(bytes calldata params) external {
+   |              ------------------------------------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 note[unused-import]: unused imports should be removed
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:5:9
+ --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:8:9
   |
-5 | import {Uint16Array, createUint16Array} from "../../src/utils/Uint16Array.sol";
-  |         -----------
+8 | import {AgentExecutor} from "./AgentExecutor.sol";
+  |         -------------
   |
   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/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[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:29:9
+   |
+29 | import {Upgrade} from "./Upgrade.sol";
+   |         -------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:41:9
+   |
+41 | import {PricingStorage} from "./storage/PricingStorage.sol";
+   |         --------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:44:18
+   |
+44 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
+   |                  -------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:44:27
+   |
+44 | import {UD60x18, ud60x18, convert} from "prb/math/src/UD60x18.sol";
+   |                           -------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:674:16
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:173:17
     |
-674 |         ParaID paraID = ParaID.wrap(1000);
-    |                ------
+173 |         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/test/mocks/MockGateway.sol:36:14
+note[mixed-case-variable]: mutable variables should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/Uint16Array.t.sol:98:16
    |
-36 |     function v1_handleSetPricingParameters_public(bytes calldata params) external {
-   |              ------------------------------------
+98 |         uint16 new_value = counters.get(index);
+   |                ---------
    |
-   = 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/test/mocks/ReantrantAttacker.sol:7:9
+  |
+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/mocks/VerificationWrapper.sol:8:16
+  |
+8 |         bytes4 encodedParachainID,
+  |                ------------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:40:14
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:24:14
    |
-40 |     function v1_handleUnlockNativeToken_public(bytes calldata params) external {
-   |              ---------------------------------
+24 |     function encodeCommitment_public(Commitment calldata commitment)
+   |              -----------------------
    |
    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 note[mixed-case-function]: function names should use mixedCase
-  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:44:14
-   |
-44 |     function v1_handleRegisterForeignToken_public(bytes calldata params) external {
-   |              ------------------------------------
-   |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+   --> /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-function]: function names should use mixedCase
   --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:48:14
@@ -2148,29 +2132,29 @@ 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
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:40:14
    |
-33 |     Vm public constant vm = Vm(0x7109709ECfa91a80626fF3989D68f67F5b1DD12D);
-   |                        --
+40 |     function initialize_public(
+   |              -----------------
    |
-   = help: https://book.getfoundry.sh/reference/forge/forge-lint#screaming-snake-case-const
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:990:20
-    |
-990 |     bytes32 public expectChannelIDBytes =
-    |                    --------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/ScaleCodec.t.sol:4:8
+  |
+4 | import "forge-std/Test.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:994:16
-    |
-994 |         ParaID para_id = ParaID.wrap(1000);
-    |                -------
-    |
-    = 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/ScaleCodec.t.sol:5:8
+  |
+5 | import "forge-std/console.sol";
+  |        -----------------------
+  |
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
 note[unused-import]: unused imports should be removed
  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:7:20
@@ -2204,93 +2188,77 @@ 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/mocks/MockGateway.sol:13:9
+note[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/MockGateway.sol:13:9
+   |
+13 | import {UD60x18} from "prb/math/src/UD60x18.sol";
+   |         -------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:85:14
+   |
+85 |     function computeNumRequiredSignatures_public(
+   |              -----------------------------------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
+note[mixed-case-function]: function names should use mixedCase
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:93:14
    |
-13 | import {UD60x18} from "prb/math/src/UD60x18.sol";
-   |         -------
+93 |     function computeQuorum_public(uint256 numValidators) public pure returns (uint256) {
+   |              --------------------
    |
-   = 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:140:9
-    |
-140 |         token.transferFrom(owner, receiver, transferAmount);
-    |         ---------------------------------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-function
 note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:995:19
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:187:17
     |
-995 |         ChannelID channel_id = para_id.into();
-    |                   ----------
+187 |         bytes32 agentID,
+    |                 -------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[pascal-case-struct]: structs should use PascalCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:103:8
-    |
-103 | struct AsNativeTokenERC20 {
-    |        ------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#pascal-case-struct
-note[pascal-case-struct]: structs should use PascalCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:109:8
-    |
-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/src/v2/Types.sol:110:13
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:624:17
     |
-110 |     bytes32 foreignID;
-    |             ---------
+624 |         bytes32 ticketID,
+    |                 --------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[mixed-case-variable]: mutable variables should use mixedCase
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v2/Types.sol:121:35
+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
     |
-121 | function makeForeignAsset(bytes32 foreignID, uint128 amount) pure returns (Asset memory) {
-    |                                   ---------
+102 |         token.transferFrom(owner, receiver, transferAmount);
+    |         ---------------------------------------------------
     |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
-note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/Verification.t.sol:4:8
-  |
-4 | import "openzeppelin/utils/Strings.sol";
-  |        --------------------------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
-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
+note[unused-import]: unused imports should be removed
+ --> /home/runner/work/snowbridge/snowbridge/contracts/test/mocks/BeefyClientMock.sol:5:9
   |
-5 | import "forge-std/Test.sol";
-  |        --------------------
+5 | import {Uint16Array, createUint16Array} from "../../src/utils/Uint16Array.sol";
+  |         -----------
   |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
-note[unaliased-plain-import]: use named imports '{A, B}' or alias 'import ".." as X'
- --> /home/runner/work/snowbridge/snowbridge/contracts/test/Verification.t.sol:6:8
-  |
-6 | import "forge-std/console.sol";
-  |        -----------------------
-  |
-  = help: https://book.getfoundry.sh/reference/forge/forge-lint#unaliased-plain-import
+note[screaming-snake-case-const]: constants should use SCREAMING_SNAKE_CASE
+  --> /home/runner/work/snowbridge/snowbridge/contracts/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
 warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
-    --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:1058:9
-     |
-1058 |         token.transfer(address(assetHubAgent), 200);
-     |         -------------------------------------------
-     |
-     = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:140:9
+    |
+140 |         token.transferFrom(owner, receiver, transferAmount);
+    |         ---------------------------------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
 warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
    --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:165:9
@@ -2301,18 +2269,10 @@ 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/src/v2/Types.sol:159:13
-    |
-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
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/utils/ForkTestFixtures.sol:132:15
     |
-171 |     bytes32 foreignTokenID;
-    |             --------------
+132 |         bytes consensusEngineID;
+    |               -----------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
@@ -2332,30 +2292,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/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
     |
@@ -2365,42 +2301,10 @@ 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
-    |
-132 |         bytes 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/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/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
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:605:16
     |
-317 |         bytes32 PERMIT_TYPEHASH = keccak256(
-    |                 ---------------
+605 |         ParaID paraID = ParaID.wrap(1000);
+    |                ------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
@@ -2420,22 +2324,6 @@ 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/utils/ForkTestFixtures.sol:9:9
   |
@@ -2487,83 +2375,75 @@ note[unused-import]: unused imports should be removed
 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
-  |
-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";
-   |         --------------
+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/GatewayV1.t.sol:35:9
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/utils/ForkTestFixtures.sol:21:5
    |
-35 | import {TokenLib} from "../src/TokenLib.sol";
-   |         --------
+21 |     TokenInfo
+   |     ---------
    |
    = 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[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:656:16
+    |
+656 |         ParaID paraID = ParaID.wrap(1000);
+    |                ------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:674:16
+    |
+674 |         ParaID paraID = ParaID.wrap(1000);
+    |                ------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:286:17
+    |
+286 |         bytes32 PERMIT_TYPEHASH = keccak256(
+    |                 ---------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:317:17
+    |
+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
 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
     |
@@ -2588,6 +2468,22 @@ warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls sho
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:994:16
+    |
+994 |         ParaID para_id = ParaID.wrap(1000);
+    |                -------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-variable]: mutable variables should use mixedCase
+   --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:995:19
+    |
+995 |         ChannelID channel_id = para_id.into();
+    |                   ----------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
 warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value
    --> /home/runner/work/snowbridge/snowbridge/contracts/test/Token.t.sol:588:9
     |
@@ -2620,6 +2516,14 @@ 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
     |
@@ -2636,6 +2540,14 @@ 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
     |
@@ -2660,6 +2572,14 @@ note[mixed-case-variable]: mutable variables should use mixedCase
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#mixed-case-variable
+note[mixed-case-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
    |
@@ -2668,6 +2588,86 @@ 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[unused-import]: unused imports should be removed
+  --> /home/runner/work/snowbridge/snowbridge/contracts/test/GatewayV1.t.sol:35:9
+   |
+35 | import {TokenLib} from "../src/TokenLib.sol";
+   |         --------
+   |
+   = help: https://book.getfoundry.sh/reference/forge/forge-lint#unused-import
 note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
    --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:211:16
     |
@@ -2676,6 +2676,38 @@ note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
+note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/v1/Calls.sol:242:29
+    |
+242 |         bytes32 messageID = keccak256(abi.encodePacked(channelID, channel.outboundNonce));
+    |                             -------------------------------------------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
+note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:283:34
+    |
+283 |         bytes32 commitmentHash = keccak256(encodeCommitment(commitment));
+    |                                  ---------------------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
+note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:257:16
+    |
+257 |         return keccak256(encodedLeaf);
+    |                ----------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
+note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:158:28
+    |
+158 |         bytes32 leafHash = keccak256(abi.encode(message));
+    |                            ------------------------------
+    |
+    = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
 note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
   --> /home/runner/work/snowbridge/snowbridge/contracts/src/TokenLib.sol:76:26
    |
@@ -2703,10 +2735,10 @@ note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
 note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:283:34
+   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:422:28
     |
-283 |         bytes32 commitmentHash = keccak256(encodeCommitment(commitment));
-    |                                  ---------------------------------------
+422 |         bytes32 leafHash = keccak256(abi.encode(message));
+    |                            ------------------------------
     |
     = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
@@ -2718,22 +2750,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/v1/Calls.sol:242:29
-    |
-242 |         bytes32 messageID = keccak256(abi.encodePacked(channelID, channel.outboundNonce));
-    |                             -------------------------------------------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
-note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Gateway.sol:158:28
-    |
-158 |         bytes32 leafHash = keccak256(abi.encode(message));
-    |                            ------------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
 note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
    --> /home/runner/work/snowbridge/snowbridge/contracts/src/BeefyClient.sol:616:30
     |
@@ -2742,22 +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/Gateway.sol:422:28
-    |
-422 |         bytes32 leafHash = keccak256(abi.encode(message));
-    |                            ------------------------------
-    |
-    = help: https://book.getfoundry.sh/reference/forge/forge-lint#asm-keccak256
-note[asm-keccak256]: use of inefficient hashing mechanism; consider using inline assembly
-   --> /home/runner/work/snowbridge/snowbridge/contracts/src/Verification.sol:257:16
-    |
-257 |         return keccak256(encodedLeaf);
-    |                ----------------------
-    |
-    = 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