[remote-executor] Isolate wormhole-solana crate (#843)

* Point to another wormhole sdk

* Works

* Reset this dir

* Refresh cargo lock

* Bump solana

* Pin git packages

* Allow large errors

* Update to the right wormhole-solana

* Fix cli

* Add cargo lock

* Remove print statement

Author: guibescos

.github/workflows/remote-executor.yml

@@ -20,7 +20,7 @@ jobs:
           override: true
       - name: Install Solana
         run: |
-          sh -c "$(curl -sSfL https://release.solana.com/stable/install)"
+          sh -c "$(curl -sSfL https://release.solana.com/v1.14.18/install)"
           echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
       - name: Run executor tests
         run: cargo test-bpf --manifest-path ./governance/remote_executor/Cargo.toml

governance/remote_executor/Cargo.lock

@@ -6,3 +6,6 @@ members = [
 
 [profile.release]
 overflow-checks = true
+
+[patch.crates-io]
+serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.17.1" }

governance/remote_executor/Cargo.toml

@@ -13,6 +13,7 @@ anchor-client = "0.25.0"
 shellexpand = "2.1.2"
 anyhow = "1.0.65"
 base64 = "0.13.0"
-wormhole-solana = { git = "https://github.com/guibescos/wormhole", branch = "reisen/sdk-solana"}
-wormhole-core = { git = "https://github.com/guibescos/wormhole", branch = "reisen/sdk-solana"}
+wormhole-solana = { git = "https://github.com/guibescos/wormhole-solana", rev="f14b3b54c1e37e1aaf8c2ac2a5e236832ffdb3c2"}
+wormhole-sdk = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.17.1" }
+serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.17.1"}
 hex = "0.4.3"

governance/remote_executor/cli/Cargo.toml

@@ -1,4 +1,13 @@
 #![deny(warnings)]
+
+use {
+    serde_wormhole::RawMessage,
+    wormhole_sdk::vaa::{
+        Body,
+        Header,
+        Vaa,
+    },
+};
 pub mod cli;
 use {
     anchor_client::{
@@ -47,7 +56,6 @@ use {
         transaction::Transaction,
     },
     std::str::FromStr,
-    wormhole::VAA,
     wormhole_solana::{
         instructions::{
             post_message,
@@ -86,9 +94,10 @@ fn main() -> Result<()> {
 
             let signature_set_keypair = Keypair::new();
 
-            let vaa = VAA::from_bytes(vaa_bytes.clone())?;
+            let vaa: Vaa<&RawMessage> = serde_wormhole::from_slice(&vaa_bytes)?;
+            let (header, body): (Header, Body<&RawMessage>) = vaa.into();
 
-            let posted_vaa_key = PostedVAA::key(&wormhole, vaa.digest().unwrap().hash);
+            let posted_vaa_key = PostedVAA::key(&wormhole, body.digest().unwrap().hash);
 
             // First verify VAA
             let verify_txs = verify_signatures_txs(
@@ -106,15 +115,15 @@ fn main() -> Result<()> {
 
             // Post VAA
             let post_vaa_data = PostVAAData {
-                version:            vaa.version,
-                guardian_set_index: vaa.guardian_set_index,
-                timestamp:          vaa.timestamp,
-                nonce:              vaa.nonce,
-                emitter_chain:      vaa.emitter_chain.into(),
-                emitter_address:    vaa.emitter_address,
-                sequence:           vaa.sequence,
-                consistency_level:  vaa.consistency_level,
-                payload:            vaa.payload,
+                version:            header.version,
+                guardian_set_index: header.guardian_set_index,
+                timestamp:          body.timestamp,
+                nonce:              body.nonce,
+                emitter_chain:      body.emitter_chain.into(),
+                emitter_address:    body.emitter_address.0,
+                sequence:           body.sequence,
+                consistency_level:  body.consistency_level,
+                payload:            body.payload.to_vec(),
             };
 
             process_transaction(

governance/remote_executor/cli/src/main.rs

@@ -18,11 +18,13 @@ pythtest = []
 
 [dependencies]
 anchor-lang = {version = "0.25.0", features = ["init-if-needed"]}
-wormhole-solana = { git = "https://github.com/guibescos/wormhole", branch = "reisen/sdk-solana"}
-wormhole-core = { git = "https://github.com/guibescos/wormhole", branch = "reisen/sdk-solana"}
+wormhole-solana = { git = "https://github.com/guibescos/wormhole-solana", rev="f14b3b54c1e37e1aaf8c2ac2a5e236832ffdb3c2"}
+wormhole-sdk = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.17.1" }
+serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.17.1"}
 boolinator = "2.4.0"
 
 [dev-dependencies]
+
 solana-program-test = "=1.10.31"
 tokio = "1.14.1"
 solana-sdk = "=1.10.31"

governance/remote_executor/programs/remote-executor/Cargo.toml

@@ -1,5 +1,6 @@
 #![deny(warnings)]
 #![allow(clippy::result_unit_err)]
+#![allow(clippy::result_large_err)]
 
 use {
     anchor_lang::{
@@ -12,7 +13,7 @@ use {
         claim_record::ClaimRecord,
         posted_vaa::AnchorVaa,
     },
-    wormhole::Chain::{
+    wormhole_sdk::Chain::{
         self,
         Solana,
     },

governance/remote_executor/programs/remote-executor/src/lib.rs

@@ -10,7 +10,7 @@ use {
         mem::size_of,
         ops::Deref,
     },
-    wormhole::Chain,
+    wormhole_sdk::Chain,
 };
 
 pub const MAGIC_NUMBER: u32 = 0x4d475450; // Reverse order of the solidity contract because borsh uses little endian numbers (the solidity contract uses 0x5054474d)

governance/remote_executor/programs/remote-executor/src/state/governance_payload.rs

@@ -31,7 +31,6 @@ use {
         ToAccountMetas,
     },
     solana_program_test::{
-        find_file,
         read_file,
         BanksClient,
         BanksClientError,
@@ -54,8 +53,11 @@ use {
             TransactionError,
         },
     },
-    std::collections::HashMap,
-    wormhole::Chain,
+    std::{
+        collections::HashMap,
+        path::Path,
+    },
+    wormhole_sdk::Chain,
     wormhole_solana::VAA,
 };
 
@@ -81,9 +83,12 @@ pub enum VaaAttack {
 impl ExecutorBench {
     /// Deploys the executor program as upgradable
     pub fn new() -> ExecutorBench {
-        let mut bpf_data = read_file(find_file("remote_executor.so").unwrap_or_else(|| {
-            panic!("Unable to locate {}", "remote_executor.so");
-        }));
+        let mut bpf_data = read_file(
+            std::env::current_dir()
+                .unwrap()
+                .join(Path::new("../../target/deploy/remote_executor.so")),
+        );
+
 
         let mut program_test = ProgramTest::default();
         let program_key = crate::id();

governance/remote_executor/programs/remote-executor/src/tests/executor_simulator.rs

@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.66.1"