@layerzerolabs/lz-solana-sdk-v2 3.0.116 → 3.0.118

package/src/solita/uln.ts

@@ -482,36 +482,16 @@ export class Uln implements MessageLibInterface {
         invariant(defaultSendConfigBuf, 'defaultSendConfig not initialized')
 
         const [defaultSendConfigState] = accounts.SendConfig.fromAccountInfo(defaultSendConfigBuf)
-        let {
-            executor,
-            uln: { requiredDvns, optionalDvns },
-        } = defaultSendConfigState
         const sendConfigState = sendConfigBuf ? accounts.SendConfig.fromAccountInfo(sendConfigBuf)[0] : null
+        const finalConfigState = this.getUlnConfigState(defaultSendConfigState, sendConfigState)
+        const finalExecutorConfigState = this.getExecutorConfigState(defaultSendConfigState, sendConfigState)
 
-        // if the executor is set in the send config, use it
-        if (sendConfigState?.executor && !sendConfigState.executor.executor.equals(PublicKey.default)) {
-            ;({ executor } = sendConfigState)
-        }
-
-        // if the requiredDvns is set in the send config, use it
-        if (sendConfigState && sendConfigState.uln.requiredDvns.length > 0) {
-            requiredDvns = sendConfigState.uln.requiredDvns.filter((p) => {
-                return !p.equals(PublicKey.default)
-            })
-        }
+        const { executor } = finalExecutorConfigState
+        const { requiredDvns, optionalDvns } = finalConfigState
 
-        // if the optionalDvns is set in the send config, use it
-        if (sendConfigState && sendConfigState.uln.optionalDvns.length > 0) {
-            optionalDvns = sendConfigState.uln.optionalDvns.filter((p) => {
-                return !p.equals(PublicKey.default)
-            })
-        }
         const dvns = requiredDvns.concat(optionalDvns)
-        const [executorBuf, ...dvnBuf] = await connection.getMultipleAccountsInfo(
-            [executor.executor, ...dvns],
-            commitment
-        )
-        invariant(executorBuf, `executor:${executor.executor.toBase58()} not initialized`)
+        const [executorBuf, ...dvnBuf] = await connection.getMultipleAccountsInfo([executor, ...dvns], commitment)
+        invariant(executorBuf, `executor:${executor.toBase58()} not initialized`)
 
         return {
             executor: {
@@ -980,18 +960,6 @@ export class Uln implements MessageLibInterface {
         eid: number,
         commitmentOrConfig: Commitment | GetAccountInfoConfig = 'confirmed'
     ): Promise<accounts.ReceiveConfig> {
-        const NIL_CONFIRMATIONS = '18446744073709551615' // max u64
-        const NIL_DVN_COUNT = '255'
-
-        const rtn_config: types.UlnConfig = {
-            confirmations: 0,
-            requiredDvnCount: 0,
-            optionalDvnCount: 0,
-            optionalDvnThreshold: 0,
-            requiredDvns: [],
-            optionalDvns: [],
-        }
-
         const [defaultConfig] = this.deriver.defaultReceiveConfig(eid)
         const [customConfig] = this.deriver.receiveConfig(eid, receiver)
 
@@ -1005,7 +973,30 @@ export class Uln implements MessageLibInterface {
         const defaultConfigState = accounts.ReceiveConfig.fromAccountInfo(defaultConfigInfo)[0]
         const customConfigState = customConfigInfo ? accounts.ReceiveConfig.fromAccountInfo(customConfigInfo)[0] : null
 
-        if (customConfigState == null || customConfigState.uln.confirmations == 0) {
+        const ulnConfigState = this.getUlnConfigState(defaultConfigState, customConfigState)
+        return accounts.ReceiveConfig.fromArgs({
+            bump: defaultConfigState.bump,
+            uln: ulnConfigState,
+        })
+    }
+
+    private getUlnConfigState(
+        defaultConfigState: accounts.ReceiveConfig | accounts.SendConfig,
+        customConfigState: accounts.ReceiveConfig | accounts.SendConfig | null
+    ): types.UlnConfig {
+        const NIL_CONFIRMATIONS = '18446744073709551615' // max uint64
+        const NIL_DVN_COUNT = '255'
+
+        const rtn_config: types.UlnConfig = {
+            confirmations: 0,
+            requiredDvnCount: 0,
+            optionalDvnCount: 0,
+            optionalDvnThreshold: 0,
+            requiredDvns: [],
+            optionalDvns: [],
+        }
+
+        if (customConfigState == null || customConfigState.uln.confirmations.toString() === '0') {
             rtn_config.confirmations = defaultConfigState.uln.confirmations
         } else if (customConfigState.uln.confirmations.toString() !== NIL_CONFIRMATIONS) {
             rtn_config.confirmations = customConfigState.uln.confirmations
@@ -1036,10 +1027,30 @@ export class Uln implements MessageLibInterface {
         if (rtn_config.requiredDvnCount === 0 && rtn_config.optionalDvnCount === 0) {
             throw new Error('no dvn')
         }
+        return rtn_config
+    }
 
-        return accounts.ReceiveConfig.fromArgs({
-            bump: defaultConfigState.bump,
-            uln: rtn_config,
-        })
+    private getExecutorConfigState(
+        defaultConfigState: accounts.SendConfig,
+        customConfigState: accounts.SendConfig | null
+    ): types.ExecutorConfig {
+        const rtn_config: types.ExecutorConfig = {
+            maxMessageSize: 0,
+            executor: PublicKey.default,
+        }
+
+        if (customConfigState == null || customConfigState.executor.executor.equals(PublicKey.default)) {
+            rtn_config.executor = defaultConfigState.executor.executor
+        } else {
+            rtn_config.executor = customConfigState.executor.executor
+        }
+
+        if (customConfigState == null || customConfigState.executor.maxMessageSize === 0) {
+            rtn_config.maxMessageSize = defaultConfigState.executor.maxMessageSize
+        } else {
+            rtn_config.maxMessageSize = customConfigState.executor.maxMessageSize
+        }
+
+        return rtn_config
     }
 }

package/src/uln.ts

@@ -571,35 +571,18 @@ export class Uln implements MessageLibInterface {
         invariant(defaultSendConfigBuf.exists, 'defaultSendConfig not initialized')
 
         const defaultSendConfigState = accounts.deserializeSendConfig(defaultSendConfigBuf)
-        let {
-            executor,
-            uln: { requiredDvns, optionalDvns },
-        } = defaultSendConfigState
         const sendConfigState = sendConfigBuf.exists ? accounts.deserializeSendConfig(sendConfigBuf) : null
 
-        // if the executor is set in the send config, use it
-        if (sendConfigState?.executor && sendConfigState.executor.executor !== defaultPublicKey()) {
-            ;({ executor } = sendConfigState)
-        }
+        const finalConfigState = this.getUlnConfigState(defaultSendConfigState, sendConfigState)
+        const finalExecutorConfigState = this.getExecutorConfigState(defaultSendConfigState, sendConfigState)
 
-        // if the requiredDvns is set in the send config, use it
-        if (sendConfigState && sendConfigState.uln.requiredDvns.length > 0) {
-            requiredDvns = sendConfigState.uln.requiredDvns.filter((p) => {
-                return p !== defaultPublicKey()
-            })
-        }
-
-        // if the optionalDvns is set in the send config, use it
-        if (sendConfigState && sendConfigState.uln.optionalDvns.length > 0) {
-            optionalDvns = sendConfigState.uln.optionalDvns.filter((p) => {
-                return p !== defaultPublicKey()
-            })
-        }
+        const { requiredDvns, optionalDvns } = finalConfigState
+        const { executor } = finalExecutorConfigState
         const dvns = requiredDvns.concat(optionalDvns)
-        const [executorBuf, ...dvnBuf] = await rpc.getAccounts([executor.executor, ...dvns], {
+        const [executorBuf, ...dvnBuf] = await rpc.getAccounts([executor, ...dvns], {
             commitment,
         })
-        invariant(executorBuf.exists, `executor:${executor.executor} not initialized`)
+        invariant(executorBuf.exists, `executor:${executor} not initialized`)
 
         return {
             executor: {
@@ -999,7 +982,7 @@ export class Uln implements MessageLibInterface {
         }
         const defaultConfigState = accounts.deserializeReceiveConfig(defaultConfigInfo)
         const customConfigState = customConfigInfo.exists ? accounts.deserializeReceiveConfig(customConfigInfo) : null
-        return this.getConfigState(defaultConfigState, customConfigState)
+        return this.getUlnConfigState(defaultConfigState, customConfigState)
     }
 
     async getFinalSendConfigState(
@@ -1019,10 +1002,10 @@ export class Uln implements MessageLibInterface {
         }
         const defaultConfigState = accounts.deserializeSendConfig(defaultConfigInfo)
         const customConfigState = customConfigInfo.exists ? accounts.deserializeSendConfig(customConfigInfo) : null
-        return this.getConfigState(defaultConfigState, customConfigState)
+        return this.getUlnConfigState(defaultConfigState, customConfigState)
     }
 
-    private getConfigState(
+    private getUlnConfigState(
         defaultConfigState: accounts.ReceiveConfig | accounts.SendConfig,
         customConfigState: accounts.ReceiveConfig | accounts.SendConfig | null
     ): types.UlnConfig {
@@ -1071,4 +1054,28 @@ export class Uln implements MessageLibInterface {
         }
         return rtn_config
     }
+
+    private getExecutorConfigState(
+        defaultConfigState: accounts.SendConfig,
+        customConfigState: accounts.SendConfig | null
+    ): types.ExecutorConfig {
+        const rtn_config: types.ExecutorConfig = {
+            maxMessageSize: 0,
+            executor: defaultPublicKey(),
+        }
+
+        if (customConfigState == null || customConfigState.executor.executor === defaultPublicKey()) {
+            rtn_config.executor = defaultConfigState.executor.executor
+        } else {
+            rtn_config.executor = customConfigState.executor.executor
+        }
+
+        if (customConfigState == null || customConfigState.executor.maxMessageSize === 0) {
+            rtn_config.maxMessageSize = defaultConfigState.executor.maxMessageSize
+        } else {
+            rtn_config.maxMessageSize = customConfigState.executor.maxMessageSize
+        }
+
+        return rtn_config
+    }
 }