Guillermo Bescos 2 yıl önce
ebeveyn
işleme
e5ada91a64

+ 2 - 2
governance/remote_executor/Anchor.toml

@@ -4,11 +4,11 @@ seeds = false
 remote_executor = "Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS"
 
 [registry]
-url = "https://anchor.projectserum.com"
+url = "https://api.apr.dev"
 
 [provider]
 cluster = "localnet"
-wallet = "/Users/gbescos/.config/solana/id.json"
+wallet = "~/.config/solana/id.json"
 
 [scripts]
 test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

+ 3 - 0
governance/remote_executor/Cargo.toml

@@ -3,3 +3,6 @@ members = [
     "programs/*",
     "cli/"
 ]
+
+[profile.release]
+overflow-checks = true

+ 2 - 27
governance/remote_executor/cli/src/main.rs

@@ -43,10 +43,7 @@ use {
             Keypair,
         },
         signer::Signer,
-        system_instruction::{
-            self,
-            transfer,
-        },
+        system_instruction::{self,},
         transaction::Transaction,
     },
     std::str::FromStr,
@@ -91,31 +88,9 @@ fn main() -> Result<()> {
 
             let vaa = VAA::from_bytes(vaa_bytes.clone())?;
 
-            // RENT HACK STARTS HERE
-            let signature_set_size = 4 + 19 + 32 + 4;
-            let posted_vaa_size = 3 + 1 + 1 + 4 + 32 + 4 + 4 + 8 + 2 + 32 + 4 + vaa.payload.len();
+            // First verify VAA
             let posted_vaa_key = PostedVAA::key(&wormhole, vaa.digest().unwrap().hash);
 
-            process_transaction(
-                &rpc_client,
-                vec![
-                    transfer(
-                        &payer.pubkey(),
-                        &signature_set_keypair.pubkey(),
-                        rpc_client.get_minimum_balance_for_rent_exemption(signature_set_size)?,
-                    ),
-                    transfer(
-                        &payer.pubkey(),
-                        &posted_vaa_key,
-                        rpc_client.get_minimum_balance_for_rent_exemption(posted_vaa_size)?,
-                    ),
-                ],
-                &vec![&payer],
-            )?;
-
-            // RENT HACK ENDS HERE
-
-            // First verify VAA
             let verify_txs = verify_signatures_txs(
                 vaa_bytes.as_slice(),
                 guardian_set_data,

+ 0 - 3
governance/remote_executor/programs/remote-executor/Cargo.toml

@@ -16,9 +16,6 @@ cpi = ["no-entrypoint"]
 default = []
 pythtest = []
 
-[profile.release]
-overflow-checks = true
-
 [dependencies]
 anchor-lang = {version = "0.25.0", features = ["init-if-needed"]}
 wormhole-solana = { git = "https://github.com/guibescos/wormhole", branch = "reisen/sdk-solana"}

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

@@ -148,7 +148,7 @@ impl ExecutorBench {
     pub fn add_vaa_account(
         &mut self,
         emitter: &Pubkey,
-        instructions: &Vec<Instruction>,
+        instructions: &[Instruction],
         validity: VaaAttack,
     ) -> Pubkey {
         let emitter_chain: u16 = match validity {

+ 6 - 6
governance/remote_executor/programs/remote-executor/src/tests/test_adversarial.rs

@@ -39,7 +39,7 @@ async fn test_adversarial() {
     // Setup VAAs
     let vaa_account_valid = bench.add_vaa_account(
         &emitter,
-        &vec![transfer(
+        &[transfer(
             &executor_key,
             &receiver,
             Rent::default().minimum_balance(0),
@@ -48,7 +48,7 @@ async fn test_adversarial() {
     );
     let vaa_account_wrong_data = bench.add_vaa_account(
         &emitter,
-        &vec![transfer(
+        &[transfer(
             &executor_key,
             &receiver,
             Rent::default().minimum_balance(0),
@@ -57,7 +57,7 @@ async fn test_adversarial() {
     );
     let vaa_account_wrong_owner = bench.add_vaa_account(
         &emitter,
-        &vec![transfer(
+        &[transfer(
             &executor_key,
             &receiver,
             Rent::default().minimum_balance(0),
@@ -66,7 +66,7 @@ async fn test_adversarial() {
     );
     let vaa_account_wrong_emitter_chain = bench.add_vaa_account(
         &emitter,
-        &vec![transfer(
+        &[transfer(
             &executor_key,
             &receiver,
             Rent::default().minimum_balance(0),
@@ -76,7 +76,7 @@ async fn test_adversarial() {
 
     let vaa_account_wrong_vaa_magic = bench.add_vaa_account(
         &emitter,
-        &vec![transfer(
+        &[transfer(
             &executor_key,
             &receiver,
             Rent::default().minimum_balance(0),
@@ -86,7 +86,7 @@ async fn test_adversarial() {
 
     // The goal of this account is creating a claim_record that the attacker is going to try to use to impersonate
     // the right claim_record
-    let vaa_account_valid_2 = bench.add_vaa_account(&emitter_2, &vec![], VaaAttack::None);
+    let vaa_account_valid_2 = bench.add_vaa_account(&emitter_2, &[], VaaAttack::None);
 
     let mut sim = bench.start().await;
     sim.airdrop(&executor_key, LAMPORTS_PER_SOL).await.unwrap();

+ 3 - 5
governance/remote_executor/programs/remote-executor/src/tests/test_basic_instructions.rs

@@ -68,11 +68,9 @@ async fn test_basic_instructions() {
     );
 
     let vaa_account_create =
-        bench.add_vaa_account(&emitter, &vec![instruction1, instruction2], VaaAttack::None);
-    let vaa_account_transfer1 =
-        bench.add_vaa_account(&emitter, &vec![instruction3], VaaAttack::None);
-    let vaa_account_transfer2 =
-        bench.add_vaa_account(&emitter, &vec![instruction4], VaaAttack::None);
+        bench.add_vaa_account(&emitter, &[instruction1, instruction2], VaaAttack::None);
+    let vaa_account_transfer1 = bench.add_vaa_account(&emitter, &[instruction3], VaaAttack::None);
+    let vaa_account_transfer2 = bench.add_vaa_account(&emitter, &[instruction4], VaaAttack::None);
 
     let mut sim = bench.start().await;