fix transfer calldata validation

galacticcouncil · Oct 9, 2024 · e906541 · e906541
1 parent 0ab726e
commit e906541
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/xcm-sdk/src/adapters/transfer/ContractTransfer.ts b/packages/xcm-sdk/src/adapters/transfer/ContractTransfer.ts
@@ -24,7 +24,6 @@ export class ContractTransfer implements TransferProvider<ContractConfig> {
     config: ContractConfig
   ): Promise<XCall> {
     const { abi, asset, data } = EvmTransferFactory.get(this.#client, config);
-    const erc20 = new Erc20Client(this.#client, asset);
 
     const transferCall = {
       abi: JSON.stringify(abi),
@@ -38,6 +37,7 @@ export class ContractTransfer implements TransferProvider<ContractConfig> {
       return transferCall;
     }
 
+    const erc20 = new Erc20Client(this.#client, asset);
     const allowance = await erc20.allowance(account, config.address);
     if (allowance >= amount) {
       return transferCall;

diff --git a/packages/xcm-sdk/src/evm/Erc20Client.ts b/packages/xcm-sdk/src/evm/Erc20Client.ts
@@ -27,7 +27,9 @@ export class Erc20Client {
 
   private validateContractAddress(address: string) {
     if (!addr.isH160(address)) {
-      throw new Error('Contract address is not valid h160 address');
+      throw new Error(
+        'Contract address ' + address + ' is not valid h160 address'
+      );
     }
   }