diff --git a/Cargo.lock b/Cargo.lock index 5755b0d..ddb8a39 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2348,7 +2348,7 @@ dependencies = [ [[package]] name = "ref-exchange" -version = "1.9.15" +version = "1.9.16" dependencies = [ "hex", "mock-boost-farming", diff --git a/ref-exchange/Cargo.toml b/ref-exchange/Cargo.toml index 255fe69..22c8c0a 100644 --- a/ref-exchange/Cargo.toml +++ b/ref-exchange/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ref-exchange" -version = "1.9.15" +version = "1.9.16" authors = ["Illia Polosukhin "] edition = "2018" publish = false diff --git a/ref-exchange/release_notes.md b/ref-exchange/release_notes.md index e438cdf..0ddd293 100644 --- a/ref-exchange/release_notes.md +++ b/ref-exchange/release_notes.md @@ -1,5 +1,11 @@ # Release Notes +### Version 1.9.16 +``` +BXSNfiJC2LbVUgRTpHxAYfLiPYDwAn7cXLKJeTsVHRkG +``` +1. use 10Tgas for transfer near call back. + ### Version 1.9.15 ``` 6VT8PzHwyphkL64Gi7GLS8YyBqmeVU8y8xjSd5ej53sF diff --git a/ref-exchange/src/account_deposit.rs b/ref-exchange/src/account_deposit.rs index 7a95f1d..ee013eb 100644 --- a/ref-exchange/src/account_deposit.rs +++ b/ref-exchange/src/account_deposit.rs @@ -11,7 +11,7 @@ use near_sdk::{ AccountId, Balance, PromiseResult, StorageUsage, }; use crate::legacy::{AccountV1, AccountV2}; -use crate::utils::{ext_self, ext_wrap_near, GAS_FOR_FT_TRANSFER, GAS_FOR_FT_TRANSFER_CALL, GAS_FOR_NEAR_WITHDRAW, GAS_FOR_CB_FT_TRANSFER}; +use crate::utils::{ext_self, ext_wrap_near, GAS_FOR_FT_TRANSFER, GAS_FOR_FT_TRANSFER_CALL, GAS_FOR_NEAR_WITHDRAW, GAS_FOR_CB_NEAR_TRANSFER, GAS_FOR_CB_FT_TRANSFER}; use crate::*; // [AUDIT_01] @@ -609,7 +609,7 @@ impl Contract { U128(amount), &env::current_account_id(), 0, - GAS_FOR_CB_FT_TRANSFER, + GAS_FOR_CB_NEAR_TRANSFER, )) } else { ext_fungible_token::ft_transfer( diff --git a/ref-exchange/src/utils.rs b/ref-exchange/src/utils.rs index de3d3d5..52fdd27 100644 --- a/ref-exchange/src/utils.rs +++ b/ref-exchange/src/utils.rs @@ -26,6 +26,8 @@ pub const DEFAULT_EXTRA_TGAS: u32 = 15; pub const GAS_FOR_FT_TRANSFER: Gas = 20_000_000_000_000; pub const GAS_FOR_NEAR_WITHDRAW: Gas = 20_000_000_000_000; +/// Call back for Near transfer need extra gas +pub const GAS_FOR_CB_NEAR_TRANSFER: Gas = 10_000_000_000_000; pub const GAS_FOR_CB_FT_TRANSFER: Gas = 5_000_000_000_000; /// Fee divisor, allowing to provide fee in bps. diff --git a/ref-exchange/tests/test_migrate.rs b/ref-exchange/tests/test_migrate.rs index 3d2f66a..1d058d7 100644 --- a/ref-exchange/tests/test_migrate.rs +++ b/ref-exchange/tests/test_migrate.rs @@ -51,7 +51,7 @@ fn test_upgrade() { .assert_success(); let metadata = get_metadata(&pool); // println!("{:#?}", metadata); - assert_eq!(metadata.version, "1.9.15".to_string()); + assert_eq!(metadata.version, "1.9.16".to_string()); assert_eq!(metadata.admin_fee_bps, 5); assert_eq!(metadata.boost_farm_id, "boost_farm".to_string()); assert_eq!(metadata.burrowland_id, "burrowland".to_string()); diff --git a/releases/ref_exchange_release.wasm b/releases/ref_exchange_release.wasm index c07aab0..3340aa6 100644 Binary files a/releases/ref_exchange_release.wasm and b/releases/ref_exchange_release.wasm differ diff --git a/releases/ref_exchange_release_v1915.wasm b/releases/ref_exchange_release_v1915.wasm new file mode 100644 index 0000000..c07aab0 Binary files /dev/null and b/releases/ref_exchange_release_v1915.wasm differ