Tests and fixes when core bridge messageFee is > 0 (wormhole-foundation#609)

* Set core bridge fee > 0 in sdk e2e and cli tests + fixes

* forge fmt

* delete typo

Author: fergarrui

cli/test/sepolia-bsc.sh

@@ -8,18 +8,52 @@ set -euox pipefail
 
 BSC_PORT=8545
 SEPOLIA_PORT=8546
-
-anvil --silent --rpc-url https://bsc-testnet-rpc.publicnode.com -p "$BSC_PORT" &
+BSC_RPC_URL=https://bsc-testnet-rpc.publicnode.com
+SEPOLIA_RPC_URL=wss://ethereum-sepolia-rpc.publicnode.com
+SEPOLIA_FORK_RPC_URL=http://127.0.0.1:$SEPOLIA_PORT
+BSC_FORK_RPC_URL=http://127.0.0.1:$BSC_PORT
+SEPOLIA_CORE_BRIDGE=0x4a8bc80Ed5a4067f1CCf107057b8270E0cC11A78
+BSC_CORE_BRIDGE=0x68605AD7b15c732a30b1BbC62BE8F2A509D74b4D
+
+anvil --silent --rpc-url $BSC_RPC_URL -p "$BSC_PORT" &
 pid1=$!
-anvil --silent --rpc-url wss://ethereum-sepolia-rpc.publicnode.com -p "$SEPOLIA_PORT" &
+anvil --silent --rpc-url $SEPOLIA_RPC_URL -p "$SEPOLIA_PORT" &
 pid2=$!
-
 # check both processes are running
 if ! kill -0 $pid1 || ! kill -0 $pid2; then
   echo "Failed to start the servers"
   exit 1
 fi
 
+# wait for RPC endpoints to be ready
+wait_for_rpc() {
+  local url=$1
+  local max_attempts=30
+  local attempt=1
+  
+  echo "Waiting for RPC endpoint $url to be ready..."
+  while [ $attempt -le $max_attempts ]; do
+    if curl -s -X POST "$url" \
+      -H "Content-Type: application/json" \
+      --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}' > /dev/null 2>&1; then
+      echo "RPC endpoint $url is ready"
+      return 0
+    fi
+    echo "Attempt $attempt/$max_attempts: RPC not ready yet, waiting..."
+    sleep 1
+    attempt=$((attempt + 1))
+  done
+  echo "RPC endpoint $url failed to become ready after $max_attempts attempts"
+  return 1
+}
+
+wait_for_rpc "$SEPOLIA_FORK_RPC_URL" || exit 1
+wait_for_rpc "$BSC_FORK_RPC_URL" || exit 1
+
+# setting core bridge fee to 0.001 (7 = `messageFee` storage slot)
+curl "$SEPOLIA_FORK_RPC_URL" -H "Content-Type: application/json" --data "{\"jsonrpc\":\"2.0\",\"method\":\"anvil_setStorageAt\",\"params\":[\"$SEPOLIA_CORE_BRIDGE\", 7 ,\"0x00000000000000000000000000000000000000000000000000038D7EA4C68000\"],\"id\":1}"
+curl "$BSC_FORK_RPC_URL" -H "Content-Type: application/json" --data "{\"jsonrpc\":\"2.0\",\"method\":\"anvil_setStorageAt\",\"params\":[\"$BSC_CORE_BRIDGE\", 7 ,\"0x00000000000000000000000000000000000000000000000000038D7EA4C68000\"],\"id\":1}"
+
 # create tmp directory
 dir=$(mktemp -d)
 
@@ -44,10 +78,10 @@ cat <<EOF > overrides.json
 {
   "chains": {
     "Bsc": {
-      "rpc": "http://127.0.0.1:$BSC_PORT"
+      "rpc": "$BSC_FORK_RPC_URL"
     },
     "Sepolia": {
-      "rpc": "http://127.0.0.1:$SEPOLIA_PORT"
+      "rpc": "$SEPOLIA_FORK_RPC_URL"
     }
   }
 }

evm/script/ConfigureWormholeNtt.s.sol

@@ -10,6 +10,8 @@ import "../src/interfaces/IOwnableUpgradeable.sol";
 
 import {ParseNttConfig} from "./helpers/ParseNttConfig.sol";
 import {WormholeTransceiver} from "../src/Transceiver/WormholeTransceiver/WormholeTransceiver.sol";
+import {WormholeTransceiverState} from
+    "../src/Transceiver/WormholeTransceiver/WormholeTransceiverState.sol";
 
 contract ConfigureWormholeNtt is ParseNttConfig {
     using stdJson for string;
@@ -42,9 +44,10 @@ contract ConfigureWormholeNtt is ParseNttConfig {
                     wormholeTransceiver.setIsSpecialRelayingEnabled(targetConfig.chainId, true);
                     console2.log("Special relaying enabled for chain", targetConfig.chainId);
                 }
-
+                uint256 messageFee =
+                    WormholeTransceiverState(address(wormholeTransceiver)).wormhole().messageFee();
                 // Set peer.
-                wormholeTransceiver.setWormholePeer(
+                wormholeTransceiver.setWormholePeer{value: messageFee}(
                     targetConfig.chainId, targetConfig.wormholeTransceiver
                 );
                 console2.log("Wormhole peer set for chain", targetConfig.chainId);

evm/script/helpers/DeployWormholeNttBase.sol

@@ -12,6 +12,10 @@ import {WormholeTransceiver} from
     "../../src/Transceiver/WormholeTransceiver/WormholeTransceiver.sol";
 import {ERC1967Proxy} from "openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 
+interface IWormhole {
+    function messageFee() external view returns (uint256);
+}
+
 contract DeployWormholeNttBase is ParseNttConfig {
     struct DeploymentParams {
         address token;
@@ -71,7 +75,10 @@ contract DeployWormholeNttBase is ParseNttConfig {
         WormholeTransceiver transceiverProxy =
             WormholeTransceiver(address(new ERC1967Proxy(address(implementation), "")));
 
-        transceiverProxy.initialize();
+        IWormhole wh = IWormhole(params.wormholeCoreBridge);
+        uint256 messageFee = wh.messageFee();
+        // wh transceiver sends a WH_TRANSCEIVER_INIT_PREFIX message
+        transceiverProxy.initialize{value: messageFee}();
 
         console2.log("WormholeTransceiver:", address(transceiverProxy));
 

evm/ts/src/ntt.ts

@@ -80,11 +80,20 @@ export class EvmNttWormholeTranceiver<N extends Network, C extends EvmChains>
   async *setPeer<P extends Chain>(
     peer: ChainAddress<P>
   ): AsyncGenerator<EvmUnsignedTransaction<N, C>> {
+    const coreBridge = new Contract(this.manager.contracts.coreBridge!, [
+        "function messageFee() public view returns (uint256)",
+      ],
+      this.manager.provider
+    )
+    const messageFee = await coreBridge.getFunction("messageFee").staticCall()
     const tx = await this.transceiver.setWormholePeer.populateTransaction(
       toChainId(peer.chain),
       universalAddress(peer)
     );
-    yield this.manager.createUnsignedTx(tx, "WormholeTransceiver.registerPeer");
+    yield this.manager.createUnsignedTx({
+      ...tx,
+      value: messageFee
+    }, "WormholeTransceiver.registerPeer");
   }
 
   async getPauser(): Promise<AccountAddress<C> | null> {

sdk/__tests__/index.test.ts

@@ -2,7 +2,8 @@ import { web3 } from "@coral-xyz/anchor";
 import { chainToPlatform } from "@wormhole-foundation/sdk-connect";
 
 import { registerRelayers } from "./accountant.js";
-import { Ctx, testHub } from "./utils.js";
+import { Ctx, setMessageFee, testHub } from "./utils.js";
+import { ethers } from "ethers";
 
 // Note: Currently, in order for this to run, the evm bindings with extra contracts must be build
 // To do that, at the root, run `npm run generate:test`
@@ -62,6 +63,11 @@ const makeGetNativeSigner =
 describe("Hub and Spoke Tests", function () {
   beforeAll(async () => {
     await registerRelayers(ACCT_MNEMONIC);
+    await setMessageFee(["Ethereum", "Bsc"], ethers.parseEther("0.001"));
+  });
+
+  afterAll(async () => {
+    await setMessageFee(["Ethereum", "Bsc"], 0n);
   });
 
   test("Test Solana and Ethereum Hubs", async () => {

sdk/__tests__/utils.ts

@@ -205,7 +205,7 @@ export async function link(chainInfos: Ctx[], accountantPrivateKey: string) {
     );
     vaas.push(serialize(vaa));
   }
-
+  
   // Submit all registrations at once
   await submitAccountantVAAs(vaas, accountantPrivateKey);
 }
@@ -240,6 +240,7 @@ export async function transferWithChecks(sourceCtx: Ctx, destinationCtx: Ctx) {
 
   console.log("Calling transfer on: ", sourceCtx.context.chain);
   const srcNtt = await getNtt(sourceCtx);
+
   const transferTxs = srcNtt.transfer(sender.address, srcAmt, receiver, {
     queue: false,
     automatic: useRelayer,
@@ -260,6 +261,8 @@ export async function transferWithChecks(sourceCtx: Ctx, destinationCtx: Ctx) {
   const [managerBalanceAfterRecv, userBalanceAfterRecv] =
     await getManagerAndUserBalance(destinationCtx);
 
+
+
   checkBalances(
     sourceCtx.mode,
     [managerBalanceBeforeSend, managerBalanceAfterSend],
@@ -459,7 +462,10 @@ async function deployEvm(ctx: Ctx): Promise<Ctx> {
   console.log("Initialize the manager");
   await tryAndWaitThrice(() => manager.initialize());
   console.log("Initialize the transceiver");
-  await tryAndWaitThrice(() => transceiver.initialize());
+  const coreFee = await (await ctx.context.getWormholeCore()).getMessageFee()
+  await tryAndWaitThrice(() => transceiver.initialize({
+    value: coreFee
+  }));
 
   // Setup the initial calls, like transceivers for the manager
   console.log("Set transceiver for manager");
@@ -728,6 +734,26 @@ async function tryAndWaitThrice(
   return null;
 }
 
+export async function setMessageFee(chains: Chain[], fee: bigint) {
+  console.log(`Setting message fee for ${chains} to ${fee}`)
+  for (const chain of chains) {
+    const chainCtx = wh.getChain(chain)
+    const core = await chainCtx.getWormholeCore()
+    const coreAddress = chainCtx.config.contracts.coreBridge
+    const existingFee = await core.getMessageFee()
+    console.log(`Existing core bridge fee for ${chain}: ${existingFee}`)
+    const rpc = await chainCtx.getRpc()
+    await rpc.send("anvil_setStorageAt", [
+      coreAddress,
+      7, // messageFee storage slot
+      ethers.zeroPadValue(ethers.toBeHex(fee), 32)
+    ]);
+  
+    const newFee = await core.getMessageFee()
+    console.log(`New core bridge fee for ${chain}: ${newFee}`)
+  }
+}
+
 export async function testHub(
   source: Chain,
   destinationA: Chain,