Uses batch update to configure `RelayProvider` contract.

ethereum/ts-scripts/relayProvider/configureRelayProvider.ts

@@ -1,14 +1,18 @@
-import type { ChainId } from "@certusone/wormhole-sdk"
+import { ChainId, tryNativeToHexString } from "@certusone/wormhole-sdk"
 import type { BigNumberish } from "ethers"
 import {
   init,
   loadChains,
   ChainInfo,
   loadScriptConfig,
+  getCoreRelayerAddress,
   getRelayProvider,
+  getRelayProviderAddress,
 } from "../helpers/env"
 import { wait } from "../helpers/utils"
 
+import type { RelayProviderStructs } from "../../../sdk/src"
+
 /**
  * Meant for `config.pricingInfo`
  */
@@ -44,8 +48,19 @@ async function run() {
 
 async function configureChainsRelayProvider(chain: ChainInfo) {
   console.log("about to perform configurations for chain " + chain.chainId)
-
   const relayProvider = getRelayProvider(chain)
+  const coreRelayer = getCoreRelayerAddress(chain)
+
+  for (const remoteChain of chains) {
+    console.log(`Cross registering with chain ${remoteChain.chainId}...`)
+    const targetChainProviderAddress = getRelayProviderAddress(remoteChain)
+    const remoteRelayProvider =
+      "0x" + tryNativeToHexString(targetChainProviderAddress, "ethereum")
+    await relayProvider
+      .updateDeliveryAddress(remoteChain.chainId, remoteRelayProvider)
+      .then(wait)
+  }
+
   const thisChainsConfigInfo = config.addresses.find(
     (x: any) => x.chainId == chain.chainId
   )
@@ -60,47 +75,68 @@ async function configureChainsRelayProvider(chain: ChainInfo) {
     throw new Error("Failed to find approvedSenders info for chain " + chain.chainId)
   }
 
-  console.log("Set address info...")
-  await relayProvider.updateRewardAddress(thisChainsConfigInfo.rewardAddress).then(wait)
-  for (const { address, approved } of thisChainsConfigInfo.approvedSenders) {
-    console.log(`Setting approved sender: ${address}, approved: ${approved}`)
-    await relayProvider.updateApprovedSender(address, approved).then(wait)
+  const coreConfig: RelayProviderStructs.CoreConfigStruct = {
+    updateCoreRelayer: true,
+    updateRewardAddress: true,
+    coreRelayer,
+    rewardAddress: thisChainsConfigInfo.rewardAddress,
   }
+  const senderUpdates: RelayProviderStructs.SenderApprovalUpdateStruct[] =
+    thisChainsConfigInfo.approvedSenders.map(
+      ({ address, approved }: { address: any; approved: any }) => {
+        return {
+          sender: address,
+          approved,
+        }
+      }
+    )
+  const updates: RelayProviderStructs.UpdateStruct[] = []
 
   console.log("Set gas and native prices...")
 
   // Batch update prices
-  const pricingUpdates: UpdatePrice[] = (config.pricingInfo as PricingInfo[]).map((info) => {
-    return {
-      chainId: info.chainId,
-      gasPrice: info.updatePriceGas,
-      nativeCurrencyPrice: info.updatePriceNative,
+  const pricingUpdates: UpdatePrice[] = (config.pricingInfo as PricingInfo[]).map(
+    (info) => {
+      return {
+        chainId: info.chainId,
+        gasPrice: info.updatePriceGas,
+        nativeCurrencyPrice: info.updatePriceNative,
+      }
     }
-  })
+  )
   await relayProvider.updatePrices(pricingUpdates).then(wait)
 
   // Set the rest of the relay provider configuration
   for (const targetChain of chains) {
-    const targetChainPriceUpdate = config.pricingInfo.find(
+    const targetChainPriceUpdate = (config.pricingInfo as PricingInfo[]).find(
       (x: any) => x.chainId == targetChain.chainId
     )
     if (!targetChainPriceUpdate) {
       throw new Error("Failed to find pricingInfo for chain " + targetChain.chainId)
     }
-    //delivery addresses are not done by this script, but rather the register chains script.
-    await relayProvider
-      .updateDeliverGasOverhead(
-        targetChain.chainId,
-        targetChainPriceUpdate.deliverGasOverhead
-      )
-      .then(wait)
-    await relayProvider
-      .updateMaximumBudget(targetChain.chainId, targetChainPriceUpdate.maximumBudget)
-      .then(wait)
-    await relayProvider
-      .updateAssetConversionBuffer(targetChain.chainId, 5, 100)
-      .then(wait)
+    const targetChainProviderAddress = getRelayProviderAddress(targetChain)
+    const remoteRelayProvider =
+      "0x" + tryNativeToHexString(targetChainProviderAddress, "ethereum")
+    const update = {
+      chainId: targetChain.chainId,
+      updateAssetConversionBuffer: true,
+      updateWormholeFee: false,
+      updateDeliverGasOverhead: true,
+      updatePrice: true,
+      updateDeliveryAddress: true,
+      updateMaximumBudget: true,
+      buffer: 5,
+      bufferDenominator: 100,
+      newWormholeFee: 0,
+      newGasOverhead: targetChainPriceUpdate.deliverGasOverhead,
+      gasPrice: targetChainPriceUpdate.updatePriceGas,
+      nativeCurrencyPrice: targetChainPriceUpdate.updatePriceNative,
+      deliveryAddress: remoteRelayProvider,
+      maximumTotalBudget: targetChainPriceUpdate.maximumBudget,
+    }
+    updates.push(update)
   }
+  await relayProvider.updateConfig(updates, senderUpdates, coreConfig).then(wait)
 
   console.log("done with registrations on " + chain.chainId)
 }

ethereum/ts-scripts/relayProvider/registerChainsRelayProvider.ts

@@ -1,43 +0,0 @@
-import { tryNativeToHexString } from "@certusone/wormhole-sdk"
-
-import {
-  init,
-  loadChains,
-  ChainInfo,
-  getCoreRelayerAddress,
-  getRelayProvider,
-  getRelayProviderAddress,
-} from "../helpers/env"
-import { wait } from "../helpers/utils"
-
-const processName = "registerChainsRelayProvider"
-init()
-const chains = loadChains()
-
-async function run() {
-  console.log("Start! " + processName)
-
-  for (let i = 0; i < chains.length; i++) {
-    await registerChainsRelayProvider(chains[i])
-  }
-}
-
-async function registerChainsRelayProvider(chain: ChainInfo) {
-  console.log("about to perform registrations for chain " + chain.chainId)
-
-  const relayProvider = getRelayProvider(chain)
-  const coreRelayerAddress = getCoreRelayerAddress(chain)
-
-  await relayProvider.updateCoreRelayer(coreRelayerAddress).then(wait)
-
-  for (let i = 0; i < chains.length; i++) {
-    console.log(`Cross registering with chain ${chains[i].chainId}...`)
-    const targetChainProviderAddress = getRelayProviderAddress(chains[i])
-    const whAddress = "0x" + tryNativeToHexString(targetChainProviderAddress, "ethereum")
-    await relayProvider.updateDeliveryAddress(chains[i].chainId, whAddress).then(wait)
-  }
-
-  console.log("done with registrations on " + chain.chainId)
-}
-
-run().then(() => console.log("Done! " + processName))

ethereum/ts-scripts/shell/deployConfigureTest.sh

@@ -1,7 +1,6 @@
 ts-node ./ts-scripts/config/checkNetworks.ts \
   && ts-node ./ts-scripts/relayProvider/deployRelayProvider.ts \
   && ts-node ./ts-scripts/coreRelayer/deployCoreRelayer.ts \
-  && ts-node ./ts-scripts/relayProvider/registerChainsRelayProvider.ts \
   && ts-node ./ts-scripts/coreRelayer/registerChainsCoreRelayerSelfSign.ts \
   && ts-node ./ts-scripts/relayProvider/configureRelayProvider.ts \
   && ts-node ./ts-scripts/mockIntegration/deployMockIntegration.ts \

relayer_engine/pkgs/sdk/src/index.ts

@@ -4,7 +4,7 @@ export type { MockRelayerIntegration } from "./ethers-contracts/MockRelayerInteg
 export { MockRelayerIntegration__factory } from "./ethers-contracts/factories/MockRelayerIntegration__factory"
 export type { IWormhole, LogMessagePublishedEvent } from "./ethers-contracts/IWormhole"
 export { IWormhole__factory } from "./ethers-contracts/factories/IWormhole__factory"
-export type { RelayProvider } from "./ethers-contracts/RelayProvider"
+export type { RelayProvider, RelayProviderStructs } from "./ethers-contracts/RelayProvider"
 export { RelayProvider__factory } from "./ethers-contracts/factories/RelayProvider__factory"
 export type {IDelivery} from "./ethers-contracts/IDelivery"
 export type {IWormholeRelayer} from "./ethers-contracts/IWormholeRelayer"

sdk/src/index.ts

@@ -4,7 +4,7 @@ export type { MockRelayerIntegration } from "./ethers-contracts/MockRelayerInteg
 export { MockRelayerIntegration__factory } from "./ethers-contracts/factories/MockRelayerIntegration__factory"
 export type { IWormhole, LogMessagePublishedEvent } from "./ethers-contracts/IWormhole"
 export { IWormhole__factory } from "./ethers-contracts/factories/IWormhole__factory"
-export type { RelayProvider } from "./ethers-contracts/RelayProvider"
+export type { RelayProvider, RelayProviderStructs } from "./ethers-contracts/RelayProvider"
 export { RelayProvider__factory } from "./ethers-contracts/factories/RelayProvider__factory"
 export type {IDelivery} from "./ethers-contracts/IDelivery"
 export type {IWormholeRelayer} from "./ethers-contracts/IWormholeRelayer"