Comparing version 4.14.0 to 4.15.0
@@ -18,4 +18,4 @@ "use strict"; | ||
let res = (0, parseDict_1.parseDictBitString)(root, 16); | ||
expect(res.keys.length).toBe(3); | ||
expect(Array.from(res.keys()).length).toBe(3); | ||
}); | ||
}); |
@@ -5,2 +5,4 @@ /// <reference types="node" /> | ||
import { WalletSource } from "../contracts/sources/WalletSource"; | ||
import { Maybe } from "../types"; | ||
import { SendMode } from "./SendMode"; | ||
export declare type WalletContractType = 'org.ton.wallets.simple' | 'org.ton.wallets.simple.r2' | 'org.ton.wallets.simple.r3' | 'org.ton.wallets.v2' | 'org.ton.wallets.v2.r2' | 'org.ton.wallets.v3' | 'org.ton.wallets.v3.r2'; | ||
@@ -36,2 +38,4 @@ export declare function validateWalletType(src: string): WalletContractType | null; | ||
bounce: boolean; | ||
sendMode?: Maybe<SendMode>; | ||
timeout?: Maybe<number>; | ||
}): Promise<void>; | ||
@@ -49,2 +53,4 @@ /** | ||
secretKey: Buffer; | ||
timeout?: Maybe<number>; | ||
sendMode?: Maybe<SendMode>; | ||
}): Promise<Cell>; | ||
@@ -51,0 +57,0 @@ /** |
@@ -32,2 +32,3 @@ "use strict"; | ||
const InternalMessage_1 = require("../messages/InternalMessage"); | ||
const SendMode_1 = require("./SendMode"); | ||
// Wallet Contract Priority | ||
@@ -193,3 +194,4 @@ const allTypes = [ | ||
seqno: args.seqno, | ||
sendMode: 3, | ||
sendMode: args.sendMode || (SendMode_1.SendMode.IGNORE_ERRORS + SendMode_1.SendMode.PAY_GAS_SEPARATLY), | ||
timeout: args.timeout, | ||
order: new InternalMessage_1.InternalMessage({ | ||
@@ -219,3 +221,4 @@ to: args.to, | ||
seqno: args.seqno, | ||
sendMode: 3, | ||
sendMode: args.sendMode || (SendMode_1.SendMode.IGNORE_ERRORS + SendMode_1.SendMode.PAY_GAS_SEPARATLY), | ||
timeout: args.timeout, | ||
order: new InternalMessage_1.InternalMessage({ | ||
@@ -222,0 +225,0 @@ to: args.to, |
/// <reference types="node" /> | ||
import { Cell, InternalMessage } from "../.."; | ||
import { Maybe } from "../../types"; | ||
export declare function createWalletTransferV1(args: { | ||
@@ -14,2 +15,3 @@ seqno: number; | ||
secretKey: Buffer; | ||
timeout?: Maybe<number>; | ||
}): Promise<Cell>; | ||
@@ -22,2 +24,3 @@ export declare function createWalletTransferV3(args: { | ||
secretKey: Buffer; | ||
timeout?: Maybe<number>; | ||
}): Promise<Cell>; |
@@ -30,3 +30,4 @@ "use strict"; | ||
sendMode: args.sendMode, | ||
order: args.order | ||
order: args.order, | ||
timeout: args.timeout | ||
}); | ||
@@ -46,2 +47,3 @@ // Sign message | ||
let signingMessage = new WalletV3SigningMessage_1.WalletV3SigningMessage({ | ||
timeout: args.timeout, | ||
walletId: args.walletId, | ||
@@ -48,0 +50,0 @@ seqno: args.seqno, |
@@ -5,3 +5,3 @@ import { Cell } from "../../boc/Cell"; | ||
export declare class WalletV2SigningMessage implements Message { | ||
readonly timestamp: number; | ||
readonly timeout: number; | ||
readonly seqno: number; | ||
@@ -11,3 +11,3 @@ readonly order: Message; | ||
constructor(args: { | ||
timestamp?: Maybe<number>; | ||
timeout?: Maybe<number>; | ||
seqno: Maybe<number>; | ||
@@ -14,0 +14,0 @@ sendMode: number; |
@@ -9,7 +9,7 @@ "use strict"; | ||
this.sendMode = args.sendMode; | ||
if (args.timestamp !== undefined && args.timestamp !== null) { | ||
this.timestamp = args.timestamp; | ||
if (args.timeout !== undefined && args.timeout !== null) { | ||
this.timeout = args.timeout; | ||
} | ||
else { | ||
this.timestamp = Date.now(); | ||
this.timeout = Math.floor(Date.now() / 1e3) + 60; // Default timeout: 60 seconds | ||
} | ||
@@ -31,4 +31,3 @@ if (args.seqno !== undefined && args.seqno !== null) { | ||
else { | ||
const timestamp = Math.floor(this.timestamp / 1e3); // In seconds | ||
cell.bits.writeUint(timestamp + 60, 32); // 60 seconds timeout | ||
cell.bits.writeUint(this.timeout, 32); | ||
} | ||
@@ -35,0 +34,0 @@ cell.bits.writeUint8(this.sendMode); |
@@ -5,3 +5,3 @@ import { Cell } from "../../boc/Cell"; | ||
export declare class WalletV3SigningMessage implements Message { | ||
readonly timestamp: number; | ||
readonly timeout: number; | ||
readonly seqno: number; | ||
@@ -12,3 +12,3 @@ readonly walletId: number; | ||
constructor(args: { | ||
timestamp?: Maybe<number>; | ||
timeout?: Maybe<number>; | ||
seqno: Maybe<number>; | ||
@@ -15,0 +15,0 @@ walletId?: number; |
@@ -9,7 +9,7 @@ "use strict"; | ||
this.sendMode = args.sendMode; | ||
if (args.timestamp !== undefined && args.timestamp !== null) { | ||
this.timestamp = args.timestamp; | ||
if (args.timeout !== undefined && args.timeout !== null) { | ||
this.timeout = args.timeout; | ||
} | ||
else { | ||
this.timestamp = Date.now(); | ||
this.timeout = Math.floor(Date.now() / 1e3) + 60; // Default timeout: 60 seconds | ||
} | ||
@@ -37,4 +37,3 @@ if (args.seqno !== undefined && args.seqno !== null) { | ||
else { | ||
const timestamp = Math.floor(this.timestamp / 1e3); // In seconds | ||
cell.bits.writeUint(timestamp + 60, 32); // 60 seconds timeout | ||
cell.bits.writeUint(this.timeout, 32); | ||
} | ||
@@ -41,0 +40,0 @@ cell.bits.writeUint(this.seqno, 32); |
@@ -6,2 +6,3 @@ /// <reference types="node" /> | ||
import { WalletSource } from "./sources/WalletSource"; | ||
import { Maybe } from "../types"; | ||
export declare class WalletContract implements Contract { | ||
@@ -19,3 +20,4 @@ static create(client: TonClient, source: WalletSource): Promise<WalletContract>; | ||
secretKey: Buffer; | ||
timeout?: Maybe<number>; | ||
}): Promise<import("..").Cell>; | ||
} |
@@ -30,5 +30,5 @@ "use strict"; | ||
case 'v2': | ||
return (0, createWalletTransfer_1.createWalletTransferV2)({ seqno: args.seqno, sendMode: args.sendMode, secretKey: args.secretKey, order: args.order }); | ||
return (0, createWalletTransfer_1.createWalletTransferV2)({ seqno: args.seqno, sendMode: args.sendMode, secretKey: args.secretKey, order: args.order, timeout: args.timeout }); | ||
case 'v3': | ||
return (0, createWalletTransfer_1.createWalletTransferV3)({ seqno: args.seqno, sendMode: args.sendMode, secretKey: args.secretKey, order: args.order, walletId: this.source.walletId }); | ||
return (0, createWalletTransfer_1.createWalletTransferV3)({ seqno: args.seqno, sendMode: args.sendMode, secretKey: args.secretKey, order: args.order, walletId: this.source.walletId, timeout: args.timeout }); | ||
default: | ||
@@ -35,0 +35,0 @@ throw Error('Unknown contract type: ' + this.source.type); |
@@ -10,2 +10,3 @@ export { BitString } from './boc/BitString'; | ||
export { TonTransaction, TonMessage } from './client/TonTransaction'; | ||
export { SendMode } from './client/SendMode'; | ||
export { Message } from './messages/Message'; | ||
@@ -12,0 +13,0 @@ export { RawMessage } from './messages/RawMessage'; |
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.ConfigStore = exports.WalletV3R2Source = exports.WalletV3R1Source = exports.WalletV2R2Source = exports.WalletV2R1Source = exports.WalletV1R3Source = exports.WalletV1R2Source = exports.WalletV1R1Source = exports.UnknownContractSource = exports.createWalletTransferV3 = exports.createWalletTransferV2 = exports.createWalletTransferV1 = exports.WalletContract = exports.ElectorContract = exports.CommonMessageInfo = exports.StateInit = exports.EmptyMessage = exports.ExternalMessage = exports.InternalMessage = exports.RawMessage = exports.KeyStore = exports.fromNano = exports.toNano = exports.Address = exports.validateWalletType = exports.Wallet = exports.TonClient = exports.Cell = exports.BitStringReader = exports.BitString = void 0; | ||
exports.ConfigStore = exports.WalletV3R2Source = exports.WalletV3R1Source = exports.WalletV2R2Source = exports.WalletV2R1Source = exports.WalletV1R3Source = exports.WalletV1R2Source = exports.WalletV1R1Source = exports.UnknownContractSource = exports.createWalletTransferV3 = exports.createWalletTransferV2 = exports.createWalletTransferV1 = exports.WalletContract = exports.ElectorContract = exports.CommonMessageInfo = exports.StateInit = exports.EmptyMessage = exports.ExternalMessage = exports.InternalMessage = exports.RawMessage = exports.SendMode = exports.KeyStore = exports.fromNano = exports.toNano = exports.Address = exports.validateWalletType = exports.Wallet = exports.TonClient = exports.Cell = exports.BitStringReader = exports.BitString = void 0; | ||
var BitString_1 = require("./boc/BitString"); | ||
@@ -22,2 +22,4 @@ Object.defineProperty(exports, "BitString", { enumerable: true, get: function () { return BitString_1.BitString; } }); | ||
Object.defineProperty(exports, "KeyStore", { enumerable: true, get: function () { return KeyStore_1.KeyStore; } }); | ||
var SendMode_1 = require("./client/SendMode"); | ||
Object.defineProperty(exports, "SendMode", { enumerable: true, get: function () { return SendMode_1.SendMode; } }); | ||
var RawMessage_1 = require("./messages/RawMessage"); | ||
@@ -24,0 +26,0 @@ Object.defineProperty(exports, "RawMessage", { enumerable: true, get: function () { return RawMessage_1.RawMessage; } }); |
{ | ||
"name": "ton", | ||
"version": "4.14.0", | ||
"version": "4.15.0", | ||
"repository": "https://github.com/ex3ndr/ton.git", | ||
@@ -5,0 +5,0 @@ "author": "Steve Korshakov <steve@korshakov.com>", |
197515
143
4817