feat: ref swap, wallet connection, ref env variables

serrrfirat · serrrfirat · commit 913651d029f4 · 2024-12-03T22:49:45.000+01:00
diff --git a/agent/src/index.ts b/agent/src/index.ts
@@ -23,7 +23,6 @@ import {
     validateCharacterConfig,
 } from "@ai16z/eliza";
 import { zgPlugin } from "@ai16z/plugin-0g";
-import { goatPlugin } from "@ai16z/plugin-goat";
 import { bootstrapPlugin } from "@ai16z/plugin-bootstrap";
 // import { buttplugPlugin } from "@ai16z/plugin-buttplug";
 import {
@@ -373,11 +372,7 @@ export function createAgent(
                 !getSecret(character, "WALLET_PUBLIC_KEY")?.startsWith("0x"))
                 ? solanaPlugin
                 : null,
-            getSecret(character, "NEAR_PUBLIC_KEY") ||
-            (getSecret(character, "WALLET_PUBLIC_KEY") &&
-                !getSecret(character, "WALLET_PUBLIC_KEY")?.startsWith("ed25519"))
-                ? nearPlugin
-                : null,
+            nearPlugin,
             getSecret(character, "EVM_PUBLIC_KEY") ||
             (getSecret(character, "WALLET_PUBLIC_KEY") &&
                 !getSecret(character, "WALLET_PUBLIC_KEY")?.startsWith("0x"))
@@ -397,7 +392,6 @@ export function createAgent(
                 ? [coinbaseMassPaymentsPlugin, tradePlugin]
                 : []),
             getSecret(character, "WALLET_SECRET_SALT") ? teePlugin : null,
-            getSecret(character, "ALCHEMY_API_KEY") ? goatPlugin : null,
         ].filter(Boolean),
         providers: [],
         actions: [],
@@ -439,7 +433,6 @@ async function startAgent(character: Character, directClient) {
 
         const cache = intializeDbCache(character, db);
         const runtime = createAgent(character, db, cache, token);
-
         await runtime.initialize();
 
         const clients = await initializeClients(character, runtime);
diff --git a/packages/plugin-near/src/actions/swap.ts b/packages/plugin-near/src/actions/swap.ts
@@ -11,7 +11,7 @@ import {
 } from "@ai16z/eliza";
 import { connect, keyStores, utils } from "near-api-js";
 import BigNumber from "bignumber.js";
-import { init_env, ftGetTokenMetadata, estimateSwap, instantSwap } from '@ref-finance/ref-sdk';
+import { init_env, ftGetTokenMetadata, estimateSwap, instantSwap, fetchAllPools, FT_MINIMUM_STORAGE_BALANCE_LARGE } from '@ref-finance/ref-sdk';
 import { walletProvider } from "../providers/wallet";
 import { KeyPairString } from "near-api-js/lib/utils";
 
@@ -23,25 +23,24 @@ async function swapToken(
     inputTokenId: string,
     outputTokenId: string,
     amount: string,
-    slippageTolerance: number = 0.01
+    slippageTolerance: number = 0.1
 ): Promise<any> {
     try {
         // Get token metadata
         const tokenIn = await ftGetTokenMetadata(inputTokenId);
         const tokenOut = await ftGetTokenMetadata(outputTokenId);
 
         // Get all pools for estimation
-        const response = await fetch('https://testnet-indexer.ref-finance.com/list-pools');
-        const { simplePools } = await response.json();
+        const { ratedPools, unRatedPools, simplePools} = await fetchAllPools(200);
 
-        // Estimate swap
+        console.log("Pools:", simplePools);
         const swapTodos = await estimateSwap({
             tokenIn,
             tokenOut,
             amountIn: amount,
             simplePools,
             options: {
-                enableSmartRouting: true
+                enableSmartRouting: true,
             }
         });
 
@@ -176,7 +175,7 @@ export const executeSwap: Action = {
                 response.inputTokenId,
                 response.outputTokenId,
                 response.amount,
-                0.01 // 1% slippage tolerance
+                0.1 // 1% slippage tolerance
             );
 
             // Sign and send transactions
@@ -190,7 +189,7 @@ export const executeSwap: Action = {
                         methodName: functionCall.methodName,
                         args: functionCall.args,
                         gas: functionCall.gas,
-                        attachedDeposit: functionCall.amount ? BigInt(functionCall.amount) : BigInt(0),
+                        attachedDeposit: BigInt(1),
                     });
                     results.push(result);
                 }
@@ -208,7 +207,7 @@ export const executeSwap: Action = {
         } catch (error) {
             console.error("Error during token swap:", error);
             const responseMsg = {
-                text: `Error during swap: ${error.message}`,
+                text: `Error during swap: ${error instanceof Error ? error.message : String(error)}`,
             };
             callback?.(responseMsg);
             return false;
diff --git a/packages/plugin-near/src/environment.ts b/packages/plugin-near/src/environment.ts
@@ -1,20 +1,79 @@
 import { IAgentRuntime } from "@ai16z/eliza";
 import { z } from "zod";
 
+// Add ENV variable at the top
+let ENV: string = "testnet";
+
 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"),
     RPC_URL: z.string().min(1, "RPC URL is required"),
+    networkId: z.string(),
+    nodeUrl: z.string(),
+    walletUrl: z.string(),
+    WRAP_NEAR_CONTRACT_ID: z.string(),
+    REF_FI_CONTRACT_ID: z.string(),
+    REF_TOKEN_ID: z.string(),
+    indexerUrl: z.string(),
+    explorerUrl: z.string(),
+    REF_DCL_SWAP_CONTRACT_ID: z.string(),
 });
 
 export type NearConfig = z.infer<typeof nearEnvSchema>;
 
+export function getConfig(
+    env: string | undefined | null = ENV ||
+        process.env.NEAR_ENV ||
+        process.env.REACT_APP_REF_SDK_ENV
+) {
+    ENV = env || "testnet";
+    switch (env) {
+        case 'mainnet':
+            return {
+                networkId: 'mainnet',
+                nodeUrl: 'https://rpc.mainnet.near.org',
+                walletUrl: 'https://wallet.near.org',
+                WRAP_NEAR_CONTRACT_ID: 'wrap.near',
+                REF_FI_CONTRACT_ID: 'v2.ref-finance.near',
+                REF_TOKEN_ID: 'token.v2.ref-finance.near',
+                indexerUrl: 'https://indexer.ref.finance',
+                explorerUrl: 'https://testnet.nearblocks.io',
+                REF_DCL_SWAP_CONTRACT_ID: 'dclv2.ref-labs.near',
+            };
+        case 'testnet':
+            return {
+                networkId: 'testnet',
+                nodeUrl: 'https://rpc.testnet.near.org',
+                walletUrl: 'https://wallet.testnet.near.org',
+                indexerUrl: 'https://testnet-indexer.ref-finance.com',
+                WRAP_NEAR_CONTRACT_ID: 'wrap.testnet',
+                REF_FI_CONTRACT_ID: 'ref-finance-101.testnet',
+                REF_TOKEN_ID: 'ref.fakes.testnet',
+                explorerUrl: 'https://testnet.nearblocks.io',
+                REF_DCL_SWAP_CONTRACT_ID: 'dclv2.ref-dev.testnet',
+            };
+        default:
+            return {
+                networkId: 'mainnet',
+                nodeUrl: 'https://rpc.mainnet.near.org',
+                walletUrl: 'https://wallet.near.org',
+                REF_FI_CONTRACT_ID: 'v2.ref-finance.near',
+                WRAP_NEAR_CONTRACT_ID: 'wrap.near',
+                REF_TOKEN_ID: 'token.v2.ref-finance.near',
+                indexerUrl: 'https://indexer.ref.finance',
+                explorerUrl: 'https://nearblocks.io',
+                REF_DCL_SWAP_CONTRACT_ID: 'dclv2.ref-labs.near',
+            };
+    }
+}
+
 export async function validateNearConfig(
     runtime: IAgentRuntime
 ): Promise<NearConfig> {
     try {
+        const envConfig = getConfig(runtime.getSetting("NEAR_ENV") ?? undefined);
         const config = {
             NEAR_WALLET_SECRET_KEY:
                 runtime.getSetting("NEAR_WALLET_SECRET_KEY") ||
@@ -27,6 +86,7 @@ export async function validateNearConfig(
                 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,
+            ...envConfig // Spread the environment-specific config
         };
 
         return nearEnvSchema.parse(config);
diff --git a/packages/plugin-near/src/index.ts b/packages/plugin-near/src/index.ts
@@ -4,7 +4,7 @@ import { walletProvider } from "./providers/wallet";
 import { executeSwap } from "./actions/swap";
 
 export const nearPlugin: Plugin = {
-    name: "near",
+    name: "NEAR",
     description: "Near Protocol Plugin for Eliza",
     providers: [walletProvider],
     actions: [executeSwap],
diff --git a/packages/plugin-near/src/providers/wallet.ts b/packages/plugin-near/src/providers/wallet.ts
@@ -1,10 +1,8 @@
 import { IAgentRuntime, Memory, Provider, State } from "@ai16z/eliza";
 import { KeyPair, keyStores, connect, Account, utils } from "near-api-js";
 import BigNumber from "bignumber.js";
-import NodeCache from "node-cache";
-import fs from "fs";
-import os from "os";
 import { KeyPairString } from "near-api-js/lib/utils";
+import NodeCache from "node-cache";
 
 const PROVIDER_CONFIG = {
     networkId: process.env.NEAR_NETWORK || "testnet",
@@ -40,6 +38,7 @@ export class WalletProvider implements Provider {
     private keyStore: keyStores.InMemoryKeyStore;
     constructor(private accountId: string) {
         this.cache = new NodeCache({ stdTTL: 300 }); // Cache TTL set to 5 minutes
+        this.keyStore = new keyStores.InMemoryKeyStore();
     }
 
     async get(
diff --git a/packages/plugin-near/tsconfig.json b/packages/plugin-near/tsconfig.json
@@ -1,10 +1,21 @@
 {
-    "extends": "../../tsconfig.json",
     "compilerOptions": {
+        "target": "ES2020",
+        "module": "ESNext",
+        "moduleResolution": "node",
         "outDir": "dist",
         "rootDir": "./src",
-        "typeRoots": ["./node_modules/@types", "./src/types"],
+        "strict": true,
+        "esModuleInterop": true,
+        "skipLibCheck": true,
+        "forceConsistentCasingInFileNames": true,
+        "typeRoots": [
+            "./node_modules/@types",
+            "./src/types"
+        ],
         "declaration": true
     },
-    "include": ["src"]
-}
+    "include": [
+        "src"
+    ]
+}
