Merge pull request #1945 from 0xRider/chore/more-specific-rpc-urls

chore: more specific rpc urls
elizaOS · Jan 7, 2025 · 7e0d7ea · 7e0d7ea
2 parents 6e18209 + 0641d24
commit 7e0d7ea
Show file tree

Hide file tree

Showing 36 changed files with 42 additions and 40 deletions.
diff --git a/.env.example b/.env.example
@@ -215,7 +215,7 @@ BIRDEYE_API_KEY=
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
 BASE_MINT=So11111111111111111111111111111111111111112
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 
 # Telegram Configuration
@@ -346,7 +346,7 @@ NEAR_WALLET_SECRET_KEY=
 NEAR_WALLET_PUBLIC_KEY=
 NEAR_ADDRESS=
 SLIPPAGE=1
-RPC_URL=https://rpc.testnet.near.org
+NEAR_RPC_URL=https://rpc.testnet.near.org
 NEAR_NETWORK=testnet # or mainnet
 
 # ZKsync Era Configuration

diff --git a/README_CN.md b/README_CN.md
@@ -210,7 +210,7 @@ BIRDEYE_API_KEY=
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 
 

diff --git a/README_ES.md b/README_ES.md
@@ -120,7 +120,7 @@ BIRDEYE_API_KEY=
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 
 ## Telegram

diff --git a/README_JA.md b/README_JA.md
@@ -119,7 +119,7 @@ BIRDEYE_API_KEY=
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 
 

diff --git a/README_PTBR.md b/README_PTBR.md
@@ -121,7 +121,7 @@ BIRDEYE_API_KEY=
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 
 

diff --git a/README_RO.md b/README_RO.md
@@ -121,7 +121,7 @@ BIRDEYE_API_KEY=
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 
 

diff --git a/README_RS.md b/README_RS.md
@@ -120,7 +120,7 @@ BIRDEYE_API_KEY=
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 
 ## Telegram

diff --git a/README_RU.md b/README_RU.md
@@ -137,7 +137,7 @@ BIRDEYE_API_KEY= # API-ключ для BirdEye
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY= # API-ключ Helius
 
 

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -28,7 +28,7 @@ services:
             - BIRDEYE_API_KEY=
             - SOL_ADDRESS=So11111111111111111111111111111111111111112
             - SLIPPAGE=1
-            - RPC_URL=https://api.mainnet-beta.solana.com
+            - SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
             - HELIUS_API_KEY=
             - SERVER_PORT=3000
             - WALLET_SECRET_SALT=secret_salt

diff --git a/docs/README.md b/docs/README.md
@@ -118,7 +118,7 @@ BIRDEYE_API_KEY=
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 
 

diff --git a/docs/README_CN.md b/docs/README_CN.md
@@ -117,7 +117,7 @@ BIRDEYE_API_KEY=
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 
 

diff --git a/docs/README_DE.md b/docs/README_DE.md
@@ -114,7 +114,7 @@ BIRDEYE_API_KEY=
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 
 ## Telegram

diff --git a/docs/README_ES.md b/docs/README_ES.md
@@ -118,7 +118,7 @@ BIRDEYE_API_KEY=
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 
 

diff --git a/docs/README_FR.md b/docs/README_FR.md
@@ -118,7 +118,7 @@ BIRDEYE_API_KEY=
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 
 

diff --git a/docs/README_TH.md b/docs/README_TH.md
@@ -114,7 +114,7 @@ BIRDEYE_API_KEY=
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 
 

diff --git a/docs/docs/advanced/eliza-in-tee.md b/docs/docs/advanced/eliza-in-tee.md
@@ -272,7 +272,7 @@ services:
             - BIRDEYE_API_KEY=$BIRDEYE_API_KEY
             - SOL_ADDRESS=So11111111111111111111111111111111111111112
             - SLIPPAGE=1
-            - RPC_URL=https://api.mainnet-beta.solana.com
+            - SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
             - HELIUS_API_KEY=$HELIUS_API_KEY
             - SERVER_PORT=3000
             - WALLET_SECRET_SALT=$WALLET_SECRET_SALT

diff --git a/docs/docs/api/_media/README_CN.md b/docs/docs/api/_media/README_CN.md
@@ -118,7 +118,7 @@ BIRDEYE_API_KEY=
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 
 

diff --git a/docs/docs/api/_media/README_FR.md b/docs/docs/api/_media/README_FR.md
@@ -118,7 +118,7 @@ BIRDEYE_API_KEY=
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 
 

diff --git a/docs/docs/api/_media/README_JA.md b/docs/docs/api/_media/README_JA.md
@@ -120,7 +120,7 @@ BIRDEYE_API_KEY=
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 
 

diff --git a/docs/docs/api/_media/README_KOR.md b/docs/docs/api/_media/README_KOR.md
@@ -118,7 +118,7 @@ BIRDEYE_API_KEY=
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 
 

diff --git a/docs/docs/api/index.md b/docs/docs/api/index.md
@@ -123,7 +123,7 @@ BIRDEYE_API_KEY=
 
 SOL_ADDRESS=So11111111111111111111111111111111111111112
 SLIPPAGE=1
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 HELIUS_API_KEY=
 
 ## Telegram

diff --git a/packages/core/.env.test b/packages/core/.env.test
@@ -2,5 +2,5 @@ TEST_DATABASE_CLIENT=sqlite
 NODE_ENV=test
 MAIN_WALLET_ADDRESS=TEST_MAIN_WALLET_ADDRESS_VALUE
 OPENAI_API_KEY=TEST_OPENAI_API_KEY_VALUE
-RPC_URL=https://api.mainnet-beta.solana.com
+SOLANA_RPC_URL=https://api.mainnet-beta.solana.com
 WALLET_PUBLIC_KEY=2weMjPLLybRMMva1fM3U31goWWrCpF59CHWNhnCJ9Vyh
diff --git a/packages/plugin-near/README.md b/packages/plugin-near/README.md
@@ -34,7 +34,7 @@ NEAR_WALLET_SECRET_KEY=your-wallet-private-key
 NEAR_WALLET_PUBLIC_KEY=your-wallet-public-key
 NEAR_ADDRESS=your-account.near
 NEAR_NETWORK=testnet  # mainnet or testnet
-RPC_URL=https://rpc.testnet.near.org
+NEAR_RPC_URL=https://rpc.testnet.near.org
 SLIPPAGE=0.01  # 1% slippage tolerance
 ```
 

diff --git a/packages/plugin-near/src/actions/swap.ts b/packages/plugin-near/src/actions/swap.ts
@@ -55,7 +55,7 @@ async function swapToken(
         const tokenOut = await ftGetTokenMetadata(outputTokenId);
         const networkId = runtime.getSetting("NEAR_NETWORK") || "testnet";
         const nodeUrl =
-            runtime.getSetting("RPC_URL") || "https://rpc.testnet.near.org";
+            runtime.getSetting("NEAR_RPC_URL") || "https://rpc.testnet.near.org";
 
         // Get all pools for estimation
         // ratedPools, unRatedPools,
@@ -257,7 +257,7 @@ export const executeSwap: Action = {
                 networkId: runtime.getSetting("NEAR_NETWORK") || "testnet",
                 keyStore,
                 nodeUrl:
-                    runtime.getSetting("RPC_URL") ||
+                    runtime.getSetting("NEAR_RPC_URL") ||
                     "https://rpc.testnet.near.org",
             });
 

diff --git a/packages/plugin-near/src/actions/transfer.ts b/packages/plugin-near/src/actions/transfer.ts
@@ -64,7 +64,7 @@ async function transferNEAR(
 ): Promise<string> {
     const networkId = runtime.getSetting("NEAR_NETWORK") || "testnet";
     const nodeUrl =
-        runtime.getSetting("RPC_URL") || "https://rpc.testnet.near.org";
+        runtime.getSetting("NEAR_RPC_URL") || "https://rpc.testnet.near.org";
     const accountId = runtime.getSetting("NEAR_ADDRESS");
     const secretKey = runtime.getSetting("NEAR_WALLET_SECRET_KEY");
 

diff --git a/packages/plugin-near/src/environment.ts b/packages/plugin-near/src/environment.ts
@@ -9,7 +9,7 @@ export const nearEnvSchema = z.object({
     NEAR_WALLET_PUBLIC_KEY: z.string().min(1, "Wallet public key is required"),
     NEAR_ADDRESS: z.string().min(1, "Near address is required"),
     SLIPPAGE: z.string().min(1, "Slippage is required"),
-    RPC_URL: z.string().min(1, "RPC URL is required"),
+    NEAR_RPC_URL: z.string().min(1, "RPC URL is required"),
     networkId: z.string(),
     nodeUrl: z.string(),
     walletUrl: z.string(),
@@ -87,7 +87,7 @@ export async function validateNearConfig(
             NEAR_ADDRESS:
                 runtime.getSetting("NEAR_ADDRESS") || process.env.NEAR_ADDRESS,
             SLIPPAGE: runtime.getSetting("SLIPPAGE") || process.env.SLIPPAGE,
-            RPC_URL: runtime.getSetting("RPC_URL") || process.env.RPC_URL,
+            NEAR_RPC_URL: runtime.getSetting("NEAR_RPC_URL") || process.env.NEAR_RPC_URL,
             ...envConfig, // Spread the environment-specific config
         };
 

diff --git a/packages/plugin-solana-agentkit/src/actions/createToken.ts b/packages/plugin-solana-agentkit/src/actions/createToken.ts
@@ -104,7 +104,7 @@ export default {
 
         elizaLogger.log("Init solana agent kit...");
         const solanaPrivatekey = runtime.getSetting("SOLANA_PRIVATE_KEY");
-        const rpc = runtime.getSetting("RPC_URL");
+        const rpc = runtime.getSetting("SOLANA_RPC_URL");
         const openAIKey = runtime.getSetting("OPENAI_API_KEY");
         const solanaAgentKit = new SolanaAgentKit(
             solanaPrivatekey,

diff --git a/packages/plugin-solana/README.MD b/packages/plugin-solana/README.MD
@@ -69,7 +69,7 @@ const solanaEnvSchema = {
     WALLET_PUBLIC_KEY: string,
     SOL_ADDRESS: string,
     SLIPPAGE: string,
-    RPC_URL: string,
+    SOLANA_RPC_URL: string,
     HELIUS_API_KEY: string,
     BIRDEYE_API_KEY: string,
 };

diff --git a/packages/plugin-solana/src/actions/swapDao.ts b/packages/plugin-solana/src/actions/swapDao.ts
@@ -65,7 +65,7 @@ export const executeSwapForDAO: Action = {
 
         try {
             const connection = new Connection(
-                runtime.getSetting("RPC_URL") as string
+                runtime.getSetting("SOLANA_RPC_URL") as string
             );
 
             const { keypair: authority } = await getWalletKey(runtime, true);

diff --git a/packages/plugin-solana/src/actions/swapUtils.ts b/packages/plugin-solana/src/actions/swapUtils.ts
@@ -14,7 +14,7 @@ import { settings } from "@elizaos/core";
 const solAddress = settings.SOL_ADDRESS;
 const SLIPPAGE = settings.SLIPPAGE;
 const connection = new Connection(
-    settings.RPC_URL || "https://api.mainnet-beta.solana.com"
+    settings.SOLANA_RPC_URL || "https://api.mainnet-beta.solana.com"
 );
 const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 

diff --git a/packages/plugin-solana/src/actions/transfer.ts b/packages/plugin-solana/src/actions/transfer.ts
@@ -142,7 +142,7 @@ export default {
                 true
             );
 
-            const connection = new Connection(settings.RPC_URL!);
+            const connection = new Connection(settings.SOLANA_RPC_URL!);
 
             const mintPubkey = new PublicKey(content.tokenAddress);
             const recipientPubkey = new PublicKey(content.recipient);

diff --git a/packages/plugin-solana/src/environment.ts b/packages/plugin-solana/src/environment.ts
@@ -26,7 +26,7 @@ export const solanaEnvSchema = z
         z.object({
             SOL_ADDRESS: z.string().min(1, "SOL address is required"),
             SLIPPAGE: z.string().min(1, "Slippage is required"),
-            RPC_URL: z.string().min(1, "RPC URL is required"),
+            SOLANA_RPC_URL: z.string().min(1, "RPC URL is required"),
             HELIUS_API_KEY: z.string().min(1, "Helius API key is required"),
             BIRDEYE_API_KEY: z.string().min(1, "Birdeye API key is required"),
         })
@@ -52,7 +52,9 @@ export async function validateSolanaConfig(
             SOL_ADDRESS:
                 runtime.getSetting("SOL_ADDRESS") || process.env.SOL_ADDRESS,
             SLIPPAGE: runtime.getSetting("SLIPPAGE") || process.env.SLIPPAGE,
-            RPC_URL: runtime.getSetting("RPC_URL") || process.env.RPC_URL,
+            SOLANA_RPC_URL:
+                runtime.getSetting("SOLANA_RPC_URL") ||
+                process.env.SOLANA_RPC_URL,
             HELIUS_API_KEY:
                 runtime.getSetting("HELIUS_API_KEY") ||
                 process.env.HELIUS_API_KEY,

diff --git a/packages/plugin-solana/src/evaluators/trust.ts b/packages/plugin-solana/src/evaluators/trust.ts
@@ -158,7 +158,7 @@ async function handler(runtime: IAgentRuntime, message: Memory) {
         // create the wallet provider and token provider
         const walletProvider = new WalletProvider(
             new Connection(
-                runtime.getSetting("RPC_URL") ||
+                runtime.getSetting("SOLANA_RPC_URL") ||
                     "https://api.mainnet-beta.solana.com"
             ),
             publicKey

diff --git a/packages/plugin-solana/src/providers/simulationSellingService.ts b/packages/plugin-solana/src/providers/simulationSellingService.ts
@@ -39,7 +39,7 @@ export class SimulationSellingService {
     constructor(runtime: IAgentRuntime, trustScoreDb: TrustScoreDatabase) {
         this.trustScoreDb = trustScoreDb;
 
-        this.connection = new Connection(runtime.getSetting("RPC_URL"));
+        this.connection = new Connection(runtime.getSetting("SOLANA_RPC_URL"));
         this.baseMint = new PublicKey(
             runtime.getSetting("BASE_MINT") ||
                 "So11111111111111111111111111111111111111112"

diff --git a/packages/plugin-solana/src/providers/trustScoreProvider.ts b/packages/plugin-solana/src/providers/trustScoreProvider.ts
@@ -67,7 +67,7 @@ export class TrustScoreManager {
     ) {
         this.tokenProvider = tokenProvider;
         this.trustScoreDb = trustScoreDb;
-        this.connection = new Connection(runtime.getSetting("RPC_URL"));
+        this.connection = new Connection(runtime.getSetting("SOLANA_RPC_URL"));
         this.baseMint = new PublicKey(
             runtime.getSetting("BASE_MINT") ||
                 "So11111111111111111111111111111111111111112"

diff --git a/packages/plugin-solana/src/providers/wallet.ts b/packages/plugin-solana/src/providers/wallet.ts
@@ -374,7 +374,7 @@ const walletProvider: Provider = {
             const { publicKey } = await getWalletKey(runtime, false);
 
             const connection = new Connection(
-                runtime.getSetting("RPC_URL") || PROVIDER_CONFIG.DEFAULT_RPC
+                runtime.getSetting("SOLANA_RPC_URL") || PROVIDER_CONFIG.DEFAULT_RPC
             );
 
             const provider = new WalletProvider(connection, publicKey);