Skip to content

Commit 2cdbc67

Browse files
lalalunelalalune
committed
update to new api
1 parent 2f0519c commit 2cdbc67

File tree

3 files changed

+597
-39
lines changed

3 files changed

+597
-39
lines changed

‎packages/plugin-near/src/actions/swap.ts

+72-32
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,32 @@ import {
77
State,
88
type Action,
99
composeContext,
10-
generateObject,
10+
generateObjectV2,
1111
} from "@ai16z/eliza";
1212
import { connect, keyStores, utils } from "near-api-js";
13-
import { init_env, ftGetTokenMetadata, estimateSwap, instantSwap, fetchAllPools, FT_MINIMUM_STORAGE_BALANCE_LARGE, ONE_YOCTO_NEAR } from '@ref-finance/ref-sdk';
13+
import {
14+
init_env,
15+
ftGetTokenMetadata,
16+
estimateSwap,
17+
instantSwap,
18+
fetchAllPools,
19+
FT_MINIMUM_STORAGE_BALANCE_LARGE,
20+
ONE_YOCTO_NEAR,
21+
} from "@ref-finance/ref-sdk";
1422
import { walletProvider } from "../providers/wallet";
1523
import { KeyPairString } from "near-api-js/lib/utils";
1624

17-
18-
async function checkStorageBalance(account: any, contractId: string): Promise<boolean> {
25+
async function checkStorageBalance(
26+
account: any,
27+
contractId: string
28+
): Promise<boolean> {
1929
try {
2030
const balance = await account.viewFunction({
2131
contractId,
22-
methodName: 'storage_balance_of',
23-
args: { account_id: account.accountId }
32+
methodName: "storage_balance_of",
33+
args: { account_id: account.accountId },
2434
});
25-
return balance !== null && balance.total !== '0';
35+
return balance !== null && balance.total !== "0";
2636
} catch (error) {
2737
console.log(`Error checking storage balance: ${error}`);
2838
return false;
@@ -34,29 +44,32 @@ async function swapToken(
3444
inputTokenId: string,
3545
outputTokenId: string,
3646
amount: string,
37-
slippageTolerance: number = Number(runtime.getSetting("SLIPPAGE_TOLERANCE")) || 0.01
47+
slippageTolerance: number = Number(
48+
runtime.getSetting("SLIPPAGE_TOLERANCE")
49+
) || 0.01
3850
): Promise<any> {
3951
try {
4052
// Get token metadata
4153
const tokenIn = await ftGetTokenMetadata(inputTokenId);
4254
const tokenOut = await ftGetTokenMetadata(outputTokenId);
4355
const networkId = runtime.getSetting("NEAR_NETWORK") || "testnet";
44-
const nodeUrl = runtime.getSetting("RPC_URL") || "https://rpc.testnet.near.org";
56+
const nodeUrl =
57+
runtime.getSetting("RPC_URL") || "https://rpc.testnet.near.org";
4558

4659
// Get all pools for estimation
47-
const { ratedPools, unRatedPools, simplePools} = await fetchAllPools();
60+
const { ratedPools, unRatedPools, simplePools } = await fetchAllPools();
4861
const swapTodos = await estimateSwap({
4962
tokenIn,
5063
tokenOut,
5164
amountIn: amount,
5265
simplePools,
5366
options: {
5467
enableSmartRouting: true,
55-
}
68+
},
5669
});
5770

5871
if (!swapTodos || swapTodos.length === 0) {
59-
throw new Error('No valid swap route found');
72+
throw new Error("No valid swap route found");
6073
}
6174

6275
// Get account ID from runtime settings
@@ -88,31 +101,41 @@ async function swapToken(
88101
amountIn: amount,
89102
swapTodos,
90103
slippageTolerance,
91-
AccountId: accountId
104+
AccountId: accountId,
92105
});
93106

94107
// If storage deposit is needed, add it to transactions
95108
if (!hasStorageIn) {
96109
transactions.unshift({
97110
receiverId: inputTokenId,
98-
functionCalls: [{
99-
methodName: 'storage_deposit',
100-
args: { account_id: accountId, registration_only: true },
101-
gas: '30000000000000',
102-
amount: FT_MINIMUM_STORAGE_BALANCE_LARGE
103-
}]
111+
functionCalls: [
112+
{
113+
methodName: "storage_deposit",
114+
args: {
115+
account_id: accountId,
116+
registration_only: true,
117+
},
118+
gas: "30000000000000",
119+
amount: FT_MINIMUM_STORAGE_BALANCE_LARGE,
120+
},
121+
],
104122
});
105123
}
106124

107125
if (!hasStorageOut) {
108126
transactions.unshift({
109127
receiverId: outputTokenId,
110-
functionCalls: [{
111-
methodName: 'storage_deposit',
112-
args: { account_id: accountId, registration_only: true },
113-
gas: '30000000000000',
114-
amount: FT_MINIMUM_STORAGE_BALANCE_LARGE
115-
}]
128+
functionCalls: [
129+
{
130+
methodName: "storage_deposit",
131+
args: {
132+
account_id: accountId,
133+
registration_only: true,
134+
},
135+
gas: "30000000000000",
136+
amount: FT_MINIMUM_STORAGE_BALANCE_LARGE,
137+
},
138+
],
116139
});
117140
}
118141

@@ -156,7 +179,12 @@ Respond with a JSON markdown block containing only the extracted values. Use nul
156179

157180
export const executeSwap: Action = {
158181
name: "EXECUTE_SWAP_NEAR",
159-
similes: ["SWAP_TOKENS_NEAR", "TOKEN_SWAP_NEAR", "TRADE_TOKENS_NEAR", "EXCHANGE_TOKENS_NEAR"],
182+
similes: [
183+
"SWAP_TOKENS_NEAR",
184+
"TOKEN_SWAP_NEAR",
185+
"TRADE_TOKENS_NEAR",
186+
"EXCHANGE_TOKENS_NEAR",
187+
],
160188
validate: async (runtime: IAgentRuntime, message: Memory) => {
161189
console.log("Message:", message);
162190
return true;
@@ -186,15 +214,19 @@ export const executeSwap: Action = {
186214
template: swapTemplate,
187215
});
188216

189-
const response = await generateObject({
217+
const response = await generateObjectV2({
190218
runtime,
191219
context: swapContext,
192220
modelClass: ModelClass.LARGE,
193221
});
194222

195223
console.log("Response:", response);
196224

197-
if (!response.inputTokenId || !response.outputTokenId || !response.amount) {
225+
if (
226+
!response.inputTokenId ||
227+
!response.outputTokenId ||
228+
!response.amount
229+
) {
198230
console.log("Missing required parameters, skipping swap");
199231
const responseMsg = {
200232
text: "I need the input token ID, output token ID, and amount to perform the swap",
@@ -214,13 +246,17 @@ export const executeSwap: Action = {
214246

215247
// Create keystore and connect to NEAR
216248
const keyStore = new keyStores.InMemoryKeyStore();
217-
const keyPair = utils.KeyPair.fromString(secretKey as KeyPairString);
249+
const keyPair = utils.KeyPair.fromString(
250+
secretKey as KeyPairString
251+
);
218252
await keyStore.setKey("testnet", accountId, keyPair);
219253

220254
const nearConnection = await connect({
221255
networkId: runtime.getSetting("NEAR_NETWORK") || "testnet",
222256
keyStore,
223-
nodeUrl: runtime.getSetting("RPC_URL") || "https://rpc.testnet.near.org",
257+
nodeUrl:
258+
runtime.getSetting("RPC_URL") ||
259+
"https://rpc.testnet.near.org",
224260
});
225261

226262
// Execute swap
@@ -243,14 +279,18 @@ export const executeSwap: Action = {
243279
methodName: functionCall.methodName,
244280
args: functionCall.args,
245281
gas: functionCall.gas,
246-
attachedDeposit: BigInt(functionCall.amount === ONE_YOCTO_NEAR ? '1' : functionCall.amount),
282+
attachedDeposit: BigInt(
283+
functionCall.amount === ONE_YOCTO_NEAR
284+
? "1"
285+
: functionCall.amount
286+
),
247287
});
248288
results.push(result);
249289
}
250290
}
251291

252292
console.log("Swap completed successfully!");
253-
const txHashes = results.map(r => r.transaction.hash).join(", ");
293+
const txHashes = results.map((r) => r.transaction.hash).join(", ");
254294

255295
const responseMsg = {
256296
text: `Swap completed successfully! Transaction hashes: ${txHashes}`,

‎packages/plugin-near/src/actions/transfer.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
State,
99
type Action,
1010
composeContext,
11-
generateObject,
11+
generateObjectV2,
1212
} from "@ai16z/eliza";
1313
import { connect, keyStores, utils } from "near-api-js";
1414
import { KeyPairString } from "near-api-js/lib/utils";
@@ -27,7 +27,8 @@ function isTransferContent(
2727
): content is TransferContent {
2828
return (
2929
typeof content.recipient === "string" &&
30-
(typeof content.amount === "string" || typeof content.amount === "number")
30+
(typeof content.amount === "string" ||
31+
typeof content.amount === "number")
3132
);
3233
}
3334

@@ -58,10 +59,11 @@ Respond with a JSON markdown block containing only the extracted values.`;
5859
async function transferNEAR(
5960
runtime: IAgentRuntime,
6061
recipient: string,
61-
amount: string,
62+
amount: string
6263
): Promise<string> {
6364
const networkId = runtime.getSetting("NEAR_NETWORK") || "testnet";
64-
const nodeUrl = runtime.getSetting("RPC_URL") || "https://rpc.testnet.near.org";
65+
const nodeUrl =
66+
runtime.getSetting("RPC_URL") || "https://rpc.testnet.near.org";
6567
const accountId = runtime.getSetting("NEAR_ADDRESS");
6668
const secretKey = runtime.getSetting("NEAR_WALLET_SECRET_KEY");
6769

@@ -124,7 +126,7 @@ export const executeTransfer: Action = {
124126
});
125127

126128
// Generate transfer content
127-
const content = await generateObject({
129+
const content = await generateObjectV2({
128130
runtime,
129131
context: transferContext,
130132
modelClass: ModelClass.SMALL,
@@ -198,5 +200,3 @@ export const executeTransfer: Action = {
198200
],
199201
] as ActionExample[][],
200202
} as Action;
201-
202-

0 commit comments

Comments
 (0)