@layerzerolabs/ton-sdk-tools 3.0.95 → 3.0.96

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @layerzerolabs/ton-sdk-tools
 
+## 3.0.96
+
+### Patch Changes
+
+- 91d573e: ton sdk cleanup
+
 ## 3.0.95
 
 ### Patch Changes

package/dist/index.cjs

@@ -470,10 +470,9 @@ function saveBaseEventHandler(directory, opcodesImportPath = "../constants", all
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
 
-import { Cell, Transaction, TransactionComputeVm, TransactionDescriptionGeneric, beginCell } from '@ton/core'
+import { Cell, Transaction, beginCell } from '@ton/core'
 import { BlockchainTransaction, EventMessageSent, SendMessageResult } from '@ton/sandbox'
-import { flattenTransaction } from '@ton/test-utils'
-import { ExtendedContract, getLzDict } from '${baseWrapperImportPath}'
+import { ExtendedContract } from '${baseWrapperImportPath}'
 
 import { OPCODES } from '${opcodesImportPath}'
 
@@ -531,11 +530,11 @@ export class BaseEventHandler {
         eventObjects: [] as LzEvent[],
     }
 
-    async postProcessSuccess(event: LzEvent, tx: BlockchainTransaction & Transaction): Promise<void> {
+    async postProcessSuccess(_event: LzEvent, _tx: BlockchainTransaction & Transaction): Promise<void> {
         // base case: do nothing
     }
 
-    async postProcessFailure(event: EventMessageSent, tx: BlockchainTransaction & Transaction): Promise<void> {
+    async postProcessFailure(_event: EventMessageSent, _tx: BlockchainTransaction & Transaction): Promise<void> {
         // base case: do nothing
     }
 
@@ -580,8 +579,8 @@ function saveLzEventHandler(directory, allTypesImportPath = "./allTypes", baseEv
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
 
-import { Cell, Transaction } from '@ton/core'
-import { BlockchainTransaction, EventMessageSent, SendMessageResult } from '@ton/sandbox'
+import { Transaction } from '@ton/core'
+import { BlockchainTransaction } from '@ton/sandbox'
 
 import { Md, MdPacketSent } from '${allTypesImportPath}'
 import { BaseEventHandler, LzEvent } from '${baseEventHandlerImportPath}'
@@ -593,7 +592,7 @@ export class LzEventHandler extends BaseEventHandler {
         packetsSent: [] as MdPacketSent[],
     }
 
-    async postProcessSuccess(event: LzEvent, tx: BlockchainTransaction & Transaction): Promise<void> {
+    async postProcessSuccess(event: LzEvent, _tx: BlockchainTransaction & Transaction): Promise<void> {
         if (event.topic === 'Channel::event::PACKET_SENT' && this.isMdPacketSent(event.body)) {
             this.allVictories.packetsSent.push(event.body)
         }
@@ -619,16 +618,9 @@ function saveTonContractWrapper(tonObjects, directory, classlibWrapperImportPath
   const savedCode = `${file_signature_header}
 
 import {
-    Address,
     Cell,
     ContractProvider,
-    ContractState,
-    Sender,
-    SenderArguments,
-    TupleItem,
-    TupleReader,
     contractAddress,
-    beginCell,
 } from '@ton/core'
 
 import { ClasslibWrapper } from '${classlibWrapperImportPath}'
@@ -644,8 +636,23 @@ export class TonContractWrapper extends ClasslibWrapper {
 `;
   fs__namespace.writeFileSync(path__namespace.join(directory, "TonContractWrapper.ts"), savedCode);
 }
+function generateTypeStringFromTonObjects(tonObjects) {
+  return Object.entries(tonObjects).map(([key, tonObject]) => {
+    if (tonObject.attributes.length > 0) {
+      return "export " + (tonObject.tsTypeCode ?? "");
+    }
+    const fixedKey = key.replace(/::New.*$/, "");
+    const altObject = Object.entries(tonObjects).find(
+      ([otherKey, otherObj]) => otherKey !== key && otherKey.startsWith(fixedKey) && otherObj.attributes.length > 0
+    )?.[1];
+    if (!altObject) {
+      return "";
+    }
+    return "export " + (altObject.tsTypeCode?.replace(altObject.tsTypeName ?? "", tonObject.tsTypeName ?? "") ?? "");
+  }).filter((typeCode) => typeCode !== "").join("");
+}
 function saveAllTypes(tonObjects, directory, tonContractWrapperImportPath = "./TonContractWrapper", baseWrapperImportPath = "@layerzerolabs/ton-sdk-tools") {
-  const generatedTypes = Object.entries(tonObjects).filter(([_, tonObject]) => tonObject.attributes.length > 0).map(([_, tonObject]) => "export " + (tonObject.tsTypeCode ?? "")).join("");
+  const generatedTypes = generateTypeStringFromTonObjects(tonObjects);
   const mapping = {};
   const keyMapping = {};
   Object.entries(tonObjects).forEach(([key, item]) => {
@@ -670,11 +677,9 @@ function saveAllTypes(tonObjects, directory, tonContractWrapperImportPath = "./T
   const savedCode = `${file_signature_header}
 /* eslint-disable @typescript-eslint/no-empty-interface */
 
-import { Cell, OpenedContract, beginCell } from '@ton/core'
-import { SandboxContract } from '@ton/sandbox'
+import { Cell } from '@ton/core'
 
-import { TonContractWrapper } from '${tonContractWrapperImportPath}'
-import { ExtendedContract, LzDict, getLzDict } from '${baseWrapperImportPath}'
+import { LzDict } from '${baseWrapperImportPath}'
 
 export interface Md {}
 
@@ -816,23 +821,18 @@ export class LzGasTracker {
 }
 function saveTonObjectUnwrapper(tonObjects, directory, allTypesImportPath = "./allTypes", tonContractWrapperImportPath = "./TonContractWrapper", classlibWrapperImportPath = "@layerzerolabs/ton-sdk-tools", baseWrapperImportPath = "@layerzerolabs/ton-sdk-tools") {
   const allTypes = [
-    ...Object.values(tonObjects).map((obj) => obj.tsTypeName).filter((name) => name !== void 0),
-    "Md",
-    "nameMap"
+    ...Object.values(tonObjects).filter((obj) => obj.attributes.length !== 0).map((obj) => obj.tsTypeName).filter((name) => name !== void 0)
   ].sort();
   const savedCode = `${file_signature_header}
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
 
-import { Cell, Transaction, TransactionComputeVm, TransactionDescriptionGeneric, beginCell } from '@ton/core'
-import { BlockchainTransaction, EventMessageSent, SendMessageResult } from '@ton/sandbox'
-import { flattenTransaction } from '@ton/test-utils'
+import { Cell } from '@ton/core'
 
 import {
 ${allTypes.map((type) => "    " + type + ",\n").join("")}} from '${allTypesImportPath}'
 import { TonContractWrapper } from '${tonContractWrapperImportPath}'
-import { ClasslibWrapper } from '${classlibWrapperImportPath}'
-import { ExtendedContract, LzDict, getLzDict } from '${baseWrapperImportPath}'
+import { ExtendedContract, getLzDict } from '${baseWrapperImportPath}'
 
 export class TonObjectUnwrapper {
 ${Array.from(
@@ -1402,8 +1402,6 @@ import {
     Address,
     Builder,
     Cell,
-    Dictionary,
-    SendMode,
     TupleItem,
     TupleItemCell,
     TupleItemInt,
@@ -1412,16 +1410,12 @@ import {
 } from '@ton/core'
 import {
     Blockchain,
-    BlockchainTransaction,
     SandboxContract,
     SendMessageResult,
-    Treasury,
     TreasuryContract,
 } from '@ton/sandbox'
 import { FlatTransactionComparable } from '@ton/test-utils'
-import { ethers } from 'ethers'
 
-import AllStoragesArtifact from '@layerzerolabs/layerzero-v2-ton/build/AllStorages.compiled.json'
 import ChannelArtifact from '@layerzerolabs/layerzero-v2-ton/build/Channel.compiled.json'
 import ControllerArtifact from '@layerzerolabs/layerzero-v2-ton/build/Controller.compiled.json'
 import EndpointArtifact from '@layerzerolabs/layerzero-v2-ton/build/Endpoint.compiled.json'
@@ -1432,16 +1426,12 @@ import MultiSigOrderArtifact from '@layerzerolabs/layerzero-v2-ton/src/multisig/
 import {
     JettonMinter,
     JettonWallet,
-    MultiSigOpCodes,
     Multisig,
-    Order,
     Profile,
-    TransferRequest,
     addressToBigInt,
     buildOnchainMetadata,
     cellFromArtifact,
     getRandomInt,
-    printTransactionTrace,
     ExtendedContract,
     sendMessageViaMultisigAndExpect,
     sendInternalMessageAndExpect,
@@ -2703,8 +2693,14 @@ export async function txDecoder(
     }
 }
 
-export async function runtimeDecoder(contract: SandboxContract<TonContractWrapper>, obj: Cell): Promise<void> {
-    const { tonObjects } = require('${options.relativeSrcPath}/offchain-helpers/allObjects') as { [key: string]: { [key: string]: any } }
+export async function runtimeDecoder(
+    contract: SandboxContract<TonContractWrapper>,
+    obj: Cell,
+    tonObjectsImportPath = '../../src/offchain-helpers/allObjects'
+): Promise<void> {
+    const { tonObjects } = (await import(tonObjectsImportPath)) as {
+        [key: string]: { [key: string]: any }
+    }
 
     const typeName = await contract.getTypeOf(obj)
 
@@ -3147,18 +3143,16 @@ import ProxyArtifact from '@layerzerolabs/layerzero-v2-ton/build/Proxy.compiled.
 import UlnArtifact from '@layerzerolabs/layerzero-v2-ton/build/Uln.compiled.json'
 import UlnConnectionArtifact from '@layerzerolabs/layerzero-v2-ton/build/UlnConnection.compiled.json'
 import UlnManagerArtifact from '@layerzerolabs/layerzero-v2-ton/build/UlnManager.compiled.json'
-import { BlueprintArtfiact, ExtendedContract, Profile, addressToBigInt, cellFromArtifact, sendInternalMessageAndExpect, sendMessageViaMultisigAndExpect, LzDict, createSignatures, createVerifierDictSetFromEtherWallets, generateRandomVerifierSet } from '@layerzerolabs/ton-sdk-tools'
+import { BlueprintArtfiact, ExtendedContract, Profile, addressToBigInt, cellFromArtifact, sendInternalMessageAndExpect, sendMessageViaMultisigAndExpect, createSignatures, createVerifierDictSetFromEtherWallets, generateRandomVerifierSet } from '@layerzerolabs/ton-sdk-tools'
 
 import {
     OAppFixture,
     OAppFlowGas,
     ProtocolFixture,
-    SIGNATURE_BYTE_LENGTH,
     addMsgLibToController,
     createLzPacketFromPacketEncoded,
     emptyObject,
     protocolSetupGas,
-    publicKeyToHash,
     requireDefined,
     serializeAddressList,
     setDefaultEndpointConfig,