Works

Author: guibescos

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

@@ -14,5 +14,6 @@ shellexpand = "2.1.2"
 anyhow = "1.0.65"
 base64 = "0.13.0"
 wormhole-solana = { git = "https://github.com/guibescos/wormhole-solana"}
-wormhole-core = { git = "https://github.com/guibescos/wormhole-solana"}
+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,12 @@
 #![deny(warnings)]
+
+use {
+    serde_wormhole::RawMessage,
+    wormhole_sdk::{
+        vaa::digest,
+        Vaa,
+    },
+};
 pub mod cli;
 use {
     anchor_client::{
@@ -47,7 +55,6 @@ use {
         transaction::Transaction,
     },
     std::str::FromStr,
-    wormhole::VAA,
     wormhole_solana::{
         instructions::{
             post_message,
@@ -86,7 +93,7 @@ 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 posted_vaa_key = PostedVAA::key(&wormhole, vaa.digest().unwrap().hash);
 
@@ -111,10 +118,10 @@ fn main() -> Result<()> {
                 timestamp:          vaa.timestamp,
                 nonce:              vaa.nonce,
                 emitter_chain:      vaa.emitter_chain.into(),
-                emitter_address:    vaa.emitter_address,
+                emitter_address:    vaa.emitter_address.0,
                 sequence:           vaa.sequence,
                 consistency_level:  vaa.consistency_level,
-                payload:            vaa.payload,
+                payload:            vaa.payload.to_vec(),
             };
 
             process_transaction(

governance/remote_executor/cli/src/main.rs

@@ -19,10 +19,12 @@ pythtest = []
 [dependencies]
 anchor-lang = {version = "0.25.0", features = ["init-if-needed"]}
 wormhole-solana = { git = "https://github.com/guibescos/wormhole-solana"}
-wormhole-core = { git = "https://github.com/guibescos/wormhole-solana"}
+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

@@ -12,7 +12,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

@@ -12,5 +12,5 @@ solana-client = "1.10.31"
 anchor-client = "0.26.0"
 clap = {version ="3.2.22", features = ["derive"]}
 pyth-solana-receiver = {path = "../programs/solana-receiver"}
-wormhole-core = { git = "https://github.com/guibescos/wormhole", branch = "reisen/sdk-solana"}
-wormhole-solana = { git = "https://github.com/guibescos/wormhole", branch = "reisen/sdk-solana"}
+wormhole-core = { git = "https://github.com/guibescos/wormhole-solana"}
+wormhole-solana = { git = "https://github.com/guibescos/wormhole-solana"}