DEVREL-658 Fix Solana OFT initialization to prevent configuration failures (#1645)

Co-authored-by: Krak <krak@layerzerolabs.org>
Co-authored-by: Nazreen <10964594+nazreen@users.noreply.github.com>

Author: 3 people

.changeset/moody-ears-smile.md

@@ -0,0 +1,7 @@
+---
+"@layerzerolabs/protocol-devtools-solana": patch
+"@layerzerolabs/ua-devtools-solana": patch
+"@layerzerolabs/oft-solana-example": patch
+---
+
+Fix the handling of initSendLibrary and initReceiveLibrary to properly initialize in the init step rather than during setPeer

examples/oft-solana/tasks/common/wire.ts

@@ -6,6 +6,7 @@ import { SUBTASK_LZ_SIGN_AND_SEND, types as devtoolsTypes } from '@layerzerolabs
 import { setTransactionSizeBuffer } from '@layerzerolabs/devtools-solana'
 import { type LogLevel, createLogger } from '@layerzerolabs/io-devtools'
 import { ChainType, endpointIdToChainType } from '@layerzerolabs/lz-definitions'
+import { BlockedMessageLibProgram } from '@layerzerolabs/lz-solana-sdk-v2'
 import { type IOApp, type OAppConfigurator, type OAppOmniGraph, configureOwnable } from '@layerzerolabs/ua-devtools'
 import {
     SUBTASK_LZ_OAPP_WIRE_CONFIGURE,
@@ -129,7 +130,10 @@ task(TASK_LZ_OAPP_WIRE)
                     for (const connection of graph.connections) {
                         // check if from Solana Endpoint
                         if (endpointIdToChainType(connection.vector.from.eid) === ChainType.SOLANA) {
-                            if (connection.config?.sendLibrary) {
+                            if (
+                                connection.config?.sendLibrary &&
+                                connection.config.sendLibrary !== BlockedMessageLibProgram.PROGRAM_ID.toString()
+                            ) {
                                 // if from Solana Endpoint, ensure the PeerConfig account was already initialized
                                 const solanaConnection = await connectionFactory(connection.vector.from.eid)
 

packages/protocol-devtools-solana/src/uln302/schema.ts

@@ -8,11 +8,13 @@ export const Uln302UlnConfigInputSchema: z.ZodSchema<Uln302UlnConfig, z.ZodTypeD
         confirmations: z.union([UIntBigIntSchema, BNBigIntSchema]),
         optionalDvnThreshold: UIntNumberSchema,
         requiredDvns: z.array(PublicKeyBase58Schema),
+        requiredDvnCount: UIntNumberSchema,
         optionalDvns: z.array(PublicKeyBase58Schema),
     })
-    .transform(({ confirmations, optionalDvnThreshold, requiredDvns, optionalDvns }) => ({
+    .transform(({ confirmations, optionalDvnThreshold, requiredDvns, requiredDvnCount, optionalDvns }) => ({
         confirmations,
         optionalDVNThreshold: optionalDvnThreshold,
         requiredDVNs: requiredDvns,
+        requiredDVNCount: requiredDvnCount,
         optionalDVNs: optionalDvns,
     }))

packages/ua-devtools-solana/src/oft/sdk.ts

@@ -417,34 +417,109 @@ export class OFT extends OmniSDK implements IOApp {
         throw new TypeError(`getCallerBpsCap() not implemented on Solana OFT SDK`)
     }
 
-    public async sendConfigIsInitialized(_eid: EndpointId): Promise<boolean> {
-        const deriver = new MessageLibPDADeriver(UlnProgram.PROGRAM_ID)
-        const [sendConfig] = deriver.sendConfig(_eid, new PublicKey(this.point.address))
-        const accountInfo = await this.connection.getAccountInfo(sendConfig)
-        return accountInfo != null
+    public async sendConfigIsInitialized(eid: EndpointId): Promise<boolean> {
+        // This method should check the same conditions that initConfig checks
+        // All components must be initialized: OFT store, send/receive libraries, and ULN config accounts
+
+        // Check OFT store exists
+        const oftStoreInfo = await this.umi.rpc.getAccount(this.umiPublicKey)
+        if (!oftStoreInfo.exists) {
+            return false
+        }
+
+        // Check OFT send/receive libraries are initialized
+        const sendLibInitialized = await this.isSendLibraryInitialized(eid)
+        const receiveLibInitialized = await this.isReceiveLibraryInitialized(eid)
+
+        if (!sendLibInitialized || !receiveLibInitialized) {
+            return false
+        }
+
+        // Check ULN config accounts using MessageLibPDADeriver (same as wire command)
+        try {
+            const deriver = new MessageLibPDADeriver(UlnProgram.PROGRAM_ID)
+            const [sendConfig, receiveConfig] = await Promise.all([
+                deriver.sendConfig(eid, new PublicKey(this.point.address)),
+                deriver.receiveConfig(eid, new PublicKey(this.point.address)),
+            ])
+
+            const [sendConfigInfo, receiveConfigInfo] = await Promise.all([
+                this.connection.getAccountInfo(sendConfig[0]),
+                this.connection.getAccountInfo(receiveConfig[0]),
+            ])
+
+            return sendConfigInfo != null && receiveConfigInfo != null
+        } catch (error) {
+            this.logger.debug(`ULN config check failed for eid ${eid}: ${error}`)
+            return false
+        }
     }
 
     public async initConfig(eid: EndpointId): Promise<OmniTransaction | undefined> {
+        // Check if everything is already initialized - if so, no action needed
+        if (await this.sendConfigIsInitialized(eid)) {
+            return undefined
+        }
+
         const delegateAddress = await this.getDelegate()
         // delegate may be undefined if it has not yet been set.  In this case, use admin, which must exist.
         const delegate = delegateAddress ? createNoopSigner(publicKey(delegateAddress)) : await this._getAdmin()
+        const oftStore = this.umiPublicKey
+        const instructions: WrappedInstruction[] = []
+
+        // Now check individual components to determine which instructions to add
+        const oftStoreExists = (await this.umi.rpc.getAccount(oftStore)).exists
+        const sendLibInitialized = await this.isSendLibraryInitialized(eid)
+        const receiveLibInitialized = await this.isReceiveLibraryInitialized(eid)
+
+        // Check ULN config accounts
+        const deriver = new MessageLibPDADeriver(UlnProgram.PROGRAM_ID)
+        const [sendConfig, receiveConfig] = await Promise.all([
+            deriver.sendConfig(eid, new PublicKey(this.point.address)),
+            deriver.receiveConfig(eid, new PublicKey(this.point.address)),
+        ])
+
+        const [sendConfigInfo, receiveConfigInfo] = await Promise.all([
+            this.connection.getAccountInfo(sendConfig[0]),
+            this.connection.getAccountInfo(receiveConfig[0]),
+        ])
+
+        const ulnConfigExists = sendConfigInfo != null && receiveConfigInfo != null
+
+        // Add oft.initConfig if either OFT store OR ULN config accounts don't exist
+        // This single instruction handles both the store creation and ULN config account initialization
+        if (!oftStoreExists || !ulnConfigExists) {
+            instructions.push(
+                oft.initConfig(
+                    {
+                        admin: delegate,
+                        oftStore,
+                        payer: delegate,
+                    },
+                    eid,
+                    {
+                        msgLib: fromWeb3JsPublicKey(UlnProgram.PROGRAM_ID),
+                    }
+                )
+            )
+        }
+
+        // Add send/receive library initialization if needed
+        if (!sendLibInitialized) {
+            instructions.push(oft.initSendLibrary({ admin: delegate, oftStore }, eid))
+        }
+
+        if (!receiveLibInitialized) {
+            instructions.push(oft.initReceiveLibrary({ admin: delegate, oftStore }, eid))
+        }
+
+        if (instructions.length === 0) {
+            return undefined
+        }
+
         return {
-            ...(await this.createTransaction(
-                this._umiToWeb3Tx([
-                    oft.initConfig(
-                        {
-                            admin: delegate,
-                            oftStore: this.umiPublicKey,
-                            payer: delegate,
-                        },
-                        eid,
-                        {
-                            msgLib: fromWeb3JsPublicKey(UlnProgram.PROGRAM_ID),
-                        }
-                    ),
-                ])
-            )),
-            description: `oft.initConfig(${eid})`,
+            ...(await this.createTransaction(this._umiToWeb3Tx(instructions))),
+            description: `Initializing OFT config for eid ${eid} (${formatEid(eid)})`,
         }
     }