[Liquidity Mining] Reserve packing & unpacking (4)

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.ts]
+indent_size = 2

.github/workflows/pull-request-token-lending.yml

@@ -3,13 +3,13 @@ name: Token Lending Pull Request
 on:
   pull_request:
     paths:
-    - 'token-lending/**'
-    - 'token/**'
+      - "token-lending/**"
+      - "token/**"
   push:
     branches: [master]
     paths:
-    - 'token-lending/**'
-    - 'token/**'
+      - "token-lending/**"
+      - "token/**"
 
 jobs:
   cargo-test-bpf:
@@ -30,20 +30,20 @@ jobs:
           override: true
           profile: minimal
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
           key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}}
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/bin/rustfilt
           key: cargo-bpf-bins-${{ runner.os }}
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cache

.github/workflows/pull-request.yml

@@ -3,11 +3,11 @@ name: Pull Request
 on:
   pull_request:
     paths-ignore:
-    - 'docs/**'
+      - "docs/**"
   push:
     branches: [master, upcoming]
     paths-ignore:
-    - 'docs/**'
+      - "docs/**"
 
 jobs:
   all_github_action_checks:
@@ -59,7 +59,7 @@ jobs:
           profile: minimal
           components: clippy
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry
@@ -96,21 +96,21 @@ jobs:
           override: true
           profile: minimal
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
             # target # Removed due to build dependency caching conflicts
           key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}}
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/bin/rustfilt
           key: cargo-bpf-bins-${{ runner.os }}
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cache
@@ -143,7 +143,7 @@ jobs:
           override: true
           profile: minimal
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry

.mocharc.yml

@@ -0,0 +1 @@
+bail: true

Anchor.toml

@@ -1,14 +1,31 @@
-anchor_version = "0.13.2"
+[toolchain]
+package_manager = "yarn"
+anchor_version = "0.28.0"
+
+[features]
+resolution = true
+skip-lint = false
 
 [workspace]
-members = [
-    "token-lending/program",
-    "token-lending/brick",
-]
+members = ["token-lending/program", "token-lending/brick"]
 
 [provider]
 cluster = "mainnet"
 wallet = "~/.config/solana/id.json"
 
+[scripts]
+test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 token-lending/tests/**/*.ts"
+
 [programs.mainnet]
 spl_token_lending = "So1endDq2YkqhipRh3WViPa8hdiSpxWy6z3Z6tMCpAo"
+
+[programs.localnet]
+solend_program = "So1endDq2YkqhipRh3WViPa8hdiSpxWy6z3Z6tMCpAo"
+
+[test.validator]
+# we use some mainnet accounts for tests 
+url = "https://api.mainnet-beta.solana.com"
+
+[[test.validator.clone]]
+# Solend Main Pool - (USDC) Reserve State
+address = "BgxfHJDzm44T7XG68MYKx7YisTjZu73tVovyZSjJMpmw"

Cargo.toml

@@ -3,8 +3,12 @@ members = [
   "token-lending/cli",
   "token-lending/program",
   "token-lending/sdk",
-  "token-lending/brick"
-, "token-lending/oracles"]
+  "token-lending/brick",
+  "token-lending/oracles",
+]
+
+[workspace.package]
+version = "2.1.0"
 
 [profile.dev]
 split-debuginfo = "unpacked"

package.json

@@ -0,0 +1,20 @@
+{
+  "license": "ISC",
+  "scripts": {
+    "lint:fix": "prettier */*.js \"*/**/*{.js,.ts}\" -w",
+    "lint": "prettier */*.js \"*/**/*{.js,.ts}\" --check"
+  },
+  "dependencies": {
+    "@coral-xyz/anchor": "^0.28.0"
+  },
+  "devDependencies": {
+    "chai": "^4.3.4",
+    "mocha": "^9.0.3",
+    "ts-mocha": "^10.0.0",
+    "@types/bn.js": "^5.1.0",
+    "@types/chai": "^4.3.0",
+    "@types/mocha": "^9.0.0",
+    "typescript": "^5.7.3",
+    "prettier": "^2.6.2"
+  }
+}

token-lending/cli/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
+name = "solend-program-cli"
+version.workspace = true
 authors = ["Solend Maintainers <[email protected]>"]
 description = "Solend Program CLI"
 edition = "2018"
 homepage = "https://solend.fi"
 license = "Apache-2.0"
-name = "solend-program-cli"
 repository = "https://github.com/solendprotocol/solana-program-library"
-version = "2.0.2"
 
 [dependencies]
 clap = "=2.34.0"
@@ -16,9 +16,9 @@ solana-client = "1.14.10"
 solana-logger = "1.14.10"
 solana-sdk = "1.14.10"
 solana-program = "1.14.10"
-solend-sdk = { path="../sdk" }
-solend-program = { path="../program", features = [ "no-entrypoint" ] }
-spl-token = { version = "3.3.0", features=["no-entrypoint"] }
+solend-sdk = { path = "../sdk" }
+solend-program = { path = "../program", features = ["no-entrypoint"] }
+spl-token = { version = "3.3.0", features = ["no-entrypoint"] }
 spl-associated-token-account = "1.0"
 solana-account-decoder = "1.14.10"
 reqwest = { version = "0.12.2", features = ["blocking", "json"] }

token-lending/cli/src/main.rs

@@ -11,6 +11,7 @@ use solend_program::{
     instruction::set_lending_market_owner_and_config,
     state::{validate_reserve_config, RateLimiterConfig},
 };
+use solend_sdk::instruction::upgrade_reserve_to_v2_1_0;
 use solend_sdk::{
     instruction::{
         liquidate_obligation_and_redeem_reserve_collateral, redeem_reserve_collateral,
@@ -768,6 +769,20 @@ fn main() {
                         .help("Risk authority address"),
                 )
         )
+        .subcommand(
+            SubCommand::with_name("upgrade-reserve")
+                .about("Migrate reserve to version 2.1.0")
+                .arg(
+                    Arg::with_name("reserve")
+                        .long("reserve")
+                        .validator(is_pubkey)
+                        .value_name("PUBKEY")
+                        .takes_value(true)
+                        .required(true)
+                        .help("Reserve address"),
+                )
+
+        )
         .subcommand(
             SubCommand::with_name("update-reserve")
                 .about("Update a reserve config")
@@ -1324,6 +1339,11 @@ fn main() {
                 risk_authority_pubkey,
             )
         }
+        ("upgrade-reserve", Some(arg_matches)) => {
+            let reserve_pubkey = pubkey_of(arg_matches, "reserve").unwrap();
+
+            command_upgrade_reserve_to_v2_1_0(&mut config, reserve_pubkey)
+        }
         ("update-reserve", Some(arg_matches)) => {
             let reserve_pubkey = pubkey_of(arg_matches, "reserve").unwrap();
             let lending_market_owner_keypair =
@@ -1973,6 +1993,29 @@ fn command_set_lending_market_owner_and_config(
     Ok(())
 }
 
+fn command_upgrade_reserve_to_v2_1_0(config: &mut Config, reserve_pubkey: Pubkey) -> CommandResult {
+    let recent_blockhash = config.rpc_client.get_latest_blockhash()?;
+
+    let message = Message::new_with_blockhash(
+        &[
+            ComputeBudgetInstruction::set_compute_unit_price(30101),
+            upgrade_reserve_to_v2_1_0(
+                config.lending_program_id,
+                reserve_pubkey,
+                config.fee_payer.pubkey(),
+            ),
+        ],
+        Some(&config.fee_payer.pubkey()),
+        &recent_blockhash,
+    );
+
+    let transaction = Transaction::new(&vec![config.fee_payer.as_ref()], message, recent_blockhash);
+
+    send_transaction(config, transaction)?;
+
+    Ok(())
+}
+
 #[allow(clippy::too_many_arguments, clippy::unnecessary_unwrap)]
 fn command_update_reserve(
     config: &mut Config,

token-lending/program/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solend-program"
-version = "2.0.2"
+version.workspace = true
 description = "Solend Program"
 authors = ["Solend Maintainers <[email protected]>"]
 repository = "https://github.com/solendprotocol/solana-program-library"
@@ -18,7 +18,7 @@ bytemuck = "1.5.1"
 solana-program = "=1.16.20"
 solend-sdk = { path = "../sdk" }
 oracles = { path = "../oracles" }
-spl-token = { version = "3.3.0", features=["no-entrypoint"] }
+spl-token = { version = "3.3.0", features = ["no-entrypoint"] }
 static_assertions = "1.1.0"
 
 [dev-dependencies]

token-lending/program/src/processor.rs

@@ -244,6 +244,12 @@ pub fn process_instruction(
                 accounts,
             )
         }
+
+        // temporary ix for upgrade
+        LendingInstruction::UpgradeReserveToV2_1_0 => {
+            msg!("Instruction: Upgrade Reserve to v2.1.0");
+            liquidity_mining::upgrade_reserve(program_id, accounts)
+        }
     }
 }