From 2263d767721d463b2575892fb6c2ec879c800a39 Mon Sep 17 00:00:00 2001
From: odilitime <janesmith@airmail.cc>
Date: Mon, 16 Dec 2024 23:55:57 +0000
Subject: [PATCH] fix merge: remove double improve, adjust params to various
 calls, use initWalletProvider

---
 packages/plugin-evm/src/actions/transfer.ts | 23 +++++++++------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/packages/plugin-evm/src/actions/transfer.ts b/packages/plugin-evm/src/actions/transfer.ts
index 73511b3370..61b2bacbbe 100644
--- a/packages/plugin-evm/src/actions/transfer.ts
+++ b/packages/plugin-evm/src/actions/transfer.ts
@@ -12,17 +12,10 @@ import {
 import { initWalletProvider, WalletProvider } from "../providers/wallet";
 import type { Transaction, TransferParams } from "../types";
 import { transferTemplate } from "../templates";
-import {
-    composeContext,
-    generateObjectDEPRECATED,
-    HandlerCallback,
-    ModelClass,
-    type IAgentRuntime,
-    type Memory,
-    type State,
-} from "@ai16z/eliza";
 
 export { transferTemplate };
+
+// Exported for tests
 export class TransferAction {
     constructor(private walletProvider: WalletProvider) {}
 
@@ -35,7 +28,11 @@ export class TransferAction {
             params.data = "0x";
         }
 
-        await this.walletProvider.switchChain(runtime, params.fromChain);
+        await this.walletProvider.switchChain(params.fromChain);
+
+        const walletClient = this.walletProvider.getWalletClient(
+            params.fromChain
+        );
 
         try {
             const hash = await walletClient.sendTransaction({
@@ -118,7 +115,7 @@ export const transferAction = {
         callback?: HandlerCallback
     ) => {
         console.log("Transfer action handler called");
-        const walletProvider = new WalletProvider(runtime);
+        const walletProvider = initWalletProvider(runtime);
         const action = new TransferAction(walletProvider);
 
         // Compose transfer context
@@ -128,7 +125,7 @@ export const transferAction = {
         });
 
         // Generate transfer content
-        const content = await generateObjectDEPRECATED({
+        const content = await generateObjectDeprecated({
             runtime,
             context: transferContext,
             modelClass: ModelClass.LARGE,
@@ -142,7 +139,7 @@ export const transferAction = {
         };
 
         try {
-            const transferResp = await action.transfer(runtime, paramOptions);
+            const transferResp = await action.transfer(paramOptions);
             if (callback) {
                 callback({
                     text: `Successfully transferred ${paramOptions.amount} tokens to ${paramOptions.toAddress}\nTransaction Hash: ${transferResp.hash}`,