Degen pool

Makefile

@@ -78,7 +78,7 @@ test-pyth: mock-pyth
 release:
 	$(call docker_build,_rust_setup.sh)
 	mkdir -p res
-	cp target/wasm32-unknown-unknown/release/ref_exchange.wasm res/ref_exchange_release.wasm
+	cp target/wasm32-unknown-unknown/release/ref_exchange_by_wasm_opt.wasm res/ref_exchange_release.wasm
 	cp target/wasm32-unknown-unknown/release/ref_farming.wasm res/ref_farming_release.wasm
 
 clean:

_rust_setup.sh

@@ -4,4 +4,6 @@ rustup toolchain install $VER
 rustup default $VER
 rustup target add wasm32-unknown-unknown
 cargo build -p ref-exchange --target wasm32-unknown-unknown --release
-cargo build -p ref_farming --target wasm32-unknown-unknown --release
+cargo build -p ref_farming --target wasm32-unknown-unknown --release
+cargo install wasm-opt --locked --version 0.116.0
+wasm-opt -Oz -o target/wasm32-unknown-unknown/release/ref_exchange_by_wasm_opt.wasm  target/wasm32-unknown-unknown/release/ref_exchange.wasm

ref-exchange/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ref-exchange"
-version = "1.9.2"
+version = "1.9.4"
 authors = ["Illia Polosukhin <[email protected]>"]
 edition = "2018"
 publish = false

ref-exchange/release_notes.md

@@ -1,5 +1,19 @@
 # Release Notes
 
+### Version 1.9.4
+```
+DBz69SAuDcvGWrEraoKjNEMiiDxE3PagejSfhYw3SfqH
+```
+1. add pool limit
+2. add execute_actions_in_va
+
+### Version 1.9.3
+```
+1PW1wtYsciZKsaRNqNMpY3P1W2wD42PjZVraL142VN4
+```
+1. add degen pool
+2. add swap by output for simple pool
+
 ### Version 1.9.2
 ```
 52Fmd38fqZbHoGQGRTmoXxr9xMu8zKQWaGggHSJYi23T

ref-exchange/src/account_deposit.rs

@@ -507,14 +507,9 @@ impl Contract {
     /// save token to owner account as lostfound, no need to care about storage
     /// only global whitelisted token can be stored in lost-found
     pub(crate) fn internal_lostfound(&mut self, token_id: &AccountId, amount: u128) {
-        if self.is_whitelisted_token(token_id) {
-            let mut lostfound = self.internal_unwrap_or_default_account(&self.owner_id);
-            lostfound.deposit(token_id, amount);
-            self.accounts.insert(&self.owner_id, &lostfound.into());
-        } else {
-            log!("Deposit {} {} failed due to non global whitelisted token", amount, token_id);
-        }
-
+        let mut lostfound = self.internal_unwrap_or_default_account(&self.owner_id);
+        lostfound.deposit(token_id, amount);
+        self.accounts.insert(&self.owner_id, &lostfound.into());
     }
 
 

ref-exchange/src/action.rs

@@ -1,10 +1,10 @@
-use crate::errors::ERR41_WRONG_ACTION_RESULT;
+use crate::errors::{ERR41_WRONG_ACTION_RESULT, ERR77_INVALID_ACTION_TYPE};
 use near_sdk::serde::{Deserialize, Serialize};
 use near_sdk::{env, json_types::U128, AccountId, Balance};
 use std::collections::HashSet;
 
 /// Single swap action.
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Clone)]
 #[serde(crate = "near_sdk::serde")]
 pub struct SwapAction {
     /// Pool which should be used for swapping.
@@ -21,12 +21,31 @@ pub struct SwapAction {
     pub min_amount_out: U128,
 }
 
+/// Single swap by output action.
+#[derive(Serialize, Deserialize, Clone)]
+#[serde(crate = "near_sdk::serde")]
+pub struct SwapByOutputAction {
+    /// Pool which should be used for swapping.
+    pub pool_id: u64,
+    /// Token to swap from.
+    pub token_in: AccountId,
+    /// The desired amount of the output token.
+    /// If amount_out is None, it will take amount_in from previous step.
+    /// Will fail if amount_out is None on the first step.
+    pub amount_out: Option<U128>,
+    /// Token to swap into.
+    pub token_out: AccountId,
+    /// The maximum amount of the input token that can be used for the swap.
+    pub max_amount_in: Option<U128>,
+}
+
 /// Single action. Allows to execute sequence of various actions initiated by an account.
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Clone)]
 #[serde(crate = "near_sdk::serde")]
 #[serde(untagged)]
 pub enum Action {
     Swap(SwapAction),
+    SwapByOutput(SwapByOutputAction),
 }
 
 impl Action {
@@ -36,6 +55,51 @@ impl Action {
             Action::Swap(swap_action) => {
                 vec![swap_action.token_in.clone(), swap_action.token_out.clone()]
             }
+            Action::SwapByOutput(swap_by_output_action) => {
+                vec![swap_by_output_action.token_in.clone(), swap_by_output_action.token_out.clone()]
+            }
+        }
+    }
+
+    pub fn get_pool_id(&self) -> u64 {
+        match self {
+            Action::Swap(swap_action) => {
+                swap_action.pool_id
+            }
+            Action::SwapByOutput(swap_by_output_action) => {
+                swap_by_output_action.pool_id
+            }
+        }
+    }
+
+    pub fn get_token_in(&self) -> &AccountId {
+        match self {
+            Action::Swap(swap_action) => {
+                &swap_action.token_in
+            }
+            Action::SwapByOutput(swap_by_output_action) => {
+                &swap_by_output_action.token_in
+            }
+        }
+    }
+
+    pub fn get_token_out(&self) -> &AccountId {
+        match self {
+            Action::Swap(swap_action) => {
+                &swap_action.token_out
+            }
+            Action::SwapByOutput(swap_by_output_action) => {
+                &swap_by_output_action.token_out
+            }
+        }
+    }
+
+    pub fn get_amount_out(&self) -> Option<U128> {
+        match self {
+            Action::Swap(_) => unimplemented!(),
+            Action::SwapByOutput(swap_by_output_action) => {
+                swap_by_output_action.amount_out
+            }
         }
     }
 }
@@ -52,7 +116,7 @@ pub enum ActionResult {
 }
 
 impl ActionResult {
-    pub fn to_amount(self) -> Balance {
+    pub fn to_amount(&self) -> Balance {
         match self {
             // [AUDIT_02]
             ActionResult::Amount(result) => result.0,
@@ -70,7 +134,21 @@ pub fn get_tokens_in_actions(actions: &[Action]) -> HashSet<AccountId> {
                 tokens.insert(swap_action.token_in.clone());
                 tokens.insert(swap_action.token_out.clone());
             }
+            Action::SwapByOutput(swap_by_output_action) => {
+                tokens.insert(swap_by_output_action.token_in.clone());
+                tokens.insert(swap_by_output_action.token_out.clone());
+            }
         }
     }
     tokens
 }
+
+pub fn assert_all_same_action_type(actions: &[Action]) {
+    if !actions.is_empty() {
+        let all_same_action_type = match &actions[0] {
+            Action::Swap(_) => actions.iter().all(|action| matches!(action, Action::Swap(_))),
+            Action::SwapByOutput(_) => actions.iter().all(|action| matches!(action, Action::SwapByOutput(_))),
+        };
+        assert!(all_same_action_type, "{}", ERR77_INVALID_ACTION_TYPE);
+    }
+}

ref-exchange/src/custom_keys.rs

@@ -1,2 +1,9 @@
 // Key for rated token info
-pub const RATE_STORAGE_KEY: &str = "custom_rate_key";
+pub const RATE_STORAGE_KEY: &str = "custom_rate_key";
+
+// Key for degen token info
+pub const DEGEN_STORAGE_KEY: &str = "custom_degen_key";
+pub const DEGEN_ORACLE_CONFIG_STORAGE_KEY: &str = "custom_degen_oracle_config_key";
+
+// Key for pool limit
+pub const POOL_LIMIT: &str = "pl";