add solana support to metadata-tools (#1154)

LayerZero-Labs · Jan 9, 2025 · e455d72 · e455d72
1 parent 0995096
commit e455d72
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 7 deletions.
diff --git a/.changeset/new-horses-pull.md b/.changeset/new-horses-pull.md
@@ -0,0 +1,5 @@
+---
+"@layerzerolabs/metadata-tools": minor
+---
+
+add solana support to metadata-tools
diff --git a/packages/metadata-tools/src/config-metadata.ts b/packages/metadata-tools/src/config-metadata.ts
@@ -70,6 +70,10 @@ export function DVNsToAddresses(dvns: string[], chainKey: string, metadata: IMet
     return dvnAddresses.sort()
 }
 
+function isSolanaDeployment(deployment: { chainKey: string; executor?: { pda?: string; address?: string } }) {
+    return deployment.chainKey.startsWith('solana')
+}
+
 export async function translatePathwayToConfig(
     pathway: TwoWayConfig,
     metadata: IMetadata
@@ -92,6 +96,14 @@ export async function translatePathwayToConfig(
     const sourceLZDeployment = getEndpointIdDeployment(sourceContract.eid, metadata)
     const destinationLZDeployment = getEndpointIdDeployment(destinationContract.eid, metadata)
 
+    const sourceExecutor = isSolanaDeployment(sourceLZDeployment)
+        ? sourceLZDeployment.executor?.pda
+        : sourceLZDeployment.executor?.address
+
+    if (!sourceExecutor) {
+        throw new Error(`Can't find executor for source endpoint with eid: "${sourceContract.eid}".`)
+    }
+
     const sourceRequiredDVNs = DVNsToAddresses(requiredDVNs, sourceLZDeployment.chainKey, metadata)
     const destinationRequiredDVNs = DVNsToAddresses(requiredDVNs, destinationLZDeployment.chainKey, metadata)
 
@@ -131,7 +143,7 @@ export async function translatePathwayToConfig(
             sendConfig: {
                 executorConfig: {
                     maxMessageSize: 10000,
-                    executor: sourceLZDeployment.executor.address,
+                    executor: sourceExecutor,
                 },
                 ulnConfig: {
                     confirmations: BigInt(sourceToDestinationConfirmations),
@@ -165,6 +177,14 @@ export async function translatePathwayToConfig(
     }
 
     if (destinationToSourceConfirmations) {
+        const destinationExecutor = isSolanaDeployment(destinationLZDeployment)
+            ? destinationLZDeployment.executor?.pda
+            : destinationLZDeployment.executor?.address
+
+        if (!destinationExecutor) {
+            throw new Error(`Can't find executor for destination endpoint with eid: "${destinationContract.eid}".`)
+        }
+
         sourceToDestinationConfig.config.receiveConfig = {
             ulnConfig: {
                 confirmations: BigInt(destinationToSourceConfirmations),
@@ -179,7 +199,7 @@ export async function translatePathwayToConfig(
         destinationToSourceConfig.config.sendConfig = {
             executorConfig: {
                 maxMessageSize: 10000,
-                executor: destinationLZDeployment.executor.address,
+                executor: destinationExecutor,
             },
             ulnConfig: {
                 confirmations: BigInt(destinationToSourceConfirmations),

diff --git a/packages/metadata-tools/src/types.ts b/packages/metadata-tools/src/types.ts
@@ -26,7 +26,7 @@ export interface IMetadata {
             relayerV2?: { address: string }
             ultraLightNodeV2?: { address: string }
             nonceContract?: { address: string }
-            executor?: { address: string }
+            executor?: { address: string; pda?: string }
             deadDVN?: { address: string }
             endpointV2?: { address: string }
             sendUln302?: { address: string }

diff --git a/packages/metadata-tools/test/data/solana-mainnet.json b/packages/metadata-tools/test/data/solana-mainnet.json
@@ -1,6 +1,6 @@
 {
-  "created": "2024-12-12T03:31:22.000Z",
-  "updated": "2024-12-12T03:31:22.000Z",
+  "created": "2025-01-07T18:33:21.000Z",
+  "updated": "2025-01-07T18:33:21.000Z",
   "tableName": "layerzero-chain_metadata",
   "environment": "mainnet",
   "blockExplorers": [
@@ -17,7 +17,8 @@
         "address": "8ahPGPjEbpgGaZx2NV1iG5Shj7TDwvsjkEDcGWjt94TP"
       },
       "executor": {
-        "address": "AwrbHeCyniXaQhiJZkLhgWdUCteeWSGaSN1sTfLiY7xK"
+        "pda": "AwrbHeCyniXaQhiJZkLhgWdUCteeWSGaSN1sTfLiY7xK",
+        "address": "6doghB248px58JSSwG4qejQ46kFMW4AMj7vzJnWZHNZn"
       },
       "endpointV2": {
         "address": "76y77prsiCMvXMjuoZ5VRrhG5qYBrUMYTE5WgHqgjEn6"

diff --git a/packages/metadata-tools/test/data/solana-testnet.json b/packages/metadata-tools/test/data/solana-testnet.json
@@ -17,7 +17,8 @@
         "address": "8ahPGPjEbpgGaZx2NV1iG5Shj7TDwvsjkEDcGWjt94TP"
       },
       "executor": {
-        "address": "AwrbHeCyniXaQhiJZkLhgWdUCteeWSGaSN1sTfLiY7xK"
+        "pda": "AwrbHeCyniXaQhiJZkLhgWdUCteeWSGaSN1sTfLiY7xK",
+        "address": "6doghB248px58JSSwG4qejQ46kFMW4AMj7vzJnWZHNZn"
       },
       "endpointV2": {
         "address": "76y77prsiCMvXMjuoZ5VRrhG5qYBrUMYTE5WgHqgjEn6"