v3Bridge evm claim

XP-NETWORK · Nov 8, 2023 · 7c1d9f1 · 7c1d9f1
1 parent a268fbf
commit 7c1d9f1
Show file tree

Hide file tree

Showing 6 changed files with 213 additions and 62 deletions.
diff --git a/src/consts.ts b/src/consts.ts
@@ -240,6 +240,7 @@ export namespace Chain {
 export enum v3_ChainId {
   BSC = "BSC",
   POLYGON = "MATIC",
+  ETHEREUM = "ETH",
   DEFAULT = "",
 }
 
@@ -329,7 +330,7 @@ CHAIN_INFO.set(Chain.BSC, {
 CHAIN_INFO.set(Chain.ETHEREUM, {
   name: "Ethereum",
   nonce: 5,
-  v3_chainId: v3_ChainId.DEFAULT,
+  v3_chainId: v3_ChainId.ETHEREUM,
   currency: SupportedCurrency.ETH,
   currencySymbol: SupportedCurrencyName.ETH,
   chainId: 5,

diff --git a/src/factory/factories.ts b/src/factory/factories.ts
@@ -319,6 +319,7 @@ export namespace ChainFactoryConfigs {
         erc1155Minter: "0xE90105827d04522e52AdfA6BF695730E5706C0C2",
         erc721Minter: "0x90d38996B210D45bDF2FD54d091C6061dff0dA9F",
         minter_addr: "0x04a5f9158829Cae5a0a549954AdEaBD47BbB3d2d",
+        v3_bridge: "0x7935f469298002c0Fb11F853B415B08aDCaC9Cf7",
         nonce: Chain.ETHEREUM,
         feeMargin,
       },

diff --git a/src/factory/index.ts b/src/factory/index.ts
@@ -1,7 +1,7 @@
 import { Chain, CHAIN_INFO, ChainType } from "../consts";
 import { ElrondParams } from "../helpers/elrond";
 import { TronParams } from "../helpers/tron";
-import { Web3Params, getClaimFee } from "../helpers/evm/web3";
+import { Web3Params } from "../helpers/evm/web3";
 
 export * from "./utils";
 export * from "./factories";
@@ -71,6 +71,7 @@ import {
   InferNativeNft,
   InferSigner,
   ParamMap,
+  V3_ChainId,
 } from "../type-utils";
 import {
   getDefaultContract,
@@ -79,6 +80,8 @@ import {
 } from "./utils";
 
 import { CasperParams } from "../helpers/casper/casper";
+import { BridgeStorage__factory } from "xpnet-web3-contracts/dist/v3/factories/contracts/BridgeStorage__factory";
+import { BridgeStorage } from "xpnet-web3-contracts/dist/v3";
 
 export type FullChain<Signer, RawNft, Resp> = TransferNftForeign<
   Signer,
@@ -321,7 +324,8 @@ export type ChainFactory = {
   ): Promise<Resp | undefined>;
 
   estimateClaimFee(
-    fromChain: FullChain<never, unknown, unknown>
+    fromChain: FullChain<never, unknown, unknown>,
+    storageContract: BridgeStorage | undefined
   ): Promise<string>;
 };
 
@@ -449,6 +453,26 @@ function mapNonceToParams(chainParams: Partial<ChainParams>): ParamMap {
  * @param chainParams: {@link ChainParams} Contains the details for all the chains to mint and transfer NFTs between them.
  * @returns {ChainFactory}: A factory object that can be used to mint and transfer NFTs between chains.
  */
+
+export const getStorageContract = (config: AppConfig) => {
+  const provider = new ethers.providers.JsonRpcProvider(config.storegeNetwork);
+  const storageContract = BridgeStorage__factory.connect(
+    config.storageContract,
+    provider
+  );
+
+  return storageContract;
+};
+
+export const getClaimFee = async (
+  toChain: V3_ChainId,
+  storageContract: BridgeStorage
+) => {
+  const fee = await storageContract.chainFee(toChain);
+
+  return String(fee);
+};
+
 export function ChainFactory(
   appConfig: AppConfig,
   chainParams: Partial<ChainParams>
@@ -737,11 +761,15 @@ export function ChainFactory(
   }
 
   const estimateClaimFee = async (
-    fromChain: FullChain<never, unknown, unknown>
+    fromChain: FullChain<never, unknown, unknown>,
+    storageContract: BridgeStorage | undefined
   ) => {
+    if (!storageContract) {
+      storageContract = getStorageContract(appConfig);
+    }
     const v3_chainId = CHAIN_INFO.get(fromChain.getNonce())!.v3_chainId;
     if (!v3_chainId) return "0";
-    return await getClaimFee(v3_chainId, appConfig);
+    return await getClaimFee(v3_chainId, storageContract);
   };
 
   return {
@@ -1120,9 +1148,10 @@ export function ChainFactory(
       return await from.lockNFT(signer, toChain.v3_chainId, nft, receiver);
     },
     async claimNFT(from, to, txHash, signer, fee) {
-      const fromChain = CHAIN_INFO.get(from.getNonce())!;
-      if (!fee) fee = await estimateClaimFee(from);
-      return await to.claimV3NFT(signer, fromChain.v3_chainId, txHash, fee);
+      const storageContract = getStorageContract(appConfig);
+      if (!fee) fee = await estimateClaimFee(from, storageContract);
+
+      return await to.claimV3NFT(signer, from, txHash, storageContract, fee);
     },
     estimateClaimFee,
   };

diff --git a/src/helpers/chain.ts b/src/helpers/chain.ts
@@ -1,6 +1,8 @@
 import BigNumber from "bignumber.js";
 import { ethers } from "ethers";
 import { ChainNonce, V3_ChainId } from "../type-utils";
+import { FullChain } from "../factory";
+import { BridgeStorage } from "xpnet-web3-contracts/dist/v3";
 
 /**
  * NFT Info
@@ -64,12 +66,32 @@ export interface LockNFT<Signer, RawNft, Resp> {
   ): Promise<Resp | undefined>;
 }
 
+export type ClaimData = {
+  tokenId: string;
+  destinationChain: V3_ChainId;
+  destinationUserAddress: string;
+  sourceNftContractAddress: string;
+  tokenAmount: string;
+  nftType: "singular" | "multiple";
+  sourceChain: V3_ChainId;
+  royalty: string;
+  royaltyReceiver: string;
+  metadata: string;
+  name: string;
+  symbol: string;
+};
+
+export interface GetClaimData<BridgeType> {
+  getClaimData(hash: string, bridge: BridgeType): Promise<ClaimData>;
+}
+
 export interface ClaimV3NFT<Signer, Resp> {
   claimV3NFT(
     sender: Signer,
-    fromChain: V3_ChainId,
+    fromChain: FullChain<never, unknown, unknown>,
     txHash: string,
-    fee?: string
+    storageContract: BridgeStorage,
+    fee: string
   ): Promise<Resp | undefined>;
 }