Publish crate2 (solana-labs#80)

* setting up to publish + add missing instruction

* add test for withdraw and fix all the renames that had to happen

* delete js since unused anyway

* post rebase fix

* minor cli fix

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

@@ -64,27 +64,3 @@ jobs:
           name: token-lending-programs
           path: "target/deploy/*.so"
           if-no-files-found: error
-
-  js-test:
-    runs-on: ubuntu-latest
-    env:
-      NODE_VERSION: 12.x
-    needs: cargo-test-bpf
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-      - uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: node-${{ hashFiles('token-lending/js/package-lock.json') }}
-          restore-keys: |
-            node-
-      - name: Download programs
-        uses: actions/download-artifact@v2
-        with:
-          name: token-lending-programs
-          path: target/deploy
-      - run: ./ci/js-test-token-lending.sh

deploy_token_lending.sh

@@ -21,10 +21,10 @@ SOURCE=`target/debug/spl-token --config $SOLANA_CONFIG wrap 10 2>&1 | head -n1 |
 
 solana program --config $SOLANA_CONFIG deploy \
   --program-id $PROGRAM_ID \
-  target/deploy/spl_token_lending.so;
+  target/deploy/solend_program.so;
 
 echo "Creating Lending Market";
-CREATE_MARKET_OUTPUT=`target/debug/spl-token-lending create-market \
+CREATE_MARKET_OUTPUT=`target/debug/solend-program create-market \
   --fee-payer    $OWNER \
   --market-owner $MARKET_OWNER \
   --verbose`;
@@ -34,7 +34,7 @@ MARKET_ADDR=`echo $CREATE_MARKET_OUTPUT | head -n1 | awk '{print $4}'`;
 AUTHORITY_ADDR=`echo $CREATE_MARKET_OUTPUT | grep "Authority Address" | awk '{print $NF}'`;
 
 echo "Creating SOL reserve";
-SOL_RESERVE_OUTPUT=`target/debug/spl-token-lending add-reserve \
+SOL_RESERVE_OUTPUT=`target/debug/solend-program add-reserve \
   --fee-payer         $OWNER \
   --market-owner      $OWNER \
   --source-owner      $OWNER \
@@ -63,7 +63,7 @@ echo "USDC MINT: $USDC_TOKEN_MINT"
 USDC_TOKEN_ACCOUNT=`target/debug/spl-token --config $SOLANA_CONFIG create-account $USDC_TOKEN_MINT | awk '{print $3}'`;
 target/debug/spl-token --config $SOLANA_CONFIG mint $USDC_TOKEN_MINT 30000000;
 
-USDC_RESERVE_OUTPUT=`target/debug/spl-token-lending add-reserve \
+USDC_RESERVE_OUTPUT=`target/debug/solend-program add-reserve \
   --fee-payer         $OWNER \
   --market-owner      $OWNER \
   --source-owner      $OWNER \
@@ -92,7 +92,7 @@ echo "ETH MINT: $ETH_TOKEN_MINT"
 ETH_TOKEN_ACCOUNT=`target/debug/spl-token --config $SOLANA_CONFIG create-account $ETH_TOKEN_MINT | awk '{print $3}'`;
 target/debug/spl-token --config $SOLANA_CONFIG mint $ETH_TOKEN_MINT 8000000;
 
-ETH_RESERVE_OUTPUT=`target/debug/spl-token-lending add-reserve \
+ETH_RESERVE_OUTPUT=`target/debug/solend-program add-reserve \
   --fee-payer         $OWNER \
   --market-owner      $OWNER \
   --source-owner      $OWNER \
@@ -121,7 +121,7 @@ echo "BTC MINT: $BTC_TOKEN_MINT"
 BTC_TOKEN_ACCOUNT=`target/debug/spl-token --config $SOLANA_CONFIG create-account $BTC_TOKEN_MINT | awk '{print $3}'`;
 target/debug/spl-token --config $SOLANA_CONFIG mint $BTC_TOKEN_MINT 8000000;
 
-BTC_RESERVE_OUTPUT=`target/debug/spl-token-lending add-reserve \
+BTC_RESERVE_OUTPUT=`target/debug/solend-program add-reserve \
   --fee-payer         $OWNER \
   --market-owner      $OWNER \
   --source-owner      $OWNER \

token-lending/README.md

@@ -30,7 +30,7 @@ This is optional! You can skip these steps and use the [Token Lending CLI](./cli
 1. Install the Token and Token Lending CLIs:
    ```shell
    cargo install spl-token-cli
-   cargo install spl-token-lending-cli
+   cargo install solend-program-cli
    ```
 
 1. Clone the SPL repo:
@@ -101,7 +101,7 @@ This is optional! You can skip these steps and use the [Token Lending CLI](./cli
    solana program deploy \
      -k owner.json \
      --program-id lending.json \
-     target/deploy/spl_token_lending.so
+     target/deploy/solend_program.so
 
    # Program Id: 6TvznH3B2e3p2mbhufNBpgSrLx6UkgvxtVQvopEZ2kuH
    ```

token-lending/cli/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
-authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-description = "SPL Token Lending CLI"
+authors = ["Solend Maintainers <maintainers@solend.fi>"]
+description = "Solend Program CLI"
 edition = "2018"
-homepage = "https://spl.solana.com/token-lending"
+homepage = "https://solend.fi"
 license = "Apache-2.0"
-name = "spl-token-lending-cli"
-repository = "https://github.com/solana-labs/solana-program-library"
+name = "solend-program-cli"
+repository = "https://github.com/solendprotocol/solana-program-library"
 version = "0.1.0"
 
 [dependencies]
@@ -16,9 +16,9 @@ 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" ] }
+solend-program = { path="../program", features = [ "no-entrypoint" ] }
 spl-token = { version = "3.2.0", features=["no-entrypoint"] }
 
 [[bin]]
-name = "spl-token-lending"
+name = "solend-program"
 path = "src/main.rs"

token-lending/cli/README.md

@@ -6,7 +6,7 @@ See https://spl.solana.com/token-lending for more details
 
 ## Install the CLI
 ```shell
-cargo install spl-token-lending-cli
+cargo install solend-program-cli
 ```
 
 ## Deploy a lending program (optional)
@@ -23,7 +23,7 @@ The lending market owner must sign to add reserves.
 
 ### Usage
 ```shell
-spl-token-lending \
+solend-program \
   --program      PUBKEY \
   --fee-payer    SIGNER \
   create-market \
@@ -33,11 +33,11 @@ spl-token-lending \
 - `--fee-payer` will sign to pay transaction fees.
 - `--market-owner` is the lending market owner pubkey.
 
-Run `spl-token-lending create-market --help` for more details and options.
+Run `solend-program create-market --help` for more details and options.
 
 ### Example
 ```shell
-spl-token-lending \
+solend-program \
   --program      6TvznH3B2e3p2mbhufNBpgSrLx6UkgvxtVQvopEZ2kuH \
   --fee-payer    owner.json \
   create-market \
@@ -54,7 +54,7 @@ A reserve is a liquidity pool that can be deposited into, borrowed from, and opt
 
 ### Usage
 ```shell
-spl-token-lending \
+solend-program \
   --program      PUBKEY \
   --fee-payer    SIGNER \
   add-reserve \
@@ -76,11 +76,11 @@ spl-token-lending \
 - `--pyth-product` and `--pyth-price` are oracle
   accounts [provided by Pyth](https://pyth.network/developers/consumers/accounts).
 
-Run `spl-token-lending add-reserve --help` for more details and options.
+Run `solend-program add-reserve --help` for more details and options.
 
 ### Example
 ```shell
-spl-token-lending \
+solend-program \
   --program      6TvznH3B2e3p2mbhufNBpgSrLx6UkgvxtVQvopEZ2kuH \
   --fee-payer    owner.json \
   add-reserve \

token-lending/cli/src/main.rs

@@ -17,18 +17,18 @@ use {
         system_instruction,
         transaction::Transaction,
     },
+    solend_program::{
+        self,
+        instruction::{init_lending_market, init_reserve, update_reserve_config},
+        math::WAD,
+        state::{LendingMarket, Reserve, ReserveConfig, ReserveFees},
+    },
     spl_token::{
         amount_to_ui_amount,
         instruction::{approve, revoke},
         state::{Account as Token, Mint},
         ui_amount_to_amount,
     },
-    spl_token_lending::{
-        self,
-        instruction::{init_lending_market, init_reserve, update_reserve_config},
-        math::WAD,
-        state::{LendingMarket, Reserve, ReserveConfig, ReserveFees},
-    },
     std::{borrow::Borrow, process::exit, str::FromStr},
     system_instruction::create_account,
 };
@@ -90,7 +90,7 @@ const SWITCHBOARD_PROGRAM_ID_DEV: &str = "7azgmy1pFXHikv36q1zZASvFq5vFa39TT9NweV
 fn main() {
     solana_logger::setup_with_default("solana=info");
 
-    let default_lending_program_id: &str = &spl_token_lending::id().to_string();
+    let default_lending_program_id: &str = &solend_program::id().to_string();
 
     let matches = App::new(crate_name!())
         .about(crate_description!())
@@ -368,6 +368,16 @@ fn main() {
                         .default_value("20")
                         .help("Amount of fee going to host account: [0, 100]"),
                 )
+                .arg(
+                    Arg::with_name("protocol_liquidation_fee")
+                        .long("protocol-liquidation-fee")
+                        .validator(is_parsable::<u8>)
+                        .value_name("INTEGER_PERCENT")
+                        .takes_value(true)
+                        .required(false)
+                        .default_value("30")
+                        .help("Amount of liquidation bonus going to fee reciever: [0, 100]"),
+                )
                 .arg(
                     Arg::with_name("deposit_limit")
                         .long("deposit-limit")
@@ -510,6 +520,15 @@ fn main() {
                         .required(false)
                         .help("Amount of fee going to host account: [0, 100]"),
                 )
+                .arg(
+                    Arg::with_name("protocol_liquidation_fee")
+                        .long("protocol-liquidation-fee")
+                        .validator(is_parsable::<u8>)
+                        .value_name("INTEGER_PERCENT")
+                        .takes_value(true)
+                        .required(false)
+                        .help("Amount of liquidation bonus going to fee reciever: [0, 100]"),
+                )
                 .arg(
                     Arg::with_name("deposit_limit")
                         .long("deposit-limit")
@@ -1180,7 +1199,7 @@ fn command_update_reserve(
         reserve.config.protocol_liquidation_fee = reserve_config.protocol_liquidation_fee.unwrap();
     }
 
-    let mut new_pyth_product_pubkey = spl_token_lending::NULL_PUBKEY;
+    let mut new_pyth_product_pubkey = solend_program::NULL_PUBKEY;
     if pyth_price_pubkey.is_some() {
         println!(
             "Updating pyth oracle pubkey from {} to {}",