@layerzerolabs/ton-sdk-tools 3.0.27 → 3.0.29

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @layerzerolabs/ton-sdk-tools
 
+## 3.0.29
+
+### Patch Changes
+
+- 6d435ec: fix sdk
+
+## 3.0.28
+
+### Patch Changes
+
+- 0ced4cd: fix zksync artifacts
+
 ## 3.0.27
 
 ### Patch Changes

package/dist/index.cjs

@@ -297,7 +297,7 @@ function parseDeclareLines(input, fieldMap) {
 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;
+  const regex = /^const\s+int\s+(?:[A-Za-z]+::)?[A-Za-z]\w+::([A-Za-z0-9]+)\s*=\s*(\d+);/gm;
   let match;
   while ((match = regex.exec(strInput)) !== null) {
     const [, fieldName, fieldIndexStr] = match;
@@ -3178,8 +3178,7 @@ function generateSmlTestUtils(directory, filename) {
   fs__namespace.default.writeFileSync(path__namespace.default.join(directory, filename), savedCode);
 }
 function generateUlnTestUtils(directory, filename) {
-  const savedCode = `
-     import { Address, Cell, TupleItemCell, beginCell, toNano } from '@ton/core'
+  const savedCode = `import { Address, Cell, TupleItemCell, beginCell, toNano } from '@ton/core'
 import { Blockchain, SandboxContract, SendMessageResult, TreasuryContract } from '@ton/sandbox'
 import { FlatTransactionComparable } from '@ton/test-utils'
 import { ethers } from 'ethers'
@@ -3198,21 +3197,15 @@ import UlnManagerArtifact from '@layerzerolabs/layerzero-v2-ton/build/UlnManager
 import { Profile, addressToBigInt, cellFromArtifact } from '@layerzerolabs/ton-sdk-tools'
 
 import {
-    ActionTypes,
     OAppFixture,
     OAppFlowGas,
-    OutOfOrder,
-    PacketInFlight,
     ProtocolFixture,
     SIGNATURE_BYTE_LENGTH,
     addMsgLibToController,
-    assertCommittableView,
-    assertVerifiedView,
     createLzPacketFromPacketEncoded,
     createVerifierDictSet,
     emptyObject,
     generateRandomVerifierSet,
-    lzReceiveAndExpect,
     protocolSetupGas,
     publicKeyToHash,
     requireDefined,
@@ -3222,9 +3215,7 @@ import {
     setDefaultEndpointConfig,
     wireChannels,
 } from './auto-utils-common'
-import { ExpectedCounts, assertInboundCount, assertOutboundCount, incrementCounterAndExpectULN } from './utils'
 import {
-    ERRORS,
     ExtendedContract,
     LzDict,
     LzEventHandler,
@@ -3235,8 +3226,6 @@ import {
 } from '../../src'
 
 const ULN_MANAGER_DEFAULT_VERSION = BigInt(1)
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const ULN_MANAGER_CUSTOM_VERSION = BigInt(2)
 
 export const TRUE = BigInt(-1)
 export const FALSE = BigInt(0)
@@ -3322,211 +3311,6 @@ export function serializeDvns(dvnList: bigint[]): Cell {
     return linkedList.endCell()
 }
 
-// ================================Out of order helper functions================================
-
-export async function generateFromPacketsInFlight(
-    outOfOrder: OutOfOrder,
-    fixtures: Map<bigint, OAppFixtureULN>,
-    expectedCounts: Map<bigint, ExpectedCounts>,
-    packetsInFlight: Map<bigint, PacketInFlight[]>,
-    multiSigOwner1: SandboxContract<TreasuryContract>,
-    eventHandler: LzEventHandler,
-    profile?: Profile
-): Promise<PacketInFlight[]> {
-    let fromPacketsInFlight: PacketInFlight[] | undefined = []
-
-    for (const action of outOfOrder.actions) {
-        const fromEidBigInt = BigInt(action.fromEid)
-        const fromFixture = fixtures.get(fromEidBigInt)
-        const fromExpectedCounts = expectedCounts.get(fromEidBigInt)
-        fromPacketsInFlight = packetsInFlight.get(fromEidBigInt)
-
-        if (!fromFixture || !fromExpectedCounts || !fromPacketsInFlight) {
-            throw new Error('Fixture, ExpectedCount, or PacketsInFlight not found')
-        }
-
-        const mdPacketSent = await incrementCounterAndExpectULN(
-            {
-                dstEid: action.toEid,
-                actionType: ActionTypes[action.actionType],
-                extraOptions: beginCell().endCell(),
-                nativeFee: toNano('0.000006240'),
-                zroFee: toNano('0'),
-            },
-            multiSigOwner1,
-            eventHandler,
-            fromFixture.msglibConnection,
-            fromFixture,
-            profile ?? undefined
-        )
-
-
-        await assertOutboundCount(fromFixture.oApp, action.toEid, ++fromExpectedCounts.outbound)
-
-        fromPacketsInFlight.push({
-            fromEid: action.fromEid,
-            toEid: action.toEid,
-            mdPacketSent,
-        })
-    }
-    return fromPacketsInFlight
-}
-
-export async function getRandomLzPacket(
-    allStorages: SandboxContract<TonContractWrapper>,
-    fromPacketsInFlight: PacketInFlight[],
-    fixtures: Map<bigint, OAppFixtureULN>,
-    expectedCounts: Map<bigint, ExpectedCounts>,
-    pooos: Map<bigint, number[]>
-): Promise<{
-    randomPacketIndex: number
-    randomPacketInFlight: PacketInFlight
-    toFixture: OAppFixtureULN
-    toExpectedCounts: ExpectedCounts
-    lzPacket: Cell
-    toPooo: number[]
-}> {
-    if (fromPacketsInFlight.length === 0) {
-        throw new Error('No packets in flight available')
-    }
-
-    const randomPacketIndex = Math.floor(Math.random() * fromPacketsInFlight.length)
-    const randomPacketInFlight = fromPacketsInFlight[randomPacketIndex]
-
-    const toEidBigInt = BigInt(randomPacketInFlight.toEid)
-    const toFixture = fixtures.get(toEidBigInt)
-    const toExpectedCounts = expectedCounts.get(toEidBigInt)
-    const toPooo = pooos.get(toEidBigInt)
-
-    if (!toFixture || !toExpectedCounts || !toPooo) {
-        throw new Error('Fixture, ExpectedCount, or POOO not found')
-    }
-
-    const lzPacket = await createLzPacketFromPacketEncoded(randomPacketInFlight.mdPacketSent.packetEncoded, allStorages)
-
-    return {
-        randomPacketIndex,
-        randomPacketInFlight,
-        toFixture,
-        toExpectedCounts,
-        lzPacket,
-        toPooo,
-    }
-}
-
-export async function handleVerify(
-    toFixture: OAppFixtureULN,
-    randomPacketInFlight: PacketInFlight,
-    lzPacket: Cell,
-    allStorages: SandboxContract<TonContractWrapper>,
-    eventHandler: LzEventHandler
-): Promise<void> {
-    let isVerified = true
-    for (const dvnFixture of toFixture.receiveDvnFixturesCustom) {
-        const isVerifiedView = await assertVerifiedView(
-            toFixture.msglibConnection,
-            addressToBigInt(dvnFixture.proxy.address),
-            randomPacketInFlight.mdPacketSent.nonce,
-            BigInt('0x' + lzPacket.hash().toString('hex')),
-            BigInt(1) // requiredConfirmations
-        )
-
-        if (isVerifiedView == FALSE) {
-            isVerified = false
-        }
-    }
-
-    if (!isVerified) {
-        await ulnVerifyAndExpect(
-            allStorages,
-            randomPacketInFlight.mdPacketSent,
-            toFixture,
-            toFixture.receiveDvnFixturesCustom,
-            toFixture.msglibManager,
-            toFixture.msglibConnection,
-            eventHandler
-        )
-    }
-}
-
-export async function handleCommit(
-    toFixture: OAppFixtureULN,
-    randomPacketInFlight: PacketInFlight,
-    lzPacketWithGuid: Cell,
-    multiSigOwner1: SandboxContract<TreasuryContract>,
-    eventHandler: LzEventHandler
-): Promise<void> {
-    const status = await assertCommittableView(
-        toFixture.msglibConnection,
-        randomPacketInFlight.mdPacketSent.nonce,
-        lzPacketWithGuid,
-        toFixture.defaultUlnReceiveConfig
-    )
-
-    if (status == UlnConnectionVerificationStatusCommittable) {
-        await commitVerificationAndExpect(lzPacketWithGuid, multiSigOwner1, eventHandler, toFixture)
-    }
-}
-
-export async function handleLzReceive(
-    isExecutable: boolean,
-    nonces: bigint[],
-    toFixture: OAppFixtureULN,
-    randomPacketInFlight: PacketInFlight,
-    multiSigOwner1: SandboxContract<TreasuryContract>,
-    allStorages: SandboxContract<TonContractWrapper>,
-    lzReceivePrepareValue: bigint,
-    eventHandler: LzEventHandler,
-    toExpectedCounts: ExpectedCounts,
-    randomPacketIndex: number | undefined,
-    fromPacketsInFlight: PacketInFlight[] | undefined,
-    totalPacketsDelivered?: number,
-    opcode = OPCODES.Channel_OP_LZ_RECEIVE_PREPARE,
-    profile?: Profile
-): Promise<number | undefined> {
-    if (isExecutable) {
-        for (const nonce of nonces) {
-            await lzReceiveAndExpect({
-                lzReceivePrepareMd: await allStorages.getNewMdLzReceivePrepare({
-                    nonce,
-                    nanotons: lzReceivePrepareValue,
-                }),
-                oAppFixture: toFixture,
-                deployer: multiSigOwner1,
-                eventHandler,
-                profile,
-            })
-            await assertInboundCount(toFixture.oApp, randomPacketInFlight.fromEid, ++toExpectedCounts.inbound)
-            if (totalPacketsDelivered !== undefined) totalPacketsDelivered++
-        }
-        if (fromPacketsInFlight && randomPacketIndex !== undefined) {
-            fromPacketsInFlight.splice(randomPacketIndex, 1)
-        }
-    } else {
-        await sendInternalMessageAndExpect({
-            value: toNano('1'),
-            sender: multiSigOwner1.getSender(),
-            contract: toFixture.channel,
-            opCode: opcode,
-            md: await allStorages.getNewMdLzReceivePrepare({
-                nonce: randomPacketInFlight.mdPacketSent.nonce,
-                nanotons: lzReceivePrepareValue,
-            }),
-            expectedTransactions: [
-                {
-                    from: multiSigOwner1.address,
-                    to: toFixture.channel.address,
-                    op: Number(opcode),
-                    exitCode: Number(ERRORS.Channel_ERROR_notExecutable),
-                    success: false,
-                },
-            ],
-        })
-        await assertInboundCount(toFixture.oApp, randomPacketInFlight.fromEid, toExpectedCounts.inbound)
-    }
-    return totalPacketsDelivered
-}
-
 // ==============================ULN INTEGRATION FUNCTIONS==============================
 
 export async function commitVerificationAndExpect(
@@ -3639,6 +3423,7 @@ export async function addDvnWorkers(
     for (const dvnFixture of [...sendDvnFixtures, ...receiveDvnFixtures]) {
         const dvnWorkerCallMd = await allStorages.getNewMdExecuteParams({
             target: addressToBigInt(msglibManager.address),
+            forwardingAddress: 0n,
             callData: await allStorages.getNewUlnWorkerFeelibInfo({
                 workerAddress: addressToBigInt(dvnFixture.dvn.address),
                 workerFeelibBytecode: cellFromArtifact(DvnFeelibArtifact),
@@ -4095,7 +3880,7 @@ export async function deployConfigAndRegisterDvn(
 ): Promise<[DvnFixture[], DvnFixture[]]> {
     const dvnAdmins = [fixture.owner]
     const verifierSet = generateRandomVerifierSet(3)
-    
+
     const sendDvnFixtures: DvnFixture[] = []
     const receiveDvnFixtures: DvnFixture[] = []
 
@@ -4137,7 +3922,7 @@ export async function deployConfigAndRegisterDvn(
         })
         await eventHandler.addCurrentEventsToAllEvents(dvnMsgResults, dvn)
     }
-    
+
     return [sendDvnFixtures, receiveDvnFixtures]
 }
 
@@ -4151,7 +3936,6 @@ export async function deployConfigAndRegisterUln(
     eventHandler: LzEventHandler,
     dvnFixtureConfig: DvnFixtureConfig
 ): Promise<SandboxContract<TonContractWrapper>> {
-    
     // ===================================open and deploy uln manager =====================================
 
     const [msglibManager, ulnManagerMsgResults] = await openAndDeployUlnManagerViaMultisig(
@@ -4164,7 +3948,6 @@ export async function deployConfigAndRegisterUln(
     srcFixture.msglibManager = msglibManager
 
     // ===================================open and deploy dvn =====================================
-
     ;[srcFixture.sendDvnFixtures, srcFixture.receiveDvnFixtures] = await deployConfigAndRegisterDvn(
         blockchain,
         allStorages,
@@ -4172,7 +3955,7 @@ export async function deployConfigAndRegisterUln(
         eventHandler,
         dvnFixtureConfig
     )
-    
+
     // ===================================open and deploy executor=====================================
 
     const executorAdmins = [srcFixture.owner]
@@ -4274,7 +4057,7 @@ export async function deployConfigAndRegisterUln(
         priceFeedCacheProxy.address,
         eventHandler
     )
-    
+
     // ===================================addUlnWorker - executor =======================================
 
     const executorWorkerCallMd = await allStorages.getNewMdExecuteParams({
@@ -4296,6 +4079,7 @@ export async function deployConfigAndRegisterUln(
         }),
         expiration: BigInt(0),
         opcode: OPCODES.UlnManager_OP_ADD_ULN_WORKER,
+        forwardingAddress: 0n,
     })
 
     internalMsgResults = await addUlnWorker(srcFixture.executorFixtures.admins[0], executor, executorWorkerCallMd, [
@@ -4357,6 +4141,7 @@ export async function deployConfigAndRegisterUln(
         }),
         expiration: BigInt(0),
         opcode: OPCODES.UlnManager_OP_ADD_ULN_WORKER,
+        forwardingAddress: 0n,
     })
 
     internalMsgResults = await addUlnWorker(
@@ -4418,7 +4203,7 @@ export async function deployConfigAndRegisterUln(
         confirmationsNull: BigInt(0),
         confirmations: BigInt(1),
     })
-    
+
     srcFixture.defaultUlnSendConfig = ulnSendConfig
 
     await sendMessageViaMultisigAndExpect({
@@ -4471,7 +4256,7 @@ export async function deployConfigAndRegisterUln(
     })
 
     srcFixture.defaultUlnReceiveConfig = ulnReceiveConfig
-    
+
     await sendMessageViaMultisigAndExpect({
         blockchain,
         multiSigContract: srcFixture.multisig,
@@ -4547,7 +4332,7 @@ export async function wireFixtureWithUln(
     }
 
     // ===================================deploy, configue, and register uln =====================================
-    
+
     srcFixture.msglibManager = await deployConfigAndRegisterUln(
         blockchain,
         multiSigners,
@@ -4569,7 +4354,7 @@ export async function wireFixtureWithUln(
         srcFixture.msglibManager
     )
     await eventHandler.addCurrentEventsToAllEvents(internalMsgResults, srcFixture.controller)
-    
+
     // ===================================open and deploy uln connection =====================================
 
     const [msglibConnection, ulnConnectionMsgResults] = await openAndDeployUlnConnection(
@@ -4597,8 +4382,7 @@ export async function wireFixtureWithUln(
 
     // expect no failures
     expect(eventHandler.allFailures.txList).toHaveLength(0)
-    
-    
+
     if (dvnFixtureConfigCustom) {
         // ===================================open and deploy dvn =====================================
 
@@ -4648,7 +4432,7 @@ export async function wireFixtureWithUln(
             md: await allStorages.getNewLzConfig({
                 path: srcFixture.path,
                 forwardingAddress: addressToBigInt(srcFixture.msglibManager.address),
-                opCode: OPCODES.MsglibManager_OP_SET_OAPP_MSGLIB_SEND_CONFIG,
+                opCode: OPCODES.MsglibManager_OP_SET_OAPP_MSGLIB_SEND_CONFIG as bigint,
                 config: ulnSendConfig,
             }),
             balanceRefill: toNano('1'),
@@ -4699,7 +4483,7 @@ export async function wireFixtureWithUln(
             md: await allStorages.getNewLzConfig({
                 path: srcFixture.path,
                 forwardingAddress: addressToBigInt(srcFixture.msglibManager.address),
-                opCode: OPCODES.MsglibManager_OP_SET_OAPP_MSGLIB_RECEIVE_CONFIG,
+                opCode: OPCODES.MsglibManager_OP_SET_OAPP_MSGLIB_RECEIVE_CONFIG as bigint,
                 config: ulnReceiveConfig,
             }),
             balanceRefill: toNano('1'),
@@ -4868,6 +4652,7 @@ interface SetDictOnDvnParams {
     nonce: bigint
     allStorages: SandboxContract<TonContractWrapper>
     expectedTransactions: FlatTransactionComparable[]
+    target: bigint
 }
 
 export async function setDictOnDvn({
@@ -4878,6 +4663,7 @@ export async function setDictOnDvn({
     signedOpcode,
     incomingOpcode,
     nonce,
+    target,
     allStorages,
     expectedTransactions = [],
 }: SetDictOnDvnParams): Promise<SendMessageResult> {
@@ -4885,6 +4671,7 @@ export async function setDictOnDvn({
         nonce,
         opcode: signedOpcode,
         _dict: newDict,
+        target,
     })
 
     return signAndSendRequestToDvn({
@@ -4922,6 +4709,7 @@ interface SetQuorumOnDvnParams {
     nonce: bigint
     allStorages: SandboxContract<TonContractWrapper>
     expectedTransactions: FlatTransactionComparable[]
+    target: bigint
 }
 
 export async function setQuorumOnDvn({
@@ -4934,11 +4722,13 @@ export async function setQuorumOnDvn({
     nonce,
     allStorages,
     expectedTransactions,
+    target,
 }: SetQuorumOnDvnParams): Promise<SendMessageResult> {
     const setQuorumMd = await dvn.getNewMdSetQuorum({
         nonce,
         opcode: signedOpcode,
         quorum: newQuorum,
+        target,
     })
 
     return signAndSendRequestToDvn({
@@ -5033,6 +4823,7 @@ interface CallVerifyOnDvnParams {
     callData: Cell
     allStorages: SandboxContract<TonContractWrapper>
     expectedTransactions: FlatTransactionComparable[]
+    forwardingAddress: bigint
 }
 
 export async function callVerifyOnDvn({
@@ -5046,12 +4837,14 @@ export async function callVerifyOnDvn({
     callData,
     allStorages,
     expectedTransactions,
+    forwardingAddress,
 }: CallVerifyOnDvnParams): Promise<SendMessageResult> {
     const executeParamsMd = await dvn.getNewMdExecuteParams({
         expiration,
         target,
         callData,
         opcode: signedOpcode,
+        forwardingAddress,
     })
 
     return signAndSendRequestToDvn({
@@ -5082,21 +4875,22 @@ export async function ulnVerifyAndExpect(
 
     const lzPacket = await createLzPacketFromPacketEncoded(mdPacketSent.packetEncoded, allStorages)
 
-    const requestMd = await allStorages.getNewMdExecuteParams({
-        target: addressToBigInt(uln.address),
-        callData: await allStorages.getNewMdMdAddress({
-            md: await allStorages.getNewMdUlnVerification({
-                nonce: mdPacketSent.nonce,
-                hash: BigInt('0x' + lzPacket.hash().toString('hex')),
-                confirmations,
+    for (const { dvn, proxy, admins, verifiers } of receiveDvnFixtures) {
+        const requestMd = await allStorages.getNewMdExecuteParams({
+            target: addressToBigInt(dvn.address),
+            callData: await allStorages.getNewMdMdAddress({
+                md: await allStorages.getNewMdUlnVerification({
+                    nonce: mdPacketSent.nonce,
+                    hash: BigInt('0x' + lzPacket.hash().toString('hex')),
+                    confirmations,
+                }),
+                address: addressToBigInt(msglibConnection.address),
             }),
-            address: addressToBigInt(msglibConnection.address),
-        }),
-        expiration: oneDayFromNow,
-        opcode: OPCODES.Uln_OP_ULN_VERIFY,
-    })
+            expiration: oneDayFromNow,
+            opcode: OPCODES.Uln_OP_ULN_VERIFY,
+            forwardingAddress: addressToBigInt(uln.address),
+        })
 
-    for (const { dvn, proxy, admins, verifiers } of receiveDvnFixtures) {
         const internalMsgResults: SendMessageResult = await sendInternalMessageAndExpect({
             profile,
             value: OAppFlowGas['Msglib.COMMIT_PACKET'],