Bump wormhole rust crates to v2.14.8, remove rent adjustment (#601)

drozdziak1 · web-flow · commit 8e11caa1ee46 · 2023-02-20T11:06:57.000+01:00
This change upgrades our wormhole dependency to the current latest
release. It introduces a fix in rent calculation logic, making Solitaire compatible with
PythNet. This lets us get rid of dedicated rent adjustment logic,
which we also remove in this change.
diff --git a/target_chains/cosmwasm/Cargo.lock b/target_chains/cosmwasm/Cargo.lock
diff --git a/target_chains/cosmwasm/Cargo.toml b/target_chains/cosmwasm/Cargo.toml
@@ -12,3 +12,6 @@ codegen-units = 1
 panic = 'abort'
 incremental = false
 overflow-checks = true
+
+[patch.crates-io]
+cw20-wrapped-2 = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.14.8"}
diff --git a/target_chains/cosmwasm/contracts/pyth/Cargo.toml b/target_chains/cosmwasm/contracts/pyth/Cargo.toml
@@ -20,7 +20,7 @@ schemars = "0.8.1"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 serde_derive = { version = "1.0.103"}
 terraswap = "2.4.0"
-wormhole-bridge-terra-2 = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.8.9", features = ["library"] }
+wormhole-bridge-terra-2 = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.14.8", features = ["library"] }
 thiserror = { version = "1.0.20" }
 k256 = { version = "0.9.4", default-features = false, features = ["ecdsa"] }
 sha3 = { version = "0.9.1", default-features = false }
diff --git a/tilt_devnet/docker_images/Dockerfile.solana b/tilt_devnet/docker_images/Dockerfile.solana
@@ -31,7 +31,7 @@ RUN cargo init --lib /tmp/decoy-crate && \
 
 WORKDIR /usr/src/bridge
 
-ARG WORMHOLE_REV=2.14.7
+ARG WORMHOLE_REV=2.14.8
 ADD https://github.com/wormhole-foundation/wormhole/archive/refs/tags/v${WORMHOLE_REV}.tar.gz .
 RUN tar -xvf v${WORMHOLE_REV}.tar.gz
 RUN mv wormhole-${WORMHOLE_REV} wormhole
diff --git a/wormhole_attester/Cargo.lock b/wormhole_attester/Cargo.lock
diff --git a/wormhole_attester/client/Cargo.toml b/wormhole_attester/client/Cargo.toml
@@ -21,7 +21,7 @@ borsh = "=0.9.3"
 clap = {version = "3.1.18", features = ["derive"]}
 env_logger = "0.8.4"
 log = "0.4.14"
-wormhole-bridge-solana = {git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.8.9"}
+wormhole-bridge-solana = {git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.14.8"}
 pyth-wormhole-attester = {path = "../program"}
 pyth-wormhole-attester-sdk = { path = "../sdk/rust", features=["solana"] }
 pyth-sdk-solana = "0.6.1"
@@ -32,7 +32,7 @@ solana-client = "=1.10.31"
 solana-program = "=1.10.31"
 solana-sdk = "=1.10.31"
 solana-transaction-status = "=1.10.31"
-solitaire = {git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.8.9"}
+solitaire = {git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.14.8"}
 tokio = {version = "1", features = ["sync", "rt-multi-thread", "time"]}
 futures = "0.3.21"
 sha3 = "0.10.6"
diff --git a/wormhole_attester/program/Cargo.toml b/wormhole_attester/program/Cargo.toml
@@ -15,9 +15,9 @@ trace = ["solitaire/trace", "wormhole-bridge-solana/trace"]
 no-entrypoint = []
 
 [dependencies]
-wormhole-bridge-solana = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.8.9" }
-solitaire = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.8.9"}
-rocksalt = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.8.9"}
+wormhole-bridge-solana = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.14.8" }
+solitaire = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.14.8"}
+rocksalt = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.14.8"}
 solana-program = "=1.10.31"
 borsh = "=0.9.3"
 pyth-client = "0.2.2"
diff --git a/wormhole_attester/program/src/attest.rs b/wormhole_attester/program/src/attest.rs
@@ -24,14 +24,9 @@ use {
     },
     solana_program::{
         clock::Clock,
-        program::{
-            invoke,
-            invoke_signed,
-        },
+        program::invoke_signed,
         program_error::ProgramError,
         rent::Rent,
-        system_instruction,
-        sysvar::Sysvar as SolanaSysvar,
     },
     solitaire::{
         trace,
@@ -368,42 +363,5 @@ pub fn attest(ctx: &ExecutionContext, accs: &mut Attest, data: AttestData) -> So
         .as_slice(),
     )?;
 
-    // NOTE: 2022-09-05
-    //
-    // This part is added to avoid rent exemption error that is introduced using
-    // a wrong implementation in solitaire
-    //
-    // This is done after the cross-contract call to get the proper account sizes
-    // and avoid breaking wormhole call.
-    //
-    // It can be removed once wormhole mitigates this problem and upgrades its contract
-
-    // Checking the message account balance
-    let wh_message_balance = accs.wh_message.info().lamports();
-    let wh_message_rent_exempt = Rent::get()?.minimum_balance(accs.wh_message.info().data_len());
-
-    if wh_message_balance < wh_message_rent_exempt {
-        let required_deposit = wh_message_rent_exempt - wh_message_balance;
-
-        let transfer_ix = system_instruction::transfer(
-            accs.payer.key,
-            accs.wh_message.info().key,
-            required_deposit,
-        );
-        invoke(&transfer_ix, ctx.accounts)?
-    }
-
-    // Checking the sequence account balance
-    let wh_sequence_balance = accs.wh_sequence.info().lamports();
-    let wh_sequence_rent_exempt = Rent::get()?.minimum_balance(accs.wh_sequence.data_len());
-
-    if wh_sequence_balance < wh_sequence_rent_exempt {
-        let required_deposit = wh_sequence_rent_exempt - wh_sequence_balance;
-
-        let transfer_ix =
-            system_instruction::transfer(accs.payer.key, accs.wh_sequence.key, required_deposit);
-        invoke(&transfer_ix, ctx.accounts)?
-    }
-
     Ok(())
 }
diff --git a/wormhole_attester/program/src/initialize.rs b/wormhole_attester/program/src/initialize.rs
@@ -3,12 +3,6 @@ use {
         P2WConfigAccount,
         Pyth2WormholeConfig,
     },
-    solana_program::{
-        program::invoke,
-        rent::Rent,
-        system_instruction,
-        sysvar::Sysvar,
-    },
     solitaire::{
         trace,
         AccountState,
@@ -41,21 +35,5 @@ pub fn initialize(
         .create(ctx, accs.payer.info().key, CreationLamports::Exempt)?;
     accs.new_config.1 = data;
 
-    // TODO(2022-09-05): Remove this rent collection after
-    // sysvar-based rent calculation becomes mainline in Solitaire.
-    let config_balance = accs.new_config.info().lamports();
-    let config_rent_exempt = Rent::get()?.minimum_balance(accs.new_config.info().data_len());
-
-    if config_balance < config_rent_exempt {
-        let required_deposit = config_rent_exempt - config_balance;
-
-        let transfer_ix = system_instruction::transfer(
-            accs.payer.key,
-            accs.new_config.info().key,
-            required_deposit,
-        );
-        invoke(&transfer_ix, ctx.accounts)?
-    }
-
     Ok(())
 }
diff --git a/wormhole_attester/program/src/migrate.rs b/wormhole_attester/program/src/migrate.rs
@@ -8,16 +8,11 @@ use {
         Pyth2WormholeConfig,
     },
     solana_program::{
-        program::invoke,
         program_error::ProgramError,
-        rent::Rent,
-        system_instruction,
         system_program,
-        sysvar::Sysvar,
     },
     solitaire::{
         trace,
-        AccountSize,
         AccountState,
         CreationLamports,
         ExecutionContext,
@@ -77,25 +72,6 @@ pub fn migrate(ctx: &ExecutionContext, accs: &mut Migrate, _data: ()) -> SoliRes
         .create(ctx, accs.payer.info().key, CreationLamports::Exempt)?;
     accs.new_config.1 = Pyth2WormholeConfig::from(old_config.clone());
 
-    // Adjust new config lamports
-    // NOTE(2022-09-29): Necessary due to PythNet rent calculation
-    // differences, remove when solitaire supports Rent::get()?
-    let acc_lamports = accs.new_config.info().lamports();
-
-    let new_lamports = Rent::get()?.minimum_balance(accs.new_config.size());
-
-    let diff_lamports: u64 = (acc_lamports as i64 - new_lamports as i64).unsigned_abs();
-
-    if acc_lamports < new_lamports {
-        // Less than enough lamports, debit the payer
-        let transfer_ix = system_instruction::transfer(
-            accs.payer.info().key,
-            accs.new_config.info().key,
-            diff_lamports,
-        );
-        invoke(&transfer_ix, ctx.accounts)?;
-    }
-
     // Reclaim old config lamports
 
     // Save current balance
diff --git a/wormhole_attester/sdk/rust/Cargo.toml b/wormhole_attester/sdk/rust/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pyth-wormhole-attester-sdk"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Wormhole Contributors <contact@certus.one>"]
 edition = "2018"
 description = "Pyth to Wormhole SDK"
@@ -17,7 +17,7 @@ hex = "0.4.3"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 pyth-sdk = {version = "0.5.0"}
 pyth-sdk-solana = { version = "0.5.0", optional = true }
-solitaire = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.8.9", optional = true}
+solitaire = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.14.8", optional = true}
 solana-program = { version = "=1.10.31", optional = true }
 
 [dev-dependencies]
