Merge pull request #199 from FindoraNetwork/feat_evm_token_asset_type…

…_mainnet feat: fix the method that caclulates the asset type to use the address from the contract
FindoraNetwork · Jun 2, 2023 · e579a61 · e579a61
2 parents 9b3da22 + df4694a
commit e579a61
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 27 deletions.
diff --git a/dist/api/evm/evm.d.ts b/dist/api/evm/evm.d.ts
@@ -4,7 +4,8 @@ import { WalletKeypar } from '../keypair';
 import { SubmitEvmTxResult } from '../network/types';
 import { IWebLinkedInfo } from './web3';
 export declare const fraAddressToHashAddress: (address: string) => string;
-export declare const hashAddressTofraAddress: (addresss: string) => Promise<string>;
+export declare const hashAddressTofraAddressOld: (addresss: string) => Promise<string>;
+export declare const hashAddressTofraAddress: (addresss: string, bridgeAddress: string, web3WalletInfo: IWebLinkedInfo) => Promise<string>;
 export declare const hashAddressTofraAddressByNFT: (addresss: string, tokenId: string) => Promise<string>;
 export declare const fraToBar: (bridgeAddress: string, recipientAddress: string, amount: string, web3WalletInfo: IWebLinkedInfo) => Promise<TransactionReceipt | any>;
 export declare const approveToken: (tokenAddress: string, deckAddress: string, price: string, web3WalletInfo: IWebLinkedInfo) => Promise<import("web3-eth").TransactionReceipt>;

diff --git a/dist/api/evm/evm.js b/dist/api/evm/evm.js
diff --git a/dist/api/evm/evm.js.map b/dist/api/evm/evm.js.map
diff --git a/dist/run.js b/dist/run.js
diff --git a/dist/run.js.map b/dist/run.js.map
diff --git a/src/api/evm/evm.ts b/src/api/evm/evm.ts
@@ -16,15 +16,15 @@ import { SubmitEvmTxResult } from '../network/types';
 import * as AssetApi from '../sdkAsset';
 import * as Transaction from '../transaction';
 import {
-  IWebLinkedInfo,
   calculationDecimalsAmount,
   getErc20Contract,
   getFNSRegistryContract,
+  getNameResolverContract,
   getNFT1155Contract,
   getNFT721Contract,
-  getNameResolverContract,
   getSimBridgeContract,
   getWeb3,
+  IWebLinkedInfo,
 } from './web3';
 
 export const fraAddressToHashAddress = (address: string) => {
@@ -35,7 +35,7 @@ export const fraAddressToHashAddress = (address: string) => {
   return '0x' + Buffer.from(data).toString('hex');
 };
 
-export const hashAddressTofraAddress = async (addresss: string) => {
+export const hashAddressTofraAddressOld = async (addresss: string) => {
   const ledger = await getLedger();
 
   const tokenAddress = ethereumjsAbi.rawEncode(
@@ -45,7 +45,27 @@ export const hashAddressTofraAddress = async (addresss: string) => {
 
   const tokenAddressHex = Web3.utils.keccak256(`0x${tokenAddress.toString('hex')}`);
 
-  return ledger.asset_type_from_jsvalue(Web3.utils.hexToBytes(tokenAddressHex));
+  const assetType = ledger.asset_type_from_jsvalue(Web3.utils.hexToBytes(tokenAddressHex));
+
+  return assetType;
+};
+
+// uses contract to compute the proper asset type for the token
+export const hashAddressTofraAddress = async (
+  addresss: string,
+  bridgeAddress: string,
+  web3WalletInfo: IWebLinkedInfo,
+): Promise<string> => {
+  const ledger = await getLedger();
+
+  const web3 = getWeb3(web3WalletInfo.rpcUrl);
+  const contract = getSimBridgeContract(web3, bridgeAddress);
+
+  const tokenAddressHexA = await contract.methods.computeERC20AssetType(addresss).call();
+  // const tokenAddressHex = Web3.utils.keccak256(tokenAddressHexA);
+
+  const assetType = ledger.asset_type_from_jsvalue(Web3.utils.hexToBytes(tokenAddressHexA));
+  return assetType;
 };
 
 export const hashAddressTofraAddressByNFT = async (addresss: string, tokenId: string) => {

diff --git a/src/run.ts b/src/run.ts
@@ -2,10 +2,10 @@
 import S3 from 'aws-sdk/clients/s3';
 import dotenv from 'dotenv';
 import sleep from 'sleep-promise';
-import Sdk from './Sdk';
 import { Account, Asset, Evm, Keypair, Network, Staking, Transaction } from './api';
 import * as NetworkTypes from './api/network/types';
 import { waitForBlockChange } from './evm/testHelpers';
+import Sdk from './Sdk';
 import { toWei } from './services/bigNumber';
 import { FileCacheProvider, MemoryCacheProvider } from './services/cacheStore/providers';
 import * as Fee from './services/fee';
@@ -1300,15 +1300,13 @@ async function approveToken() {
   //   chainId: 1111, // 2154,
   //   account: '0x72488bAa718F52B76118C79168E55c209056A2E6',
   // };
-
   // const result = await Evm.approveToken(
   //   '0xfd66Bd7839Ed3AeC90f5F54ab2E11E7bF2FF4be5', // token
   //   '0xaBA48f89BDa0C2C57c0E68056E445D1984EA8664', // 授权 prism->ledger
   //   '100',
   //   webLinkedInfo,
   // );
   // console.log(result.transactionHash);
-
   // const result1 = await Evm.frc20ToBar(
   //   '0x7Ed73c1D16590Bc2810F2C510Cd0923e34E3F592', // bridge
   //   'fra1nqkz745gc6rcv2htrvv4yyey2482kw4awrjzsnw4nrkp99lxw64qjsrd6v',
@@ -1323,11 +1321,9 @@ async function approveToken() {
   //   true,
   //   webLinkedInfo.account,
   // );
-
   // console.log(result1);
-
-  const addr = await Evm.hashAddressTofraAddress('0xfd66Bd7839Ed3AeC90f5F54ab2E11E7bF2FF4be5');
-  console.log(addr);
+  // const addr = await Evm.hashAddressTofraAddress('0xfd66Bd7839Ed3AeC90f5F54ab2E11E7bF2FF4be5');
+  // console.log(addr);
 }
 
 async function testCommitment() {