Use 1.8.14 instead and fix compute

solendprotocol · Feb 10, 2022 · 78028d5 · 78028d5
1 parent 7160c00
commit 78028d5
Show file tree

Hide file tree

Showing 11 changed files with 751 additions and 482 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ci/solana-version.sh b/ci/solana-version.sh
@@ -14,7 +14,7 @@
 if [[ -n $SOLANA_VERSION ]]; then
   solana_version="$SOLANA_VERSION"
 else
-  solana_version=v1.9.5
+  solana_version=v1.8.14
 fi
 
 export solana_version="$solana_version"

diff --git a/token-lending/cli/Cargo.toml b/token-lending/cli/Cargo.toml
@@ -10,12 +10,12 @@ version = "0.1.0"
 
 [dependencies]
 clap = "=2.34.0"
-solana-clap-utils = "=1.9.5"
-solana-cli-config = "=1.9.5"
-solana-client = "=1.9.5"
-solana-logger = "=1.9.5"
-solana-sdk = "=1.9.5"
-solana-program = "=1.9.5"
+solana-clap-utils = "=1.8.14"
+solana-cli-config = "=1.8.14"
+solana-client = "=1.8.14"
+solana-logger = "=1.8.14"
+solana-sdk = "=1.8.14"
+solana-program = "=1.8.14"
 spl-token-lending = { path="../program", features = [ "no-entrypoint" ] }
 spl-token = { version = "3.2.0", features=["no-entrypoint"] }
 

diff --git a/token-lending/program/Cargo.toml b/token-lending/program/Cargo.toml
@@ -16,7 +16,7 @@ arrayref = "0.3.6"
 bytemuck = "1.5.1"
 num-derive = "0.3"
 num-traits = "0.2"
-solana-program = "=1.9.5"
+solana-program = "=1.8.14"
 spl-token = { version = "3.2.0", features=["no-entrypoint"] }
 switchboard-program = "0.2.0"
 thiserror = "1.0"
@@ -27,8 +27,8 @@ assert_matches = "1.5.0"
 base64 = "0.13"
 log = "0.4.14"
 proptest = "1.0"
-solana-program-test = "=1.9.5"
-solana-sdk = "=1.9.5"
+solana-program-test = "=1.8.14"
+solana-sdk = "=1.8.14"
 serde = "1.0"
 serde_yaml = "0.8"
 

diff --git a/token-lending/program/tests/borrow_obligation_liquidity.rs b/token-lending/program/tests/borrow_obligation_liquidity.rs
@@ -28,7 +28,7 @@ async fn test_borrow_usdc_fixed_amount() {
     );
 
     // limit to track compute unit increase
-    test.set_bpf_compute_max_units(45_000);
+    test.set_bpf_compute_max_units(50_000);
 
     const USDC_TOTAL_BORROW_FRACTIONAL: u64 = 1_000 * FRACTIONAL_TO_USDC;
     const FEE_AMOUNT: u64 = 100;
@@ -172,7 +172,7 @@ async fn test_borrow_sol_max_amount() {
     );
 
     // limit to track compute unit increase
-    test.set_bpf_compute_max_units(45_000);
+    test.set_bpf_compute_max_units(52_000);
 
     const FEE_AMOUNT: u64 = 5000;
     const HOST_FEE_AMOUNT: u64 = 1000;

diff --git a/token-lending/program/tests/flash_borrow_repay.rs b/token-lending/program/tests/flash_borrow_repay.rs
@@ -3,16 +3,14 @@
 mod helpers;
 
 use helpers::*;
-use solana_program::instruction::AccountMeta;
 use solana_program_test::*;
 use solana_sdk::{
     pubkey::Pubkey,
     signature::{Keypair, Signer},
-    transaction::{Transaction, TransactionError},
+    transaction::{Transaction},
 };
-use spl_token::solana_program::instruction::InstructionError;
 use spl_token_lending::{
-    error::LendingError, instruction::flash_borrow_reserve_liquidity,
+    instruction::flash_borrow_reserve_liquidity,
     instruction::flash_repay_reserve_liquidity, processor::process_instruction,
 };
 

diff --git a/token-lending/program/tests/liquidate_obligation.rs b/token-lending/program/tests/liquidate_obligation.rs
@@ -25,7 +25,7 @@ async fn test_success() {
     );
 
     // limit to track compute unit increase
-    test.set_bpf_compute_max_units(51_000);
+    test.set_bpf_compute_max_units(57_000);
 
     // 100 SOL collateral
     const SOL_DEPOSIT_AMOUNT_LAMPORTS: u64 = 100 * LAMPORTS_TO_SOL * INITIAL_COLLATERAL_RATIO;

diff --git a/token-lending/program/tests/obligation_end_to_end.rs b/token-lending/program/tests/obligation_end_to_end.rs
@@ -32,7 +32,7 @@ async fn test_success() {
     );
 
     // limit to track compute unit increase
-    test.set_bpf_compute_max_units(45_000);
+    test.set_bpf_compute_max_units(160_000);
 
     const FEE_AMOUNT: u64 = 100;
     const HOST_FEE_AMOUNT: u64 = 20;

diff --git a/token-lending/program/tests/refresh_obligation.rs b/token-lending/program/tests/refresh_obligation.rs
@@ -27,7 +27,7 @@ async fn test_success() {
     );
 
     // limit to track compute unit increase
-    test.set_bpf_compute_max_units(28_000);
+    test.set_bpf_compute_max_units(42_000);
 
     const SOL_DEPOSIT_AMOUNT: u64 = 100;
     const USDC_BORROW_AMOUNT: u64 = 1_000;

diff --git a/token-lending/program/tests/refresh_reserve.rs b/token-lending/program/tests/refresh_reserve.rs
@@ -25,7 +25,7 @@ async fn test_success() {
     );
 
     // limit to track compute unit increase
-    test.set_bpf_compute_max_units(16_000);
+    test.set_bpf_compute_max_units(28_000);
 
     const SOL_RESERVE_LIQUIDITY_LAMPORTS: u64 = 100 * LAMPORTS_TO_SOL;
     const USDC_RESERVE_LIQUIDITY_FRACTIONAL: u64 = 100 * FRACTIONAL_TO_USDC;

diff --git a/token-lending/program/tests/withdraw_obligation_collateral.rs b/token-lending/program/tests/withdraw_obligation_collateral.rs
@@ -27,7 +27,7 @@ async fn test_withdraw_fixed_amount() {
     );
 
     // limit to track compute unit increase
-    test.set_bpf_compute_max_units(33_000);
+    test.set_bpf_compute_max_units(36_000);
 
     const SOL_DEPOSIT_AMOUNT_LAMPORTS: u64 = 200 * LAMPORTS_TO_SOL * INITIAL_COLLATERAL_RATIO;
     const USDC_BORROW_AMOUNT_FRACTIONAL: u64 = 1_000 * FRACTIONAL_TO_USDC;