fix(mobile): masterchain lockup

tonkeeper · Jan 25, 2024 · 64906a3 · 64906a3
1 parent ba45f01
commit 64906a3
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 1 deletion.
diff --git a/packages/@core-js/src/Tonkeeper.ts b/packages/@core-js/src/Tonkeeper.ts
@@ -163,6 +163,7 @@ export class Tonkeeper {
     const contract = ContractService.getWalletContract(
       WalletVersion.v4R2,
       Buffer.from(keyPair.publicKey),
+      0,
     );
     const stateInitCell = beginCell().store(storeStateInit(contract.init)).endCell();
     const rawAddress = contract.address.toRawString();

diff --git a/packages/@core-js/src/service/contractService.ts b/packages/@core-js/src/service/contractService.ts
@@ -50,11 +50,11 @@ export interface CreateJettonTransferBodyParams {
   queryId?: number;
 }
 
-const workchain = 0;
 export class ContractService {
   static getWalletContract(
     version: WalletVersion,
     publicKey: Buffer,
+    workchain: number,
     additionalParams?: LockupContractV1AdditionalParams,
   ) {
     switch (version) {

diff --git a/packages/mobile/src/blockchain/vault.ts b/packages/mobile/src/blockchain/vault.ts
@@ -209,6 +209,10 @@ export class Vault {
     return null;
   }
 
+  public get workchain() {
+    return this.info.workchain ?? 0;
+  }
+
   isMasterChain() {
     return this.info.workchain === -1;
   }

diff --git a/packages/mobile/src/blockchain/wallet.ts b/packages/mobile/src/blockchain/wallet.ts
@@ -177,6 +177,10 @@ export class TonWallet {
     return this.vault.getVersion();
   }
 
+  get workchain() {
+    return this.vault.workchain;
+  }
+
   isV4() {
     return this.vault.getVersion() === 'v4R2';
   }
@@ -376,6 +380,7 @@ export class TonWallet {
     const contract = ContractService.getWalletContract(
       contractVersionsMap[version ?? 'v4R2'],
       Buffer.from(vault.tonPublicKey),
+      vault.workchain,
       {
         allowedDestinations: lockupConfig?.allowed_destinations,
       },
@@ -544,6 +549,7 @@ export class TonWallet {
     const contract = ContractService.getWalletContract(
       contractVersionsMap[walletVersion ?? version ?? 'v4R2'],
       Buffer.from(vault.tonPublicKey),
+      vault.workchain,
       {
         lockupPubKey: lockupConfig?.config_pubkey,
         allowedDestinations: lockupConfig?.allowed_destinations,

diff --git a/packages/mobile/src/core/ModalContainer/NFTOperations/Modals/SignRawModal.tsx b/packages/mobile/src/core/ModalContainer/NFTOperations/Modals/SignRawModal.tsx
@@ -73,6 +73,7 @@ export const SignRawModal = memo<SignRawModalProps>((props) => {
     const contract = ContractService.getWalletContract(
       contractVersionsMap[vault.getVersion() ?? 'v4R2'],
       Buffer.from(vault.tonPublicKey),
+      vault.workchain,
     );
     const boc = TransactionService.createTransfer(contract, {
       messages: TransactionService.parseSignRawMessages(params.messages),
@@ -254,6 +255,7 @@ export const openSignRawModal = async (
     const contract = ContractService.getWalletContract(
       contractVersionsMap[wallet.ton.version],
       Buffer.from(wallet.ton.vault.tonPublicKey),
+      wallet.ton.vault.workchain,
     );
 
     let consequences: MessageConsequences | null = null;

diff --git a/packages/mobile/src/core/NFTSend/NFTSend.tsx b/packages/mobile/src/core/NFTSend/NFTSend.tsx
@@ -145,6 +145,7 @@ export const NFTSend: FC<Props> = (props) => {
       const contract = ContractService.getWalletContract(
         contractVersionsMap[wallet.ton.version ?? 'v4R2'],
         Buffer.from(await wallet.ton.getTonPublicKey()),
+        wallet.ton.workchain,
       );
 
       const boc = TransactionService.createTransfer(contract, {
@@ -288,6 +289,7 @@ export const NFTSend: FC<Props> = (props) => {
       const contract = ContractService.getWalletContract(
         contractVersionsMap[wallet.ton.version ?? 'v4R2'],
         Buffer.from(await wallet.ton.getTonPublicKey()),
+        vault.workchain,
       );
 
       const boc = TransactionService.createTransfer(contract, {