@tonappchain/sdk 0.9.0-rc1 → 0.9.0-rc2

package/dist/artifacts/mainnet/ton/internal/wrappers/NFTCollection.d.ts

@@ -49,10 +49,10 @@ export declare class NFTCollection implements Contract {
     static createFromAddress(address: Address): NFTCollection;
     static createFromConfig(config: NFTCollectionConfig, code: Cell, workchain?: number): NFTCollection;
     sendDeploy(provider: ContractProvider, via: Sender, value: bigint): Promise<void>;
-    static deployNFTItemMessage(queryId: number | bigint, itemIndex: number, itemOwner: Address, nftContent: Cell, maybeNewContent?: Cell, forwardPayload?: Cell): Cell;
+    static deployNFTItemMessage(queryId: number | bigint, itemIndex: bigint | number, itemOwner: Address, nftContent: Cell, maybeNewContent?: Cell, forwardPayload?: Cell): Cell;
     sendDeployNFTItem(provider: ContractProvider, via: Sender, value: bigint, params: {
         queryId?: number | bigint;
-        itemIndex: number;
+        itemIndex: bigint | number;
         itemOwner: Address;
         nftContent: Cell;
         maybeNewContent?: Cell;
@@ -79,7 +79,7 @@ export declare class NFTCollection implements Contract {
         adminAddress: Address;
         newAdminAddress: Address | null;
     }>;
-    getNFTAddressByIndex(provider: ContractProvider, index: number | bigint): Promise<Address>;
-    getNFTContent(provider: ContractProvider, index: number | bigint, individualNFTContent: Cell): Promise<Cell>;
+    getNFTAddressByIndex(provider: ContractProvider, index: bigint | number): Promise<Address>;
+    getNFTContent(provider: ContractProvider, index: bigint | number, individualNFTContent: Cell): Promise<Cell>;
     getOriginalAddress(provider: ContractProvider): Promise<String>;
 }

package/dist/artifacts/testnet/ton/internal/wrappers/NFTCollection.d.ts

@@ -49,10 +49,10 @@ export declare class NFTCollection implements Contract {
     static createFromAddress(address: Address): NFTCollection;
     static createFromConfig(config: NFTCollectionConfig, code: Cell, workchain?: number): NFTCollection;
     sendDeploy(provider: ContractProvider, via: Sender, value: bigint): Promise<void>;
-    static deployNFTItemMessage(queryId: number | bigint, itemIndex: number, itemOwner: Address, nftContent: Cell, maybeNewContent?: Cell, forwardPayload?: Cell): Cell;
+    static deployNFTItemMessage(queryId: number | bigint, itemIndex: bigint | number, itemOwner: Address, nftContent: Cell, maybeNewContent?: Cell, forwardPayload?: Cell): Cell;
     sendDeployNFTItem(provider: ContractProvider, via: Sender, value: bigint, params: {
         queryId?: number | bigint;
-        itemIndex: number;
+        itemIndex: bigint | number;
         itemOwner: Address;
         nftContent: Cell;
         maybeNewContent?: Cell;
@@ -79,7 +79,7 @@ export declare class NFTCollection implements Contract {
         adminAddress: Address;
         newAdminAddress: Address | null;
     }>;
-    getNFTAddressByIndex(provider: ContractProvider, index: number | bigint): Promise<Address>;
-    getNFTContent(provider: ContractProvider, index: number | bigint, individualNFTContent: Cell): Promise<Cell>;
+    getNFTAddressByIndex(provider: ContractProvider, index: bigint | number): Promise<Address>;
+    getNFTContent(provider: ContractProvider, index: bigint | number, individualNFTContent: Cell): Promise<Cell>;
     getOriginalAddress(provider: ContractProvider): Promise<String>;
 }

package/dist/esm/src/index.mjs

@@ -6294,8 +6294,9 @@ import {
 import { sign } from "ton-crypto";
 
 // src/wrappers/HighloadQueryId.ts
-var BIT_NUMBER_SIZE = 10n;
-var MAX_BIT_NUMBER = 1022n;
+var HIGHLOAD_QUERY_ID_BIT_NUMBER_SIZE = 10n;
+var HIGHLOAD_QUERY_ID_INVALID_BIT_NUMBER = (1n << HIGHLOAD_QUERY_ID_BIT_NUMBER_SIZE) - 1n;
+var MAX_BIT_NUMBER = HIGHLOAD_QUERY_ID_INVALID_BIT_NUMBER - 1n;
 var MAX_SHIFT = 8191n;
 var HighloadQueryId = class _HighloadQueryId {
   // [0 .. 1022]
@@ -6339,11 +6340,11 @@ var HighloadQueryId = class _HighloadQueryId {
     return this.bitnumber;
   }
   getQueryId() {
-    return (this.shift << BIT_NUMBER_SIZE) + this.bitnumber;
+    return (this.shift << HIGHLOAD_QUERY_ID_BIT_NUMBER_SIZE) + this.bitnumber;
   }
   static fromQueryId(queryId) {
-    const shift = queryId >> BIT_NUMBER_SIZE;
-    const bitnumber = queryId & 1023n;
+    const shift = queryId >> HIGHLOAD_QUERY_ID_BIT_NUMBER_SIZE;
+    const bitnumber = queryId & HIGHLOAD_QUERY_ID_INVALID_BIT_NUMBER;
     return this.fromShiftAndBitNumber(shift, bitnumber);
   }
   static fromSeqno(i) {
@@ -6374,6 +6375,7 @@ var HIGHLOAD_V3_CODE = Cell8.fromBoc(
 )[0];
 var TIMESTAMP_SIZE = 64;
 var TIMEOUT_SIZE = 22;
+var QUERY_ID_PERIOD = 8388608n;
 function highloadWalletV3ConfigToCell(config) {
   return beginCell9().storeBuffer(config.publicKey).storeUint(config.subwalletId ?? DEFAULT_SUBWALLET_ID, 32).storeUint(0, 1 + 1 + TIMESTAMP_SIZE).storeUint(config.timeout ?? DEFAULT_TIMEOUT, TIMEOUT_SIZE).endCell();
 }
@@ -6412,7 +6414,16 @@ var HighloadWalletV3 = class _HighloadWalletV3 {
     return new _HighloadWalletV3(contractAddress(workchain, init), init);
   }
   static generateCreatedAt() {
-    return Math.floor(Date.now() / 1e3) - 40;
+    return _HighloadWalletV3.normalizeCreatedAt(Math.floor(Date.now() / 1e3) - 40);
+  }
+  /**
+   * The Highload V3 contract accepts bitnumber values [0..1022]. Query IDs
+   * are derived from createdAt, so skip timestamps whose low 10 bits are the
+   * invalid value 1023.
+   */
+  static normalizeCreatedAt(createdAt) {
+    const queryId = BigInt(createdAt) % QUERY_ID_PERIOD;
+    return (queryId & HIGHLOAD_QUERY_ID_INVALID_BIT_NUMBER) === HIGHLOAD_QUERY_ID_INVALID_BIT_NUMBER ? createdAt + 1 : createdAt;
   }
   async sendExternalMessage(provider, secretKey, opts) {
     let messageCell;
@@ -6433,6 +6444,7 @@ var HighloadWalletV3 = class _HighloadWalletV3 {
     if (createdAt == void 0) {
       createdAt = _HighloadWalletV3.generateCreatedAt();
     }
+    createdAt = _HighloadWalletV3.normalizeCreatedAt(createdAt);
     const queryId = this.getQueryIdFromCreatedAt(createdAt);
     return await this.sendExternalMessage(provider, secretKey, {
       message: this.packActions(messages, value, queryId),
@@ -6444,7 +6456,7 @@ var HighloadWalletV3 = class _HighloadWalletV3 {
     });
   }
   getQueryIdFromCreatedAt(createdAt) {
-    return HighloadQueryId.fromQueryId(BigInt(createdAt) % 8388608n);
+    return HighloadQueryId.fromQueryId(BigInt(createdAt) % QUERY_ID_PERIOD);
   }
   getExternalMessage(messages, sendMode, value, queryId) {
     return this.packActions(
@@ -6598,7 +6610,7 @@ var BatchSender = class {
       let validGroupFound = false;
       while (groupSize > 0) {
         const group = messages.slice(left, left + groupSize);
-        const createdAt = Math.floor(Date.now() / 1e3) - 40;
+        const createdAt = HighloadWalletV3.generateCreatedAt();
         const queryId = this.wallet.getQueryIdFromCreatedAt(createdAt);
         const externalMsg = this.wallet.getExternalMessage(group, SendMode2.PAY_GAS_SEPARATELY, 0n, queryId);
         const isBocSizeValid = externalMsg.body.toBoc().length <= MAX_EXT_MSG_SIZE;
@@ -6626,6 +6638,7 @@ var BatchSender = class {
     if (createdAt <= this.lastCreatedAt) {
       createdAt = this.lastCreatedAt + 1;
     }
+    createdAt = HighloadWalletV3.normalizeCreatedAt(createdAt);
     this.lastCreatedAt = createdAt;
     return walletContract.sendTransfer({
       secretKey: this.secretKey,
@@ -7613,6 +7626,8 @@ export {
   FT,
   FetchError,
   FormatError,
+  HIGHLOAD_QUERY_ID_BIT_NUMBER_SIZE,
+  HIGHLOAD_QUERY_ID_INVALID_BIT_NUMBER,
   HighloadQueryId,
   HighloadWalletV3,
   KeyError,

package/dist/src/sender/BatchSender.js

@@ -78,7 +78,7 @@ class BatchSender {
             let validGroupFound = false;
             while (groupSize > 0) {
                 const group = messages.slice(left, left + groupSize);
-                const createdAt = Math.floor(Date.now() / 1000) - 40;
+                const createdAt = HighloadWalletV3_1.HighloadWalletV3.generateCreatedAt();
                 const queryId = this.wallet.getQueryIdFromCreatedAt(createdAt);
                 const externalMsg = this.wallet.getExternalMessage(group, ton_1.SendMode.PAY_GAS_SEPARATELY, 0n, queryId);
                 const isBocSizeValid = externalMsg.body.toBoc().length <= Consts_1.MAX_EXT_MSG_SIZE;
@@ -106,6 +106,7 @@ class BatchSender {
         if (createdAt <= this.lastCreatedAt) {
             createdAt = this.lastCreatedAt + 1; // to prevent error::already_executed on highload wallet
         }
+        createdAt = HighloadWalletV3_1.HighloadWalletV3.normalizeCreatedAt(createdAt);
         this.lastCreatedAt = createdAt;
         return walletContract.sendTransfer({
             secretKey: this.secretKey,

package/dist/src/wrappers/HighloadQueryId.d.ts

@@ -1,3 +1,5 @@
+export declare const HIGHLOAD_QUERY_ID_BIT_NUMBER_SIZE = 10n;
+export declare const HIGHLOAD_QUERY_ID_INVALID_BIT_NUMBER: bigint;
 export declare class HighloadQueryId {
     private shift;
     private bitnumber;

package/dist/src/wrappers/HighloadQueryId.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HighloadQueryId = void 0;
-const BIT_NUMBER_SIZE = 10n; // 10 bit
-const MAX_BIT_NUMBER = 1022n;
+exports.HighloadQueryId = exports.HIGHLOAD_QUERY_ID_INVALID_BIT_NUMBER = exports.HIGHLOAD_QUERY_ID_BIT_NUMBER_SIZE = void 0;
+exports.HIGHLOAD_QUERY_ID_BIT_NUMBER_SIZE = 10n;
+exports.HIGHLOAD_QUERY_ID_INVALID_BIT_NUMBER = (1n << exports.HIGHLOAD_QUERY_ID_BIT_NUMBER_SIZE) - 1n;
+const MAX_BIT_NUMBER = exports.HIGHLOAD_QUERY_ID_INVALID_BIT_NUMBER - 1n;
 const MAX_SHIFT = 8191n; // 2^13 = 8192
 class HighloadQueryId {
     constructor() {
@@ -49,11 +50,11 @@ class HighloadQueryId {
         return this.bitnumber;
     }
     getQueryId() {
-        return (this.shift << BIT_NUMBER_SIZE) + this.bitnumber;
+        return (this.shift << exports.HIGHLOAD_QUERY_ID_BIT_NUMBER_SIZE) + this.bitnumber;
     }
     static fromQueryId(queryId) {
-        const shift = queryId >> BIT_NUMBER_SIZE;
-        const bitnumber = queryId & 1023n;
+        const shift = queryId >> exports.HIGHLOAD_QUERY_ID_BIT_NUMBER_SIZE;
+        const bitnumber = queryId & exports.HIGHLOAD_QUERY_ID_INVALID_BIT_NUMBER;
         return this.fromShiftAndBitNumber(shift, bitnumber);
     }
     static fromSeqno(i) {

package/dist/src/wrappers/HighloadWalletV3.d.ts

@@ -38,6 +38,12 @@ export declare class HighloadWalletV3 implements WalletInstanse {
     }): Promise<string>;
     static create(config: HighloadWalletV3Config, code?: Cell, workchain?: number): HighloadWalletV3;
     static generateCreatedAt(): number;
+    /**
+     * The Highload V3 contract accepts bitnumber values [0..1022]. Query IDs
+     * are derived from createdAt, so skip timestamps whose low 10 bits are the
+     * invalid value 1023.
+     */
+    static normalizeCreatedAt(createdAt: number): number;
     sendExternalMessage(provider: ContractProvider, secretKey: Buffer, opts: {
         message: MessageRelaxed | Cell;
         mode: number;

package/dist/src/wrappers/HighloadWalletV3.js

@@ -14,6 +14,7 @@ exports.DEFAULT_TIMEOUT = 60 * 60; // 1 hour
 const HIGHLOAD_V3_CODE = ton_1.Cell.fromBoc(Buffer.from('b5ee9c7241021001000228000114ff00f4a413f4bcf2c80b01020120020d02014803040078d020d74bc00101c060b0915be101d0d3030171b0915be0fa4030f828c705b39130e0d31f018210ae42e5a4ba9d8040d721d74cf82a01ed55fb04e030020120050a02027306070011adce76a2686b85ffc00201200809001aabb6ed44d0810122d721d70b3f0018aa3bed44d08307d721d70b1f0201200b0c001bb9a6eed44d0810162d721d70b15800e5b8bf2eda2edfb21ab09028409b0ed44d0810120d721f404f404d33fd315d1058e1bf82325a15210b99f326df82305aa0015a112b992306dde923033e2923033e25230800df40f6fa19ed021d721d70a00955f037fdb31e09130e259800df40f6fa19cd001d721d70a00937fdb31e0915be270801f6f2d48308d718d121f900ed44d0d3ffd31ff404f404d33fd315d1f82321a15220b98e12336df82324aa00a112b9926d32de58f82301de541675f910f2a106d0d31fd4d307d30cd309d33fd315d15168baf2a2515abaf2a6f8232aa15250bcf2a304f823bbf2a35304800df40f6fa199d024d721d70a00f2649130e20e01fe5309800df40f6fa18e13d05004d718d20001f264c858cf16cf8301cf168e1030c824cf40cf8384095005a1a514cf40e2f800c94039800df41704c8cbff13cb1ff40012f40012cb3f12cb15c9ed54f80f21d0d30001f265d3020171b0925f03e0fa4001d70b01c000f2a5fa4031fa0031f401fa0031fa00318060d721d300010f0020f265d2000193d431d19130e272b1fb00b585bf03', 'hex'))[0];
 exports.TIMESTAMP_SIZE = 64;
 exports.TIMEOUT_SIZE = 22;
+const QUERY_ID_PERIOD = 8388608n; // 2^23
 function highloadWalletV3ConfigToCell(config) {
     return (0, ton_1.beginCell)()
         .storeBuffer(config.publicKey)
@@ -57,7 +58,19 @@ class HighloadWalletV3 {
         return new HighloadWalletV3((0, ton_1.contractAddress)(workchain, init), init);
     }
     static generateCreatedAt() {
-        return Math.floor(Date.now() / 1000) - 40; // -40 is used to pass check created_at <= now() in smart contract for sure
+        // -40 is used to pass check created_at <= now() in smart contract for sure
+        return HighloadWalletV3.normalizeCreatedAt(Math.floor(Date.now() / 1000) - 40);
+    }
+    /**
+     * The Highload V3 contract accepts bitnumber values [0..1022]. Query IDs
+     * are derived from createdAt, so skip timestamps whose low 10 bits are the
+     * invalid value 1023.
+     */
+    static normalizeCreatedAt(createdAt) {
+        const queryId = BigInt(createdAt) % QUERY_ID_PERIOD;
+        return (queryId & HighloadQueryId_1.HIGHLOAD_QUERY_ID_INVALID_BIT_NUMBER) === HighloadQueryId_1.HIGHLOAD_QUERY_ID_INVALID_BIT_NUMBER
+            ? createdAt + 1
+            : createdAt;
     }
     async sendExternalMessage(provider, secretKey, opts) {
         let messageCell;
@@ -89,6 +102,7 @@ class HighloadWalletV3 {
         if (createdAt == undefined) {
             createdAt = HighloadWalletV3.generateCreatedAt();
         }
+        createdAt = HighloadWalletV3.normalizeCreatedAt(createdAt);
         const queryId = this.getQueryIdFromCreatedAt(createdAt);
         return await this.sendExternalMessage(provider, secretKey, {
             message: this.packActions(messages, value, queryId),
@@ -100,7 +114,7 @@ class HighloadWalletV3 {
         });
     }
     getQueryIdFromCreatedAt(createdAt) {
-        return HighloadQueryId_1.HighloadQueryId.fromQueryId(BigInt(createdAt) % 8388608n);
+        return HighloadQueryId_1.HighloadQueryId.fromQueryId(BigInt(createdAt) % QUERY_ID_PERIOD);
     }
     getExternalMessage(messages, sendMode, value, queryId) {
         return this.packActions(messages.map((msg) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@tonappchain/sdk",
-    "version": "0.9.0-rc1",
+    "version": "0.9.0-rc2",
     "repository": "https://github.com/TacBuild/tac-sdk.git",
     "author": "TAC. <developers@tac>",
     "license": "MIT",