address nits

coinbase · Feb 7, 2025 · 70d2375 · 70d2375
1 parent 62903ed
commit 70d2375
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 25 deletions.
diff --git a/typescript/agentkit/src/network/svm.ts b/typescript/agentkit/src/network/svm.ts
@@ -1,7 +1,4 @@
-// Chain IDs
-export const SOLANA_MAINNET_CHAIN_ID = 101;
-export const SOLANA_TESTNET_CHAIN_ID = 102;
-export const SOLANA_DEVNET_CHAIN_ID = 103;
+import { Network } from "./types";
 
 // CDP Network IDs
 export const SOLANA_MAINNET_NETWORK_ID = "solana-mainnet";
@@ -11,7 +8,32 @@ export const SOLANA_DEVNET_NETWORK_ID = "solana-devnet";
 // AgentKit Protocol Family
 export const SOLANA_PROTOCOL_FAMILY = "svm";
 
-// Genesis Block Hashes
+// Chain IDs - Genesis Block Hashes
 export const SOLANA_MAINNET_GENESIS_BLOCK_HASH = "5eykt4UsFv8P8NJdTREpY1vzqKqZKvdpKuc147dw2N9d";
 export const SOLANA_TESTNET_GENESIS_BLOCK_HASH = "4uhcVJyU9pJkvQyS88uRDiswHXSCkY3zQawwpjk2NsNY";
-export const SOLANA_DEVNET_GENESIS_BLOCK_HASH = "EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG";
+export const SOLANA_DEVNET_GENESIS_BLOCK_HASH = "EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG";
+
+export const SOLANA_MAINNET_NETWORK: Network = {
+    protocolFamily: SOLANA_PROTOCOL_FAMILY,
+    chainId: SOLANA_MAINNET_GENESIS_BLOCK_HASH,
+    networkId: SOLANA_MAINNET_NETWORK_ID,
+};
+
+export const SOLANA_TESTNET_NETWORK: Network = {
+    protocolFamily: SOLANA_PROTOCOL_FAMILY,
+    chainId: SOLANA_TESTNET_GENESIS_BLOCK_HASH,
+    networkId: SOLANA_TESTNET_NETWORK_ID,
+};
+
+export const SOLANA_DEVNET_NETWORK: Network = {
+    protocolFamily: SOLANA_PROTOCOL_FAMILY,
+    chainId: SOLANA_DEVNET_GENESIS_BLOCK_HASH,
+    networkId: SOLANA_DEVNET_NETWORK_ID,
+};
+
+export const SOLANA_NETWORKS = {
+    [SOLANA_MAINNET_NETWORK_ID]: SOLANA_MAINNET_NETWORK,
+    [SOLANA_TESTNET_NETWORK_ID]: SOLANA_TESTNET_NETWORK,
+    [SOLANA_DEVNET_NETWORK_ID]: SOLANA_DEVNET_NETWORK,
+};
+
diff --git a/typescript/agentkit/src/wallet-providers/svmKeypairWalletProvider.ts b/typescript/agentkit/src/wallet-providers/svmKeypairWalletProvider.ts
@@ -2,7 +2,7 @@ import { SvmWalletProvider } from "./svmWalletProvider";
 import { Network } from "../network";
 import { Connection, Keypair, PublicKey, VersionedTransaction, LAMPORTS_PER_SOL, SystemProgram, MessageV0, ComputeBudgetProgram } from "@solana/web3.js";
 import bs58 from "bs58";
-import { SOLANA_MAINNET_CHAIN_ID, SOLANA_MAINNET_NETWORK_ID, SOLANA_PROTOCOL_FAMILY, SOLANA_MAINNET_GENESIS_BLOCK_HASH, SOLANA_TESTNET_CHAIN_ID, SOLANA_TESTNET_NETWORK_ID, SOLANA_DEVNET_GENESIS_BLOCK_HASH, SOLANA_DEVNET_CHAIN_ID, SOLANA_DEVNET_NETWORK_ID, SOLANA_TESTNET_GENESIS_BLOCK_HASH } from "../network/svm";
+import { SOLANA_NETWORKS } from "../network/svm";
 
 export class SvmKeypairWalletProvider extends SvmWalletProvider {
     #keypair: Keypair;
@@ -35,24 +35,8 @@ export class SvmKeypairWalletProvider extends SvmWalletProvider {
     }
 
     getNetwork(): Network {
-        if (this.#genesisHash === SOLANA_MAINNET_GENESIS_BLOCK_HASH) {
-            return {
-                protocolFamily: SOLANA_PROTOCOL_FAMILY,
-                chainId: String(SOLANA_MAINNET_CHAIN_ID),
-                networkId: SOLANA_MAINNET_NETWORK_ID,
-            };
-        } else if (this.#genesisHash === SOLANA_TESTNET_GENESIS_BLOCK_HASH) {
-            return {
-                protocolFamily: SOLANA_PROTOCOL_FAMILY,
-                chainId: String(SOLANA_TESTNET_CHAIN_ID),
-                networkId: SOLANA_TESTNET_NETWORK_ID,
-            };
-        } else if (this.#genesisHash === SOLANA_DEVNET_GENESIS_BLOCK_HASH) {
-            return {
-                protocolFamily: SOLANA_PROTOCOL_FAMILY,
-                chainId: String(SOLANA_DEVNET_CHAIN_ID),
-                networkId: SOLANA_DEVNET_NETWORK_ID,
-            };
+        if (this.#genesisHash in SOLANA_NETWORKS) {
+            return SOLANA_NETWORKS[this.#genesisHash];
         } else {
             throw new Error(`Unknown network with genesis hash: ${this.#genesisHash}`);
         }