relayer: Fixes to get ready to merge (#3029)

* fixes

* remove sh bash changes

.github/workflows/generic-relayer-docker.yml

@@ -3,7 +3,7 @@ name: Publish generic relayer container image
 on:
   workflow_dispatch:
   push:
-    branches: ["generic-relayer-merge", "gr/re-app-docker-push"]
+    branches: ["main", "generic-relayer-merge", "gr/re-app-docker-push"]
   release:
     types: [published]
 

clients/js/src/cmds/generate.ts

@@ -85,9 +85,9 @@ export const builder = function (y: typeof yargs) {
             } as const)
         ,
         (argv) => {
-          let module = argv["module"];
-          assertChain(argv["chain"]);
-          let payload: PortalRegisterChain<typeof module> = {
+          const module = argv["module"];
+          assertChain(argv.chain);
+          const payload: PortalRegisterChain<typeof module> = {
             module,
             type: "RegisterChain",
             chain: 0,
@@ -128,9 +128,9 @@ export const builder = function (y: typeof yargs) {
               demandOption: true,
             } as const),
         (argv) => {
-          assertChain(argv["chain"]);
-          let module = argv["module"];
-          let payload: ContractUpgrade = {
+          assertChain(argv.chain);
+          const module = argv["module"];
+          const payload: ContractUpgrade = {
             module,
             type: "ContractUpgrade",
             chain: toChainId(argv.chain),
@@ -276,8 +276,8 @@ export const builder = function (y: typeof yargs) {
             })
         },
         (argv) => {
-          assertChain(argv["chain"]);
-          let payload: WormholeRelayerSetDefaultDeliveryProvider = {
+          assertChain(argv.chain);
+          const payload: WormholeRelayerSetDefaultDeliveryProvider = {
             module: "WormholeRelayer",
             type: "SetDefaultDeliveryProvider",
             chain: toChainId(argv["chain"]),

ethereum/package.json

@@ -21,7 +21,7 @@
   },
   "scripts": {
     "build:core": "truffle compile",
-    "build": "npm run build:core && forge build && typechain --target=ethers-v5 --out-dir=./ethers-contracts \"build-forge/!(test).sol/*.json\"&& npm run erase-types && echo 'TODO .. MAKE SURE THAT IT IS OKAY TO TYPECHAIN ON ONLY THE FORGE OUTPUT. DONT MERGE THIS YET'",
+    "build": "npm run build:core && forge build && typechain --target=ethers-v5 --out-dir=./ethers-contracts \"build-forge/!(test).sol/*.json\"&& npm run erase-types",
     "erase-types": "ts-node ./ts-scripts/relayer/eraseTypes.ts ./contracts/interfaces/relayer/IDeliveryProviderTyped.sol ./contracts/interfaces/relayer/IWormholeRelayerTyped.sol",
     "test": "npm run build:core && mkdir -p build/contracts && cp node_modules/@openzeppelin/contracts/build/contracts/* build/contracts/ && truffle test --network test --compile-none",
     "migrate": "npm run build:core && mkdir -p build/contracts && cp node_modules/@openzeppelin/contracts/build/contracts/* build/contracts/ && truffle migrate --to 4 --compile-none",

scripts/contract-upgrade-governance.sh

@@ -237,7 +237,7 @@ guardiand template token-bridge-upgrade-contract \\
   wormhole_relayer)
     echo "\
 guardiand template token-bridge-upgrade-contract \\
-  --chain-id $chain --module \"CoreRelayer\" \\
+  --chain-id $chain --module \"WormholeRelayer\" \\
   --new-address $address"
     ;;
   *) echo "unknown module $module" >&2

scripts/register-chain-governance.sh

@@ -36,7 +36,7 @@ Usage:
 
   where:
     -h  show this help text
-    -m  module (TokenBridge, NFTBridge, CoreRelayer)
+    -m  module (TokenBridge, NFTBridge, WormholeRelayer)
     -c  chain name
     -a  emitter address (optional, derived by worm CLI by default)
     -o  multi-mode output directory
@@ -124,10 +124,10 @@ guardiand template token-bridge-register-chain \\
   --chain-id $chain --module \"NFTBridge\" \\
   --new-address $address"
     ;;
-  CoreRelayer)
+  WormholeRelayer)
     echo "\
 guardiand template token-bridge-register-chain \\
-  --chain-id $chain --module \"CoreRelayer\" \\
+  --chain-id $chain --module \"WormholeRelayer\" \\
   --new-address $address"
     ;;
   *) echo "unknown module $module" >&2

sdk/js/src/rpc/getGovernorIsVAAEnqueuedWithRetry.ts

@@ -31,6 +31,5 @@ export async function getGovernorIsVAAEnqueuedWithRetry(
       }
     }
   }
-
   return result;
 }

sdk/js/tsconfig.json

@@ -10,7 +10,6 @@
     "downlevelIteration": true,
     "allowJs": true,
     "resolveJsonModule": true,
-    "forceConsistentCasingInFileNames": true,
     "lib": ["dom", "es5", "scripthost", "es2020.bigint"]
   },
   "include": ["src", "types"],