DEVREL-126 feat: validate Solana admin address for delegate/owner when wiring (#1538)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: 2 people

.changeset/bright-cows-destroy.md

@@ -0,0 +1,7 @@
+---
+"@layerzerolabs/ua-devtools-solana": minor
+"@layerzerolabs/devtools-solana": minor
+"@layerzerolabs/io-devtools": minor
+---
+
+validate solana owner or delegate is valid before proceeding to set

.changeset/tall-poems-explain.md

@@ -0,0 +1,5 @@
+---
+"@layerzerolabs/ua-devtools": patch
+---
+
+bump target version for tsconfig

packages/devtools-solana/DEVELOPMENT.md

@@ -0,0 +1 @@
+@solana-developers/helpers pinned to 2.8.0 due to this issue: https://solana.stackexchange.com/questions/21945/issue-with-solana-developers-helpers-package-in-browser-environments-anchors?utm_source=chatgpt.com

packages/devtools-solana/package.json

@@ -39,7 +39,7 @@
   "dependencies": {
     "@safe-global/api-kit": "^1.3.0",
     "@safe-global/protocol-kit": "^1.3.0",
-    "@solana-developers/helpers": "^2.8.1",
+    "@solana-developers/helpers": "2.8.0",
     "ethers": "^5.7.2",
     "p-memoize": "~4.0.4"
   },

packages/devtools-solana/src/common/addresses.ts

@@ -0,0 +1,55 @@
+import { DebugLogger, KnownErrors } from '@layerzerolabs/io-devtools'
+import { Connection, PublicKey, SystemProgram } from '@solana/web3.js'
+import { PROGRAM_ID as SQUADS_PROGRAM_ID } from '@sqds/multisig'
+
+/**
+ * Returns true if the provided address is a valid on-curve public key. This can mean the address is either a 'regular' Solana address or a Squads Vault PDA.
+ */
+export function isOnCurveAddress(address: string): boolean {
+    try {
+        return PublicKey.isOnCurve(new PublicKey(address).toBytes())
+    } catch {
+        return false
+    }
+}
+
+/**
+ * Returns true if the provided address could be a Squads vault PDA.
+ */
+export async function isPossibleSquadsVault(connection: Connection, address: string): Promise<boolean> {
+    try {
+        const pubkey = new PublicKey(address)
+        const accountInfo = await connection.getAccountInfo(pubkey)
+
+        return accountInfo != null && accountInfo.owner.equals(SystemProgram.programId)
+    } catch (error) {
+        return false
+    }
+}
+
+export async function assertValidSolanaAdmin(connection: Connection, address: string): Promise<void> {
+    const pubkey = new PublicKey(address)
+
+    try {
+        const accountInfo = await connection.getAccountInfo(pubkey)
+
+        if (accountInfo != null && accountInfo.owner.equals(SQUADS_PROGRAM_ID)) {
+            DebugLogger.printErrorAndFixSuggestion(KnownErrors.SOLANA_OWNER_OR_DELEGATE_CANNOT_BE_MULTISIG_ACCOUNT)
+            throw new Error(
+                `Invalid owner/delegate address ${address}. This is a Squads multisig account. Use the vault address instead.`
+            )
+        }
+
+        if (!isOnCurveAddress(address) && !(await isPossibleSquadsVault(connection, address))) {
+            DebugLogger.printErrorAndFixSuggestion(KnownErrors.SOLANA_INVALID_OWNER_OR_DELEGATE)
+            throw new Error(
+                `Invalid owner/delegate address ${address}. Must be a valid on-curve address or a Squads Vault PDA.`
+            )
+        }
+    } catch (error) {
+        if (error instanceof Error) {
+            throw error
+        }
+        throw new Error(String(error))
+    }
+}

packages/devtools-solana/src/common/index.ts

@@ -1,3 +1,4 @@
 export * from './accounts'
 export * from './schema'
 export * from './types'
+export * from './addresses'

packages/io-devtools/src/stdio/debugLogger.ts

@@ -54,6 +54,8 @@ export enum KnownErrors {
     ERROR_QUOTING_NATIVE_GAS_COST = 'ERROR_QUOTING_NATIVE_GAS_COST',
     ERROR_SENDING_TRANSACTION = 'ERROR_SENDING_TRANSACTION',
     ERROR_GETTING_HRE = 'ERROR_GETTING_HARDHAT_RUNTIME_ENVIRONMENT_FOR_NETWORK',
+    SOLANA_INVALID_OWNER_OR_DELEGATE = 'SOLANA_INVALID_OWNER_OR_DELEGATE',
+    SOLANA_OWNER_OR_DELEGATE_CANNOT_BE_MULTISIG_ACCOUNT = 'SOLANA_OWNER_OR_DELEGATE_MULTISIG_ACCOUNT',
 }
 
 export enum KnownWarnings {
@@ -92,6 +94,14 @@ export const ERRORS_FIXES_MAP: Record<KnownErrors, ErrorFixInfo> = {
         tip: 'Have you added the srcEid network to your `./hardhat.config.ts` file?',
         info: 'If you loaded a custom OFT deployment from an EVM network, you must add the deployment srcEid to your `./hardhat.config.ts` file for the OFT to be found.',
     },
+    [KnownErrors.SOLANA_INVALID_OWNER_OR_DELEGATE]: {
+        tip: 'The owner or delegate of the Solana OApp must either be a regular on curve address or a Squads Vault Account.',
+        info: 'Ensure that you are using a regular on-curve Solana address or a Squads Vault PDA as the owner or delegate of the OApp.',
+    },
+    [KnownErrors.SOLANA_OWNER_OR_DELEGATE_CANNOT_BE_MULTISIG_ACCOUNT]: {
+        tip: 'The owner or delegate of the Solana OApp must not be the Squads multisig account address.',
+        info: 'If you intend to use Squads Multisig, ensure that you are providing a Squads Vault address as the owner or delegate of the OApp. The Squads Multisig account address cannot be the owner or delegate.',
+    },
 }
 
 export const WARNINGS_FIXES_MAP: Record<KnownWarnings, ErrorFixInfo> = {

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

@@ -17,7 +17,7 @@ import type { EndpointId } from '@layerzerolabs/lz-definitions'
 import { EndpointV2 } from '@layerzerolabs/protocol-devtools-solana'
 import { type Logger, printBoolean, printJson } from '@layerzerolabs/io-devtools'
 import { mapError, AsyncRetriable } from '@layerzerolabs/devtools'
-import { OmniSDK } from '@layerzerolabs/devtools-solana'
+import { assertValidSolanaAdmin, OmniSDK } from '@layerzerolabs/devtools-solana'
 import { Connection, PublicKey, Transaction, TransactionInstruction } from '@solana/web3.js'
 import { Options } from '@layerzerolabs/lz-v2-utilities'
 import assert from 'assert'
@@ -121,6 +121,7 @@ export class OFT extends OmniSDK implements IOApp {
     }
 
     async setOwner(address: OmniAddress): Promise<OmniTransaction> {
+        await assertValidSolanaAdmin(this.connection, address)
         this.logger.debug(`Setting owner to ${address}`)
 
         return {
@@ -236,6 +237,7 @@ export class OFT extends OmniSDK implements IOApp {
     }
 
     async setDelegate(delegate: OmniAddress): Promise<OmniTransaction> {
+        await assertValidSolanaAdmin(this.connection, delegate)
         this.logger.debug(`Setting delegate to ${delegate}`)
         return {
             ...(await this.createTransaction(this._umiToWeb3Tx([await this._setOFTDelegateIx(delegate)]))),

packages/ua-devtools/tsconfig.json

@@ -3,6 +3,7 @@
   "exclude": ["dist", "node_modules"],
   "include": ["src", "test"],
   "compilerOptions": {
+    "target": "es2020",
     "types": ["node", "jest"],
     "paths": {
       "@/*": ["./src/*"]