@alephium/powfi-sdk 0.0.1-rc.2 → 0.0.1-rc.21

package/src/{zeta.ts → powfi.ts}

@@ -1,13 +1,13 @@
 import type { SignerProvider, Account } from '@alephium/web3';
 import { NodeProvider, ExplorerProvider, web3 } from '@alephium/web3';
 import { CpmmModule } from './cpmm/cpmm';
-import type { Network, ZetaLoadParams } from './common/types';
+import type { Network, PowfiLoadParams } from './common/types';
 import { defaultNetworks } from './common/types';
 import { ClmmModule } from './clmm/clmm';
 import { TokenModule } from './token/token';
 import { StakingModule } from './staking/staking';
 
-export class Zeta {
+export class Powfi {
   public cpmm: CpmmModule;
   public clmm: ClmmModule;
   public token: TokenModule;
@@ -20,7 +20,7 @@ export class Zeta {
   private _account?: Account;
   private _network: Network;
 
-  constructor(params: ZetaLoadParams) {
+  constructor(params: PowfiLoadParams) {
     const network = defaultNetworks.find((n) => n.id === params.networkId);
     if (!network) {
       throw new Error(`Network ${params.networkId} not found`);
@@ -42,8 +42,8 @@ export class Zeta {
     this.staking = new StakingModule(this);
   }
 
-  static load(config: ZetaLoadParams): Zeta {
-    return new Zeta(config);
+  static load(config: PowfiLoadParams): Powfi {
+    return new Powfi(config);
   }
 
   public set signer(signer: SignerProvider) {

package/src/staking/staking.ts

@@ -1,5 +1,6 @@
 import type { ExecuteScriptResult, HexString } from '@alephium/web3';
 import {
+  DUST_AMOUNT,
   MINIMAL_CONTRACT_DEPOSIT,
   addressFromContractId,
   addressToBytes,
@@ -20,7 +21,6 @@ import type {
   XAlphTokenTypes,
 } from 'staking/artifacts/ts';
 import {
-  AlphStakeAndLock,
   AlphUnstakeVault,
   GovernanceDemo,
   RewardSharingVault,
@@ -30,7 +30,7 @@ import {
 } from 'staking/artifacts/ts';
 import { loadDeployments } from 'staking/artifacts/ts/deployments';
 import ModuleBase from '../moduleBase';
-import type { Zeta } from '../zeta';
+import type { Powfi } from '../powfi';
 import type { StakeVaultUserInfo, StakingConfig } from './types';
 import { decodeContractIdList, decodeU256List } from './utils';
 import type { StakingSettings } from './settings';
@@ -41,7 +41,7 @@ export class StakingModule extends ModuleBase {
   private xAlphTokenContract: XAlphTokenInstance;
   private stakeVaultContract: XAlphStakeVaultInstance;
 
-  constructor(scope: Zeta) {
+  constructor(scope: Powfi) {
     super({ scope, moduleName: 'StakingModule' });
 
     this.config = this.loadStakingConfig();
@@ -119,6 +119,16 @@ export class StakingModule extends ModuleBase {
     });
   }
 
+  async cancelUnstake(
+    vaultIndex: bigint,
+  ): Promise<XAlphTokenTypes.SignExecuteMethodResult<'cancelUnstake'>> {
+    return this.xAlphTokenContract.transact.cancelUnstake({
+      signer: this.scope.signer,
+      args: { vaultIndex },
+      attoAlphAmount: DUST_AMOUNT
+    });
+  }
+
   async stakeXAlph(amount: bigint): Promise<XAlphStakeVaultTypes.SignExecuteMethodResult<'stake'>> {
     this.ensurePositiveAmount(amount, 'Stake amount');
     return this.stakeVaultContract.transact.stake({
@@ -140,18 +150,6 @@ export class StakingModule extends ModuleBase {
     });
   }
 
-  async stakeAndLockAlph(amount: bigint): Promise<ExecuteScriptResult> {
-    return AlphStakeAndLock.execute({
-      signer: this.scope.signer,
-      initialFields: {
-        xAlphToken: this.xAlphTokenContract.contractId,
-        xAlphStakeVault: this.stakeVaultContract.contractId,
-        amount,
-      },
-      attoAlphAmount: amount + MINIMAL_CONTRACT_DEPOSIT,
-    });
-  }
-
   async unlockAndStartUnstake(amount: bigint): Promise<ExecuteScriptResult> {
     return XAlphUnlockAndStartUnstake.execute({
       signer: this.scope.signer,
@@ -179,7 +177,8 @@ export class StakingModule extends ModuleBase {
     userAddress: string,
     vaultIndex: bigint,
   ): Promise<AlphUnstakeVaultTypes.State> {
-    return this.getAlphUnstakeVault(userAddress, vaultIndex).fetchState();
+    const stakerAddress = this.getStakerAddress(userAddress);
+    return this.getAlphUnstakeVault(stakerAddress, vaultIndex).fetchState();
   }
 
   async connectToDapp(
@@ -204,10 +203,7 @@ export class StakingModule extends ModuleBase {
   }
 
   async getUserStakeVaultInfo(address: string): Promise<StakeVaultUserInfo> {
-    let stakerAddress = address;
-    if (isGrouplessAddressWithoutGroupIndex(address)) {
-      stakerAddress = `${address}:${this.stakeVaultContract.groupIndex}`;
-    }
+    const stakerAddress = this.getStakerAddress(address);
     const result = await this.stakeVaultContract.view.getUserStakingInfo({
       args: { user: stakerAddress },
     });
@@ -218,25 +214,29 @@ export class StakingModule extends ModuleBase {
   }
 
   async isUserStaking(address: string): Promise<boolean> {
-    const result = await this.stakeVaultContract.view.isStaking({ args: { user: address } });
+    const stakerAddress = this.getStakerAddress(address);
+    const result = await this.stakeVaultContract.view.isStaking({ args: { user: stakerAddress } });
     return result.returns;
   }
 
   async getUserWeight(address: string): Promise<bigint> {
-    const result = await this.stakeVaultContract.view.getWeight({ args: { user: address } });
+    const stakerAddress = this.getStakerAddress(address);
+    const result = await this.stakeVaultContract.view.getWeight({ args: { user: stakerAddress } });
     return result.returns;
   }
 
   async getActiveUnstakeVaultIndexes(address: string): Promise<bigint[]> {
+    const stakerAddress = this.getStakerAddress(address);
     const result = await this.xAlphTokenContract.view.getActiveUnstakeVaultIndexes({
-      args: { caller: address },
+      args: { caller: stakerAddress },
     });
     return decodeU256List(result.returns);
   }
 
   async getClaimableAmount(address: string, vaultIndex: bigint): Promise<bigint> {
+    const stakerAddress = this.getStakerAddress(address);
     const result = await this.xAlphTokenContract.view.getClaimableAmount({
-      args: { user: address, vaultIndex },
+      args: { user: stakerAddress, vaultIndex },
     });
     return result.returns;
   }
@@ -274,4 +274,11 @@ export class StakingModule extends ModuleBase {
       throw new Error(`${label} must be greater than zero`);
     }
   }
+
+  private getStakerAddress(address: string): string {
+    if (isGrouplessAddressWithoutGroupIndex(address)) {
+      return `${address}:${this.stakeVaultContract.groupIndex}`;
+    }
+    return address;
+  }
 }

package/src/token/token.ts

@@ -1,6 +1,6 @@
 import type { TokenInfo } from '@alephium/token-list';
 import ModuleBase from '../moduleBase';
-import type { Zeta } from '../zeta';
+import type { Powfi } from '../powfi';
 import { TokenListFetchError } from '../common/error';
 
 interface TokenCache {
@@ -17,7 +17,7 @@ export class TokenModule extends ModuleBase {
   private readonly cacheTimeMs: number;
 
   constructor(
-    scope: Zeta,
+    scope: Powfi,
     private readonly cacheTimeDays: number = 1,
   ) {
     super({ scope, moduleName: 'TokenModule' });

package/staking/artifacts/AlphUnstakeVault.ral.json

@@ -1,8 +1,8 @@
 {
-  "version": "v4.2.5",
+  "version": "v4.3.1",
   "name": "AlphUnstakeVault",
-  "bytecode": "060540ea40f841384172418c0000030901409216020c3013415e7b160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e160216083736371708160416083702010000000103d3f10c9d97ce020201000003014020d3223281b2ce040c3313167b5617001600ce033413177b1600ce032b1701ce0217021601ce04314c0516021601ce04000017021602a0002b0201020102011fd30e00e856b417011601ce0077457a4b04181601ce014513147b160000023213157bce011600a8a00016002aa100a000ce022f0201020001000bd38e18691cb417001600ce00774513147bce01b0",
-  "codeHash": "5216c458f360d0f51f5e2109a760814ff97eab76f546adc835eb318c6cbc5256",
+  "bytecode": "060640ea40f84138417241ac41c60000030901409216020c3013415e7b160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e160216083736371708160416083702010000000103d3f10c9d97ce020201000003014020d3223281b2ce040c3313167b5617001600ce033413177b1600ce032b1701ce0217021601ce04314c0516021601ce04000017021602a0002b0201020102011fd30e00e856b417011601ce0077457a4b04181601ce014513147b160000023213157bce011600a8a00016002aa100a000ce022f0201020004021ed34a517d1bb417001600ce00774513147b00021701ce02a0002b1702160216012b170316030c334c04ce00771603a8160116030201020001000bd38e18691cb417001600ce00774513147bce01b0",
+  "codeHash": "a065f4a88edfe06c09d65e3c11154fe9d5a5b1cdc42b36adf1a3485ff8a51394",
   "fieldsSig": {
     "names": [
       "xalphToken",
@@ -85,6 +85,16 @@
         "Bool"
       ]
     },
+    {
+      "name": "cancelAndReturn",
+      "paramNames": [],
+      "paramTypes": [],
+      "paramIsMutable": [],
+      "returnTypes": [
+        "U256",
+        "U256"
+      ]
+    },
     {
       "name": "destroy",
       "paramNames": [],

package/staking/artifacts/XAlphStakeVault.ral.json

@@ -1,5 +1,5 @@
 {
-  "version": "v4.2.5",
+  "version": "v4.3.1",
   "name": "XAlphStakeVault",
   "bytecode": "05174028407340af40cc40fc411a41284136414f41a341c341cd41db42234241431043f0448b451145604577458e45a7010002030112d3545eacd4160116000005311342277b160113202c170216001602160213202a620201000204014028d3083a358916004313202e0c2f1342267b16014313202f1342287b1600000517020c170316031602314c0e1600160300001601414c0316033f0216030d2a17034a2e0b0201000203011fd3694941c216004313202e0c2f1342267b16014313202f1342287b160016010001170216020b244c031600024a05160016023d00040201000202010dd354ad273416004313202e0c2f1342267b160016014402010002030118d34b2e25b7160116000005311342277b160113202c170216000c1602621600160213202a16004362440201000101010ed30041471116004313202e0c2f1342267b16004313202d02010000000103d3676c3c33140002010000000103d393f264e8a0000200000101000c16004313202f136afb7b1600a10005a000b45f0000020601402e16014313202f136afa7b160117021600431703160313202e0c2f136af97b0c170416041603314c1016001604160413202a62170516051602000a1702160413202a17044a2c160271a000712f02000002020110160071160171314c051600160144000b4a041601160044000b0200000101010316004f02010000000103d3b299f80ace000201000102021ed3f87904e4140a5f5f6d61705f5f305f5f16004744cbc5194c040c0006024a110c0d0d140a5f5f6d61705f5f305f5f16004744cb1701160101010d0d0d1601010102010001010108d32b875d11140a5f5f6d61705f5f305f5f16004744cbc5020101010800405fd3d63c543cb4170116014813412d7b16000c331341307b1601ce001600ac140a5f5f6d61705f5f305f5f16014744cbc54c40370c0d0d140a5f5f6d61705f5f305f5f16014744cb1707160701010d0d0d1607010117031702160216002a0c0e0c140a5f5f6d61705f5f305f5f16014744cb01021603000517040c170516051604314c0f1603160500001706160116000e0c1606d4926b380b16050d2a17054a2d4a09ca140a5f5f6d61705f5f305f5f16014744b116000006d20102a00116002aa10106160116005f0102010900406bd310bd129fb4170116014813412d7b140a5f5f6d61705f5f305f5f16014744cbc513412e7b16000c331341317b0c0d0d140a5f5f6d61705f5f305f5f16014744cb1708160801010d0d0d1608010117031702160216003413412f7b160216002b17041603000517050c170616061605314c0f1603160600001707160116000e0c1607d465b06cae16060d2a17064a2d16040c2f4c0aca0d0c140a5f5f6d61705f5f305f5f16014744cb01034a0a16040c0e0c140a5f5f6d61705f5f305f5f16014744cb01021601ce001600aba00116002ba10107160116005f01000206004045d3c5f91cb4b4170216024813412d7b1601160000161341357b140a5f5f6d61705f5f305f5f16024744cbc513412e7b0c0d0d140a5f5f6d61705f5f305f5f16024744cb1705160501010d0d0d160501011704170316040005ce01311341327b1604160000010b241341337b160216030e0c1600d4926b380b1604160000030d0e0c140a5f5f6d61705f5f305f5f16024744cb01020100010500403ad3b6398887b4170116014813412d7b140a5f5f6d61705f5f305f5f16014744cbc513412e7b0c0d0d140a5f5f6d61705f5f305f5f16014744cb1704160401010d0d0d16040101170317021603160000010b251341347b160116020e0c1600d465b06cae1603160000020d0e0c140a5f5f6d61705f5f305f5f16014744cb010201000101011fd3e5725392140a5f5f6d61705f5f305f5f16004744cbc5197a4b0418a0010c2f4c020c020c0d0d140a5f5f6d61705f5f305f5f16004744cb010113c40de0b6b3a76400002ca0012d02010001010008d3e5bf78dcb4a0024513412c7b16000008010001010008d34f58efe6b4a0024513412c7b1600a102010002030109d3af1ed9dd1601b9170216001602000b000902",
   "codeHash": "06a6db7355978ed027d5a0d36573bf54cef4a67d503b270b8ede5870b3117c7b",

package/staking/artifacts/XAlphToken.ral.json

@@ -1,8 +1,8 @@
 {
-  "version": "v4.2.5",
+  "version": "v4.3.1",
   "name": "XAlphToken",
-  "bytecode": "091109121b40244051407a40ac40ca411741474165417341a6427842b242d4435d010000000102ce0002010000000102ce0102010000000102ce0202010000000102a00002010002040115d3cee9319416011600000a311342277b160113202c170216001602160213202a62170316037102010002030114d33cd5e72916004313202e0c2f1342267b16004313202d1702160016010c1602000802010002030119d32cabd28216004313202e0c2f1342267b160016010005170216020b244c031600024a05160016023d00090201000202010ed31bc25d3416004313202e0c2f1342267b160016016b44020000040601402a16021603344c020b02160216032a0e2d17041600160400041705160516012f4c0316043f0216051601314c091600160116040d2a16030008024a061600160116021604000802010002030118d34b2e25b716011600000a311342277b160113202c170216000c1602621600160213202a16004362440201000101010ed30041471116004313202e0c2f1342267b16004313202d02010000000103d3676c3c3314000201010102001bd3d63c543cb41701160148130a7b16000c33130e7b1601b11600ab16011600a9a00016002aa10005160116005f01010106014069d33538a49fb41701160148130a7bce050c33130c7b16000c33130e7ba0010d2aa101140a5f5f6d61705f5f305f5f16014744cbc54c1d0c0d0d140a5f5f6d61705f5f305f5f16014744cb010117021602000ace0431130b7b1602a00100070c0e0c140a5f5f6d61705f5f305f5f16014744cb01024a09ca140a5f5f6d61705f5f305f5f16014744b1a0016bd201011601b11600acb11601160056ce051305640c13016417041703b21600a2160147a0014044ce0316031604c11705a00016002ba10006160116005f160502010001010115d38072397d140a5f5f6d61705f5f305f5f16004744cbc5194c021400020c0d0d140a5f5f6d61705f5f305f5f16004744cb010102010002030111d3fd3d3af616004716014044cb17021602c5130d7b0c0d160201020201000206004040d38bb32147b4170216024716004044cb170316010c33130e7b16010d0d16030103170416044c40290c0d0d140a5f5f6d61705f5f305f5f16024744cb01011600000617051605430c2f4c0a16020d0c140a5f5f6d61705f5f305f5f16024744cb01034a0a16050c0e0c140a5f5f6d61705f5f305f5f16024744cb01020c0c16030104",
-  "codeHash": "5f95704fd2f96ed987b89fdb6e0659cc32d2accc50194a6bd2aedcffdce2f3e5",
+  "bytecode": "0a1509121b40244051407a40ac40ca4117414741654173425d426b42c643b243e0441a443c44c54593010000000102ce0002010000000102ce0102010000000102ce0202010000000102a00102010002040115d3cee9319416011600000a311342277b160113202c170216001602160213202a62170316037102010002030114d33cd5e72916004313202e0c2f1342267b16004313202d1702160016010c1602000802010002030119d32cabd28216004313202e0c2f1342267b160016010005170216020b244c031600024a05160016023d00090201000202010ed31bc25d3416004313202e0c2f1342267b160016016b44020000040601402a16021603344c020b02160216032a0e2d17041600160400041705160516012f4c0316043f0216051601314c091600160116040d2a16030008024a061600160116021604000802010002030118d34b2e25b716011600000a311342277b160113202c170216000c1602621600160213202a16004362440201000101010ed30041471116004313202e0c2f1342267b16004313202d02010000000103d3676c3c331400020000030901409216020c3013415e7b160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e160216083736371708160416083702010000000103d38719c92ea0000201010103014032d38bbc9beeb41701160148130a7b16000c33130e7ba0010c2f4c0216004a041600a001a000000c170216020c33130f7b1601b11602ab16011600a9a00016002aa100a00116022aa101051601160016026016020201010107014078d33538a49fb41701160148130a7bce050c33130c7b16000c33130e7b1600a000a001000c170216020c3313107ba0020d2aa102140a5f5f6d61705f5f305f5f16014744cbc54c1d0c0d0d140a5f5f6d61705f5f305f5f16014744cb010117031603000ace0431130b7b1603a00200070c0e0c140a5f5f6d61705f5f305f5f16014744cb01024a09ca140a5f5f6d61705f5f305f5f16014744b1a0026bd201011601b11600acb11601160256ce051305640c13016417051704b21602a2160147a0024044ce0316041605c11706a00016022ba100a00116002ba1010616011600160260160602010701020018d3fe1110a1b4170116000c33130e7ba0010c3313117b16011600a9a00016002aa10008160116005f010001010115d38072397d140a5f5f6d61705f5f305f5f16004744cbc5194c021400020c0d0d140a5f5f6d61705f5f305f5f16004744cb010102010002030111d3fd3d3af616004716014044cb17021602c5130d7b0c0d160201020201000206004040d38bb32147b4170216024716004044cb170316010c33130e7b16010d0d16030103170416044c40290c0d0d140a5f5f6d61705f5f305f5f16024744cb01011600000617051605430c2f4c0a16020d0c140a5f5f6d61705f5f305f5f16024744cb01034a0a16050c0e0c140a5f5f6d61705f5f305f5f16024744cb01020c0c160301050102010701406bd30bdc6a97b41701160148130a7b16014716004044cb17021602c5130d7b0c0e16020104170417030c0c160201050c170516040c334c1ca0010c2f4c0216044a041604a001a000000c170516050c33130f7b1601b11605aba00016042aa100a00116052aa1010c0d0d140a5f5f6d61705f5f305f5f16014744cb01011600000617061606430c2f4c0a16010d0c140a5f5f6d61705f5f305f5f16014744cb01034a0a16060c0e0c140a5f5f6d61705f5f305f5f16014744cb010207160116051603160461160502",
+  "codeHash": "3329d0319da90857686a9e618c3fa8197226ed9be58b7371314b3247d9fd8e1c",
   "fieldsSig": {
     "names": [
       "symbol",
@@ -11,7 +11,8 @@
       "unstakeVaultTemplateId",
       "maxActiveUnstakeRequestsPerUser",
       "unstakeDuration",
-      "totalStaked",
+      "totalDepositedAlph",
+      "totalXAlphSupply",
       "lastUnstakeVaultIndex",
       "__stdInterfaceId"
     ],
@@ -24,6 +25,7 @@
       "U256",
       "U256",
       "U256",
+      "U256",
       "ByteVec"
     ],
     "isMutable": [
@@ -35,6 +37,7 @@
       false,
       true,
       true,
+      true,
       false
     ]
   },
@@ -43,10 +46,12 @@
       "name": "Staked",
       "fieldNames": [
         "to",
-        "amount"
+        "alphAmount",
+        "xAlphAmount"
       ],
       "fieldTypes": [
         "Address",
+        "U256",
         "U256"
       ]
     },
@@ -54,6 +59,34 @@
       "name": "UnstakeScheduled",
       "fieldNames": [
         "to",
+        "xAlphAmount",
+        "alphAmount"
+      ],
+      "fieldTypes": [
+        "Address",
+        "U256",
+        "U256"
+      ]
+    },
+    {
+      "name": "UnstakeCancelled",
+      "fieldNames": [
+        "to",
+        "xAlphAmount",
+        "claimedAlphAmount",
+        "restakedAlphAmount"
+      ],
+      "fieldTypes": [
+        "Address",
+        "U256",
+        "U256",
+        "U256"
+      ]
+    },
+    {
+      "name": "RewardDeposited",
+      "fieldNames": [
+        "from",
         "amount"
       ],
       "fieldTypes": [
@@ -237,6 +270,36 @@
         "ByteVec"
       ]
     },
+    {
+      "name": "mulDiv",
+      "paramNames": [
+        "a",
+        "b",
+        "denominator"
+      ],
+      "paramTypes": [
+        "U256",
+        "U256",
+        "U256"
+      ],
+      "paramIsMutable": [
+        false,
+        false,
+        true
+      ],
+      "returnTypes": [
+        "U256"
+      ]
+    },
+    {
+      "name": "getTotalDepositedAlph",
+      "paramNames": [],
+      "paramTypes": [],
+      "paramIsMutable": [],
+      "returnTypes": [
+        "U256"
+      ]
+    },
     {
       "name": "stake",
       "paramNames": [
@@ -248,7 +311,9 @@
       "paramIsMutable": [
         false
       ],
-      "returnTypes": []
+      "returnTypes": [
+        "U256"
+      ]
     },
     {
       "name": "startUnstake",
@@ -265,6 +330,19 @@
         "ByteVec"
       ]
     },
+    {
+      "name": "depositReward",
+      "paramNames": [
+        "amount"
+      ],
+      "paramTypes": [
+        "U256"
+      ],
+      "paramIsMutable": [
+        false
+      ],
+      "returnTypes": []
+    },
     {
       "name": "getActiveUnstakeVaultIndexes",
       "paramNames": [
@@ -313,6 +391,21 @@
         false
       ],
       "returnTypes": []
+    },
+    {
+      "name": "cancelUnstake",
+      "paramNames": [
+        "vaultIndex"
+      ],
+      "paramTypes": [
+        "U256"
+      ],
+      "paramIsMutable": [
+        false
+      ],
+      "returnTypes": [
+        "U256"
+      ]
     }
   ],
   "constants": [
@@ -351,6 +444,25 @@
         }
       ]
     },
+    {
+      "name": "FullMathError",
+      "fields": [
+        {
+          "name": "DivByZero",
+          "value": {
+            "type": "U256",
+            "value": "350"
+          }
+        },
+        {
+          "name": "MulDivOverflow",
+          "value": {
+            "type": "U256",
+            "value": "351"
+          }
+        }
+      ]
+    },
     {
       "name": "ErrorCodes",
       "fields": [
@@ -388,6 +500,27 @@
             "type": "U256",
             "value": "14"
           }
+        },
+        {
+          "name": "ZeroXAlphOutput",
+          "value": {
+            "type": "U256",
+            "value": "15"
+          }
+        },
+        {
+          "name": "ZeroAlphOutput",
+          "value": {
+            "type": "U256",
+            "value": "16"
+          }
+        },
+        {
+          "name": "NoStakers",
+          "value": {
+            "type": "U256",
+            "value": "17"
+          }
         }
       ]
     }

package/staking/artifacts/XAlphUnlockAndStartUnstake.ral.json

@@ -1,7 +1,7 @@
 {
-  "version": "v4.2.5",
+  "version": "v4.3.1",
   "name": "XAlphUnlockAndStartUnstake",
-  "bytecodeTemplate": "01010300020016b41700{2}0d0c{1}01100c0d{1}010c170116001601{2}a3{2}0d0d{0}010d18",
+  "bytecodeTemplate": "01010300020016b41700{2}0d0c{1}01100c0d{1}010c170116001601{2}a3{2}0d0d{0}010f18",
   "fieldsSig": {
     "names": [
       "xAlphToken",

package/staking/artifacts/examples/GovernanceDemo.ral.json

@@ -1,5 +1,5 @@
 {
-  "version": "v4.2.5",
+  "version": "v4.3.1",
   "name": "GovernanceDemo",
   "bytecode": "090c40c9419741f54217422b426c42a642b44382438d439843a801000206004058d3926b380bb417021602ce00774513087b140a5f5f6d61705f5f305f5f16004744cbc54c403f0c0d0d140a5f5f6d61705f5f305f5f16004744cb1705160501010d0d0d1605010117041703000b7a4c041816030c304c180c0d0d140a5f5f6d61705f5f315f5f16034044cb010116012a0c0e0c140a5f5f6d61705f5f315f5f16034044cb0102a00016012aa100160416012a0d0e0c140a5f5f6d61705f5f305f5f16004744cb01024a09ca140a5f5f6d61705f5f305f5f16004744b10c1601d201020100020700405ed365b06caeb417021602ce00774513087b140a5f5f6d61705f5f305f5f16004744cbc50d7b0c0d0d140a5f5f6d61705f5f305f5f16004744cb1706160601010d0d0d1606010117041703160416012b170516050d0e0c140a5f5f6d61705f5f305f5f16004744cb0102000b7a4c041816030c304c180c0d0d140a5f5f6d61705f5f315f5f16034044cb010116012b0c0e0c140a5f5f6d61705f5f315f5f16034044cb0102a00016012ba10016050c2f4c09ca0d0c140a5f5f6d61705f5f305f5f16004744cb010301000002004033d3ecf99ab7b4ce054513077b000919107b000a19117b56a101ce01ce02ce03ce041017000c170116011600314c14ca140a5f5f6d61705f5f315f5f16017a10314d0d2acf4044b10cd2010116010d2a17014a2805a0015e010000000012d33919f580b4ce054513077b00090f7b000a19117b56a10207a0025e010000000406d3068539face01ce02ce03ce040201000102021ad344a25325140a5f5f6d61705f5f305f5f16004744cbc50d7b0c0d0d140a5f5f6d61705f5f305f5f16004744cb1701160101010d0d0d1601010102010001010116d32e30a67700090f7b140a5f5f6d61705f5f315f5f16004044cbc50e7b0c0d0d140a5f5f6d61705f5f315f5f16004044cb010102010000000103d33cfd4f9ea000020100010300405cd376a80ea2b417011601480c7b00090f7b000a19117b140a5f5f6d61705f5f315f5f16004044cbc50e7b140a5f5f6d61705f5f305f5f16014744cbc50d7b0c0d0d140a5f5f6d61705f5f305f5f16014744cb01010c2f13067b0d0d0d140a5f5f6d61705f5f305f5f16014744cb01011702a00016022aa1000c0d0d140a5f5f6d61705f5f315f5f16004044cb010116022a0c0e0c140a5f5f6d61705f5f315f5f16004044cb010216000c0e0c140a5f5f6d61705f5f305f5f16014744cb01020616011600160260000000000104a0010c3002000000000104a0020c300200000000010700097a4c0318000a1902",
   "codeHash": "1d77f89642f8b3bd6364388e7b9b8ad9d58815365d4e7a02a932fe65ab913078",

package/staking/artifacts/examples/RewardSharingVault.ral.json

@@ -1,5 +1,5 @@
 {
-  "version": "v4.2.5",
+  "version": "v4.3.1",
   "name": "RewardSharingVault",
   "bytecode": "040740b74152423c4277428942c0431e01000208004054d3926b380bb417021602ce00774513287b140a5f5f6d61705f5f305f5f16004744cbc54c40270c0d0d140a5f5f6d61705f5f305f5f16004744cb01011703160116032a16000d0ece00010d1707170616062f132b7b16000005160316012a0c0e0c140a5f5f6d61705f5f305f5f16004744cb01024a15160116000d0ece00010d1705170416042f132b7bca140a5f5f6d61705f5f305f5f16004744b11601a001d20102a00016012aa10005160016015f01000205004046d365b06caeb417021602ce00774513287b140a5f5f6d61705f5f305f5f16004744cbc513297b0c0d0d140a5f5f6d61705f5f305f5f16004744cb010117031601160332132c7b160316012b17041600000516040c2f4c0aca0d0c140a5f5f6d61705f5f305f5f16004744cb01034a0a16040c0e0c140a5f5f6d61705f5f305f5f16004744cb0102a00016012ba10006160016015f0000030901409216020c3013415e7b160016010c0d3687170316001601371704160316043616031604314c020d4a010c36170516050c2f4c04160416022d02160216053313415f7b160016011602871706160516061604334c020d4a010c361705160416063617040c1602361602381707160216072d1702160416072d17040c16073616072d0d351707160416051607373917040f1602370e3a170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e16021608373637170816080e160216083736371708160416083702010101030019d3fe1110a1a0000c33132a7bb417011601ce011600ac160013c40de0b6b3a7640000a00000021702a00116022aa10107160116005f010300010005d3a28b71d5b417001600000500020102001916000006170116010c334c081600ce011601ab08160016015fa0010d0e0c140a5f5f6d61705f5f305f5f16004744cb010201000105014024d31191a066140a5f5f6d61705f5f305f5f16004744cbc513297b0c0d0d140a5f5f6d61705f5f305f5f16004744cb1704160401010d0d0d1604010117021701a00116022b17031601160313c40de0b6b3a7640000000202",
   "codeHash": "8beaa8b570543344d4352cf8534bbc7df4591b4ecda97cfc3c30bc28dca5adb9",

package/staking/artifacts/ts/AlphUnstakeVault.ts

@@ -67,6 +67,10 @@ export namespace AlphUnstakeVaultTypes {
       params: CallContractParams<{ amount: bigint }>;
       result: CallContractResult<boolean>;
     };
+    cancelAndReturn: {
+      params: Omit<CallContractParams<{}>, "args">;
+      result: CallContractResult<[bigint, bigint]>;
+    };
     destroy: {
       params: Omit<CallContractParams<{}>, "args">;
       result: CallContractResult<null>;
@@ -109,6 +113,10 @@ export namespace AlphUnstakeVaultTypes {
       params: SignExecuteContractMethodParams<{ amount: bigint }>;
       result: SignExecuteScriptTxResult;
     };
+    cancelAndReturn: {
+      params: Omit<SignExecuteContractMethodParams<{}>, "args">;
+      result: SignExecuteScriptTxResult;
+    };
     destroy: {
       params: Omit<SignExecuteContractMethodParams<{}>, "args">;
       result: SignExecuteScriptTxResult;
@@ -189,6 +197,14 @@ class Factory extends ContractFactory<
     ): Promise<TestContractResultWithoutMaps<boolean>> => {
       return testMethod(this, "claim", params, getContractByCodeHash);
     },
+    cancelAndReturn: async (
+      params: Omit<
+        TestContractParamsWithoutMaps<AlphUnstakeVaultTypes.Fields, never>,
+        "args"
+      >
+    ): Promise<TestContractResultWithoutMaps<[bigint, bigint]>> => {
+      return testMethod(this, "cancelAndReturn", params, getContractByCodeHash);
+    },
     destroy: async (
       params: Omit<
         TestContractParamsWithoutMaps<AlphUnstakeVaultTypes.Fields, never>,
@@ -213,7 +229,7 @@ export const AlphUnstakeVault = new Factory(
   Contract.fromJson(
     AlphUnstakeVaultContractJson,
     "",
-    "5216c458f360d0f51f5e2109a760814ff97eab76f546adc835eb318c6cbc5256",
+    "a065f4a88edfe06c09d65e3c11154fe9d5a5b1cdc42b36adf1a3485ff8a51394",
     types.AllStructs
   )
 );
@@ -278,6 +294,17 @@ export class AlphUnstakeVaultInstance extends ContractInstance {
         getContractByCodeHash
       );
     },
+    cancelAndReturn: async (
+      params?: AlphUnstakeVaultTypes.CallMethodParams<"cancelAndReturn">
+    ): Promise<AlphUnstakeVaultTypes.CallMethodResult<"cancelAndReturn">> => {
+      return callMethod(
+        AlphUnstakeVault,
+        this,
+        "cancelAndReturn",
+        params === undefined ? {} : params,
+        getContractByCodeHash
+      );
+    },
     destroy: async (
       params?: AlphUnstakeVaultTypes.CallMethodParams<"destroy">
     ): Promise<AlphUnstakeVaultTypes.CallMethodResult<"destroy">> => {
@@ -326,6 +353,18 @@ export class AlphUnstakeVaultInstance extends ContractInstance {
     ): Promise<AlphUnstakeVaultTypes.SignExecuteMethodResult<"claim">> => {
       return signExecuteMethod(AlphUnstakeVault, this, "claim", params);
     },
+    cancelAndReturn: async (
+      params: AlphUnstakeVaultTypes.SignExecuteMethodParams<"cancelAndReturn">
+    ): Promise<
+      AlphUnstakeVaultTypes.SignExecuteMethodResult<"cancelAndReturn">
+    > => {
+      return signExecuteMethod(
+        AlphUnstakeVault,
+        this,
+        "cancelAndReturn",
+        params
+      );
+    },
     destroy: async (
       params: AlphUnstakeVaultTypes.SignExecuteMethodParams<"destroy">
     ): Promise<AlphUnstakeVaultTypes.SignExecuteMethodResult<"destroy">> => {