@layerzerolabs/ton-sdk-tools 3.0.18-ton.2 → 3.0.19-ton.1

package/dist/index.mjs

@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import fs__default from 'fs';
 import * as path from 'path';
 import path__default from 'path';
-import { Cell, beginCell, Address, SendMode, contractAddress, Dictionary, toNano } from '@ton/core';
+import { Cell, Address, SendMode, beginCell, contractAddress, Dictionary, toNano } from '@ton/core';
 import { toBigIntBE, toBufferBE } from 'bigint-buffer';
 import * as crc32 from 'crc-32';
 import { extractEvents as extractEvents$1 } from '@ton/sandbox/dist/event/Event';
@@ -17,20 +17,6 @@ function getOpcodeCRC(input) {
 var MASTER_CHAIN_ID = -1;
 var BASE_CHAIN_ID = 0;
 var MASTER_CHAIN_SHARD = "8000000000000000";
-function randomQueryId() {
-  return Math.floor(Math.random() * 1e11);
-}
-function beginMessage(opcode, queryId) {
-  return beginCell().storeUint(opcode, 32).storeUint(queryId ?? randomQueryId(), 64);
-}
-async function sendRequest(provider, via, request) {
-  return provider.internal(via, {
-    value: request.value,
-    sendMode: request.sendMode ?? void 0,
-    body: request.body,
-    bounce: request.bounce
-  });
-}
 function bigintToAddress(value) {
   const buf = to32ByteBuffer(value);
   return Address.parse(`0:${buf.toString("hex")}`);
@@ -78,7 +64,7 @@ function findDeepestCell(cell) {
 // src/sdk-tools.ts
 var file_signature_header = `////// Generated by sdk/sdk-generator.ts`;
 var ERRORCODE_MASK = 0x7ffn;
-function tonTypeToTStype(tonType, addr_type = "Slice", force_cell = false) {
+function tonTypeToTStype(tonType) {
   switch (tonType) {
     case "int":
     case "uint8":
@@ -90,19 +76,15 @@ function tonTypeToTStype(tonType, addr_type = "Slice", force_cell = false) {
     case "bool":
     case "address":
       return "bigint";
-    case "slice":
-      return addr_type;
     case "cell":
     case "cellRef":
       return "Cell";
     case "tuple":
       return "Tuple";
     case "objRef":
-      if (force_cell) {
-        return "Cell";
-      } else {
-        return "Tuple";
-      }
+      return "Cell";
+    case "slice":
+      return "Address";
     case "dict256":
     case "dictionary":
       return "LzDict";
@@ -234,8 +216,6 @@ function mergeConstructorDicts(result, added) {
       {
         constructorInputArgs: inputArgs,
         attributes,
-        constructorIncomplete: incomplete,
-        dependencies,
         constructorName: functionName,
         tonName,
         fieldMap,
@@ -245,8 +225,6 @@ function mergeConstructorDicts(result, added) {
       result[name] = {
         constructorInputArgs: inputArgs,
         attributes,
-        constructorIncomplete: incomplete,
-        dependencies,
         constructorName: functionName,
         tonName,
         fieldMap,
@@ -256,12 +234,6 @@ function mergeConstructorDicts(result, added) {
   );
   return result;
 }
-function mergeInputArgs(result, added) {
-  Object.entries(added).forEach(([name, type]) => {
-    result[name] = type;
-  });
-  return result;
-}
 function parseDirectory(directoryPath) {
   let result = {};
   const items = fs.readdirSync(directoryPath);
@@ -281,58 +253,28 @@ function parseDirectory(directoryPath) {
 function snakeToCamelCase(str2) {
   return str2.replace(/::/g, "_").replace(/(_\w)/g, (match) => match[1].toUpperCase());
 }
-function parseClSetLines(input, inputArgs, fieldMap) {
+function parseDeclareLines(input, fieldMap) {
   const psResult = [];
-  let incomplete = false;
-  const setRegex = /\[\s*([a-zA-Z_][\w:]*),\s*((?:[^,\]]|\([^)]*\))*)\]/g;
-  const dependencies = [];
+  const declareLineRegex = /\[\s*([a-zA-Z_][\w:]*),\s*((?:[^,\]]|\([^)]*\))*)\]/g;
   let key = 0;
   let match;
-  while ((match = setRegex.exec(input)) !== null && key < Object.keys(fieldMap).length) {
+  while ((match = declareLineRegex.exec(input)) !== null && key < Object.keys(fieldMap).length) {
     const [, argType, assignedValue] = match;
-    let depName = "";
-    const value = assignedValue.trim();
-    let which = "const";
-    if (value.includes("::New")) {
-      incomplete = true;
-      depName = value.slice(0, value.lastIndexOf("::New"));
-      dependencies.push(depName);
-    }
-    if (value.includes("::New()")) {
-      which = "constClass";
-    } else if (value.includes("::New")) {
-      which = "classWithArgs";
-    } else if (/^\d+$/.test(value)) {
-      which = "const";
-    } else {
-      switch (value) {
-        case "true":
-        case "false":
-        case "addr_none()":
-        case "new_dict()":
-          which = "const";
-          break;
-        default:
-          which = value in inputArgs && inputArgs[value].length > 0 ? "inputArg" : "const";
-      }
-    }
     psResult.push({
       name: key in fieldMap ? fieldMap[key].trim() : "",
       type: argType.trim().split("::").pop() ?? "int",
-      value,
-      metaType: which,
-      dependencyName: depName
+      value: assignedValue.trim()
     });
     key += 1;
   }
-  return [psResult, incomplete, dependencies];
+  return psResult;
 }
-function parseFieldNames(name, input) {
+function parseFieldNames(strInput) {
   const fieldMap = {};
   const inverseFieldMap = {};
   const regex = /^const\s+int\s+(?:[A-Za-z]+::)?[A-Za-z]\w+::(\w+)\s*=\s*(\d+);/gm;
   let match;
-  while ((match = regex.exec(input)) !== null) {
+  while ((match = regex.exec(strInput)) !== null) {
     const [, fieldName, fieldIndexStr] = match;
     const fieldIndex = parseInt(fieldIndexStr, 10);
     fieldMap[fieldIndex] = fieldName;
@@ -340,14 +282,13 @@ function parseFieldNames(name, input) {
   }
   return [fieldMap, inverseFieldMap];
 }
-function parseClasses(input) {
+function parseClasses(strInput) {
   const functionRegex = /(\w+(?:::\w+)*::New\w*)\s*\(([\w\s,$·]*)\)\s*·?\s*(impure)?\s*(inline\s*)?method_id\s*\{([^}]*)\}/g;
   const results = {};
   let match;
-  while ((match = functionRegex.exec(input)) !== null) {
+  while ((match = functionRegex.exec(strInput)) !== null) {
     const [, rawName, argsString, , , body] = match;
     const args = {};
-    if (rawName.includes("OFTSend")) ;
     const argPairs = argsString.split(",").map((arg) => arg.trim());
     for (const argPair of argPairs) {
       const [argType, argName] = argPair.split(/\s+/);
@@ -357,17 +298,15 @@ function parseClasses(input) {
     }
     const name = rawName.replace(/::New$/, "");
     const functionName = snakeToCamelCase("getnew_" + name);
-    const [fieldMap, inverseFieldMap] = parseFieldNames(name, input);
+    const [fieldMap, inverseFieldMap] = parseFieldNames(strInput);
     console.log(`Parsing ${name}...`);
     const tonNameRegex = /const int\s+(?:md::)?[\w:]+::NAME = "(.*?)"u;/;
-    const tonNameMatch = input.match(tonNameRegex);
+    const tonNameMatch = strInput.match(tonNameRegex);
     const tonName = tonNameMatch ? tonNameMatch[1] : name;
-    const [attributes, incomplete, dependencies] = parseClSetLines(body, args, fieldMap);
+    const attributes = parseDeclareLines(body, fieldMap);
     results[name] = {
       constructorInputArgs: args,
       attributes,
-      constructorIncomplete: incomplete,
-      dependencies,
       constructorName: functionName,
       tonName,
       fieldMap,
@@ -376,8 +315,11 @@ function parseClasses(input) {
   }
   return results;
 }
-function saveTonContractWrapper(tonObjects, directory) {
-  const generatedMethods = Object.entries(tonObjects).map(([_, tonObject]) => tonObject.cellConstructorCode ?? "").join("\n");
+function saveTonContractWrapper(tonObjects, directory, baseWrapper) {
+  const generatedMethods = Object.entries(tonObjects).map(([_, tonObject]) => tonObject.constructorCode ?? "").join("\n");
+  if (baseWrapper === void 0) {
+    baseWrapper = `import { BaseWrapper, SendRequestOptions } from '@layerzerolabs/ton-sdk-tools'`;
+  }
   const savedCode = `${file_signature_header}
 
 import {
@@ -392,8 +334,7 @@ import {
     contractAddress,
 } from '@ton/core'
 
-import { BaseWrapper, SendRequestOptions } from './base-wrapper'
-import { beginMessage } from './utils'
+${baseWrapper}
 
 export type GetIntFnNames =
     | 'cl::get<uint8>'
@@ -411,6 +352,33 @@ export class TonContractWrapper extends BaseWrapper {
         return new TonContractWrapper(contractAddress(workchain, init), init)
     }
 
+    buildRequest(
+        opCode: bigint,
+        data: Cell,
+        opts: SendRequestOptions,
+        balanceRefill = 0n,
+        queryId?: number | bigint
+    ): SenderArguments {
+        const body = this.beginMessage(opCode, queryId).storeCoins(balanceRefill).storeRef(data).endCell()
+        return this.buildSenderArguments(body, opts)
+    } 
+
+    async sendInternalMessage(
+        provider: ContractProvider,
+        via: Sender,
+        opCode: bigint,
+        md: Cell,
+        opts: SendRequestOptions,
+        balanceRefill = 0n,
+        queryId?: number | bigint
+    ): Promise<void> {
+        if (via.address === undefined) {
+            throw new Error('Sender address is not defined')
+        }
+        const request = this.buildRequest(opCode, md, opts, balanceRefill, queryId)
+        return this.sendRequest(provider, via, request)
+    }
+
     async getFieldStack(
         provider: ContractProvider,
         method: string,
@@ -429,11 +397,6 @@ export class TonContractWrapper extends BaseWrapper {
         return provider.getState()
     }
 
-    async getCurrentStorage(provider: ContractProvider): Promise<TupleReader> {
-        const ret = await provider.get('getContractStorage', [])
-        return ret.stack
-    }
-
     async getCurrentStorageCell(provider: ContractProvider): Promise<Cell> {
         const getResult = await provider.get('getContractStorage', [])
         return getResult.stack.readCell()
@@ -497,33 +460,6 @@ export class TonContractWrapper extends BaseWrapper {
         return ret.stack.readCell()
     }
 
-    buildRequest(
-        opCode: bigint,
-        data: Cell,
-        opts: SendRequestOptions,
-        balanceRefill = 0n,
-        queryId?: number | bigint
-    ): SenderArguments {
-        const body = beginMessage(opCode, queryId).storeCoins(balanceRefill).storeRef(data).endCell()
-        return this.buildSenderArguments(body, opts)
-    }
-
-    async sendInternalMessage(
-        provider: ContractProvider,
-        via: Sender,
-        opCode: bigint,
-        md: Cell,
-        opts: SendRequestOptions,
-        balanceRefill = 0n,
-        queryId?: number | bigint
-    ): Promise<void> {
-        if (via.address === undefined) {
-            throw new Error('Sender address is not defined')
-        }
-        const request = this.buildRequest(opCode, md, opts, balanceRefill, queryId)
-        return this.sendRequest(provider, via, request)
-    }
-
 ${generatedMethods}
 }
 `;
@@ -838,57 +774,18 @@ ${Object.entries(tonObjects).map(([_, constructor]) => constructor.deconstructor
 `;
   fs.writeFileSync(path.join(directory, "TonObjectUnwrapper.ts"), savedCode);
 }
-function findClass(tonClasses, name) {
-  if (name in tonClasses) return tonClasses[name];
-  const lzName = "lz::" + name;
-  if (lzName in tonClasses) return tonClasses[lzName];
-  const mdName = "md::" + name;
-  if (mdName in tonClasses) return tonClasses[mdName];
-  const clName = "cl::" + name;
-  if (clName in tonClasses) return tonClasses[clName];
-  const packetV1Key = "lz::" + name.replace("packet", "packet_v1");
-  if (packetV1Key in tonClasses) return tonClasses[packetV1Key];
-  const packetV1UnderscoreKey = "lz::" + name.replace("packet", "packet_v1_");
-  if (packetV1UnderscoreKey in tonClasses) return tonClasses[packetV1UnderscoreKey];
-  const packetV2Key = "lz::" + name.replace("packet", "packet_v2");
-  if (packetV2Key in tonClasses) return tonClasses[packetV2Key];
-  const packetV2UnderscoreKey = "lz::" + name.replace("packet", "packet_v2_");
-  if (packetV2UnderscoreKey in tonClasses) return tonClasses[packetV2UnderscoreKey];
-  return void 0;
-}
-function findClassKey(tonClasses, name) {
-  if (name in tonClasses) return name;
-  const lzName = "lz::" + name;
-  if (lzName in tonClasses) return lzName;
-  const mdName = "md::" + name;
-  if (mdName in tonClasses) return mdName;
-  const clName = "cl::" + name;
-  if (clName in tonClasses) return clName;
-  const packetV1Key = "lz::" + name.replace("packet", "packet_v1");
-  if (packetV1Key in tonClasses) return packetV1Key;
-  const packetV1UnderscoreKey = "lz::" + name.replace("packet", "packet_v1_");
-  if (packetV1UnderscoreKey in tonClasses) return packetV1UnderscoreKey;
-  const packetV2Key = "lz::" + name.replace("packet", "packet_v2");
-  if (packetV2Key in tonClasses) return packetV2Key;
-  const packetV2UnderscoreKey = "lz::" + name.replace("packet", "packet_v2_");
-  if (packetV2UnderscoreKey in tonClasses) return packetV2UnderscoreKey;
-  return void 0;
-}
-function generateConstructorCodes(className, tonClasses) {
+function generateConstructorCode(className, tonClasses) {
   if (!(className in tonClasses)) {
     return tonClasses;
   }
   const tonClass = tonClasses[className];
   const { constructorInputArgs: inputArgs } = tonClass;
   const fnName = snakeToCamelCase(`getNew_${className}`);
-  const scratchFnName = snakeToCamelCase(`getNew_${className}FromScratch`);
   let methodIdName = `${className}::New`;
   if (className.includes("::New")) {
     methodIdName = className;
   }
   tonClass.constructorName = fnName;
-  tonClass.fromScratchConstructorName = scratchFnName;
-  tonClass.nonClassConstructorArgs = {};
   tonClass.constructorCode = `
         async ${fnName}(provider: ContractProvider${Object.keys(inputArgs).length > 0 ? `, args: {
          ${Object.entries(inputArgs).map(([argName, argType]) => `${argName}: ${tonTypeToTStype(argType)}`).join(",\n    ")}
@@ -900,21 +797,6 @@ function generateConstructorCodes(className, tonClasses) {
             ]);
             return getResult.stack.readCell()
     }`;
-  const cellArgs = {};
-  Object.entries(inputArgs).forEach(([argName, argType]) => {
-    cellArgs[argName] = argType === "tuple" ? "cell" : argType;
-  });
-  tonClass.cellConstructorCode = `
-        async ${fnName}Cell(provider: ContractProvider${Object.keys(inputArgs).length > 0 ? `, args: {
-        ${Object.entries(cellArgs).map(([argName, argType]) => `${argName}: ${tonTypeToTStype(argType, "Slice", true)}`).join(",\n    ")}
-            }` : ""}): Promise<Cell> {
-        const getResult = await provider.get('${methodIdName}', [
-        ${Object.entries(cellArgs).map(
-    ([argName, argType]) => `{ type: '${tonTypeToTupleType(argType)}', ${tonTypeToTupleValueName(argType)}: ${tonTypeToTupleValue(Object.keys(inputArgs).length > 0 ? `args.${argName}` : argName, argType)} }`
-  ).join(",\n    ")}
-        ]);
-        return getResult.stack.readCell()
-    }`;
   tonClass.constructorCodeCallGenerator = (callerArgs, _) => {
     const missingArgs = Object.keys(inputArgs).filter((key) => !(key in callerArgs));
     if (missingArgs.length > 0) {
@@ -925,119 +807,14 @@ function generateConstructorCodes(className, tonClasses) {
     const filteredArgs = Object.entries(inputArgs).filter(([key, value]) => key in callerArgs);
     return `await ${fnName}(provider.getSender()${filteredArgs.length > 0 ? `, { ${filteredArgs.map(([argName, argType]) => `${argName}: ${argName}`).join(", ")} }` : ""})`;
   };
-  tonClass.flatConstructorArgs = { ...inputArgs };
-  Object.entries(tonClass.constructorInputArgs).map(([argName, argType]) => {
-    if (argType === "tuple") {
-      const tupleClass = findClass(tonClasses, argName);
-      if (tupleClass?.scratchConstructorCodeCallGenerator === void 0) {
-        const implicitDepName = findClassKey(tonClasses, argName);
-        if (implicitDepName !== void 0) {
-          generateConstructorCodes(implicitDepName, tonClasses);
-        }
-      }
-      tonClass.flatConstructorArgs = mergeInputArgs(
-        tonClass.flatConstructorArgs ?? {},
-        tupleClass?.flatConstructorArgs ?? {}
-      );
-    }
-  });
-  const classArgs = {};
-  Object.entries(tonClass.flatConstructorArgs ?? {}).forEach(([argName, argType]) => {
-    if (argType === "tuple" && findClass(tonClasses, argName) !== void 0) {
-      classArgs[argName] = tonClass.flatConstructorArgs?.[argName] ?? "";
-    } else {
-      (tonClass.nonClassConstructorArgs ?? (tonClass.nonClassConstructorArgs = {}))[argName] = argType;
-    }
-  });
-  tonClass.scratchConstructorCodeCallGenerator = (parentArgs, _) => {
-    const missingArgs = Object.keys(tonClass.nonClassConstructorArgs ?? {}).filter((key) => !(key in parentArgs));
-    if (missingArgs.length > 0) {
-      console.warn(
-        `Argument(s) not provided: ${missingArgs.join(", ")}, make sure the TON constructor has default values for these arguments`
-      );
-    }
-    const filteredArgs = Object.entries(tonClass.nonClassConstructorArgs ?? {}).filter(
-      ([key, value]) => key in parentArgs
-    );
-    return `await ${scratchFnName}(provider${filteredArgs.length > 0 ? `, { ${filteredArgs.map(([argName, argType]) => `${argName}: args.${argName}`).join(", ")} }` : ""})`;
-  };
-  const finalScratchArgs = { ...tonClass.nonClassConstructorArgs };
-  const insideTupleGenerationCode = Object.entries(classArgs).map(([argName, argType]) => {
-    const tupleInstanceName = argName;
-    const tupleClass = findClass(tonClasses, argName);
-    if (tupleClass !== void 0) {
-      finalScratchArgs[`${argName}INSIDE_FLAGGED`] = argType;
-    }
-    return `const ${tupleInstanceName} = ${tupleClass?.scratchConstructorCodeCallGenerator?.(tonClass.nonClassConstructorArgs ?? {}, "") ?? ""};`.replace(
-      "getNew",
-      "this.getNew"
-    );
-  }).join("\n");
-  tonClass.fromScratchConstructorCode = `
-        async ${scratchFnName}(provider: ContractProvider${Object.keys(tonClass.nonClassConstructorArgs ?? {}).length > 0 ? `, args: {
-            ${Object.entries(tonClass.nonClassConstructorArgs ?? {}).map(([argName, argType]) => `${argName}: ${tonTypeToTStype(argType)}`).join(",\n    ")}
-        }` : ""}): Promise<Tuple> {
-            ${insideTupleGenerationCode}
-            const getResult = await provider.get('${className.toLowerCase()}::New', [
-            ${Object.entries(finalScratchArgs).map(
-    ([argName, argType]) => `{ type: '${tonTypeToTupleType(argType)}', ${tonTypeToTupleValueName(argType)}: ${tonTypeToTupleValue(Object.keys(tonClass.nonClassConstructorArgs ?? {}).length > 0 ? `args.${argName}` : argName, argType)} }`
-  ).join(",\n    ")}
-            ])
-            return LzTuple(getResult.stack)
-        }`;
-  tonClass.constructorIncomplete = false;
   tonClasses[className] = tonClass;
   return tonClasses;
 }
-function recursiveGenConstructorCode(classConstructors, key = "") {
-  if (key != "") {
-    if (!(key in classConstructors)) {
-      return classConstructors;
-    }
-    const current = classConstructors[key];
-    if (current.constructorIncomplete) {
-      current.dependencies.forEach((item) => {
-        if (item in classConstructors) {
-          if (classConstructors[item].constructorCode === void 0) {
-            classConstructors = recursiveGenConstructorCode(classConstructors, item);
-          }
-        }
-      });
-    }
-    classConstructors = generateConstructorCodes(key, classConstructors);
-  } else {
-    for (const [key2, value] of Object.entries(classConstructors)) {
-      if (value.constructorCode === void 0) {
-        classConstructors = recursiveGenConstructorCode(classConstructors, key2);
-      }
-    }
-  }
-  return classConstructors;
-}
-function recursiveGenTSTypes(classConstructors, key = "") {
-  if (key != "") {
-    if (!(key in classConstructors)) {
-      return classConstructors;
-    }
-    const current = classConstructors[key];
-    if (current.dependencies.length > 0) {
-      current.dependencies.forEach((item) => {
-        if (item in classConstructors) {
-          if (classConstructors[item].tsTypeCode === void 0) {
-            classConstructors = recursiveGenTSTypes(classConstructors, item);
-          }
-        }
-      });
-    }
-    classConstructors = generateTonClassTypes(key, classConstructors);
-  } else {
-    for (const [key2, value] of Object.entries(classConstructors)) {
-      if (value.tsTypeCode === void 0) {
-        classConstructors = recursiveGenTSTypes(classConstructors, key2);
-      }
-    }
+function generateAllConstructorCodes(tonClasses) {
+  for (const [className, tonClass] of Object.entries(tonClasses)) {
+    generateConstructorCode(className, tonClasses);
   }
-  return classConstructors;
+  return tonClasses;
 }
 function getTsAttributeName(name) {
   let modifiedName = name.replace(/::/g, "_");
@@ -1047,7 +824,7 @@ function getTsAttributeName(name) {
   }
   return modifiedName;
 }
-function generateTonClassTypes(name, tonClasses) {
+function generateTonClassType(name, tonClasses) {
   if (!(name in tonClasses)) {
     return tonClasses;
   }
@@ -1057,16 +834,8 @@ function generateTonClassTypes(name, tonClasses) {
   const typeName = tonClass.is_md ? "interface" : "type";
   const extension = tonClass.is_md ? "extends Md" : "=";
   tonClass.tsTypeCode = `${typeName} ${capitalizedName} ${extension} {
-        ${tonClass.attributes.map(({ name: name2, type, dependencyName }) => {
-    const modifiedName = getTsAttributeName(name2);
-    let attributeType = tonTypeToTStype(type, "Address", true);
-    if (type === "obj_ref") {
-      const dependantClass = findClass(tonClasses, modifiedName) ?? findClass(tonClasses, dependencyName);
-      if (dependantClass) {
-        attributeType = dependantClass.constructorName.replace("getNew", "");
-      }
-    }
-    return `${modifiedName}: ${attributeType};`;
+        ${tonClass.attributes.map(({ name: name2, type }) => {
+    return `${getTsAttributeName(name2)}: ${tonTypeToTStype(type)};`;
   }).join("\n")}
     }
 
@@ -1075,7 +844,13 @@ function generateTonClassTypes(name, tonClasses) {
   tonClasses[name] = tonClass;
   return tonClasses;
 }
-function generateDeconstructorCodes(className, tonClasses) {
+function generateAllTonClassTypes(tonClasses) {
+  for (const [className, tonClass] of Object.entries(tonClasses)) {
+    generateTonClassType(className, tonClasses);
+  }
+  return tonClasses;
+}
+function generateDeconstructorCode(className, tonClasses) {
   if (!(className in tonClasses)) {
     return tonClasses;
   }
@@ -1085,18 +860,10 @@ function generateDeconstructorCodes(className, tonClasses) {
   tonClass.deconstructorName = fnName;
   tonClass.deconstructorCode = `
         static async ${fnName}(wrapper: ExtendedContract<TonContractWrapper>, cell: Cell): Promise<${tsTypeName}> {
-            ${attributes.map(({ name, type, dependencyName }) => {
+            ${attributes.map(({ name, type }) => {
     const fieldTSName = getTsAttributeName(name);
-    const tsGetterName = tsTypeToTSGetterName(tonTypeToTStype(type, "Slice", false), "wrapper");
+    const tsGetterName = tsTypeToTSGetterName(tonTypeToTStype(type), "wrapper");
     const fieldIndex = inverseFieldMap[name];
-    if (type === "obj_ref") {
-      const dependencyClassType = (findClass(tonClasses, dependencyName) ?? findClass(tonClasses, fieldTSName))?.tsTypeName;
-      if (dependencyClassType !== void 0) {
-        const depDeconstructorName = snakeToCamelCase(`get_${dependencyClassType}ToTS`);
-        return `const ${fieldTSName}_obj = await ${tsGetterName}(cell, ${fieldIndex}n);
-                            const ${fieldTSName} = await TonObjectUnwrapper.${depDeconstructorName}(wrapper, ${fieldTSName}_obj)`;
-      }
-    }
     const tonGetterName = tonTypeToTonGetterName(type);
     if (tsGetterName === "getLzDict") {
       return `const ${fieldTSName} = await getLzDict(cell, ${fieldIndex}n, wrapper)`;
@@ -1116,34 +883,14 @@ function generateDeconstructorCodes(className, tonClasses) {
   tonClass.deconstructorCodeCallGenerator = (callerArgs, _) => {
     return `await ${fnName}(provider, obj)`;
   };
-  tonClass.deconstructorIncomplete = false;
   tonClasses[className] = tonClass;
   return tonClasses;
 }
-function recursiveGenDeconstructorCode(classConstructors, key = "") {
-  if (key != "") {
-    if (!(key in classConstructors)) {
-      return classConstructors;
-    }
-    const current = classConstructors[key];
-    if (current.deconstructorIncomplete === void 0 || current.deconstructorIncomplete) {
-      current.dependencies.forEach((item) => {
-        if (item in classConstructors) {
-          if (classConstructors[item].deconstructorCode === void 0) {
-            classConstructors = recursiveGenDeconstructorCode(classConstructors, item);
-          }
-        }
-      });
-    }
-    classConstructors = generateDeconstructorCodes(key, classConstructors);
-  } else {
-    for (const [key2, value] of Object.entries(classConstructors)) {
-      if (value.deconstructorCode === void 0) {
-        classConstructors = recursiveGenDeconstructorCode(classConstructors, key2);
-      }
-    }
+function generateAllDeconstructorCodes(tonClasses) {
+  for (const [className, tonClass] of Object.entries(tonClasses)) {
+    generateDeconstructorCode(className, tonClasses);
   }
-  return classConstructors;
+  return tonClasses;
 }
 function getSpecificFiles(dirPath, includeName) {
   const files = [];
@@ -1325,11 +1072,11 @@ function generateAllViewFunctions(rootDir, nameWhitelist, blacklist) {
           const [argType, argName] = argPair.split(/\s+/);
           if (argName !== void 0) {
             tonArgs[argName.replace("$", "")] = argType;
-            tsArgs[argName.replace("$", "")] = tonTypeToTStype(argType, "Address", true);
+            tsArgs[argName.replace("$", "")] = tonTypeToTStype(argType);
           }
         }
         const tonReturnTypes = returnType.split(",").map((type) => type.replace(/\(/g, "").replace(/\)/g, "").trim());
-        const tsReturnTypes = tonReturnTypes.map((type) => tonTypeToTStype(type, "Address", false));
+        const tsReturnTypes = tonReturnTypes.map((type) => tonTypeToTStype(type));
         if (!(contractName in viewFunctions)) {
           viewFunctions[contractName] = [];
         }
@@ -1388,6 +1135,18 @@ var BaseWrapper = class {
       body: beginCell().endCell()
     });
   }
+  async sendRequest(provider, via, request) {
+    return provider.internal(via, {
+      value: request.value,
+      sendMode: request.sendMode ?? void 0,
+      body: request.body,
+      bounce: request.bounce
+    });
+  }
+  async getDeployed(provider) {
+    const state = await provider.getState();
+    return state.state.type !== "uninit";
+  }
   buildSenderArguments(body, opts) {
     return {
       value: BigInt(opts.value),
@@ -1398,19 +1157,9 @@ var BaseWrapper = class {
       sendMode: opts.sendMode ?? SendMode.PAY_GAS_SEPARATELY
     };
   }
-  async sendRequest(provider, via, request) {
-    return sendRequest(provider, via, request);
-  }
-  async sendArbitraryOp(provider, via, op_code, opts) {
-    await provider.internal(via, {
-      value: opts.value,
-      sendMode: SendMode.PAY_GAS_SEPARATELY,
-      body: beginMessage(op_code, opts.queryId ?? randomQueryId()).endCell()
-    });
-  }
-  async getDeployed(provider) {
-    const state = await provider.getState();
-    return state.state.type !== "uninit";
+  beginMessage(opcode, queryId) {
+    const randomQueryId = Math.floor(Math.random() * 1e11);
+    return beginCell().storeUint(opcode, 32).storeUint(queryId ?? randomQueryId, 64);
   }
 };
 function generateTestUtilsCode(directory, filename) {
@@ -1445,22 +1194,15 @@ import {
     Order,
     Profile,
     TransferRequest,
+    addressToBigInt,
+    beginMessage,
     buildOnchainMetadata,
     cellFromArtifact,
     getRandomInt,
     printTransactionTrace,
 } from '@layerzerolabs/ton-sdk-tools'
 
-import {
-    LzDict,
-    LzEventHandler,
-    MdPacketSent,
-    OPCODES,
-    TonContractWrapper,
-    TonObjectUnwrapper,
-    addressToBigInt,
-    beginMessage,
-} from '../src'
+import { LzDict, LzEventHandler, MdPacketSent, OPCODES, TonContractWrapper, TonObjectUnwrapper } from '../src'
 
 const invertedOpcodes = Object.fromEntries(Object.entries(OPCODES).map(([key, value]) => [value.toString(), key]))
 const SML_MANAGER_DEFAULT_VERSION = BigInt(1)
@@ -2063,7 +1805,7 @@ export async function commitVerificationAndExpect(
         sender: deployer.getSender(),
         contract: smlManager,
         opCode: OPCODES.SmlManager_OP_SML_MANAGER_COMMIT_PACKET,
-        md: await smlManager.getNewMdMdAddressCell({
+        md: await smlManager.getNewMdMdAddress({
             md: lzPacketCell,
             address: addressToBigInt(endpoint.address),
         }),
@@ -2396,7 +2138,7 @@ export async function openAndDeployControllerViaMultiSig(
     const controller: SandboxContract<TonContractWrapper> = blockchain.openContract(
         TonContractWrapper.create(
             cellFromArtifact(ControllerArtifact),
-            await allStorages.getNewControllerCell({
+            await allStorages.getNewController({
                 owner: addressToBigInt(multiSigContract.address),
                 eid,
                 endpointCode: cellFromArtifact(EndpointArtifact),
@@ -2441,7 +2183,7 @@ export async function setControllerZroWalletViaMultisig(
         multiSigContract,
         messageBody: controller.buildRequest(
             OPCODES.Controller_OP_SET_ZRO_WALLET,
-            await controller.getNewMdSetAddressCell({
+            await controller.getNewMdSetAddress({
                 address: addressToBigInt(await zroMinter.getWalletAddress(multiSigContract.address)),
             }),
             { value: toNano('1') },
@@ -2479,7 +2221,7 @@ export async function openAndDeployEndpoint(
     const endpoint: SandboxContract<TonContractWrapper> = blockchain.openContract(
         TonContractWrapper.create(
             cellFromArtifact(EndpointArtifact),
-            await controller.getNewEndpointCell({
+            await controller.getNewEndpoint({
                 eid: srcEid,
                 dstEid: dstEid,
                 owner: addressToBigInt(controller.address),
@@ -2492,7 +2234,7 @@ export async function openAndDeployEndpoint(
         multiSigContract,
         messageBody: controller.buildRequest(
             OPCODES.Controller_OP_DEPLOY_ENDPOINT,
-            await controller.getNewMdDeployCell({
+            await controller.getNewMdDeploy({
                 dstEid: dstEid,
                 initialDeposit: toNano('1.0'),
                 dstOApp: BigInt(0), // the dstOApp is unused inside of the endpoint deploy call
@@ -2532,7 +2274,7 @@ export async function openAndDeployChannel(
     const channel: SandboxContract<TonContractWrapper> = blockchain.openContract(
         TonContractWrapper.create(
             cellFromArtifact(ChannelArtifact),
-            await srcFixture.controller.getNewChannelCell({
+            await srcFixture.controller.getNewChannel({
                 owner: addressToBigInt(srcFixture.controller.address),
                 path: srcFixture.path,
                 endpointAddress: addressToBigInt(srcFixture.endpoint.address),
@@ -2545,7 +2287,7 @@ export async function openAndDeployChannel(
         sender: deployer.getSender(),
         contract: srcFixture.oApp,
         opCode: OPCODES.OP_DeployChannel,
-        md: await srcFixture.controller.getNewMdDeployCell({
+        md: await srcFixture.controller.getNewMdDeploy({
             dstEid: dstFixture.eid,
             dstOApp: addressToBigInt(dstFixture.oApp.address),
             initialDeposit: toNano('1'),
@@ -2585,7 +2327,7 @@ export async function openAndDeploySmlManager(
     const smlManager: SandboxContract<TonContractWrapper> = blockchain.openContract(
         TonContractWrapper.create(
             cellFromArtifact(SmlManagerArtifact),
-            await allStorages.getNewSmlManagerCell({
+            await allStorages.getNewSmlManager({
                 owner: addressToBigInt(fixture.owner.address),
                 eid: fixture.eid,
                 version,
@@ -2626,7 +2368,7 @@ export async function openAndDeploySmlConnection(
     const smlConnection: SandboxContract<TonContractWrapper> = blockchain.openContract(
         TonContractWrapper.create(
             cellFromArtifact(SmlConnectionArtifact),
-            await allStorages.getNewSmlConnectionCell({
+            await allStorages.getNewSmlConnection({
                 owner: addressToBigInt(smlManager.address),
                 path: srcFixture.path,
             })
@@ -2638,8 +2380,8 @@ export async function openAndDeploySmlConnection(
         sender: srcFixture.owner.getSender(),
         contract: srcFixture.oApp,
         opCode: OPCODES.OP_DeployConnection,
-        md: await allStorages.getNewMdMdAddressCell({
-            md: await allStorages.getNewMdDeployCell({
+        md: await allStorages.getNewMdMdAddress({
+            md: await allStorages.getNewMdDeploy({
                 dstEid: dstFixture.eid,
                 dstOApp: addressToBigInt(dstFixture.oApp.address),
                 initialDeposit: toNano('1'),
@@ -2681,7 +2423,7 @@ export async function setDefaultEndpointConfig(
     srcFixture: ProtocolFixture,
     dstFixture: ProtocolFixture
 ): Promise<SendMessageResult> {
-    const set_ep_config_md = await allStorages.getNewMdSetEpConfigCell({
+    const set_ep_config_md = await allStorages.getNewMdSetEpConfig({
         useDefaults: BigInt(-1), // true
         sendMsglibManager: addressToBigInt(sendMsglibManager.address),
         receiveMsglibManager: addressToBigInt(receiveMsglibManager.address),
@@ -2694,7 +2436,7 @@ export async function setDefaultEndpointConfig(
         multiSigContract: srcFixture.multisig,
         messageBody: srcFixture.controller.buildRequest(
             OPCODES.Controller_OP_SET_EP_CONFIG_DEFAULTS,
-            await srcFixture.controller.getNewMdMdEidCell({
+            await srcFixture.controller.getNewMdMdEid({
                 md: set_ep_config_md,
                 eid: dstFixture.eid,
             }),
@@ -2740,7 +2482,7 @@ export async function addMsgLibToController(
         multiSigContract: srcFixture.multisig,
         messageBody: srcFixture.controller.buildRequest(
             OPCODES.Controller_OP_ADD_MSGLIB,
-            await srcFixture.controller.getNewMdAddMsglibCell({
+            await srcFixture.controller.getNewMdAddMsglib({
                 msglibManagerAddress: addressToBigInt(msglibManager.address),
                 dstEid: dstFixture.eid,
             }),
@@ -2943,14 +2685,14 @@ export async function wireChannels(
 
     // ===================================generate path==================================================
 
-    srcFixture.path = await allStorages.getNewLzPathCell({
+    srcFixture.path = await allStorages.getNewLzPath({
         srcEid: srcFixture.eid,
         srcOApp: addressToBigInt(srcFixture.oApp.address),
         dstEid: dstFixture.eid,
         dstOApp: addressToBigInt(dstFixture.oApp.address),
     })
 
-    dstFixture.path = await allStorages.getNewLzPathCell({
+    dstFixture.path = await allStorages.getNewLzPath({
         srcEid: dstFixture.eid,
         srcOApp: addressToBigInt(dstFixture.oApp.address),
         dstEid: srcFixture.eid,
@@ -3001,12 +2743,12 @@ export async function deployConfigAndRegisterSml(
 
     // ===================================configure sml =====================================
 
-    const set_sml_config_md = await msglibManager.getNewMdSetSmlManagerConfigCell({
+    const set_sml_config_md = await msglibManager.getNewMdSetSmlManagerConfig({
         nativeFee,
         zroFee,
     })
 
-    const set_sml_config_extended_md = await msglibManager.getNewMdExtendedMdCell({
+    const set_sml_config_extended_md = await msglibManager.getNewMdExtendedMd({
         md: set_sml_config_md,
         obj: emptyObject,
         forwardingAddress: BigInt(0),
@@ -3257,7 +2999,7 @@ var Multisig = class _Multisig {
       throw new Error("Configuration is not set: use createFromConfig or loadConfiguration");
     }
     if (via.address !== void 0) {
-      const addrCmp = (x) => via.address !== void 0 && x.equals(via.address);
+      const addrCmp = (x) => x.equals(via.address);
       addrIdx = this.configuration.signers.findIndex(addrCmp);
       if (addrIdx >= 0) {
         isSigner = true;
@@ -3269,7 +3011,7 @@ var Multisig = class _Multisig {
         isSigner = false;
       }
     } else if (isSigner === void 0 || addrIdx == void 0) {
-      throw new Error("If sender address is not known, addrIdx and isSigner parameters required");
+      throw new Error("If sender address is not known, addrIdx and isSigner parameres required");
     }
     let newActions;
     if (actions instanceof Cell) {
@@ -3891,6 +3633,6 @@ function printTransactionTrace(transactions, opcodeInfo, callerStack, profile) {
   if (profile?.profileGas) sortAndSave(filePath, gasInfo);
 }
 
-export { BASE_CHAIN_ID, BaseWrapper, Errors, JettonMinter, JettonWallet, MASTER_CHAIN_ID, MASTER_CHAIN_SHARD, MultiSigErrors, MultiSigOpCodes, MultiSigParams, Multisig, Op, Order, Txiterator, addressToBigInt, beginMessage, bigintToAddress, buildOnchainMetadata, cellFromArtifact, computedGeneric, differentAddress, executeFrom, executeTill, extractConstants, extractEvents, findDeepestCell, findTransaction, formatCoinsPure, generateAllViewFunctions, generateTestUtilsCode, getMsgPrices, getOpcodeCRC, getRandom, getRandomInt, getSpecificFiles, jettonContentToCell, jettonMinterConfigToCell, jettonWalletConfigToCell, makeSnakeCell, mergeConstructorDicts, multisigConfigToCell, orderConfigToCell, parseDirectory, printTransactionTrace, randomQueryId, recursiveGenConstructorCode, recursiveGenDeconstructorCode, recursiveGenTSTypes, saveAllTypes, saveConstantsFile, saveEventsFile, saveObjectsAsTS, saveTonContractWrapper, saveTonObjectUnwrapper, saveViewFunctions, sendRequest, storageCollected, to32ByteBuffer };
+export { BASE_CHAIN_ID, BaseWrapper, Errors, JettonMinter, JettonWallet, MASTER_CHAIN_ID, MASTER_CHAIN_SHARD, MultiSigErrors, MultiSigOpCodes, MultiSigParams, Multisig, Op, Order, Txiterator, addressToBigInt, bigintToAddress, buildOnchainMetadata, cellFromArtifact, computedGeneric, differentAddress, executeFrom, executeTill, extractConstants, extractEvents, findDeepestCell, findTransaction, formatCoinsPure, generateAllConstructorCodes, generateAllDeconstructorCodes, generateAllTonClassTypes, generateAllViewFunctions, generateConstructorCode, generateDeconstructorCode, generateTestUtilsCode, generateTonClassType, getMsgPrices, getOpcodeCRC, getRandom, getRandomInt, getSpecificFiles, jettonContentToCell, jettonMinterConfigToCell, jettonWalletConfigToCell, makeSnakeCell, mergeConstructorDicts, multisigConfigToCell, orderConfigToCell, parseDirectory, printTransactionTrace, saveAllTypes, saveConstantsFile, saveEventsFile, saveObjectsAsTS, saveTonContractWrapper, saveTonObjectUnwrapper, saveViewFunctions, storageCollected, to32ByteBuffer };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map