@layerzerolabs/ton-sdk-tools 3.0.22-ton.0 → 3.0.22-ton.1

package/dist/index.mjs

@@ -1454,7 +1454,7 @@ export interface ProtocolFixture {
     controller: SandboxContract<TonContractWrapper>
     endpoint: SandboxContract<TonContractWrapper>
     msglib: SandboxContract<TonContractWrapper>
-    msglibManagerDefault: SandboxContract<TonContractWrapper>
+    msglibManager: SandboxContract<TonContractWrapper>
     msglibManagerCustom?: SandboxContract<TonContractWrapper>
 }
 
@@ -1463,7 +1463,7 @@ export interface OAppFixture extends ProtocolFixture {
     oApp: SandboxContract<TonContractWrapper>
     path: Cell
     channel: SandboxContract<TonContractWrapper>
-    msglibConnectionDefault: SandboxContract<TonContractWrapper>
+    msglibConnection: SandboxContract<TonContractWrapper>
     msglibConnectionCustom?: SandboxContract<TonContractWrapper>
 }
 
@@ -1494,14 +1494,14 @@ export function logAddresses(
             [\`\${prefix}.multisig.address\`]: formatAddress(fixture.multisig.address),
             [\`\${prefix}.controller.address\`]: formatAddress(fixture.controller.address),
             [\`\${prefix}.endpoint.address\`]: formatAddress(fixture.endpoint.address),
-            [\`\${prefix}.MsglibManagerDefault.address\`]: formatAddress(fixture.msglibManagerDefault.address),
+            [\`\${prefix}.msglibManager.address\`]: formatAddress(fixture.msglibManager.address),
             [\`\${prefix}.msglib.address\`]: formatAddress(fixture.msglib.address),
             [\`\${prefix}.smlManagerCustom.address\`]: formatAddress(fixture.msglibManagerCustom?.address ?? ''),
             [\`--- \${oappHeader} ---\`]: '', // Custom separator
             [\`\${prefix}.owner.address\`]: formatAddress(fixture.owner.address),
             [\`\${prefix}.OApp.address\`]: formatAddress(fixture.oApp.address),
             [\`\${prefix}.channel.address\`]: formatAddress(fixture.channel.address),
-            [\`\${prefix}.MsglibConnectionDefault.address\`]: formatAddress(fixture.msglibConnectionDefault.address),
+            [\`\${prefix}.msglibConnection.address\`]: formatAddress(fixture.msglibConnection.address),
             [\`\${prefix}.smlConnectionCustom.address\`]: formatAddress(fixture.msglibConnectionCustom?.address ?? ''),
         }
     }
@@ -2717,7 +2717,13 @@ export async function runtimeDecoder(contract: SandboxContract<TonContractWrappe
                 if (newCellFieldType === 'NULL') {
                     newCellFieldType = 'cl::t::cellRef'
                 } else {
-                    newCellFieldType = keyMap[newCellFieldType] ?? newCellFieldType
+                    // Check if newCellFieldType is valid ASCII
+                    // eslint-disable-next-line no-control-regex
+                    if (!/^[p{ASCII}]+$/u.test(newCellFieldType)) {
+                        newCellFieldType = 'cl::t::cellRef'
+                    } else {
+                        newCellFieldType = keyMap[newCellFieldType] ?? newCellFieldType
+                    }
                 }
                 jsonField.fieldType = newCellFieldType
                 tonObjectDefCopy[key] = jsonField
@@ -2768,8 +2774,8 @@ function generateSmlTestUtils(directory, filename) {
         {
             endpoint,
             channel,
-            msglibManagerDefault: smlManager,
-            msglibConnectionDefault: smlConnection,
+            msglibManager: smlManager,
+            msglibConnection: smlConnection,
             controller,
         }: OAppFixture,
         profile?: Profile
@@ -3029,7 +3035,7 @@ function generateSmlTestUtils(directory, filename) {
         )
     
         // ===================================deploy and configure sml default=====================================
-        ;[srcFixture.msglibManagerDefault, srcFixture.msglibConnectionDefault] = await deployConfigAndRegisterSml(
+        ;[srcFixture.msglibManager, srcFixture.msglibConnection] = await deployConfigAndRegisterSml(
             blockchain,
             multiSigners,
             allStorages,
@@ -3047,14 +3053,14 @@ function generateSmlTestUtils(directory, filename) {
             blockchain,
             allStorages,
             multiSigners,
-            srcFixture.msglibManagerDefault,
-            srcFixture.msglibManagerDefault,
+            srcFixture.msglibManager,
+            srcFixture.msglibManager,
             srcFixture,
             dstFixture
         )
     
         // in SML, the connection is the Msglib
-        srcFixture.msglib = srcFixture.msglibConnectionDefault
+        srcFixture.msglib = srcFixture.msglibConnection
     
         await eventHandler.addCurrentEventsToAllEvents(internalMsgResults, srcFixture.controller)
         expect(eventHandler.allFailures.txList).toHaveLength(0)
@@ -3194,7 +3200,9 @@ export interface PricedfeedCacheFixture extends WorkerFixture {
 
 export interface ProtocolFixtureULN extends ProtocolFixture {
     sendDvnFixtures: DvnFixture[]
+    sendDvnFixturesCustom: DvnFixture[]
     receiveDvnFixtures: DvnFixture[]
+    receiveDvnFixturesCustom: DvnFixture[]
     executorFixtures: ExecutorFixture
     priceFeedCacheFixture: PricedfeedCacheFixture
 }
@@ -3237,8 +3245,8 @@ export async function commitVerificationAndExpect(
         endpoint,
         channel,
         msglib: uln,
-        msglibManagerDefault: ulnManager,
-        msglibConnectionDefault: ulnConnection,
+        msglibManager: ulnManager,
+        msglibConnection: ulnConnection,
         controller,
     }: OAppFixture,
     profile?: Profile
@@ -3326,7 +3334,9 @@ export async function addUlnWorker(
 
 export async function addDvnWorkers(
     allStorages: SandboxContract<TonContractWrapper>,
-    { sendDvnFixtures, receiveDvnFixtures, msglibManagerDefault, msglib: uln }: OAppFixtureULN,
+    { msglibManager, msglib: uln }: OAppFixtureULN,
+    sendDvnFixtures: DvnFixture[],
+    receiveDvnFixtures: DvnFixture[],
     dstEid: bigint,
     priceFeedCacheAddress: Address,
     eventHandler: LzEventHandler
@@ -3336,7 +3346,7 @@ export async function addDvnWorkers(
     requireDefined(uln)
     for (const dvnFixture of [...sendDvnFixtures, ...receiveDvnFixtures]) {
         const dvnWorkerCallMd = await allStorages.getNewMdExecuteParams({
-            target: addressToBigInt(msglibManagerDefault.address),
+            target: addressToBigInt(msglibManager.address),
             callData: await allStorages.getNewUlnWorkerFeelibInfo({
                 workerAddress: addressToBigInt(dvnFixture.dvn.address),
                 workerFeelibBytecode: cellFromArtifact(DvnFeelibArtifact),
@@ -3370,12 +3380,12 @@ export async function addDvnWorkers(
             },
             {
                 from: dvnFixture.proxy.address,
-                to: msglibManagerDefault.address,
+                to: msglibManager.address,
                 op: Number(OPCODES.UlnManager_OP_ADD_ULN_WORKER),
                 success: true,
             },
             {
-                from: msglibManagerDefault.address,
+                from: msglibManager.address,
                 to: uln.address,
                 success: true,
                 op: Number(OPCODES.Uln_OP_UPDATE_WORKER_FEELIB),
@@ -3383,12 +3393,12 @@ export async function addDvnWorkers(
             // emit event Uln::EVENT::ULN_WORKER_REGISTERED
             {
                 from: uln.address,
-                to: msglibManagerDefault.address,
+                to: msglibManager.address,
                 op: Number(OPCODES.BaseInterface_OP_EVENT),
                 success: false, // events are supposed to fail
             },
         ])
-        await eventHandler.addCurrentEventsToAllEvents(internalMsgResults, msglibManagerDefault)
+        await eventHandler.addCurrentEventsToAllEvents(internalMsgResults, msglibManager)
     }
 }
 
@@ -3420,7 +3430,7 @@ export async function openAndDeployUln(
         TonContractWrapper.create(
             cellFromArtifact(UlnArtifact),
             await allStorages.getNewUln({
-                owner: addressToBigInt(srcFixture.msglibManagerDefault.address),
+                owner: addressToBigInt(srcFixture.msglibManager.address),
                 eid: srcFixture.eid,
                 dstEid: dstFixture.eid,
             })
@@ -3438,17 +3448,17 @@ export async function openAndDeployUln(
             toNano('0')
         ).body!,
         signers: multiSigners,
-        targetContract: srcFixture.msglibManagerDefault,
+        targetContract: srcFixture.msglibManager,
         deploy: false,
         expectedTransactions: [
             {
                 from: srcFixture.multisig.address,
-                to: srcFixture.msglibManagerDefault.address,
+                to: srcFixture.msglibManager.address,
                 op: Number(OPCODES.UlnManager_OP_DEPLOY_ULN),
                 success: true,
             },
             {
-                from: srcFixture.msglibManagerDefault.address,
+                from: srcFixture.msglibManager.address,
                 to: uln.address,
                 success: true,
                 deploy: true,
@@ -3537,7 +3547,7 @@ export async function openAndDeployUlnConnection(
         TonContractWrapper.create(
             cellFromArtifact(UlnConnectionArtifact),
             await allStorages.getNewUlnConnection({
-                owner: addressToBigInt(srcFixture.msglibManagerDefault.address),
+                owner: addressToBigInt(srcFixture.msglibManager.address),
                 path: srcFixture.path,
                 ulnAddress: addressToBigInt(srcFixture.msglib.address),
             })
@@ -3574,7 +3584,7 @@ export async function openAndDeployUlnConnection(
         opCode: OPCODES.OP_DeployConnection,
         md: await allStorages.getNewMdMdAddress({
             md: deployMd,
-            address: addressToBigInt(srcFixture.msglibManagerDefault.address),
+            address: addressToBigInt(srcFixture.msglibManager.address),
         }),
         expectedTransactions: [
             {
@@ -3585,12 +3595,12 @@ export async function openAndDeployUlnConnection(
             },
             {
                 from: srcFixture.oApp.address,
-                to: srcFixture.msglibManagerDefault.address,
+                to: srcFixture.msglibManager.address,
                 op: Number(OPCODES.MsglibManager_OP_DEPLOY_CONNECTION),
                 success: true,
             },
             {
-                from: srcFixture.msglibManagerDefault.address,
+                from: srcFixture.msglibManager.address,
                 to: ulnConnection.address,
                 op: Number(OPCODES.BaseInterface_OP_INITIALIZE),
                 deploy: true,
@@ -3767,17 +3777,17 @@ export async function registerUlnWorkerInfo(
             toNano('0.1')
         ).body!,
         signers: multiSigners,
-        targetContract: srcFixture.msglibManagerDefault,
+        targetContract: srcFixture.msglibManager,
         deploy: false,
         expectedTransactions: [
             {
                 from: srcFixture.multisig.address,
-                to: srcFixture.msglibManagerDefault.address,
+                to: srcFixture.msglibManager.address,
                 op: Number(OPCODES.UlnManager_OP_REGISTER_WORKER_FEELIB_BYTECODE),
                 success: true,
             },
             {
-                from: srcFixture.msglibManagerDefault.address,
+                from: srcFixture.msglibManager.address,
                 to: srcFixture.multisig.address,
             },
         ],
@@ -3790,9 +3800,12 @@ export async function deployConfigAndRegisterDvn(
     fixture: OAppFixtureULN,
     eventHandler: LzEventHandler,
     dvnFixtureConfig: DvnFixtureConfig
-): Promise<void> {
+): Promise<[DvnFixture[], DvnFixture[]]> {
     const dvnAdmins = [fixture.owner]
     const verifierSet = generateRandomVerifierSet(3)
+    
+    const sendDvnFixtures: DvnFixture[] = []
+    const receiveDvnFixtures: DvnFixture[] = []
 
     for (let i = 0; i < dvnFixtureConfig.src.send.numReqDvns + dvnFixtureConfig.src.send.numOptDvns; i++) {
         const [dvn, dvnProxy, dvnMsgResults] = await openAndDeployDvnAndProxy(
@@ -3804,7 +3817,7 @@ export async function deployConfigAndRegisterDvn(
             BigInt(i)
         )
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        ;(fixture.sendDvnFixtures = fixture.sendDvnFixtures ?? []).push({
+        sendDvnFixtures.push({
             dvn,
             proxy: dvnProxy,
             admins: dvnAdmins,
@@ -3824,7 +3837,7 @@ export async function deployConfigAndRegisterDvn(
             BigInt(randomNumber + i)
         )
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        ;(fixture.receiveDvnFixtures = fixture.receiveDvnFixtures ?? []).push({
+        receiveDvnFixtures.push({
             dvn,
             proxy: dvnProxy,
             admins: dvnAdmins,
@@ -3832,6 +3845,8 @@ export async function deployConfigAndRegisterDvn(
         })
         await eventHandler.addCurrentEventsToAllEvents(dvnMsgResults, dvn)
     }
+    
+    return [sendDvnFixtures, receiveDvnFixtures]
 }
 
 export async function deployConfigAndRegisterUln(
@@ -3843,7 +3858,8 @@ export async function deployConfigAndRegisterUln(
     version: bigint,
     eventHandler: LzEventHandler,
     dvnFixtureConfig: DvnFixtureConfig
-): Promise<[SandboxContract<TonContractWrapper>, SandboxContract<TonContractWrapper>]> {
+): Promise<SandboxContract<TonContractWrapper>> {
+    
     // ===================================open and deploy uln manager =====================================
 
     const [msglibManager, ulnManagerMsgResults] = await openAndDeployUlnManagerViaMultisig(
@@ -3853,12 +3869,18 @@ export async function deployConfigAndRegisterUln(
         srcFixture
     )
     await eventHandler.addCurrentEventsToAllEvents(ulnManagerMsgResults, msglibManager)
-    srcFixture.msglibManagerDefault = msglibManager
+    srcFixture.msglibManager = msglibManager
 
     // ===================================open and deploy dvn =====================================
 
-    await deployConfigAndRegisterDvn(blockchain, allStorages, srcFixture, eventHandler, dvnFixtureConfig)
-
+    ;[srcFixture.sendDvnFixtures, srcFixture.receiveDvnFixtures] = await deployConfigAndRegisterDvn(
+        blockchain,
+        allStorages,
+        srcFixture,
+        eventHandler,
+        dvnFixtureConfig
+    )
+    
     // ===================================open and deploy executor=====================================
 
     const executorAdmins = [srcFixture.owner]
@@ -3901,7 +3923,7 @@ export async function deployConfigAndRegisterUln(
             bytecode: cellFromArtifact(DvnFeelibArtifact),
         })
     )
-    await eventHandler.addCurrentEventsToAllEvents(internalMsgResults, srcFixture.msglibManagerDefault)
+    await eventHandler.addCurrentEventsToAllEvents(internalMsgResults, srcFixture.msglibManager)
 
     // ============================registerUlnWorkerInfo - executorFeeLib=======================================
 
@@ -3913,7 +3935,7 @@ export async function deployConfigAndRegisterUln(
             bytecode: cellFromArtifact(ExecutorFeelibArtifact),
         })
     )
-    await eventHandler.addCurrentEventsToAllEvents(internalMsgResults, srcFixture.msglibManagerDefault)
+    await eventHandler.addCurrentEventsToAllEvents(internalMsgResults, srcFixture.msglibManager)
 
     // ============================registerUlnWorkerInfo - priceFeeLib(empty bytes)================================
 
@@ -3925,7 +3947,7 @@ export async function deployConfigAndRegisterUln(
             bytecode: emptyObject,
         })
     )
-    await eventHandler.addCurrentEventsToAllEvents(internalMsgResults, srcFixture.msglibManagerDefault)
+    await eventHandler.addCurrentEventsToAllEvents(internalMsgResults, srcFixture.msglibManager)
 
     // ===================================open and deploy uln =============================================
 
@@ -3951,12 +3973,20 @@ export async function deployConfigAndRegisterUln(
 
     // ===================================addUlnWorker - dvn =======================================
 
-    await addDvnWorkers(allStorages, srcFixture, dstFixture.eid, priceFeedCacheProxy.address, eventHandler)
-
+    await addDvnWorkers(
+        allStorages,
+        srcFixture,
+        srcFixture.sendDvnFixtures,
+        srcFixture.receiveDvnFixtures,
+        dstFixture.eid,
+        priceFeedCacheProxy.address,
+        eventHandler
+    )
+    
     // ===================================addUlnWorker - executor =======================================
 
     const executorWorkerCallMd = await allStorages.getNewMdExecuteParams({
-        target: addressToBigInt(srcFixture.msglibManagerDefault.address),
+        target: addressToBigInt(srcFixture.msglibManager.address),
         callData: await allStorages.getNewUlnWorkerFeelibInfo({
             workerAddress: addressToBigInt(executor.address),
             workerFeelibBytecode: cellFromArtifact(ExecutorFeelibArtifact),
@@ -3991,12 +4021,12 @@ export async function deployConfigAndRegisterUln(
         },
         {
             from: srcFixture.executorFixtures.proxy.address,
-            to: srcFixture.msglibManagerDefault.address,
+            to: srcFixture.msglibManager.address,
             op: Number(OPCODES.UlnManager_OP_ADD_ULN_WORKER),
             success: true,
         },
         {
-            from: srcFixture.msglibManagerDefault.address,
+            from: srcFixture.msglibManager.address,
             to: srcFixture.msglib.address,
             success: true,
             op: Number(OPCODES.Uln_OP_UPDATE_WORKER_FEELIB),
@@ -4004,17 +4034,17 @@ export async function deployConfigAndRegisterUln(
         // emit event Uln::EVENT::ULN_WORKER_REGISTERED
         {
             from: srcFixture.msglib.address,
-            to: srcFixture.msglibManagerDefault.address,
+            to: srcFixture.msglibManager.address,
             op: Number(OPCODES.BaseInterface_OP_EVENT),
             success: false, // events are supposed to fail
         },
     ])
-    await eventHandler.addCurrentEventsToAllEvents(internalMsgResults, srcFixture.msglibManagerDefault)
+    await eventHandler.addCurrentEventsToAllEvents(internalMsgResults, srcFixture.msglibManager)
 
     // ===================================addUlnWorker - priceFeedCache =======================================
 
     const priceFeedCacheWorkerCallMd = await allStorages.getNewMdExecuteParams({
-        target: addressToBigInt(srcFixture.msglibManagerDefault.address),
+        target: addressToBigInt(srcFixture.msglibManager.address),
         callData: await allStorages.getNewUlnWorkerFeelibInfo({
             workerAddress: addressToBigInt(priceFeedCacheProxy.address),
             workerFeelibBytecode: emptyObject,
@@ -4056,12 +4086,12 @@ export async function deployConfigAndRegisterUln(
             },
             {
                 from: priceFeedCacheProxy.address,
-                to: srcFixture.msglibManagerDefault.address,
+                to: srcFixture.msglibManager.address,
                 op: Number(OPCODES.UlnManager_OP_ADD_ULN_WORKER),
                 success: true,
             },
             {
-                from: srcFixture.msglibManagerDefault.address,
+                from: srcFixture.msglibManager.address,
                 to: srcFixture.msglib.address,
                 success: true,
                 op: Number(OPCODES.Uln_OP_UPDATE_WORKER_FEELIB),
@@ -4069,24 +4099,13 @@ export async function deployConfigAndRegisterUln(
             // emit event Uln::EVENT::ULN_WORKER_REGISTERED
             {
                 from: srcFixture.msglib.address,
-                to: srcFixture.msglibManagerDefault.address,
+                to: srcFixture.msglibManager.address,
                 op: Number(OPCODES.BaseInterface_OP_EVENT),
                 success: false, // events are supposed to fail
             },
         ]
     )
-    await eventHandler.addCurrentEventsToAllEvents(internalMsgResults, srcFixture.msglibManagerDefault)
-
-    // ===================================open and deploy uln connection =====================================
-
-    const [msglibConnection, ulnConnectionMsgResults] = await openAndDeployUlnConnection(
-        blockchain,
-        allStorages,
-        srcFixture,
-        dstFixture
-    )
-    srcFixture.msglibConnectionDefault = msglibConnection
-    await eventHandler.addCurrentEventsToAllEvents(ulnConnectionMsgResults, srcFixture.oApp)
+    await eventHandler.addCurrentEventsToAllEvents(internalMsgResults, srcFixture.msglibManager)
 
     // ===================================configure default send and receive config =====================================
 
@@ -4121,17 +4140,17 @@ export async function deployConfigAndRegisterUln(
             toNano('0.1')
         ).body!,
         signers: multiSigners,
-        targetContract: srcFixture.msglibManagerDefault,
+        targetContract: srcFixture.msglibManager,
         deploy: false,
         expectedTransactions: [
             {
                 from: srcFixture.multisig.address,
-                to: srcFixture.msglibManagerDefault.address,
+                to: srcFixture.msglibManager.address,
                 success: true,
                 op: Number(OPCODES.UlnManager_OP_SET_DEFAULT_ULN_SEND_CONFIG),
             },
             {
-                from: srcFixture.msglibManagerDefault.address,
+                from: srcFixture.msglibManager.address,
                 to: srcFixture.msglib.address,
                 success: true,
                 op: Number(OPCODES.Uln_OP_SET_DEFAULT_ULN_SEND_CONFIG),
@@ -4170,17 +4189,17 @@ export async function deployConfigAndRegisterUln(
             toNano('0.1')
         ).body!,
         signers: multiSigners,
-        targetContract: srcFixture.msglibManagerDefault,
+        targetContract: srcFixture.msglibManager,
         deploy: false,
         expectedTransactions: [
             {
                 from: srcFixture.multisig.address,
-                to: srcFixture.msglibManagerDefault.address,
+                to: srcFixture.msglibManager.address,
                 success: true,
                 op: Number(OPCODES.UlnManager_OP_SET_DEFAULT_ULN_RECEIVE_CONFIG),
             },
             {
-                from: srcFixture.msglibManagerDefault.address,
+                from: srcFixture.msglibManager.address,
                 to: srcFixture.msglib.address,
                 success: true,
                 op: Number(OPCODES.Uln_OP_SET_DEFAULT_ULN_RECEIVE_CONFIG),
@@ -4188,7 +4207,7 @@ export async function deployConfigAndRegisterUln(
         ],
     })
 
-    return [msglibManager, msglibConnection]
+    return msglibManager
 }
 
 export async function wireFixtureWithUln(
@@ -4198,14 +4217,42 @@ export async function wireFixtureWithUln(
     srcFixture: OAppFixtureULN,
     dstFixture: OAppFixtureULN,
     eventHandler: LzEventHandler,
-    dvnFixtureConfig: DvnFixtureConfig
+    dvnFixtureConfigCustom?: DvnFixtureConfig
 ): Promise<void> {
     // ===================================wire channels=====================================
 
     await wireChannels(blockchain, allStorages, srcFixture, dstFixture, eventHandler)
 
-    // ===================================deploy and configure uln default=====================================
-    ;[srcFixture.msglibManagerDefault, srcFixture.msglibConnectionDefault] = await deployConfigAndRegisterUln(
+    // ===================================default config =====================================
+
+    const defaultDvnFixtureConfig: DvnFixtureConfig = {
+        src: {
+            send: {
+                numReqDvns: 1n,
+                numOptDvns: 0n,
+            },
+            receive: {
+                numReqDvns: 1n,
+                numOptDvns: 0n,
+                optDvnQuorum: 0n,
+            },
+        },
+        dst: {
+            send: {
+                numReqDvns: 1n,
+                numOptDvns: 0n,
+            },
+            receive: {
+                numReqDvns: 1n,
+                numOptDvns: 0n,
+                optDvnQuorum: 0n,
+            },
+        },
+    }
+
+    // ===================================deploy, configue, and register uln =====================================
+    
+    srcFixture.msglibManager = await deployConfigAndRegisterUln(
         blockchain,
         multiSigners,
         allStorages,
@@ -4213,17 +4260,30 @@ export async function wireFixtureWithUln(
         dstFixture,
         ULN_MANAGER_DEFAULT_VERSION,
         eventHandler,
-        dvnFixtureConfig
+        defaultDvnFixtureConfig
     )
 
+    // ===================================add msg lib to controller =====================================
+
     let internalMsgResults = await addMsgLibToController(
         blockchain,
         multiSigners,
         srcFixture,
         dstFixture,
-        srcFixture.msglibManagerDefault
+        srcFixture.msglibManager
     )
     await eventHandler.addCurrentEventsToAllEvents(internalMsgResults, srcFixture.controller)
+    
+    // ===================================open and deploy uln connection =====================================
+
+    const [msglibConnection, ulnConnectionMsgResults] = await openAndDeployUlnConnection(
+        blockchain,
+        allStorages,
+        srcFixture,
+        dstFixture
+    )
+    srcFixture.msglibConnection = msglibConnection
+    await eventHandler.addCurrentEventsToAllEvents(ulnConnectionMsgResults, srcFixture.oApp)
 
     // ===================================set default endpoint config=====================================
 
@@ -4231,8 +4291,8 @@ export async function wireFixtureWithUln(
         blockchain,
         allStorages,
         multiSigners,
-        srcFixture.msglibManagerDefault,
-        srcFixture.msglibManagerDefault,
+        srcFixture.msglibManager,
+        srcFixture.msglibManager,
         srcFixture,
         dstFixture
     )
@@ -4241,6 +4301,134 @@ export async function wireFixtureWithUln(
 
     // expect no failures
     expect(eventHandler.allFailures.txList).toHaveLength(0)
+    
+    
+    if (dvnFixtureConfigCustom) {
+        // ===================================open and deploy dvn =====================================
+
+        ;[srcFixture.sendDvnFixturesCustom, srcFixture.receiveDvnFixturesCustom] = await deployConfigAndRegisterDvn(
+            blockchain,
+            allStorages,
+            srcFixture,
+            eventHandler,
+            dvnFixtureConfigCustom
+        )
+
+        // ===================================addUlnWorker - dvn =======================================
+
+        await addDvnWorkers(
+            allStorages,
+            srcFixture,
+            srcFixture.sendDvnFixturesCustom,
+            srcFixture.receiveDvnFixturesCustom,
+            dstFixture.eid,
+            srcFixture.priceFeedCacheFixture.proxy.address,
+            eventHandler
+        )
+
+        const [reqSendDvns, optSendDvns] = getDvnArrayFromDvnFixtures(
+            srcFixture.sendDvnFixturesCustom,
+            dvnFixtureConfigCustom.src.send
+        )
+
+        const ulnSendConfig = await allStorages.getNewUlnSendConfig({
+            workerQuoteGasLimit: BigInt(100000000),
+            maxMessageBytes: BigInt(1000000000),
+            executorNull: BigInt(0),
+            executor: addressToBigInt(srcFixture.executorFixtures.proxy.address),
+            requiredDVNsNull: BigInt(0),
+            requiredDVNs: serializeDvns(reqSendDvns),
+            optionalDVNsNull: BigInt(0),
+            optionalDVNs: serializeDvns(optSendDvns),
+            confirmationsNull: BigInt(0),
+            confirmations: BigInt(1),
+        })
+
+        await sendInternalMessageAndExpect({
+            value: protocolSetupGas['MsgLib.INITIALIZE'],
+            sender: srcFixture.owner.getSender(),
+            contract: srcFixture.oApp,
+            opCode: OPCODES.OP_SetLzConfig,
+            md: await allStorages.getNewLzConfig({
+                path: srcFixture.path,
+                forwardingAddress: addressToBigInt(srcFixture.msglibManager.address),
+                opCode: OPCODES.UlnManager_OP_SET_OAPP_ULN_SEND_CONFIG,
+                config: ulnSendConfig,
+            }),
+            balanceRefill: toNano('1'),
+            expectedTransactions: [
+                {
+                    from: srcFixture.owner.address,
+                    to: srcFixture.oApp.address,
+                    op: Number(OPCODES.OP_SetLzConfig),
+                    success: true,
+                },
+                {
+                    from: srcFixture.oApp.address,
+                    to: srcFixture.msglibManager.address,
+                    op: Number(OPCODES.UlnManager_OP_SET_OAPP_ULN_SEND_CONFIG),
+                    success: true,
+                },
+                {
+                    from: srcFixture.msglibManager.address,
+                    to: srcFixture.msglibConnection.address,
+                    op: Number(OPCODES.UlnConnection_OP_SET_OAPP_ULN_SEND_CONFIG),
+                    success: true,
+                },
+            ],
+        })
+
+        const [reqReceiveDvns, optReceiveDvns, optReceiveQuorum] = getDvnArrayFromDvnFixtures(
+            srcFixture.receiveDvnFixturesCustom,
+            dvnFixtureConfigCustom.src.receive
+        )
+
+        const ulnReceiveConfig = await allStorages.getNewUlnReceiveConfig({
+            minCommitPacketGasNull: BigInt(0),
+            minCommitPacketGas: BigInt(1),
+            confirmationsNull: BigInt(0),
+            confirmations: BigInt(1),
+            requiredDVNsNull: BigInt(0),
+            requiredDVNs: serializeDvns(reqReceiveDvns),
+            optionalDVNsNull: BigInt(0),
+            optionalDVNs: serializeDvns(optReceiveDvns),
+            optionalDVNThreshold: BigInt(optReceiveQuorum),
+        })
+
+        await sendInternalMessageAndExpect({
+            value: protocolSetupGas['MsgLib.INITIALIZE'],
+            sender: srcFixture.owner.getSender(),
+            contract: srcFixture.oApp,
+            opCode: OPCODES.OP_SetLzConfig,
+            md: await allStorages.getNewLzConfig({
+                path: srcFixture.path,
+                forwardingAddress: addressToBigInt(srcFixture.msglibManager.address),
+                opCode: OPCODES.UlnManager_OP_SET_OAPP_ULN_RECEIVE_CONFIG,
+                config: ulnReceiveConfig,
+            }),
+            balanceRefill: toNano('1'),
+            expectedTransactions: [
+                {
+                    from: srcFixture.owner.address,
+                    to: srcFixture.oApp.address,
+                    op: Number(OPCODES.OP_SetLzConfig),
+                    success: true,
+                },
+                {
+                    from: srcFixture.oApp.address,
+                    to: srcFixture.msglibManager.address,
+                    op: Number(OPCODES.UlnManager_OP_SET_OAPP_ULN_RECEIVE_CONFIG),
+                    success: true,
+                },
+                {
+                    from: srcFixture.msglibManager.address,
+                    to: srcFixture.msglibConnection.address,
+                    op: Number(OPCODES.UlnConnection_OP_SET_OAPP_ULN_RECEIVE_CONFIG),
+                    success: true,
+                },
+            ],
+        })
+    }
 }
 
 export async function wireFixturesTogetherWithUln(
@@ -4250,30 +4438,7 @@ export async function wireFixturesTogetherWithUln(
     srcFixture: OAppFixtureULN,
     dstFixture: OAppFixtureULN,
     eventHandler: LzEventHandler,
-    defaultDvnFixtureConfig: DvnFixtureConfig = {
-        src: {
-            send: {
-                numReqDvns: 1n,
-                numOptDvns: 0n,
-            },
-            receive: {
-                numReqDvns: 1n,
-                numOptDvns: 0n,
-                optDvnQuorum: 0n,
-            },
-        },
-        dst: {
-            send: {
-                numReqDvns: 1n,
-                numOptDvns: 0n,
-            },
-            receive: {
-                numReqDvns: 1n,
-                numOptDvns: 0n,
-                optDvnQuorum: 0n,
-            },
-        },
-    }
+    dvnFixtureConfigCustom?: DvnFixtureConfig
 ): Promise<void> {
     await wireFixtureWithUln(
         blockchain,
@@ -4282,7 +4447,7 @@ export async function wireFixturesTogetherWithUln(
         srcFixture,
         dstFixture,
         eventHandler,
-        defaultDvnFixtureConfig
+        dvnFixtureConfigCustom
     )
     await wireFixtureWithUln(
         blockchain,
@@ -4291,7 +4456,7 @@ export async function wireFixturesTogetherWithUln(
         dstFixture,
         srcFixture,
         eventHandler,
-        defaultDvnFixtureConfig
+        dvnFixtureConfigCustom
     )
 }
 
@@ -4607,7 +4772,10 @@ export async function callVerifyOnDvn({
 export async function ulnVerifyAndExpect(
     allStorages: SandboxContract<TonContractWrapper>,
     mdPacketSent: MdPacketSent,
-    { msglib: uln, msglibConnectionDefault, msglibManagerDefault, receiveDvnFixtures }: OAppFixtureULN,
+    { msglib: uln }: OAppFixtureULN,
+    receiveDvnFixtures: DvnFixture[],
+    msglibManager: SandboxContract<TonContractWrapper>,
+    msglibConnection: SandboxContract<TonContractWrapper>,
     eventHandler: LzEventHandler,
     confirmations = 1n
 ): Promise<Cell> {
@@ -4625,7 +4793,7 @@ export async function ulnVerifyAndExpect(
                 hash: BigInt('0x' + lzPacket.hash().toString('hex')),
                 confirmations,
             }),
-            address: addressToBigInt(msglibConnectionDefault.address),
+            address: addressToBigInt(msglibConnection.address),
         }),
         expiration: oneDayFromNow,
         opcode: OPCODES.Uln_OP_ULN_VERIFY,
@@ -4662,19 +4830,19 @@ export async function ulnVerifyAndExpect(
                 },
                 {
                     from: uln.address,
-                    to: msglibConnectionDefault.address,
+                    to: msglibConnection.address,
                     op: Number(OPCODES.UlnConnection_OP_ULN_CONNECTION_VERIFY),
                     success: true,
                 },
                 // emit UlnConnection::EVENT::PACKET_VERIFIED
                 {
-                    from: msglibConnectionDefault.address,
-                    to: msglibManagerDefault.address,
+                    from: msglibConnection.address,
+                    to: msglibManager.address,
                     op: Number(OPCODES.BaseInterface_OP_EVENT),
                     success: false, // events are supposed to fail
                 },
                 {
-                    from: msglibConnectionDefault.address,
+                    from: msglibConnection.address,
                     to: proxy.address,
                     op: Number(OPCODES.UltraLightNode_OP_ULN_CONNECTION_VERIFY_CALLBACK),
                     success: true,