Refactor interface

Anchor.toml

@@ -16,7 +16,7 @@ upgradeable = true
 
 [[test.genesis]]
 address = "ATqjh2vkjogyVUUNmXQssQZNSFGgSA7Tm6P1UzEUg85s"
-program = "lib/relayer-infra-contracts/src/solana/target/sbf-solana-solana/release/solana_price_oracle.so"
+program = "target/sbf-solana-solana/release/solana_price_oracle.so"
 
 # [[test.genesis]]
 # address = "worm2ZoG2kUd4vFXhvjh93UUH596ayRfgQ2MgjNMTth" # Mainnet in lib.rs

deployment/config/config.types.ts

@@ -19,7 +19,6 @@ export type BaseTbrV3Config = ChainConfig & {
 // TODO: in reality this should limit ChainConfig to only containing evm chain ids..
 export type EvmTbrV3Config = BaseTbrV3Config & {
   initGasErc20TokenizationIsExplicit: boolean;
-  txSizeSensitive: boolean;
 };
 
 // TODO: in reality this should limit ChainConfig to only containing solana chain ids..

deployment/config/localnet/tbr-v3.json

@@ -4,7 +4,6 @@
     "feeRecipient": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
     "initGasErc20TokenizationIsExplicit": false,
     "relayFee": 1,
-    "maxGasDropoff": 1,
-    "txSizeSensitive": false
+    "maxGasDropoff": 1
   }
 ]

deployment/config/testnet/tbr-v3.json

@@ -19,28 +19,24 @@
     "chainId": 10002,
     "initGasErc20TokenizationIsExplicit": true,
     "relayFee": 1,
-    "maxGasDropoff": 0.1,
-    "txSizeSensitive": false
+    "maxGasDropoff": 0.1
   },
   {
     "chainId": 10003,
     "initGasErc20TokenizationIsExplicit": true,
     "relayFee": 1000,
-    "maxGasDropoff": 0.1,
-    "txSizeSensitive": false
+    "maxGasDropoff": 0.1
   },
   {
     "chainId": 10004,
     "initGasErc20TokenizationIsExplicit": true,
     "relayFee": 1000,
-    "maxGasDropoff": 0.1,
-    "txSizeSensitive": false
+    "maxGasDropoff": 0.1
   },
   {
     "chainId": 10005,
     "initGasErc20TokenizationIsExplicit": true,
     "relayFee": 1000,
-    "maxGasDropoff": 0.1,
-    "txSizeSensitive": false
+    "maxGasDropoff": 0.1
   }
 ]

deployment/evm/configure-fee-and-dropoff.ts

@@ -1,75 +1,70 @@
 import {
-  contracts,
   evm,
   getChainConfig,
   getContractAddress,
   loadTbrPeers,
 } from "../helpers/index.js";
-import { chainIdToChain } from "@wormhole-foundation/sdk-base";
-import { SupportedChains, Tbrv3 } from "@xlabs-xyz/evm-arbitrary-token-transfers";
-import { ethers } from "ethers";
+import { chainIdToChain, encoding } from "@wormhole-foundation/sdk-base";
+import { SupportedChain, Tbrv3 } from "@xlabs-xyz/evm-arbitrary-token-transfers";
 import { EvmTbrV3Config } from "../config/config.types.js";
+import { EvmAddress } from "@wormhole-foundation/sdk-evm/dist/cjs";
+import { wrapEthersProvider } from "../helpers/evm.js";
 
 /**
  * Configures relay fee and max gas dropoff for Tbrv3 contracts
  */
 evm.runOnEvms("configure-fee-and-dropoff", async (chain, signer, log) => {
-  const tbrv3ProxyAddress = getContractAddress("TbrV3Proxies", chain.chainId);
-  const tbrv3 = new Tbrv3(signer.provider!, chain.network, tbrv3ProxyAddress);
+  const tbrv3ProxyAddress = new EvmAddress(getContractAddress("TbrV3Proxies", chain.chainId));
+  const tbrv3 = Tbrv3.connect(wrapEthersProvider(signer.provider!), chain.network, "Sepolia", tbrv3ProxyAddress);
   const peers = loadTbrPeers(chain);
 
-  const relayFeeUpdates: Map<SupportedChains, number> = new Map();
+  const queries = [];
   for (const otherTbrv3 of peers) {
-    const otherTbrv3Chain = chainIdToChain(otherTbrv3.chainId) as SupportedChains;
-    const peerChainCfg = await getChainConfig<EvmTbrV3Config>("tbr-v3", otherTbrv3.chainId);
-    const desiredRelayFee = Number(peerChainCfg.relayFee);
+    const otherTbrv3Chain = chainIdToChain(otherTbrv3.chainId) as SupportedChain;
 
-    const currentRelayFee = await tbrv3.relayFee(otherTbrv3Chain as SupportedChains);
-    if (currentRelayFee.fee !== desiredRelayFee) {
-      log(`Will updaterelay fee for ${otherTbrv3Chain}: ${peerChainCfg.maxGasDropoff}`);
-      relayFeeUpdates.set(otherTbrv3Chain, desiredRelayFee);
-    }
-  }  
+    queries.push({query: "BaseFee", chain: otherTbrv3Chain} as const);
+    queries.push({query: "MaxGasDropoff", chain: otherTbrv3Chain} as const);
+  }
 
-  if (relayFeeUpdates.size !== 0) {
-    log("Updating relay fee");
-    const partialTx = tbrv3.updateRelayFees(relayFeeUpdates);
-    const { error, receipt } = await evm.sendTx(signer, { ...partialTx, data: ethers.hexlify(partialTx.data) });
-    if (error) {
-      log("Error updating relay fee: ", error);
-      throw error;
-    }
-    if (receipt) {
-      log("Updated relay fee");
+  const configValues = await tbrv3.query([{query: "ConfigQueries", queries}]);
+
+  const currentState: Map<SupportedChain, {baseFee: number; maxGasDropoff: number}> = new Map(peers.map(({chainId}) => [
+    chainIdToChain(chainId) as SupportedChain,
+    {} as any
+  ]));
+  for (const config of configValues) {
+    const chainState = currentState.get(config.chain)!;
+    if (config.query === "BaseFee") {
+      chainState.baseFee = config.result;
+    } else {
+      chainState.maxGasDropoff = config.result;
     }
   }
 
-  const updateMaxGasDropoff: Map<SupportedChains, number> = new Map();
+  const commands = [];
   for (const otherTbrv3 of peers) {
-    const otherTbrv3Chain = chainIdToChain(otherTbrv3.chainId) as SupportedChains;
     const peerChainCfg = await getChainConfig<EvmTbrV3Config>("tbr-v3", otherTbrv3.chainId);
+    const desiredBaseFee = Number(peerChainCfg.relayFee);
     const desiredMaxGasDropoff = Number(peerChainCfg.maxGasDropoff);
-
-    const currentMaxGasDropoff = await tbrv3.maxGasDropoff(otherTbrv3Chain);
-    if (currentMaxGasDropoff !== desiredMaxGasDropoff) {
+    const otherTbrv3Chain = chainIdToChain(otherTbrv3.chainId) as SupportedChain;
+    const chainState = currentState.get(otherTbrv3Chain)!;
+    // schedule update
+    if (chainState.baseFee !== desiredBaseFee) {
+      log(`Will update base fee for ${otherTbrv3Chain}: ${peerChainCfg.maxGasDropoff}`);
+      commands.push({command: "UpdateBaseFee", chain: otherTbrv3Chain, value: desiredBaseFee} as const);
+    }
+    if (chainState.maxGasDropoff !== desiredMaxGasDropoff) {
       log(`Will update max gas dropoff for ${otherTbrv3Chain}: ${peerChainCfg.maxGasDropoff}`);
-      updateMaxGasDropoff.set(otherTbrv3Chain, desiredMaxGasDropoff);
+      commands.push({command: "UpdateMaxGasDropoff", chain: otherTbrv3Chain, value: desiredMaxGasDropoff} as const);
     }
   }
 
-  if (updateMaxGasDropoff.size !== 0) {
-    log("Updating max gas dropoff");
-    const partialTx = tbrv3.updateMaxGasDroppoffs(updateMaxGasDropoff);
-    const { error, receipt } = await evm.sendTx(signer, { ...partialTx, data: ethers.hexlify(partialTx.data) });
-    if (error) {
-      log("Error updating max gas dropoff: ", error);
-      throw error;
-    }
-    if (receipt) {
-      log("Updated max gas dropoff");
-    }
-  } else {
-    log("No max gas dropoff to update");
+  if (commands.length === 0) {
+    log("No updates to base fee or max gas dropoff are needed.");
+    return;
   }
-
+
+  const partialTx = tbrv3.execTx(0n, [{ command: "ConfigCommands", commands}]);
+  const { txid } = await evm.sendTx(signer, { ...partialTx, data: encoding.hex.encode(partialTx.data) });
+  log(`Update tx successful in ${txid}`);
 });

deployment/evm/deploy.ts

@@ -10,6 +10,7 @@ import { ethers } from "ethers";
 import { encoding } from "@wormhole-foundation/sdk-base";
 import { Tbr__factory, Proxy__factory } from "../ethers-contracts/index.js";
 import { getSigner } from "../helpers/evm";
+import { EvmAddress } from "@wormhole-foundation/sdk-evm/dist/cjs";
 
 
 const processName = "tbr-v3";
@@ -107,13 +108,17 @@ async function deployProxy(
 ) {
   console.log("deployRelayerProxy " + chain.chainId);
   const signer = await getSigner(chain);
-  const signerAddress = await signer.getAddress();
+  const signerAddress = new EvmAddress(await signer.getAddress());
   const { Tbrv3 } = await import("@xlabs-xyz/evm-arbitrary-token-transfers");
+  const owner = config.owner !== undefined ? new EvmAddress(config.owner) : signerAddress;
+  const admin = config.admin !== undefined ? new EvmAddress(config.admin) : signerAddress;
+  const feeRecipient = config.feeRecipient !== undefined ? new EvmAddress(config.feeRecipient) : signerAddress;
 
   const proxyConstructorArgs = Tbrv3.proxyConstructor(
-    config.owner || signerAddress,
-    config.admin || signerAddress,
-    config.feeRecipient || signerAddress,
+    owner,
+    // TODO: accept more admins in config
+    [admin],
+    feeRecipient,
   );
 
   const contractInterface = Proxy__factory.createInterface();

deployment/evm/read-configured-fee-and-dropoff.ts

@@ -1,35 +1,41 @@
 import {
-    contracts,
-    evm,
-    getContractAddress,
-  } from "../helpers/index.js";
-  import { chainIdToChain } from "@wormhole-foundation/sdk-base";
-  import { SupportedChains, Tbrv3 } from "@xlabs-xyz/evm-arbitrary-token-transfers";
+  evm,
+  getContractAddress,
+  loadTbrPeers,
+} from "../helpers/index.js";
+import { chainIdToChain } from "@wormhole-foundation/sdk-base";
+import { EvmAddress } from "@wormhole-foundation/sdk-evm/dist/cjs";
+import { SupportedChain, Tbrv3 } from "@xlabs-xyz/evm-arbitrary-token-transfers";
+import { wrapEthersProvider } from "../helpers/evm.js";
 
-  /**
-   * Reads the configured relay fee and max gas dropoff for Tbrv3 contracts
-   */
-  evm.runOnEvmsSequentially("read-configured-fee-and-dropoff", async (chain, signer, log) => {
-    console.log(`Operating chain: ${chain.name}`);
+/**
+ * Reads the configured relay fee and max gas dropoff for Tbrv3 contracts
+ */
+evm.runOnEvmsSequentially("read-configured-fee-and-dropoff", async (chain, signer, log) => {
+  console.log(`Operating chain: ${chain.name}`);
 
-    const tbrv3ProxyAddress = getContractAddress("TbrV3Proxies", chain.chainId);
-    const tbrv3 = new Tbrv3(signer.provider!, chain.network, tbrv3ProxyAddress);
-    const deployedTbrv3s = contracts["TbrV3Proxies"];
-
-    for (const otherTbrv3 of deployedTbrv3s){
-        const otherTbrv3Chain = chainIdToChain(otherTbrv3.chainId) as SupportedChains;
-        
-        const currentRelayFee = await tbrv3.relayFee(otherTbrv3Chain);
+  const tbrv3ProxyAddress = new EvmAddress(getContractAddress("TbrV3Proxies", chain.chainId));
+  const tbrv3 = Tbrv3.connect(
+    wrapEthersProvider(signer.provider!),
+    chain.network,
+    chainIdToChain(chain.chainId),
+    tbrv3ProxyAddress
+  );
+  const peers = loadTbrPeers(chain);
 
-        log(`Current relay fee for ${otherTbrv3Chain}: ${currentRelayFee.fee}`);
-    }
-
-    for (const otherTbrv3 of deployedTbrv3s) {
-      const otherTbrv3Chain = chainIdToChain(otherTbrv3.chainId) as SupportedChains;
-
-      const currentMaxGasDropoff = await tbrv3.maxGasDropoff(otherTbrv3Chain);
 
-      log(`Current max gas dropoff for ${otherTbrv3Chain}: ${currentMaxGasDropoff}`);
-      }
-  });
+  let queries = [];
+  for (const otherTbrv3 of peers) {
+    const otherTbrv3Chain = chainIdToChain(otherTbrv3.chainId) as SupportedChain;
+
+    queries.push({query: "BaseFee", chain: otherTbrv3Chain} as const);
+    queries.push({query: "MaxGasDropoff", chain: otherTbrv3Chain} as const);
+  }
+  const configValues = await tbrv3.query([{query: "ConfigQueries", queries}]);
+
+  for (const config of configValues) {
+    log(`Current ${config.query} for ${config.chain}: ${config.result}`);
+  }
+
+});
 

deployment/evm/register-peers.ts

@@ -3,72 +3,47 @@ import {
   getContractAddress,
   loadTbrPeers,
 } from "../helpers/index.js";
-import { UniversalAddress } from "@wormhole-foundation/sdk-definitions";
-import { SolanaAddress } from "@wormhole-foundation/sdk-solana";
-import { chainIdToChain } from "@wormhole-foundation/sdk-base";
-import { SupportedChains, Tbrv3 } from "@xlabs-xyz/evm-arbitrary-token-transfers";
-import { ethers } from "ethers";
+import { toUniversal } from "@wormhole-foundation/sdk-definitions";
+import { chainIdToChain, encoding } from "@wormhole-foundation/sdk-base";
+import { SupportedChain, Tbrv3 } from "@xlabs-xyz/evm-arbitrary-token-transfers";
+import { EvmAddress } from "@wormhole-foundation/sdk-evm";
+import { wrapEthersProvider } from "../helpers/evm.js";
 
 /**
  * Configure peers for Tbrv3 contracts:
- *  - Add all other Tbrv3 contracts as canonical peers
  *  - Add all other Tbrv3 contracts as peers
- *  
+ * If no peer is registered for a chain, it will be set as the canonical peer.
  */
 evm.runOnEvms("register-peers", async (chain, signer, log) => {
-  const tbrv3ProxyAddress = getContractAddress("TbrV3Proxies", chain.chainId);
-  const tbrv3 = new Tbrv3(signer.provider!, chain.network, tbrv3ProxyAddress);
-  const deployedTbrv3s = loadTbrPeers(chain)
-
-  const addPeersCmd: { chain: SupportedChains, peer: UniversalAddress }[] = [];
-  const updateCanonicalPeersCmd: Map<SupportedChains, UniversalAddress> = new Map();
-  for (const otherTbrv3 of deployedTbrv3s) {
-    const otherTbrv3Chain = chainIdToChain(otherTbrv3.chainId) as SupportedChains;
-    const peerAddress = (otherTbrv3Chain === "Solana" ?
-      new SolanaAddress(otherTbrv3.address).toUniversalAddress() :
-      new UniversalAddress(otherTbrv3.address)) as UniversalAddress;
-
-    const currentCanonicalPeer = await tbrv3.canonicalPeer(otherTbrv3Chain);
-    if (!currentCanonicalPeer.equals(peerAddress)) {
-      log(`Will update canonical peer: ${peerAddress} (${otherTbrv3.chainId})`);
-      updateCanonicalPeersCmd.set(otherTbrv3Chain, peerAddress);
-    }
-
-    const isPeer = updateCanonicalPeersCmd.get(otherTbrv3Chain)?.equals(peerAddress) || await tbrv3.isPeer(otherTbrv3Chain, peerAddress);
-    if (!isPeer) {
-      log(`Will add peer: ${peerAddress}(${otherTbrv3.chainId})`);
-      addPeersCmd.push({ chain: otherTbrv3Chain, peer: peerAddress });
-    }
-
+  const tbrv3ProxyAddress = new EvmAddress(getContractAddress("TbrV3Proxies", chain.chainId));
+  const tbrv3 = Tbrv3.connect(
+    wrapEthersProvider(signer.provider!),
+    chain.network,
+    chainIdToChain(chain.chainId),
+    tbrv3ProxyAddress
+  );
+  const peers = loadTbrPeers(chain);
+
+  const queries = [];
+  for (const otherTbrv3 of peers) {
+    const otherTbrv3Chain = chainIdToChain(otherTbrv3.chainId) as SupportedChain;
+    const peerAddress = toUniversal(otherTbrv3Chain, otherTbrv3.address);
+    queries.push({query: "IsPeer", chain: otherTbrv3Chain, address: peerAddress} as const);
   }
+  const isPeerResults = await tbrv3.query([{query: "ConfigQueries", queries}]);
 
-  if (updateCanonicalPeersCmd.size !== 0) {
-    log("updating canonical peers");
-    const partialTx = await tbrv3.updateCanonicalPeers(updateCanonicalPeersCmd);
-    const { error, receipt } = await evm.sendTx(signer, { ...partialTx, data: ethers.hexlify(partialTx.data) });
-    if (error) {
-      log("Error updating canonical peers: ", error);
-    }
-    if (receipt) {
-      log(`Updated canonical peers: ${updateCanonicalPeersCmd.size}`);
-    }
-  } else {
-    log("No canonical peers to update");
-  }
+  const commands = isPeerResults.filter(({result}) => !result)
+    .map(({result, query, ...rest}) => ({command: "AddPeer", ...rest} as const));
 
-  if (addPeersCmd.length !== 0) {
-    log("adding peers");
-    const partialTx = await tbrv3.addPeers(addPeersCmd);
-    const { error, receipt } = await evm.sendTx(signer, { ...partialTx, data: ethers.hexlify(partialTx.data) });
-    if (error) {
-      log("Error adding peers: ", error);
-    }
-    if (receipt) {
-      log(`Added peers: ${addPeersCmd.length}`);
-    }
-  } else {
-    log("No peers to add");
+  if (commands.length === 0) {
+    log("No new peers to add.");
+    return;
   }
 
-
+  for (const command of commands) {
+    log(`Will add peer: ${command.address} (${command.chain})`);
+  }
+  const partialTx = tbrv3.execTx(0n, [{ command: "ConfigCommands", commands}]);
+  const { txid } = await evm.sendTx(signer, { ...partialTx, data: encoding.hex.encode(partialTx.data) });
+  log(`Update tx successful in ${txid}`);
 });