--wip-- [skip ci]

moonbeam-foundation · May 29, 2024 · af92721 · af92721
1 parent 9cd13a5
commit af92721
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 14 deletions.
diff --git a/packages/config/src/chains.ts b/packages/config/src/chains.ts
@@ -1279,6 +1279,9 @@ export const peaqEvmAlphanet = new EvmParachain({
       metadataId: 0,
     },
   ],
+  contracts: {
+    Xtokens: '0x0000000000000000000000000000000000000803',
+  },
   ecosystem: Ecosystem.AlphanetRelay,
   genesisHash:
     '0x2dfcd5c560f6db1667cbc2bc3791dfd337f88f400af6de39b1b8638ee7af6ed4',

diff --git a/packages/sdk/src/contract/contract.factory.ts b/packages/sdk/src/contract/contract.factory.ts
@@ -10,14 +10,35 @@ import { Erc20Public } from './contracts/Erc20/Erc20Public';
 
 export function createContractWithSigner(
   config: ContractConfig,
+  chain: EvmParachain,
   signer: EvmSigner,
 ): TransferContractInterface | BalanceContractInterface {
   if (config.module === 'Erc20') {
     return new Erc20(config, signer);
   }
 
+  console.log(
+    '\x1b[34m████████████████████▓▓▒▒░ contract.factory.ts:20 ░▒▒▓▓████████████████████\x1b[0m',
+  );
+  console.log('* config.module = ');
+  console.log(config.module);
+  console.log(
+    '\x1b[34m▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄\x1b[0m',
+  );
+
+  console.log(
+    '\x1b[34m████████████████████▓▓▒▒░ contract.factory.ts:29 ░▒▒▓▓████████████████████\x1b[0m',
+  );
+  console.log('* chain = ');
+  console.log(chain);
+  console.log(
+    '\x1b[34m▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄\x1b[0m',
+  );
+
   if (config.module === 'Xtokens') {
-    return new Xtokens(config, signer);
+    const address = chain?.contracts?.Xtokens;
+
+    return new Xtokens(config, signer, address);
   }
 
   throw new Error(`Contract ${config.module} not found`);
@@ -40,6 +61,6 @@ export function createContract(
   chain?: AnyChain,
 ): TransferContractInterface | BalanceContractInterface {
   return signer
-    ? createContractWithSigner(config, signer)
+    ? createContractWithSigner(config, chain, signer)
     : createContractWithoutSigner(config, chain as EvmParachain);
 }
diff --git a/packages/sdk/src/contract/contracts/Xtokens/Xtokens.ts b/packages/sdk/src/contract/contracts/Xtokens/Xtokens.ts
@@ -1,6 +1,7 @@
 import { ContractConfig } from '@moonbeam-network/xcm-builder';
 import { Contract, TransactionResponse } from 'ethers';
 import {
+  Address,
   GetContractReturnType,
   PublicClient,
   WriteContractReturnType,
@@ -16,19 +17,24 @@ import abi from './XtokensABI.json';
 type XtokensContract = GetContractReturnType<typeof abi, PublicClient>;
 
 export class Xtokens implements TransferContractInterface {
-  readonly address = '0x0000000000000000000000000000000000000804';
+  readonly defaultMoonChainAddress =
+    '0x0000000000000000000000000000000000000804';
+
+  readonly address: Address;
 
   readonly #config: ContractConfig;
 
   readonly #contract: Contract | XtokensContract;
 
   readonly #signer: EvmSigner;
 
-  constructor(config: ContractConfig, signer: EvmSigner) {
+  constructor(config: ContractConfig, signer: EvmSigner, address?: Address) {
     this.#config = config;
 
     this.#signer = signer;
 
+    this.address = address || this.defaultMoonChainAddress;
+
     this.#contract = isEthersSigner(signer)
       ? new Contract(this.address, abi, signer)
       : getContract({

diff --git a/packages/sdk/src/getTransferData/getSourceData.ts b/packages/sdk/src/getTransferData/getSourceData.ts
@@ -10,7 +10,11 @@ import {
   FeeAssetConfig,
   TransferConfig,
 } from '@moonbeam-network/xcm-config';
-import { AnyChain, AssetAmount } from '@moonbeam-network/xcm-types';
+import {
+  AnyChain,
+  AssetAmount,
+  EvmParachain,
+} from '@moonbeam-network/xcm-types';
 import {
   convertDecimals,
   toBigInt,
@@ -42,6 +46,7 @@ export async function getSourceData({
   destinationFee,
   polkadot,
   sourceAddress,
+  evmSigner,
 }: GetSourceDataParams): Promise<SourceChainTransferData> {
   const {
     asset,
@@ -145,6 +150,7 @@ export async function getSourceData({
     decimals: zeroFeeAmount.decimals,
     destinationFeeBalanceAmount,
     destinationFeeConfig: config.destinationFee,
+    evmSigner,
     extrinsic,
     feeConfig: config.fee,
     polkadot,
@@ -260,7 +266,13 @@ export async function getFee({
       }
     }
 
-    return getContractFee(balance, contract, decimals, evmSigner);
+    return getContractFee({
+      balance,
+      chain: chain as EvmParachain,
+      config: contract,
+      decimals,
+      evmSigner,
+    });
   }
 
   if (extrinsic) {
@@ -283,15 +295,23 @@ export async function getFee({
   throw new Error('Either contract or extrinsic must be provided');
 }
 
-export async function getContractFee(
-  balance: bigint,
-  config: ContractConfig,
-  decimals: number,
-  evmSigner: EvmSigner,
-): Promise<bigint> {
+export async function getContractFee({
+  balance,
+  config,
+  decimals,
+  evmSigner,
+  chain,
+}: {
+  balance: bigint;
+  config: ContractConfig;
+  decimals: number;
+  evmSigner: EvmSigner;
+  chain: EvmParachain;
+}): Promise<bigint> {
   const contract = createContract(
     config,
     evmSigner,
+    chain,
   ) as TransferContractInterface;
   const fee = await contract.getFee(balance);
 

diff --git a/packages/sdk/src/getTransferData/getTransferData.ts b/packages/sdk/src/getTransferData/getTransferData.ts
@@ -46,9 +46,19 @@ export async function getTransferData({
     destination.fee,
   );
 
+  console.log(
+    '\x1b[34m████████████████████▓▓▒▒░ getTransferData.ts:49 ░▒▒▓▓████████████████████\x1b[0m',
+  );
+  console.log('* transferConfig = ');
+  console.log(transferConfig);
+  console.log(
+    '\x1b[34m▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄\x1b[0m',
+  );
+
   const source = await getSourceData({
     destinationAddress,
     destinationFee,
+    evmSigner,
     polkadot: srcPolkadot,
     sourceAddress,
     transferConfig,
@@ -123,7 +133,11 @@ export async function getTransferData({
         }
 
         return (
-          createContract(contract, evmSigner) as TransferContractInterface
+          createContract(
+            contract,
+            evmSigner,
+            chain,
+          ) as TransferContractInterface
         )
           .transfer()
           .then((tx) =>

diff --git a/packages/types/src/chain/parachain/EvmParachain.ts b/packages/types/src/chain/parachain/EvmParachain.ts
@@ -1,4 +1,4 @@
-import { defineChain } from 'viem';
+import { Address, defineChain } from 'viem';
 import { Chain } from 'viem/chains';
 import { ChainType } from '../Chain.interfaces';
 import { Parachain, ParachainConstructorParams } from './Parachain';
@@ -9,6 +9,7 @@ export interface EvmParachainConstructorParams
   rpc: string;
   nativeCurrency: NativeCurrency;
   isEvmSigner?: boolean;
+  contracts?: Contracts;
 }
 
 type NativeCurrency = {
@@ -17,6 +18,10 @@ type NativeCurrency = {
   symbol: string;
 };
 
+type Contracts = {
+  Xtokens?: Address;
+};
+
 export class EvmParachain extends Parachain {
   readonly id: number;
 
@@ -26,15 +31,19 @@ export class EvmParachain extends Parachain {
 
   readonly isEvmSigner: boolean;
 
+  readonly contracts?: Contracts;
+
   constructor({
     id,
     rpc,
     nativeCurrency,
     isEvmSigner = false,
+    contracts,
     ...others
   }: EvmParachainConstructorParams) {
     super({ type: ChainType.EvmParachain, ...others });
 
+    this.contracts = contracts;
     this.id = id;
     this.rpc = rpc;
     this.nativeCurrency = nativeCurrency;