chore(core,llm): use string instead MultiAddress

Author: CocDap

packages/core/src/pallets/assets/transferNative.ts

@@ -1,5 +1,4 @@
 import type { Api, KnownChainId } from "@polkadot-agent-kit/common"
-import type { MultiAddress } from "@polkadot-api/descriptors"
 
 import type { Tx } from "../../types"
 
@@ -10,6 +9,6 @@ import type { Tx } from "../../types"
  * @param amount - The amount to transfer
  * @returns The transfer call
  */
-export const transferNativeCall = (api: Api<KnownChainId>, to: MultiAddress, amount: bigint): Tx => {
+export const transferNativeCall = (api: Api<KnownChainId>, to: string, amount: bigint): Tx => {
   return api.tx.Balances.transfer_keep_alive({ dest: to, value: amount })
 }

packages/core/src/utils/format.ts

@@ -1,6 +1,5 @@
 import type { KnownChainId } from "@polkadot-agent-kit/common"
 import { getAllSupportedChains, getChainById } from "@polkadot-agent-kit/common"
-import { MultiAddress } from "@polkadot-api/descriptors"
 import * as ss58 from "@subsquid/ss58"
 import { AccountId } from "polkadot-api"
 
@@ -50,6 +49,3 @@ export function convertAddress(address: string, targetChainId: KnownChainId | nu
   }
 }
 
-export function toMultiAddress(address: string): MultiAddress {
-  return MultiAddress.Id(address)
-}

packages/llm/src/langchain/transfer.ts

@@ -8,7 +8,7 @@ import type { z } from "zod"
 import type { TransferToolResult, transferToolSchema } from "../types"
 import { ToolNames } from "../types/common"
 import { toolConfigTransferNative } from "../types/transfer"
-import { executeTool, getApiForChain, validateAndFormatMultiAddress } from "../utils"
+import { executeTool, getApiForChain, validateAndFormatAddress } from "../utils"
 /**
  * Returns a tool that transfers native tokens to a specific address
  * @param api - The API instance to use for the transfer
@@ -23,7 +23,7 @@ export const transferNativeTool = (
       ToolNames.TRANSFER_NATIVE,
       async () => {
         const api = getApiForChain(apis, chain)
-        const formattedAddress = validateAndFormatMultiAddress(to, chain as KnownChainId)
+        const formattedAddress = validateAndFormatAddress(to, chain as KnownChainId)
         const parsedAmount = parseUnits(amount, getDecimalsByChainId(chain))
         const tx = await submitAndWatchTx(
           transferNativeCall(api, formattedAddress, parsedAmount),

packages/llm/src/utils/tools.test.ts

@@ -1,16 +1,14 @@
 import { describe, it, expect, vi, beforeEach } from "vitest"
-import { validateAndFormatAddress, validateAndFormatMultiAddress } from "./tools"
+import { validateAndFormatAddress } from "./tools"
 import { InvalidAddressError } from "../types"
 
 vi.mock("@polkadot-agent-kit/core", () => ({
   convertAddress: vi.fn(),
-  toMultiAddress: vi.fn()
 }))
 
-import { convertAddress, toMultiAddress } from "@polkadot-agent-kit/core"
+import { convertAddress } from "@polkadot-agent-kit/core"
 
 const mockConvertAddress = vi.mocked(convertAddress)
-const mockToMultiAddress = vi.mocked(toMultiAddress)
 
 describe("validateAndFormatAddress", () => {
   beforeEach(() => {
@@ -152,13 +150,11 @@ describe("validateAndFormatMultiAddress", () => {
       const chain = "polkadot" as any
 
       mockConvertAddress.mockReturnValue(formattedAddress)
-      mockToMultiAddress.mockReturnValue(multiAddress)
 
-      const result = validateAndFormatMultiAddress(inputAddress, chain)
+      const result = validateAndFormatAddress(inputAddress, chain)
 
       expect(mockConvertAddress).toHaveBeenCalledWith(inputAddress, chain)
-      expect(mockToMultiAddress).toHaveBeenCalledWith(formattedAddress)
-      expect(result).toBe(multiAddress)
+      expect(result).toBe(formattedAddress)
     })
 
     it("should handle different MultiAddress types", () => {
@@ -176,13 +172,10 @@ describe("validateAndFormatMultiAddress", () => {
 
       multiAddressTypes.forEach(multiAddress => {
         mockConvertAddress.mockReturnValue(formattedAddress)
-        mockToMultiAddress.mockReturnValue(multiAddress)
 
-        const result = validateAndFormatMultiAddress(inputAddress, chain)
+        const result = validateAndFormatAddress(inputAddress, chain)
 
-        expect(result).toBe(multiAddress)
-        expect(result.type).toBe(multiAddress.type)
-        expect(result.value).toBe(multiAddress.value)
+        expect(result).toBe(formattedAddress)
       })
     })
   })
@@ -194,11 +187,11 @@ describe("validateAndFormatMultiAddress", () => {
 
       mockConvertAddress.mockReturnValue(null as any)
 
-      expect(() => validateAndFormatMultiAddress(invalidAddress, chain)).toThrow(
+      expect(() => validateAndFormatAddress(invalidAddress, chain)).toThrow(
         InvalidAddressError
       )
 
-      expect(mockToMultiAddress).not.toHaveBeenCalled()
+      expect(mockConvertAddress).not.toHaveBeenCalled()
     })
 
     it("should not call toMultiAddress when address validation fails", () => {
@@ -207,11 +200,11 @@ describe("validateAndFormatMultiAddress", () => {
 
       mockConvertAddress.mockReturnValue("")
 
-      expect(() => validateAndFormatMultiAddress(invalidAddress, chain)).toThrow(
+      expect(() => validateAndFormatAddress(invalidAddress, chain)).toThrow(
         InvalidAddressError
       )
 
-      expect(mockToMultiAddress).not.toHaveBeenCalled()
+      expect(mockConvertAddress).not.toHaveBeenCalled()
     })
   })
 
@@ -220,19 +213,14 @@ describe("validateAndFormatMultiAddress", () => {
       const inputAddress = "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY"
       const formattedAddress = "15oF4uVJwmo4TdGW7VfQxNLavjCXviqxT9S1MgbjMNHr6Sp5"
       const chain = "polkadot" as any
-      const conversionError = new Error("Failed to convert to MultiAddress")
 
       mockConvertAddress.mockReturnValue(formattedAddress)
-      mockToMultiAddress.mockImplementation(() => {
-        throw conversionError
-      })
 
-      expect(() => validateAndFormatMultiAddress(inputAddress, chain)).toThrow(
+      expect(() => validateAndFormatAddress(inputAddress, chain)).toThrow(
         "Failed to convert to MultiAddress"
       )
 
       expect(mockConvertAddress).toHaveBeenCalledWith(inputAddress, chain)
-      expect(mockToMultiAddress).toHaveBeenCalledWith(formattedAddress)
     })
   })
 })

packages/llm/src/utils/tools.ts

@@ -1,6 +1,5 @@
 import type { Api, KnownChainId } from "@polkadot-agent-kit/common"
-import { convertAddress, toMultiAddress } from "@polkadot-agent-kit/core"
-import type { MultiAddress } from "@polkadot-api/descriptors"
+import { convertAddress } from "@polkadot-agent-kit/core"
 
 import type { ToolError, ToolResponse } from "../types"
 import { ChainNotAvailableError, ErrorCodes, InvalidAddressError, isAnyToolError } from "../types"
@@ -32,14 +31,6 @@ export const validateAndFormatAddress = (address: string, chain: KnownChainId):
   return formattedAddress
 }
 
-export const validateAndFormatMultiAddress = (
-  address: string,
-  chain: KnownChainId
-): MultiAddress => {
-  const formattedAddress = validateAndFormatAddress(address, chain)
-  return toMultiAddress(formattedAddress)
-}
-
 /**
  * Creates a standardized error response for tool operations.
  * Supports both ToolError objects and plain error messages.

packages/sdk/src/api.ts

@@ -69,7 +69,7 @@ export class PolkadotAgentKit implements IPolkadotApi, IPolkadotAgentApi {
    * Get Native Transfer Tool
    * Creates a tool for transferring native tokens to an address
    *
-   * @param to - The recipient address as MultiAddress
+   * @param to - The recipient address as string
    * @param amount - The amount to transfer as bigint
    * @returns DynamicStructuredTool for transferring native tokens
    *