Merge branch 'main' into fix-withdraw

Near-One · Feb 14, 2025 · cd3fd0e · cd3fd0e
2 parents 1e68f94 + 3f626ff
commit cd3fd0e
Show file tree

Hide file tree

Showing 6 changed files with 245 additions and 134 deletions.
diff --git a/near/mock/mock-token/src/lib.rs b/near/mock/mock-token/src/lib.rs
@@ -11,7 +11,8 @@ use near_sdk::borsh::BorshSerialize;
 use near_sdk::collections::LazyOption;
 use near_sdk::json_types::U128;
 use near_sdk::{
-    env, log, near, require, AccountId, BorshStorageKey, NearToken, PanicOnDefault, PromiseOrValue,
+    env, log, near, require, AccountId, BorshStorageKey, NearToken, PanicOnDefault, Promise,
+    PromiseOrValue,
 };
 
 #[near(contract_state)]
@@ -73,6 +74,14 @@ impl Contract {
 
         this
     }
+
+    #[payable]
+    pub fn near_withdraw(&mut self, amount: U128) -> Promise {
+        self.token
+            .internal_withdraw(&env::predecessor_account_id(), amount.into());
+
+        Promise::new(env::predecessor_account_id()).transfer(NearToken::from_yoctonear(amount.0))
+    }
 }
 
 #[near]