Update Solana to 1.9.4

Change-Id: I9c1ce5f25b21ca81599957a7faa730558d8fc03e

Dockerfile.client

@@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -yq libssl-dev libudev-dev pkg-config zlib
 RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs
 RUN curl -sSfL https://release.solana.com/v1.8.1/install | sh
 
-RUN rustup default nightly-2021-08-01
+RUN rustup default nightly-2022-01-02
 RUN rustup component add rustfmt
 
 RUN --mount=type=cache,target=/root/.cache \

sdk/rust/sdk/Cargo.toml

@@ -31,13 +31,13 @@ opt-level = 3
 lto       = "thin"
 
 [dependencies]
-borsh           = { version="0.8.1" }
+borsh           = { version="=0.9.1" }
 nom             = { version="7", default-features=false, features=["alloc"] }
 primitive-types = { version = "0.9.0", default-features = false }
 wormhole-core   = { path="../core", version="0.1.0" }
 
 # Solana Specific
-solana-program = { version="1.7.0", optional=true }
+solana-program = { version="=1.9.4", optional=true }
 
 # Terra Specific
 cosmwasm-std     = { version = "0.16.0", optional=true }

solana/Dockerfile

@@ -12,9 +12,9 @@ RUN apt-get update && \
     && \
     rm -rf /var/lib/apt/lists/* && \
     rustup component add rustfmt && \
-    rustup default nightly-2021-08-01
+    rustup default nightly-2022-01-02
 
-RUN sh -c "$(curl -sSfL https://release.solana.com/v1.8.1/install)"
+RUN sh -c "$(curl -sSfL https://release.solana.com/v1.9.4/install)"
 
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
 

solana/Dockerfile.wasm

@@ -3,7 +3,7 @@ FROM docker.io/library/rust:1.49@sha256:a50165ea96983c21832578afb1c8c028674c965b
 
 RUN apt-get update && apt-get install -y libssl-dev libudev-dev pkg-config zlib1g-dev llvm clang
 RUN rustup component add rustfmt
-RUN rustup default nightly-2021-08-01
+RUN rustup default nightly-2022-01-02
 
 WORKDIR /usr/src/bridge
 

solana/bridge/client/Cargo.toml

@@ -6,17 +6,17 @@ edition = "2018"
 
 [dependencies]
 anyhow = "1.0.40"
-borsh = "0.8.1"
+borsh = "=0.9.1"
 clap = "2.33.0"
 cpi-poster = { path = "../cpi_poster", features = ["no-entrypoint"] }
 hex = "0.4.3"
 rand = "0.7.3"
 shellexpand = "2.1.0"
-solana-clap-utils = "=1.7.0"
-solana-cli-config = "=1.7.0"
-solana-client = "=1.7.0"
-solana-program = "=1.7.0"
-solana-sdk = "=1.7.0"
-wormhole-bridge-solana = { path = "../program", features = ["client"] }
-solitaire-client = { path = "../../solitaire/client" }
+solana-client = "=1.9.4"
+solana-program = "=1.9.4"
+solana-sdk = "=1.9.4"
+solana-cli-config = "=1.9.4"
+solana-clap-utils = "=1.9.4"
 solitaire = { path = "../../solitaire/program" }
+solitaire-client = { path = "../../solitaire/client" }
+wormhole-bridge-solana = { path = "../program", features = ["client"] }

solana/bridge/client/src/main.rs

@@ -1,4 +1,5 @@
-#![feature(const_generics)]
+
+#![feature(adt_const_params)]
 #![allow(warnings)]
 
 use std::{
@@ -417,6 +418,7 @@ fn main() {
                         skip_preflight: true,
                         preflight_commitment: None,
                         encoding: None,
+                        max_retries: None,
                     },
                 )?;
             println!("Signature: {}", signature);

solana/bridge/cpi_poster/Cargo.toml

@@ -16,11 +16,11 @@ no-entrypoint = ["solitaire/no-entrypoint"]
 trace = ["solitaire/trace"]
 
 [dependencies]
-borsh = "0.8.1"
+borsh = "=0.9.1"
 byteorder = "1.4.3"
 primitive-types = { version = "0.9.0", default-features = false }
 sha3 = "0.9.1"
-solana-program = "=1.7.0"
+solana-program = "=1.9.4"
 wormhole-bridge-solana = { path = "../program", features = ["no-entrypoint"] }
 solitaire-client = { path = "../../solitaire/client", optional = true }
 solitaire = { path = "../../solitaire/program" }
@@ -30,5 +30,5 @@ hex = "*"
 rand = "0.7.3"
 hex-literal = "0.3.1"
 libsecp256k1 = { version = "0.3.5", features = [] }
-solana-client = "1.7.0"
-solana-sdk = "=1.7.0"
+solana-client = "=1.9.4"
+solana-sdk = "=1.9.4"

solana/bridge/cpi_poster/src/lib.rs

@@ -1,4 +1,5 @@
-#![feature(const_generics)]
+
+#![feature(adt_const_params)]
 #![allow(non_upper_case_globals)]
 #![allow(incomplete_features)]
 

solana/bridge/program/Cargo.toml

@@ -17,12 +17,12 @@ no-entrypoint = ["solitaire/no-entrypoint"]
 trace = ["solitaire/trace"]
 
 [dependencies]
-borsh = "0.8.1"
+borsh = "=0.9.1"
 byteorder = "1.4.3"
 primitive-types = { version = "0.9.0", default-features = false }
 serde = { version = "1.0", features = ["derive"] }
 sha3 = "0.9.1"
-solana-program = "=1.7.0"
+solana-program = "=1.9.4"
 solitaire-client = { path = "../../solitaire/client", optional = true }
 solitaire = { path = "../../solitaire/program" }
 wasm-bindgen = { version = "0.2.74", features = ["serde-serialize"], optional = true }
@@ -32,5 +32,5 @@ hex = "*"
 rand = "0.7.3"
 hex-literal = "0.3.1"
 libsecp256k1 = { version = "0.3.5", features = [] }
-solana-client = "1.7.0"
-solana-sdk = "=1.7.0"
+solana-client = "=1.9.4"
+solana-sdk = "=1.9.4"

solana/bridge/program/src/api/verify_signature.rs

@@ -1,15 +1,15 @@
 use solitaire::*;
 
 use crate::{
-    GuardianSet,
-    GuardianSetDerivationData,
-    SignatureSet,
     error::Error::{
         GuardianSetMismatch,
         InstructionAtWrongIndex,
         InvalidHash,
         InvalidSecpInstruction,
     },
+    GuardianSet,
+    GuardianSetDerivationData,
+    SignatureSet,
     MAX_LEN_GUARDIAN_KEYS,
 };
 use byteorder::ByteOrder;
@@ -89,18 +89,18 @@ pub fn verify_signatures(
         })
         .collect();
 
-    let current_instruction = solana_program::sysvar::instructions::load_current_index(
-        &accs.instruction_acc.try_borrow_mut_data()?,
-    );
+    let current_instruction = solana_program::sysvar::instructions::load_current_index_checked(
+        &accs.instruction_acc,
+    )?;
     if current_instruction == 0 {
         return Err(InstructionAtWrongIndex.into());
     }
 
     // The previous ix must be a secp verification instruction
     let secp_ix_index = (current_instruction - 1) as u8;
-    let secp_ix = solana_program::sysvar::instructions::load_instruction_at(
+    let secp_ix = solana_program::sysvar::instructions::load_instruction_at_checked(
         secp_ix_index as usize,
-        &accs.instruction_acc.try_borrow_mut_data()?,
+        &accs.instruction_acc,
     )
     .map_err(|_| ProgramError::InvalidAccountData)?;
 

solana/bridge/program/src/lib.rs

@@ -1,4 +1,5 @@
-#![feature(const_generics)]
+
+#![feature(adt_const_params)]
 #![allow(non_upper_case_globals)]
 #![allow(incomplete_features)]
 

solana/bridge/program_stub/Cargo.toml

@@ -16,11 +16,11 @@ no-entrypoint = ["solitaire/no-entrypoint"]
 trace = ["solitaire/trace"]
 
 [dependencies]
-borsh = "0.8.1"
+borsh = "=0.9.1"
 byteorder = "1.4.3"
 primitive-types = { version = "0.9.0", default-features = false }
 sha3 = "0.9.1"
-solana-program = "=1.7.0"
+solana-program = "=1.9.4"
 solitaire-client = { path = "../../solitaire/client", optional = true }
 solitaire = { path = "../../solitaire/program" }
 wormhole-bridge-solana = { path = "../program", features = ["no-entrypoint"] }
@@ -30,5 +30,5 @@ hex = "*"
 rand = "0.7.3"
 hex-literal = "0.3.1"
 libsecp256k1 = { version = "0.3.5", features = [] }
-solana-client = "1.7.0"
-solana-sdk = "=1.7.0"
+solana-client = "=1.9.4"
+solana-sdk = "=1.9.4"

solana/bridge/program_stub/src/lib.rs

@@ -1,4 +1,5 @@
-#![feature(const_generics)]
+
+#![feature(adt_const_params)]
 #![allow(non_upper_case_globals)]
 #![allow(incomplete_features)]
 

solana/migration/Cargo.toml

@@ -17,13 +17,13 @@ cpi = ["no-entrypoint"]
 default = []
 
 [dependencies]
-borsh = "0.8.1"
+borsh = "=0.9.1"
 byteorder = "1.4.3"
 rocksalt = { path = "../solitaire/rocksalt" }
 solitaire = { path = "../solitaire/program" }
 sha3 = "0.9.1"
 solana-program = "*"
-spl-token = { version = "=3.1.0", features = ["no-entrypoint"] }
+spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
 solitaire-client = { path = "../solitaire/client", optional = true }
 wasm-bindgen = { version = "0.2.74", features = ["serde-serialize"], optional = true }
 serde = { version = "1.0", features = ["derive"] }
@@ -33,9 +33,9 @@ rand = { version = "0.7.3", optional = true }
 hex = "*"
 hex-literal = "0.3.1"
 libsecp256k1 = { version = "0.3.5", features = [] }
-solana-client = "1.7.0"
-solana-sdk = "=1.7.0"
-spl-token = { version = "=3.1.0", features = ["no-entrypoint"] }
+solana-client = "=1.9.4"
+solana-sdk = "=1.9.4"
+spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
 
 [patch.crates-io]
 memmap2 = { path = "../bridge/memmap2-rs" }

solana/migration/src/lib.rs

@@ -1,5 +1,6 @@
 #![allow(incomplete_features)]
-#![feature(const_generics)]
+
+#![feature(adt_const_params)]
 
 use api::{
     add_liquidity::*,

solana/modules/nft_bridge/program/Cargo.toml

@@ -18,14 +18,14 @@ default = []
 
 [dependencies]
 wormhole-bridge-solana = { path = "../../../bridge/program", features = ["no-entrypoint", "cpi"] }
-borsh = "0.8.1"
+borsh = "=0.9.1"
 bstr = "0.2.16"
 byteorder = "1.4.3"
 rocksalt = { path = "../../../solitaire/rocksalt" }
 solitaire = { path = "../../../solitaire/program" }
 sha3 = "0.9.1"
 solana-program = "*"
-spl-token = { version = "=3.1.0", features = ["no-entrypoint"] }
+spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
 spl-associated-token-account = { version = "1.0.2" }
 primitive-types = { version = "0.9.0", default-features = false }
 solitaire-client = { path = "../../../solitaire/client", optional = true }
@@ -38,7 +38,7 @@ rand = { version = "0.7.3", optional = true }
 hex = "*"
 hex-literal = "0.3.1"
 libsecp256k1 = { version = "0.3.5", features = [] }
-solana-client = "1.7.0"
-solana-sdk = "=1.7.0"
-spl-token = { version = "=3.1.0", features = ["no-entrypoint"] }
+solana-client = "=1.9.4"
+solana-sdk = "=1.9.4"
+spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
 spl-token-metadata = { path = "../../token_bridge/token-metadata" }

solana/modules/nft_bridge/program/src/lib.rs

@@ -1,4 +1,5 @@
-#![feature(const_generics)]
+
+#![feature(adt_const_params)]
 #![allow(incomplete_features)]
 #![deny(unused_must_use)]
 // #![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]

solana/modules/token_bridge/client/Cargo.toml

@@ -5,17 +5,17 @@ edition = "2018"
 
 [dependencies]
 anyhow = "1.0.40"
-borsh = "0.8.1"
+borsh = "=0.9.1"
 token-bridge = { path = "../program", features = ["client"] }
 clap = "2.33.0"
 rand = "0.7.3"
 shellexpand = "2.1.0"
-solana-client = "=1.7.0"
-solana-program = "=1.7.0"
-solana-sdk = "=1.7.0"
-solana-cli-config = "=1.7.0"
+solana-client = "=1.9.4"
+solana-program = "=1.9.4"
+solana-sdk = "=1.9.4"
+solana-cli-config = "=1.9.4"
 solitaire = { path = "../../../solitaire/program" }
 solitaire-client = { path = "../../../solitaire/client" }
-solana-clap-utils = "=1.7.0"
+solana-clap-utils = "=1.9.4"
 hex = "0.4.3"
 spl-token-metadata = { path = "../token-metadata" }

solana/modules/token_bridge/client/src/main.rs

@@ -1,4 +1,5 @@
-#![feature(const_generics)]
+
+#![feature(adt_const_params)]
 #![allow(warnings)]
 
 use std::{
@@ -363,6 +364,7 @@ fn main() {
                         skip_preflight: true,
                         preflight_commitment: None,
                         encoding: None,
+                        max_retries: None,
                     },
                 )?;
             println!("Signature: {}", signature);

solana/modules/token_bridge/program/Cargo.toml

@@ -18,14 +18,14 @@ default = []
 
 [dependencies]
 wormhole-bridge-solana = { path = "../../../bridge/program", features = ["no-entrypoint", "cpi"] }
-borsh = "0.8.1"
+borsh = "=0.9.1"
 bstr = "0.2.16"
 byteorder = "1.4.3"
 rocksalt = { path = "../../../solitaire/rocksalt" }
 solitaire = { path = "../../../solitaire/program" }
 sha3 = "0.9.1"
 solana-program = "*"
-spl-token = { version = "=3.1.0", features = ["no-entrypoint"] }
+spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
 primitive-types = { version = "0.9.0", default-features = false }
 solitaire-client = { path = "../../../solitaire/client", optional = true }
 spl-token-metadata = { path = "../token-metadata" }
@@ -37,7 +37,7 @@ rand = { version = "0.7.3", optional = true }
 hex = "*"
 hex-literal = "0.3.1"
 libsecp256k1 = { version = "0.3.5", features = [] }
-solana-client = "1.7.0"
-solana-sdk = "=1.7.0"
-spl-token = { version = "=3.1.0", features = ["no-entrypoint"] }
+solana-client = "=1.9.4"
+solana-sdk = "=1.9.4"
+spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
 spl-token-metadata = { path = "../token-metadata" }

solana/modules/token_bridge/program/src/lib.rs

@@ -1,4 +1,5 @@
-#![feature(const_generics)]
+
+#![feature(adt_const_params)]
 #![deny(unused_must_use)]
 
 // #![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]

solana/modules/token_bridge/token-metadata/Cargo.toml

@@ -15,6 +15,6 @@ no-entrypoint = []
 test-bpf = []
 
 [dependencies]
-borsh = "0.8.1"
-solana-program = "1.7.0"
-spl-token = { version = "=3.1.0", features = ["no-entrypoint"] }
+borsh = "=0.9.1"
+solana-program = "=1.9.4"
+spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }

solana/pyth2wormhole/client/Cargo.toml

@@ -9,16 +9,16 @@ edition = "2018"
 default = ["pyth2wormhole/client", "wormhole-bridge-solana/client"]
 
 [dependencies]
-borsh = "0.8.1"
+borsh = "=0.9.1"
 clap = "3.0.0-beta.2" # This beta assimilates structopt into clap
 env_logger = "0.8.4"
 log = "0.4.14"
 wormhole-bridge-solana = {path = "../../bridge/program"}
 pyth2wormhole = {path = "../program"}
 shellexpand = "2.1.0"
-solana-client = "=1.7.0"
-solana-program = "=1.7.0"
-solana-sdk = "=1.7.0"
-solana-transaction-status = "=1.7.0"
+solana-client = "=1.9.4"
+solana-program = "=1.9.4"
+solana-sdk = "=1.9.4"
+solana-transaction-status = "=1.9.4"
 solitaire-client = {path = "../../solitaire/client"}
 solitaire = {path = "../../solitaire/program"}

solana/pyth2wormhole/program/Cargo.toml

@@ -20,8 +20,8 @@ wormhole-bridge-solana = {path = "../../bridge/program"}
 solitaire = { path = "../../solitaire/program" }
 solitaire-client = { path = "../../solitaire/client", optional = true }
 rocksalt = { path = "../../solitaire/rocksalt" }
-solana-program = "=1.7.0"
-borsh = "0.8.1"
+solana-program = "=1.9.4"
+borsh = "=0.9.1"
 # NOTE: We're following bleeding edge to encounter format changes more easily
 pyth-client = {git = "https://github.com/pyth-network/pyth-client-rs", branch = "v2"}
 # Crates needed for easier wasm data passing

solana/pyth2wormhole/program/src/lib.rs

@@ -1,4 +1,5 @@
-#![feature(const_generics)]
+
+#![feature(adt_const_params)]
 pub mod attest;
 pub mod config;
 pub mod initialize;

solana/solitaire/client/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-solana-sdk = "=1.7.0"
-solana-program = "=1.7.0"
+solana-sdk = "=1.9.4"
+solana-program = "=1.9.4"
 solitaire = {path = "../program", features = ["no-entrypoint"]}
-borsh = "0.8.1"
+borsh = "=0.9.1"

solana/solitaire/client/src/lib.rs

@@ -1,4 +1,5 @@
-#![feature(const_generics)]
+
+#![feature(adt_const_params)]
 #![feature(const_generics_defaults)]
 #![allow(warnings)]
 

solana/solitaire/program/Cargo.toml

@@ -16,9 +16,9 @@ no-entrypoint = []
 trace = []
 
 [dependencies]
-borsh = "0.8.1"
+borsh = "=0.9.1"
 byteorder = "1.4.3"
 rocksalt = { path = "../../solitaire/rocksalt" }
 
 sha3 = "0.9.1"
-solana-program = "=1.7.0"
+solana-program = "=1.9.4"

solana/solitaire/program/src/lib.rs

@@ -1,4 +1,5 @@
-#![feature(const_generics)]
+
+#![feature(adt_const_params)]
 #![allow(warnings)]
 
 pub use rocksalt::*;

solana/solitaire/rocksalt/Cargo.toml

@@ -17,5 +17,5 @@ byteorder = "1.4.3"
 proc-macro2 = "1.0"
 quote = "1.0"
 sha3 = "0.9.1"
-solana-program = "=1.7.0"
+solana-program = "=1.9.4"
 syn = "1.0"