Add open and getTransactions to ContractProvider

Add helper `toSandboxContract` function

.gitignore

@@ -1,5 +1,6 @@
 node_modules
 dist
+.idea
 
 # yarn
 .yarn/*

examples/contracts/Elector.ts

@@ -1,7 +1,7 @@
-import { Address, Cell, Contract, ContractProvider } from "@ton/core";
+import {Address, Contract, ContractProvider, StateInit} from "@ton/core";
 
 export class Elector implements Contract {
-    constructor(readonly address: Address, readonly init?: { code: Cell; data: Cell }) {}
+    constructor(readonly address: Address, readonly init?: StateInit) {}
 
     static createFromAddress(address: Address) {
         return new Elector(address);

examples/contracts/NftCollection.ts

@@ -1,4 +1,14 @@
-import { Address, beginCell, Cell, Contract, contractAddress, ContractProvider, Sender, toNano } from "@ton/core";
+import {
+    Address,
+    beginCell,
+    Cell,
+    Contract,
+    contractAddress,
+    ContractProvider,
+    Sender,
+    StateInit,
+    toNano
+} from "@ton/core";
 import { NftItem } from "./NftItem";
 
 export type NftCollectionData = {
@@ -30,7 +40,7 @@ export class NftCollection implements Contract {
 
     nextItemIndex: number = 0;
 
-    constructor(readonly address: Address, readonly init?: { code: Cell; data: Cell }) {}
+    constructor(readonly address: Address, readonly init?: StateInit) {}
 
     static createFromAddress(address: Address) {
         return new NftCollection(address);
@@ -80,4 +90,4 @@ export class NftCollection implements Contract {
             owner: stack.readAddress(),
         }
     }
-}
+}

examples/contracts/NftItem.ts

@@ -1,4 +1,4 @@
-import { Address, beginCell, Cell, Contract, ContractProvider, Sender, toNano, Builder } from "@ton/core";
+import {Address, beginCell, Cell, Contract, ContractProvider, Sender, toNano, Builder, StateInit} from "@ton/core";
 
 export type NftItemData = {
     inited: boolean
@@ -11,7 +11,7 @@ export type NftItemData = {
 export class NftItem implements Contract {
     static readonly code = Cell.fromBase64('te6ccgECDgEAAdwAART/APSkE/S88sgLAQIBYgIDAgLOBAUACaEfn+AFAgEgBgcCASAMDQLPDIhxwCSXwPg0NMDAXGwkl8D4PpA+kAx+gAxcdch+gAx+gAwc6m0APACBLOOFDBsIjRSMscF8uGVAfpA1DAQI/AD4AbTH9M/ghBfzD0UUjC64wIwNDQ1NYIQL8smohK64wJfBIQP8vCAICQARPpEMHC68uFNgAqwyEDdeMkATUTXHBfLhkfpAIfAB+kDSADH6ACDXScIA8uLEggr68IAboSGUUxWgod4i1wsBwwAgkgahkTbiIML/8uGSIZQQKjdb4w0CkzAyNOMNVQLwAwoLAHJwghCLdxc1BcjL/1AEzxYQJIBAcIAQyMsFUAfPFlAF+gIVy2oSyx/LPyJus5RYzxcBkTLiAckB+wAAfIIQBRONkchQCc8WUAvPFnEkSRRURqBwgBDIywVQB88WUAX6AhXLahLLH8s/Im6zlFjPFwGRMuIByQH7ABBHAGom8AGCENUydtsQN0QAbXFwgBDIywVQB88WUAX6AhXLahLLH8s/Im6zlFjPFwGRMuIByQH7AAA7O1E0NM/+kAg10nCAJp/AfpA1DAQJBAj4DBwWW1tgAB0A8jLP1jPFgHPFszJ7VSA=')
 
-    constructor(readonly address: Address, readonly init?: { code: Cell; data: Cell }) {}
+    constructor(readonly address: Address, readonly init?: StateInit) {}
 
     static createFromAddress(address: Address) {
         return new NftItem(address);
@@ -48,4 +48,4 @@ export class NftItem implements Contract {
             content: stack.readCellOpt(),
         }
     }
-}
+}

examples/contracts/NftMarketplace.ts

@@ -1,4 +1,15 @@
-import { Address, beginCell, Cell, Contract, contractAddress, ContractProvider, Sender, storeStateInit, toNano } from "@ton/core";
+import {
+    Address,
+    beginCell,
+    Cell,
+    Contract,
+    contractAddress,
+    ContractProvider,
+    Sender,
+    StateInit,
+    storeStateInit,
+    toNano
+} from "@ton/core";
 
 export type NftMarketplaceConfig = {
     owner: Address
@@ -13,7 +24,7 @@ function nftMarketplaceConfigToCell(config: NftMarketplaceConfig): Cell {
 export class NftMarketplace implements Contract {
     static readonly code = Cell.fromBase64('te6ccgEBBAEAagABFP8A9KQT9LzyyAsBAgEgAgMApNIyIccAkVvg0NMDAXGwkVvg+kAw7UTQ+kAwxwXy4ZHTHwHAAY4p+gDU1DAh+QBwyMoHy//J0Hd0gBjIywXLAljPFlAE+gITy2vMzMlx+wCRMOIABPIw')
 
-    constructor(readonly address: Address, readonly init?: { code: Cell; data: Cell }) {}
+    constructor(readonly address: Address, readonly init?: StateInit) {}
 
     static createFromAddress(address: Address) {
         return new NftMarketplace(address);
@@ -26,7 +37,7 @@ export class NftMarketplace implements Contract {
     }
 
     async sendDeploy(provider: ContractProvider, via: Sender, params: {
-        init: { code: Cell, data: Cell }
+        init: StateInit
         body?: Cell
         value?: bigint
         deployValue?: bigint
@@ -42,4 +53,4 @@ export class NftMarketplace implements Contract {
         })
         return contractAddress(0, params.init)
     }
-}
+}

examples/contracts/NftSale.ts

@@ -1,4 +1,4 @@
-import { Address, beginCell, Cell, Contract, contractAddress, ContractProvider } from "@ton/core";
+import {Address, beginCell, Cell, Contract, contractAddress, ContractProvider, StateInit} from "@ton/core";
 
 export type NftSaleConfig = {
     marketplace: Address
@@ -26,7 +26,7 @@ function nftSaleConfigToCell(config: NftSaleConfig): Cell {
 export class NftSale implements Contract {
     static readonly code = Cell.fromBase64('te6ccgECCgEAAbQAART/APSkE/S88sgLAQIBIAIDAgFIBAUABPIwAgLNBgcAL6A4WdqJofSB9IH0gfQBqGGh9AH0gfQAYQH30A6GmBgLjYSS+CcH0gGHaiaH0gfSB9IH0AahgRa6ThAVnHHZkbGymQ44LJL4NwKJFjgvlw+gFpj8EIAonGyIldeXD66Z+Y/SAYIBpkKALniygB54sA54sA/QFmZPaqcBNjgEybCBsimYI4eAJwA2mP6Z+YEOAAyS+FcBDAgB9dQQgdzWUAKShQKRhfeXDhAeh9AH0gfQAYOEAIZGWCqATniyi50JDQqFrQilAK/QEK5bVkuP2AOEAIZGWCrGeLKAP9AQtltWS4/YA4QAhkZYKoAueLAP0BCeW1ZLj9gDgQQQgv5h6KEMAMZGWCqALnixF9AQpltQnlj4pAkAyMACmjEQRxA2RUAS8ATgMjY3BMADjkeCEDuaygAVvvLhyVMSxwVZxwWx8uHKcCCCEF/MPRQhgBDIywVQBs8WIvoCFctqFMsfFMs/Ic8WAc8WygAh+gLKAMmBAKD7AOBfBoQP8vAAKss/Is8WWM8WygAh+gLKAMmBAKD7AA==')
 
-    constructor(readonly address: Address, readonly init?: { code: Cell; data: Cell }) {}
+    constructor(readonly address: Address, readonly init?: StateInit) {}
 
     static createFromAddress(address: Address) {
         return new NftSale(address);
@@ -50,4 +50,4 @@ export class NftSale implements Contract {
             royaltyAmount: stack.readBigNumber(),
         }
     }
-}
+}

examples/contracts/NftSaleV3.ts

@@ -1,8 +1,8 @@
-import { Address, Cell, Contract, ContractProvider } from "@ton/core";
+import {Address, Contract, ContractProvider, StateInit} from "@ton/core";
 import { NftSaleConfig } from "./NftSale";
 
 export class NftSaleV3 implements Contract {
-    constructor(readonly address: Address, readonly init?: { code: Cell; data: Cell }) {}
+    constructor(readonly address: Address, readonly init?: StateInit) {}
 
     static createFromAddress(address: Address) {
         return new NftSaleV3(address);
@@ -33,4 +33,4 @@ export class NftSaleV3 implements Contract {
             royaltyAmount,
         }
     }
-}
+}

package.json

@@ -13,10 +13,10 @@
     "url": "git+https://github.com/ton-org/sandbox"
   },
   "devDependencies": {
-    "@ton/core": "^0.49.2",
+    "@ton/core": "^0.56.0",
     "@ton/crypto": "3.2.0",
     "@ton/test-utils": "^0.3.1",
-    "@ton/ton": "^13.4.2",
+    "@ton/ton": "^13.11.0",
     "@types/jest": "^29.5.0",
     "@types/node": "^18.15.11",
     "jest": "^29.5.0",
@@ -25,7 +25,7 @@
     "typescript": "^4.9.5"
   },
   "peerDependencies": {
-    "@ton/core": ">=0.49.2",
+    "@ton/core": ">=0.56.0",
     "@ton/crypto": ">=3.2.0"
   },
   "scripts": {

src/blockchain/Blockchain.ts

@@ -1,5 +1,20 @@
 import { defaultConfig } from "../config/defaultConfig";
-import {Address, Cell, Message, Transaction, ContractProvider, Contract, Sender, toNano, loadMessage, ShardAccount, TupleItem, ExternalAddress, StateInit} from "@ton/core";
+import {
+    Address,
+    Cell,
+    Message,
+    Transaction,
+    ContractProvider,
+    Contract,
+    Sender,
+    toNano,
+    loadMessage,
+    ShardAccount,
+    TupleItem,
+    ExternalAddress,
+    StateInit,
+    OpenedContract
+} from "@ton/core";
 import {Executor, TickOrTock} from "../executor/Executor";
 import {BlockchainStorage, LocalBlockchainStorage} from "./BlockchainStorage";
 import { extractEvents, Event } from "../event/Event";
@@ -52,6 +67,8 @@ export type SendMessageResult = {
 
 type ExtendsContractProvider<T> = T extends ContractProvider ? true : (T extends SandboxContractProvider ? true : false);
 
+export const SANDBOX_CONTRACT_SYMBOL = Symbol('SandboxContract')
+
 export type SandboxContract<F> = {
     [P in keyof F]: P extends `get${string}`
         ? (F[P] extends (x: infer CP, ...args: infer P) => infer R ? (ExtendsContractProvider<CP> extends true ? (...args: P) => R : never) : never)
@@ -62,6 +79,14 @@ export type SandboxContract<F> = {
             : F[P]);
 }
 
+export function toSandboxContract<T>(contract: OpenedContract<T>): SandboxContract<T> {
+    if ((contract as any)[SANDBOX_CONTRACT_SYMBOL] === true) {
+        return contract as any
+    }
+
+    throw new Error('Invalid contract: not a sandbox contract')
+}
+
 export type PendingMessage = (({
     type: 'message',
 } & Message) | ({
@@ -329,12 +354,13 @@ export class Blockchain {
         })
     }
 
-    provider(address: Address, init?: { code: Cell, data: Cell }): ContractProvider {
+    provider(address: Address, init?: StateInit | null): ContractProvider {
         return new BlockchainContractProvider({
             getContract: (addr) => this.getContract(addr),
             pushMessage: (msg) => this.pushMessage(msg),
             runGetMethod: (addr, method, args) => this.runGetMethod(addr, method, args),
             pushTickTock: (on, which) => this.pushTickTock(on, which),
+            openContract: <T extends Contract>(contract: T) => this.openContract(contract) as OpenedContract<T>,
         }, address, init)
     }
 
@@ -379,7 +405,7 @@ export class Blockchain {
 
     openContract<T extends Contract>(contract: T) {
         let address: Address;
-        let init: { code: Cell, data: Cell } | undefined = undefined;
+        let init: StateInit | undefined = undefined;
 
         if (!Address.isAddress(contract.address)) {
             throw Error('Invalid address');
@@ -400,6 +426,10 @@ export class Blockchain {
 
         return new Proxy<any>(contract as any, {
             get(target, prop) {
+                if (prop === SANDBOX_CONTRACT_SYMBOL) {
+                    return true
+                }
+
                 const value = target[prop]
                 if (typeof prop === 'string' && typeof value === 'function') {
                     if (prop.startsWith('get')) {
@@ -486,4 +516,4 @@ export class Blockchain {
             ...opts
         })
     }
-}
+}

src/blockchain/BlockchainContractProvider.ts

@@ -1,11 +1,23 @@
-import { AccountState, Address, Cell, comment, ContractGetMethodResult, ContractProvider, ContractState, Message, Sender, SendMode, toNano, TupleItem } from "@ton/core";
-import { TickOrTock } from "../executor/Executor";
-import { GetMethodResult, SmartContract } from "./SmartContract";
+import {
+    AccountState, Address, Cell, comment, Contract,
+    ContractGetMethodResult,
+    ContractProvider,
+    ContractState,
+    Message, openContract,
+    OpenedContract,
+    Sender,
+    SendMode, StateInit,
+    toNano,
+    Transaction,
+    TupleItem
+} from "@ton/core";
+import {TickOrTock} from "../executor/Executor";
+import {GetMethodResult, SmartContract} from "./SmartContract";
 
 function bigintToBuffer(x: bigint, n = 32): Buffer {
     const b = Buffer.alloc(n)
     for (let i = 0; i < n; i++) {
-        b[n-i-1] = Number((x >> BigInt(i * 8)) & 0xffn)
+        b[n - i - 1] = Number((x >> BigInt(i * 8)) & 0xffn)
     }
     return b
 }
@@ -44,12 +56,16 @@ export class BlockchainContractProvider implements SandboxContractProvider {
             getContract(address: Address): Promise<SmartContract>
             pushMessage(message: Message): Promise<void>
             runGetMethod(address: Address, method: string, args: TupleItem[]): Promise<GetMethodResult>
-            pushTickTock(on: Address, which: TickOrTock): Promise<void>
+            pushTickTock(on: Address, which: TickOrTock): Promise<void>,
+            openContract<T extends Contract>(contract: T): OpenedContract<T>
         },
         private readonly address: Address,
-        private readonly init?: { code: Cell, data: Cell },
+        private readonly init?: StateInit | null,
     ) {}
 
+    open<T extends Contract>(contract: T): OpenedContract<T> {
+        return this.blockchain.openContract(contract);
+    }
     async getState(): Promise<ContractState> {
         const contract = await this.blockchain.getContract(this.address)
         return {
@@ -72,6 +88,9 @@ export class BlockchainContractProvider implements SandboxContractProvider {
         delete (ret as any).stackReader
         return ret
     }
+    getTransactions(address: Address, lt: bigint, hash: Buffer, limit?: number | undefined): Promise<Transaction[]> {
+        throw new Error("`getTransactions` is not implemented in `BlockchainContractProvider`, do not use it in the tests")
+    }
     async external(message: Cell) {
         const init = ((await this.getState()).state.type !== 'active' && this.init) ? this.init : undefined
 
@@ -106,4 +125,4 @@ export class BlockchainContractProvider implements SandboxContractProvider {
     async tickTock(which: TickOrTock) {
         await this.blockchain.pushTickTock(this.address, which)
     }
-}
+}

src/index.ts

@@ -5,6 +5,7 @@ export {
 
 export {
     Blockchain,
+    toSandboxContract,
     SendMessageResult,
     BlockchainTransaction,
     PendingMessage,
@@ -15,6 +16,10 @@ export {
     BlockchainSnapshot,
 } from './blockchain/Blockchain';
 
+export {
+    BlockchainApi
+} from './blockchain/BlockchainApi';
+
 export {
     BlockchainContractProvider,
     SandboxContractProvider,
@@ -75,4 +80,4 @@ export {
 
 export {
     internal,
-} from './utils/message';
+} from './utils/message';

src/treasury/Treasury.ts

@@ -1,4 +1,21 @@
-import { Address, beginCell, Cell, Contract, contractAddress, ContractProvider, Dictionary, DictionaryValue, internal, loadMessageRelaxed, MessageRelaxed, Sender, SenderArguments, SendMode, storeMessageRelaxed } from "@ton/core";
+import {
+    Address,
+    beginCell,
+    Cell,
+    Contract,
+    contractAddress,
+    ContractProvider,
+    Dictionary,
+    DictionaryValue,
+    internal,
+    loadMessageRelaxed,
+    MessageRelaxed,
+    Sender,
+    SenderArguments,
+    SendMode,
+    StateInit,
+    storeMessageRelaxed
+} from "@ton/core";
 
 const DictionaryMessageValue: DictionaryValue<{ sendMode: SendMode, message: MessageRelaxed }> = {
     serialize(src, builder) {
@@ -34,7 +51,7 @@ export class TreasuryContract implements Contract {
     }
 
     readonly address: Address;
-    readonly init: { code: Cell, data: Cell };
+    readonly init: StateInit;
     readonly subwalletId: bigint;
 
     constructor(workchain: number, subwalletId: bigint) {