fix withdraw vara

Author: none00y

scripts/package-lock.json

@@ -19,7 +19,7 @@
   "description": "",
   "dependencies": {
     "@polkadot/api": "^10.11.2",
-    "@invariant-labs/vara-sdk": "0.1.14",
+    "@invariant-labs/vara-sdk": "file:../sdk",
     "dotenv": "^16.4.5"
   },
   "devDependencies": {

scripts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@invariant-labs/vara-sdk",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "collaborators": [
     "Invariant Labs"
   ],

sdk/contracts/gear_erc20/gear_erc20.opt.wasm

@@ -66,15 +66,15 @@ export const CONCENTRATION_FACTOR = 1.00001526069123
 export const VARA_ADDRESS: HexString =
   '0x0000000000000000000000000000000000000000000000000000000000000000'
 export const TESTNET_INVARIANT_ADDRESS: HexString =
-  '0xbe6b7d437dafbbdd983a153ca594ae32abebcd42450b4914a01fcbd6d7a59264'
+  '0x876dce24e2d48e6a8aacd3617e7394641faed241651e8fd75a0f555735a38a44'
 export const TESTNET_BTC_ADDRESS: HexString =
-  '0x3d35d6eee42ee2b89490295e591d205ac94f01446b4a27a8ba21522f474caffc'
+  '0x1257026dee9ebb485256a592f37ed69f2a809dae6a6eb817bc899a9394e396b8'
 export const TESTNET_ETH_ADDRESS: HexString =
-  '0xbbef6ca66fd7ec80bd7800b0c1b5b67dbef041931c5e76a0f318ef3025868711'
+  '0x5e29b92984099dba39d80d50b86a8e18c262b9b5a8eb7ce0b1a6894178484d63'
 export const TESTNET_USDC_ADDRESS: HexString =
-  '0x79973b6c7cec41ea24101d604d2d33d9aa3d9482581dd57701a50773c8822cfc'
+  '0x866234d722106e9ca759c8d5af57e6ce0b5eea8861ad766f2d162be93dd8d4e1'
 export const TESTNET_SOL_ADDRESS: HexString =
-  '0x41c273ed8b4eb1d559bd709fba24608730f83b0225d58b55ee6bd067fc3b40aa'
+  '0x8e56e6c1e11d40232792a594c106418a6378c6dde69f17914d37e668906a9a66'
 export const TESTNET_AZERO_ADDRESS: HexString =
-  '0x7e0bf68153c2444c762b9cd9fec0e8ff4f8f48c733db64dbdf9336354af6ffa4'
+  '0x3679045a0d3af2967fd0241cca045ada83eabb8c85965253d513eaad4cd5bce8'
 

sdk/contracts/invariant/invariant.opt.wasm

@@ -77,6 +77,9 @@ describe('vara-deposits', async function () {
     await assertVaraBalanceChange(amount, async () => {
       await invariant.withdrawVara(admin, amount)
     })
+    await assertVaraBalanceChange(0n, async () => {
+      await invariant.withdrawVara(admin, null)
+    })
   })
 
   it('deposit and withdraw failures', async function () {

sdk/package-lock.json

@@ -67,6 +67,11 @@ fn test_vara_withdraw() {
     sys.claim_value_from_mailbox(REGULAR_USER_1);
     assert_eq!(sys.balance_of(INVARIANT_ID), 0);
     assert_eq!(sys.balance_of(REGULAR_USER_1), vara_mint);
+
+    let value = withdraw_vara(&invariant, REGULAR_USER_1, vara_mint.into(), None::<&str>);
+    sys.claim_value_from_mailbox(REGULAR_USER_1);
+    assert_eq!(sys.balance_of(INVARIANT_ID), 0);
+    assert_eq!(sys.balance_of(REGULAR_USER_1), vara_mint);
 }
 
 #[test]

sdk/package.json

@@ -728,12 +728,24 @@ where
     pub fn withdraw_vara(&mut self, value: Option<TokenAmount>) -> TokenAmount {
         panicking!(|| {
             let invariant = InvariantStorage::as_mut();
+            let token = &VARA_ADDRESS;
+            let caller = &msg::source();
 
-            let value = invariant.decrease_token_balance(&VARA_ADDRESS, &msg::source(), value)?;
+            let value = match value {
+                Some(value) => {
+                    if value.get() == 0.into() {
+                        return Err(InvariantError::AmountIsZero);
+                    }
+
+                    invariant.decrease_token_balance(&token, &caller, Some(value))?
+                }
+                None => invariant
+                    .decrease_token_balance(&token, &caller, None)
+                    .unwrap_or(TokenAmount::new(0.into())),
+            };
 
             // Reply has to be hardcoded since sails
             // doesn't allow for specifying value in the reply yet
-            gstd::dbg!(value.0.as_u128());
             reply(("Service", "WithdrawVara", value), value.0.as_u128())
                 .expect("Failed to send message");
             exec::leave();