Fixed some logic and typing (#2868)

Co-authored-by: Shakker Nerd <[email protected]>
elizaOS · Jan 28, 2025 · b8cdc99 · b8cdc99
1 parent 1f0bbde
commit b8cdc99
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/packages/plugin-squid-router/src/actions/xChainSwap.ts b/packages/plugin-squid-router/src/actions/xChainSwap.ts
@@ -46,16 +46,16 @@ export const xChainSwapAction = {
     ): Promise<boolean> => {
         elizaLogger.log("Starting X_CHAIN_SWAP handler...");
 
-        // Initialize or update state
-        if (!state) {
-            state = (await runtime.composeState(message)) as State;
+        let currentState = state; // Create new variable
+        if (!currentState) {
+            currentState = (await runtime.composeState(message)) as State;
         } else {
-            state = await runtime.updateRecentMessageState(state);
+            currentState = await runtime.updateRecentMessageState(currentState);
         }
 
         // Compose X chain swap context
         const xChainSwapContext = composeContext({
-            state,
+            state: currentState, // Use the new variable
             template: xChainSwapTemplate,
         });
 
@@ -164,13 +164,12 @@ export const xChainSwapAction = {
             const txReceipt = await tx.wait();
 
             // Show the transaction receipt with Axelarscan link
-            const axelarScanLink = "https://axelarscan.io/gmp/" + txReceipt.hash;
+            const axelarScanLink = `https://axelarscan.io/gmp/${txReceipt.hash}`; // Fix: Use template literal
             elizaLogger.log(`Finished! Check Axelarscan for details: ${axelarScanLink}`);
 
             if (callback) {
                 callback({
-                    text:
-                        "Swap completed successfully! Check Axelarscan for details:\n " + axelarScanLink,
+                    text: `Swap completed successfully! Check Axelarscan for details:\n${axelarScanLink}`, // Fix: Use template literal
                     content: {},
                 });
             }

diff --git a/packages/plugin-squid-router/src/providers/squidRouter.ts b/packages/plugin-squid-router/src/providers/squidRouter.ts
@@ -84,13 +84,25 @@ export class SquidRouterProvider {
             if(chain.chainType === ChainType.EVM) {
                 const provider = new ethers.JsonRpcProvider(chain.rpc);
                 return new ethers.Wallet(runtime.getSetting("SQUID_EVM_PRIVATE_KEY"), provider);
-            } else {
-                throw Error("Cannot instantiate EVM signer for non-EVM chain");
             }
+            throw new Error('Cannot instantiate EVM signer for non-EVM chain'); // Fix: Use template literal and remove else
         } catch (error) {
-            throw Error("Cannot instantiate EVM signer: "+error);
+            throw new Error(`Cannot instantiate EVM signer: ${error}`); // Fix: Use template literal
         }
     }
+
+    // async getEVMSignerForChain(chain: ChainData, runtime): Promise<ethers.Signer> {
+    //     try {
+    //         if(chain.chainType === ChainType.EVM) {
+    //             const provider = new ethers.JsonRpcProvider(chain.rpc);
+    //             return new ethers.Wallet(runtime.getSetting("SQUID_EVM_PRIVATE_KEY"), provider);
+    //         } else {
+    //             throw Error("Cannot instantiate EVM signer for non-EVM chain");
+    //         }
+    //     } catch (error) {
+    //         throw Error("Cannot instantiate EVM signer: "+error);
+    //     }
+    // }
 }
 
 export const initSquidRouterProvider = (runtime: IAgentRuntime) => {