solana: Update ntt_transceiver program to use Wormhole shims (#663)

This PR is based on this transceiver prototype commit: 66940fe.

This PR adds:
* Update `ntt_transceiver` program as described in [this comment](#663 (comment))
* Update `SolanaNtt` and `SolanaNttWormholeTransceiver` classes as described in [this comment](#663 (comment))
* Add program binaries and IDLs for interacting with the shim programs
* Add `TestWormholePostMessageShim` utility helper class to help re-build the message from event/instruction data
* Fix Cargo, Anchor, and Tilt test errors
* Update IDL

Author: nvsriram

Tiltfile

@@ -2,7 +2,7 @@ load('ext://namespace', 'namespace_create', 'namespace_inject')
 load('ext://git_resource', 'git_checkout')
 
 git_checkout('https://github.com/wormhole-foundation/wormhole.git#main', '.wormhole/', unsafe_mode=True)
-local(['sed','-i.bak','s/{chainId: vaa.ChainIDEthereum, addr: "000000000000000000000000855FA758c77D68a04990E992aA4dcdeF899F654A"},/{chainId: vaa.ChainIDEthereum, addr: "000000000000000000000000855FA758c77D68a04990E992aA4dcdeF899F654A"},{chainId: vaa.ChainIDSolana, addr: "8bf0b547c96edc5c1d512ca25c5c1d1812a180438a0046e511d1fb61561d5cdf"},{chainId: vaa.ChainIDSolana, addr: "0a490691c21334ca173d9ce386e2a86774ce173f351db10d5d0cccc5c4875376"},{chainId: vaa.ChainIDEthereum, addr: "0000000000000000000000006f84742680311cef5ba42bc10a71a4708b4561d1"},{chainId: vaa.ChainIDEthereum, addr: "0000000000000000000000009ba423008e530c4d464da15f0c9652942216f019"},{chainId: vaa.ChainIDBSC, addr: "0000000000000000000000006f84742680311cef5ba42bc10a71a4708b4561d1"},{chainId: vaa.ChainIDBSC, addr: "000000000000000000000000baac7efcddde498b0b791eda92d43b20f5cd8ff6"},/g', '.wormhole/node/pkg/accountant/ntt_config.go'])
+local(['sed','-i.bak','s/{chainId: vaa.ChainIDEthereum, addr: "000000000000000000000000855FA758c77D68a04990E992aA4dcdeF899F654A"},/{chainId: vaa.ChainIDEthereum, addr: "000000000000000000000000855FA758c77D68a04990E992aA4dcdeF899F654A"},{chainId: vaa.ChainIDSolana, addr: "253e5fcb56de6013759d1bbed9c2b0940b7a556b9333957d37be63d9ba096dd3"},{chainId: vaa.ChainIDSolana, addr: "739c49640a801d835bae7c77b64f1c6403c1665e443b87bb4147c75187750830"},{chainId: vaa.ChainIDEthereum, addr: "0000000000000000000000006f84742680311cef5ba42bc10a71a4708b4561d1"},{chainId: vaa.ChainIDEthereum, addr: "0000000000000000000000009ba423008e530c4d464da15f0c9652942216f019"},{chainId: vaa.ChainIDBSC, addr: "0000000000000000000000006f84742680311cef5ba42bc10a71a4708b4561d1"},{chainId: vaa.ChainIDBSC, addr: "000000000000000000000000baac7efcddde498b0b791eda92d43b20f5cd8ff6"},/g', '.wormhole/node/pkg/accountant/ntt_config.go'])
 
 load(".wormhole/Tiltfile", "namespace", "k8s_yaml_with_ns")
 

sdk/__tests__/utils.ts

@@ -119,11 +119,18 @@ export async function link(chainInfos: Ctx[], accountantPrivateKey: string) {
   const hub = chainInfos[0]!;
   const hubChain = hub.context.chain;
 
+  // handle Solana emitter account case separately
+  const whTransceiver =
+    chainToPlatform(hubChain) === "Solana"
+      ? NTT.transceiverPdas(hub.contracts!.transceiver["wormhole"]!)
+          .emitterAccount()
+          .toString()
+      : hub.contracts!.transceiver["wormhole"]!;
   const msgId: WormholeMessageId = {
     chain: hubChain,
     emitter: Wormhole.chainAddress(
       hubChain,
-      hub.contracts!.transceiver["wormhole"]!
+      whTransceiver
     ).address.toUniversalAddress(),
     sequence: 0n,
   };
@@ -495,7 +502,8 @@ async function deploySolana(ctx: Ctx): Promise<Ctx> {
   console.log(`Using public key: ${address}`);
 
   const signature = await connection.requestAirdrop(address, 1000000000000);
-  await connection.confirmTransaction(signature);
+  const latestBlockhash = await connection.getLatestBlockhash();
+  await connection.confirmTransaction({ ...latestBlockhash, signature });
   console.log(`Airdropped 1000 SOL`);
 
   const mint = await spl.createMint(connection, keypair, address, null, 9);
@@ -519,14 +527,16 @@ async function deploySolana(ctx: Ctx): Promise<Ctx> {
     ctx.mode === "locking"
       ? "NTTManager222222222222222222222222222222222"
       : "NTTManager111111111111111111111111111111111";
+  const transceiverProgramId =
+    ctx.mode === "locking"
+      ? "NTTTransceiver22222222222222222222222222222"
+      : "NTTTransceiver11111111111111111111111111111";
 
   ctx.contracts = {
     token: mint.toBase58(),
     manager: managerProgramId,
     transceiver: {
-      wormhole: NTT.transceiverPdas(managerProgramId)
-        .emitterAccount()
-        .toString(),
+      wormhole: transceiverProgramId,
     },
   };
 
@@ -577,13 +587,16 @@ async function deploySolana(ctx: Ctx): Promise<Ctx> {
     console.log("Registered transceiver with self");
   }
 
+  const whTransceiver = await manager.getWormholeTransceiver();
+  if (!whTransceiver) {
+    throw new Error("Wormhole transceiver not found");
+  }
+
   return {
     ...ctx,
     contracts: {
       transceiver: {
-        wormhole: NTT.transceiverPdas(manager.program.programId)
-          .emitterAccount()
-          .toString(),
+        wormhole: whTransceiver.programId.toString(),
       },
       manager: manager.program.programId.toString(),
       token: mint.toString(),
@@ -600,7 +613,11 @@ async function setupPeer(targetCtx: Ctx, peerCtx: Ctx) {
   } = peerCtx.contracts!;
 
   const peerManager = Wormhole.chainAddress(peer.chain, manager);
-  const peerTransceiver = Wormhole.chainAddress(peer.chain, transceiver!);
+  const whTransceiver =
+    chainToPlatform(peer.chain) === "Solana"
+      ? NTT.transceiverPdas(transceiver!).emitterAccount().toString()
+      : transceiver!;
+  const peerTransceiver = Wormhole.chainAddress(peer.chain, whTransceiver);
 
   const tokenDecimals = target.config.nativeTokenDecimals;
   const inboundLimit = amount.units(amount.parse("1000", tokenDecimals));

solana/Anchor.toml

@@ -32,6 +32,14 @@ upgradeable = true
 address = "worm2ZoG2kUd4vFXhvjh93UUH596ayRfgQ2MgjNMTth"
 program = "programs/example-native-token-transfers/tests/fixtures/mainnet_core_bridge.so"
 
+[[test.genesis]]
+address = "EtZMZM22ViKMo4r5y4Anovs3wKQ2owUmDpjygnMMcdEX"
+program = "programs/example-native-token-transfers/tests/fixtures/mainnet_wormhole_post_message_shim.so"
+
+[[test.genesis]]
+address = "EFaNWErqAtVWufdNb7yofSHHfWFos843DFpu4JBw24at"
+program = "programs/example-native-token-transfers/tests/fixtures/mainnet_wormhole_verify_vaa_shim.so"
+
 [test.validator]
 bind_address = "0.0.0.0"
 url = "https://api.mainnet-beta.solana.com"

solana/Cargo.lock

@@ -54,7 +54,7 @@ solana-address-lookup-table-program = "=1.18.26"
 spl-token = "4.0.0"
 spl-token-2022 = "3.0.2"
 
-wormhole-anchor-sdk = { version = "0.29.0-alpha.1", default-features = false }
+wormhole-anchor-sdk = { git = "https://github.com/wormholelabs-xyz/wormhole-scaffolding", branch = "solana/anchor-0.29.0", default-features = false }
 wormhole-sdk = { git = "https://github.com/wormhole-foundation/wormhole", rev = "eee4641" }
 serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", rev = "eee4641" }
 

solana/Cargo.toml

@@ -22,13 +22,16 @@ RUN --mount=type=cache,target=/opt/solana/deps/target,id=build_anchor_ntt_target
 
 RUN cp ./target/sbf-solana-solana/release/example_native_token_transfers.so /opt/solana/deps/example_native_token_transfers.so
 RUN cp ./target/sbf-solana-solana/release/wormhole_governance.so /opt/solana/deps/wormhole_governance.so
+RUN cp ./target/sbf-solana-solana/release/ntt_transceiver.so /opt/solana/deps/ntt_transceiver.so
 
 RUN --mount=type=cache,target=/opt/solana/deps/target,id=build_anchor_ntt_target \
     --mount=type=cache,target=/usr/local/cargo/registry,id=cargo_registry \
     --mount=type=cache,target=.anchor,id=anchor_cache \
     anchor build --arch sbf -- --no-default-features --features tilt-devnet2
 
 RUN cp ./target/sbf-solana-solana/release/example_native_token_transfers.so /opt/solana/deps/example_native_token_transfers_2.so
+RUN cp ./target/sbf-solana-solana/release/ntt_transceiver.so /opt/solana/deps/ntt_transceiver_2.so
+
 
 COPY solana/tilt /opt/solana/deps
 

solana/Dockerfile

@@ -16,12 +16,13 @@ no-log-ix-name = []
 cpi = ["no-entrypoint"]
 idl-build = [
   "anchor-lang/idl-build",
-  "anchor-spl/idl-build"
+  "anchor-spl/idl-build",
 ]
 # cargo-test-sbf will pass this along
 test-sbf = []
 # networks
 mainnet = [ "wormhole-anchor-sdk/mainnet" ]
+bridge-address-from-env = [ "wormhole-anchor-sdk/bridge-address-from-env" ]
 solana-devnet = [ "wormhole-anchor-sdk/solana-devnet" ]
 tilt-devnet = [ "wormhole-anchor-sdk/tilt-devnet" ]
 tilt-devnet2 = [ "tilt-devnet" ]

solana/programs/example-native-token-transfers/Cargo.toml

@@ -73,7 +73,7 @@ async fn test_reregister_all_transceivers() {
     // Transceivers are expected to be executable which requires them to be added on setup
     // Thus, we pass all available executable program IDs as dummy_transceivers
     let dummy_transceivers = vec![
-        wormhole_anchor_sdk::wormhole::program::ID,
+        wormhole_anchor_sdk::wormhole::program::Wormhole::id(),
         wormhole_governance::ID,
     ];
     let num_dummy_transceivers: u8 = dummy_transceivers.len().try_into().unwrap();

solana/programs/example-native-token-transfers/tests/admin.rs

@@ -128,7 +128,7 @@ pub async fn setup_programs(program_owner: Pubkey) -> Result<ProgramTest, Error>
     add_program_upgradeable(
         &mut program_test,
         "mainnet_core_bridge",
-        wormhole_anchor_sdk::wormhole::program::ID,
+        wormhole_anchor_sdk::wormhole::program::Wormhole::id(),
         None,
     );