Changes following review

Author: area

.eslintrc

@@ -10,7 +10,7 @@
     "assert": true,
     "contract": true
   },
-  "settings" :{
+  "settings": {
     "import/resolver": {
       "typescript": {
         "project" : "./tsconfig.json"

helpers/test-helper.js

@@ -1369,6 +1369,24 @@ exports.deployCreateXIfNeeded = async function deployCreateXIfNeeded() {
   }
 };
 
+exports.evmChainIdToWormholeChainId = function evmChainIdToWormholeChainId(_chainId) {
+  let chainId = _chainId;
+  if (typeof chainId === "string") {
+    if (chainId.startsWith("0x")) {
+      chainId = parseInt(chainId, 16);
+    } else {
+      chainId = parseInt(chainId, 10);
+    }
+  }
+  if (chainId === FORKED_XDAI_CHAINID) {
+    return 10003;
+  }
+  if (chainId === FORKED_XDAI_CHAINID + 1) {
+    return 10002;
+  }
+  throw new Error("Unsupported chainId");
+};
+
 class TestAdapter {
   constructor() {
     this.outputs = [];

packages/package-utils/retryProvider.js renamed to packages/package-utils/RetryProvider.js

@@ -4,5 +4,5 @@ exports.DiscordAdapter = require("./adapters/discord");
 exports.SlackAdapter = require("./adapters/slack");
 exports.ConsoleAdapter = require("./adapters/console");
 exports.TruffleLoader = require("./TruffleLoader");
-exports.RetryProvider = require("./retryProvider");
+exports.RetryProvider = require("./RetryProvider");
 exports.ExtendedNonceManager = require("./ExtendedNonceManager");

packages/package-utils/index.js

@@ -12,7 +12,7 @@ import {
   SubscribeSignedVAARequest,
   SubscribeSignedVAAResponse,
 } from "../lib/wormhole/sdk/js-proto-node/src/spy/v1/spy";
-import { FORKED_XDAI_CHAINID } from "../helpers/constants";
+import { evmChainIdToWormholeChainId } from "../helpers/test-helper";
 
 // Random key
 
@@ -46,15 +46,15 @@ class MockGuardianSpy {
 
   foreignWormholeBridgeForColony: ethers.Contract;
 
-  skipCount: number = 0;
+  skipCount = 0;
 
   queue: QueueEntry[] = [];
 
   skipped: QueueEntry[] = [];
 
-  locked: boolean = false;
+  locked = false;
 
-  bridgingPromiseCount: number = 0;
+  bridgingPromiseCount = 0;
 
   resolveBridgingPromise: (tx: ethers.Transaction) => void;
 
@@ -204,14 +204,7 @@ class MockGuardianSpy {
       // So I've decreed that for chainId 256669100, we use 10003 (which is really arbitrum sepolia)
       // and for chainId 256669101, we use 10002 (which is really sepolia).
       // This isn't ideal, but it's the best solution I have for now
-      let wormholeChainId;
-      if (chainId === FORKED_XDAI_CHAINID) {
-        wormholeChainId = 10003;
-      } else if (chainId === FORKED_XDAI_CHAINID + 1) {
-        wormholeChainId = 10002;
-      } else {
-        throw new Error("Unsupported chainId");
-      }
+      const wormholeChainId = evmChainIdToWormholeChainId(chainId);
 
       if (this.skipCount > 0) {
         this.skipped.push([this.foreignWormholeBridgeForColony, sender, sequence, nonce, payload, consistencyLevel, wormholeChainId]);
@@ -228,14 +221,7 @@ class MockGuardianSpy {
       // So I've decreed that for chainId 256669100, we use 10003 (which is really arbitrum sepolia)
       // and for chainId 256669101, we use 10002 (which is really sepolia).
       // This isn't ideal, but it's the best solution I have for now
-      let wormholeChainId;
-      if (chainId === FORKED_XDAI_CHAINID) {
-        wormholeChainId = 10003;
-      } else if (chainId === FORKED_XDAI_CHAINID + 1) {
-        wormholeChainId = 10002;
-      } else {
-        throw new Error("Unsupported chainId");
-      }
+      const wormholeChainId = evmChainIdToWormholeChainId(chainId);
 
       if (this.skipCount > 0) {
         this.skipped.push([this.homeWormholeBridgeForColony, sender, sequence, nonce, payload, consistencyLevel, wormholeChainId]);

scripts/mockGuardianSpy.ts

@@ -34,7 +34,7 @@ const WormholeBridgeForColony = artifacts.require("WormholeBridgeForColony");
 const { setupBridging, deployBridge } = require("../../scripts/setup-bridging-contracts");
 
 const { MINING_CYCLE_DURATION, CHALLENGE_RESPONSE_WINDOW_DURATION, ROOT_ROLE, CURR_VERSION, CREATEX_ADDRESS } = require("../../helpers/constants");
-const { forwardTime, checkErrorRevertEthers, revert, snapshot } = require("../../helpers/test-helper");
+const { forwardTime, checkErrorRevertEthers, revert, snapshot, evmChainIdToWormholeChainId } = require("../../helpers/test-helper");
 const ReputationMinerTestWrapper = require("../../packages/reputation-miner/test/ReputationMinerTestWrapper");
 const { TruffleLoader } = require("../../packages/package-utils");
 
@@ -136,19 +136,11 @@ contract("Cross-chain", (accounts) => {
     // and for chainId 256669101, we use 10002 (which is really sepolia).
     // This isn't ideal, but it's the best solution I have for now
     homeChainId = await ethersHomeSigner.provider.send("eth_chainId", []);
-    if (homeChainId === "0xfd5c9ec") {
-      wormholeHomeChainId = 10003;
-    } else {
-      wormholeHomeChainId = 10002;
-    }
+    wormholeHomeChainId = evmChainIdToWormholeChainId(homeChainId);
 
     // const foreignNetworkId = await ethersForeignSigner.provider.send("net_version", []);
     foreignChainId = await ethersForeignSigner.provider.send("eth_chainId", []);
-    if (foreignChainId === "0xfd5c9ec") {
-      wormholeForeignChainId = 10003;
-    } else {
-      wormholeForeignChainId = 10002;
-    }
+    wormholeForeignChainId = evmChainIdToWormholeChainId(foreignChainId);
 
     // Deploy colonyNetwork to whichever chain truffle hasn't already deployed to.
     try {