Merge pull request elizaOS#2016 from elizaOS/fix-near-slippage-env-conflict

fix: remove near-solana slippage env conflict

Author: shakkernerd

.env.example

@@ -359,7 +359,7 @@ MVX_NETWORK= # must be one of mainnet, devnet, testnet
 NEAR_WALLET_SECRET_KEY=
 NEAR_WALLET_PUBLIC_KEY=
 NEAR_ADDRESS=
-SLIPPAGE=1
+NEAR_SLIPPAGE=1
 NEAR_RPC_URL=https://rpc.testnet.near.org
 NEAR_NETWORK=testnet # or mainnet
 

packages/plugin-near/README.md

@@ -35,7 +35,7 @@ NEAR_WALLET_PUBLIC_KEY=your-wallet-public-key
 NEAR_ADDRESS=your-account.near
 NEAR_NETWORK=testnet  # mainnet or testnet
 NEAR_RPC_URL=https://rpc.testnet.near.org
-SLIPPAGE=0.01  # 1% slippage tolerance
+NEAR_SLIPPAGE=0.01  # 1% slippage tolerance
 ```
 
 ## Usage

packages/plugin-near/src/environment.ts

@@ -8,7 +8,7 @@ export const nearEnvSchema = z.object({
     NEAR_WALLET_SECRET_KEY: z.string().min(1, "Wallet secret key is required"),
     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"),
+    NEAR_SLIPPAGE: z.string().min(1, "Slippage is required"),
     NEAR_RPC_URL: z.string().min(1, "RPC URL is required"),
     networkId: z.string(),
     nodeUrl: z.string(),
@@ -86,7 +86,7 @@ export async function validateNearConfig(
                 process.env.NEAR_WALLET_PUBLIC_KEY,
             NEAR_ADDRESS:
                 runtime.getSetting("NEAR_ADDRESS") || process.env.NEAR_ADDRESS,
-            SLIPPAGE: runtime.getSetting("SLIPPAGE") || process.env.SLIPPAGE,
+            NEAR_SLIPPAGE: runtime.getSetting("NEAR_SLIPPAGE") || process.env.NEAR_SLIPPAGE,
             NEAR_RPC_URL: runtime.getSetting("NEAR_RPC_URL") || process.env.NEAR_RPC_URL,
             ...envConfig, // Spread the environment-specific config
         };

packages/plugin-near/src/providers/wallet.ts

@@ -20,7 +20,7 @@ const PROVIDER_CONFIG = {
     explorerUrl: `https://${process.env.NEAR_NETWORK || "testnet"}.nearblocks.io`,
     MAX_RETRIES: 3,
     RETRY_DELAY: 2000,
-    SLIPPAGE: process.env.SLIPPAGE ? parseInt(process.env.SLIPPAGE) : 1,
+    SLIPPAGE: process.env.NEAR_SLIPPAGE ? parseInt(process.env.NEAR_SLIPPAGE) : 1,
 };
 
 export interface NearToken {