Connext integration #3

prathmeshkhandelwal1 · 2023-05-03T16:30:17Z

updated PR having the final piece of code
Need testing for deposit on hub contract
added UI for selecting polygon chain for going cross-chain

FiboApe · 2023-05-16T16:05:46Z

package.json

@@ -160,7 +166,9 @@
    "url": "^0.11.0",
    "uuid": "^9.0.0",
    "wagmi": "^0.12.7",
-    "web3modal": "^1.9.3"
+    "web3modal": "^1.9.3",
+    "zlib": "^1.0.5",


why are all of these new dependencies needed?

FiboApe · 2023-05-16T16:07:09Z

src/config/constants/addresses.ts

@@ -724,4 +724,68 @@ export const getGhTokenListLogoUrl = (chainId: number, address: string) =>
 // oasis: 42262,

 export const UNSUPPORTED_WAGMI_CHAIN = [122, 128, 106, 42262];
+
+export const SUPPORTED_CHAINS_BY_CONNEXT: Record<number, { domainId: string; name: string; network: string }> = {


You could extend de NetworkStruct type to add the domainId, and with that you would already have if it is mainnet or a testnet, plus all the names. Furthermore, i would assign keys here as [NETWORKS.optimism.chainId]

FiboApe · 2023-05-16T16:08:15Z

src/home/swap-container/components/swap/index.tsx

@@ -363,15 +367,21 @@ const Swap = ({
        ),
      });
      trackEvent('DCA - Create position submitting');
-      const result = await positionService.deposit(
+      // change it to xCall here.
+      // eslint-disable-next-line no-console


please don't disable these lint-rules, its fine if it fails the lint action since later you can remove them

FiboApe · 2023-05-16T16:10:25Z

src/services/web3Service.ts

@@ -179,14 +182,16 @@ export default class Web3Service {
      this.providerService,
      this.safeService
    );
+    this.connextService = new ConnextService(this.walletService, 137); // hardcoding polygon ID


how would this work if its not just polygon? do we need a connextService for each chain?

Nope, we are only demonstrating arbitrum to polygon transfer as of now, this will be changed to dynamic input later after discussing the UX

We should remove the second parameter right? Since its going to depend on when you create the position

FiboApe · 2023-05-16T16:11:20Z

src/utils/destinantionCallParams.ts

@@ -0,0 +1,15 @@
+import { DestinationCallDataParams } from '@connext/chain-abstraction/dist/types';


lets create a connext.ts file inside utils to send all of these new utils

FiboApe · 2023-05-16T16:28:58Z

src/services/positionService.ts

+    // get the pool fees.
+    const poolFee = await this.connextService.getPoolFeeForUniV3Helper(
+      destinantionDomainID, // Destination Domain
+      destinantionUSDC, // final destination token, Address should be getting from user


all of this is harcoded only for USDC, could we make so it accepts any token?

Underlying it's using USDC , we claim for any to any token as, On origin side : <any_token> -> USDC, then bridge this USDC to destination chain using connext and then again USDC -> <any_token> on destinantion

FiboApe · 2023-05-16T16:29:33Z

src/services/positionService.ts

+    const relayerFees = await this.connextService.getCalculatedRelayerFees(originDomainID, destinantionDomainID);
+
+    // swap can be done after figuring out about domains, and also after deploying contract
+    const amountIn = BigNumber.from('40000000000000');


wait why is this hardcoded?

Just for MVP

FiboApe · 2023-05-16T16:30:37Z

src/services/positionService.ts

@@ -645,6 +655,16 @@ export default class PositionService {
    if (yieldFrom || yieldTo) {
      permissions = [...permissions, PERMISSIONS.TERMINATE];
    }
+    const POLYGON_WETH = '0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619';
+
+    const forwardCallData = getForwardFunctionCallHelper(


this would only be needed in case of using multichain right?

FiboApe · 2023-05-16T16:35:49Z

src/services/positionService.ts

@@ -742,6 +834,35 @@ export default class PositionService {
    return this.safeService.submitMultipleTxs([approveTx, depositTx]);
  }

+  async xCallDeposit(


I would prefer if we keep it all under the deposit function, the consumers of the positionService should have no need to know if it is a normal deposit or an xCallDeposit, and we can query different functions based on the destination network.

bump, from what I've said before about accepting a fundWithToken that is of Token type. If the from.chainId !== fundWithToken.chainId then we go through xCall, if not, we go through the normal flow

FiboApe · 2023-05-16T16:37:09Z

src/home/swap-container/components/step1/index.tsx

@@ -19,6 +19,7 @@ import TokenIcon from 'common/token-icon';
 import useSelectedNetwork from 'hooks/useSelectedNetwork';
 import Select from '@mui/material/Select';
 import MenuItem from '@mui/material/MenuItem';
+import { Button } from '@mui/material';


Use our button please from @common/components/button

FiboApe

Overall seems pretty simple, but we should start generalizing the services, we can handle the UX later

prathmeshkhandelwal1 · 2023-05-16T16:48:48Z

For all those Hardcoded values like network (i.e polygon) , we are only enabling cross-chain from arbitrum network to polygon network in this PR, which is underlying uses USDC to make bridging happen. This is majorly for MVP and after UI discussion we can convert all the hardcoded values as a input from user or mean SDK.

FiboApe

We can remove all the UI stuff, and I think there still a few leftover comments from the previous review

FiboApe · 2023-05-29T13:43:22Z

src/config/constants/addresses.ts

+};
+
+export const X_TARGET_ADDRESS: Record<number, string> = {
+  137: '0xC825d25123Ca8d49066cf8F0AeE164660056e172',


should this be updated with the new chains?

Yes, If we deploy target on more chain, We have to add that particular contract address here.

Cool lets update it, in an ideal world tho, this would be exposed directly by the connext sdk right?

I dont think so, as It totally is on-chain, and people will have their own adapter contract, so they have to keep track of contract address on chains which they are moving to.

Oh gotcha, this is a specific Mean Finance adapter with connext?

FiboApe · 2023-05-29T16:05:31Z

src/services/connextService.ts

+  }
+
+  getRPCURL(chainID: number) {
+    const network = Object.values(NETWORKS).find((net) => net.chainId === chainID);


we already have lodash, so you can use their find function which is a bit more legible find(NETWORKS, { chainId }

FiboApe · 2023-05-29T16:06:46Z

src/services/connextService.ts

+      .map(([key, value]) => ({ domainId: value.domainId, chainId: key }));
+
+    domainChainIds.forEach((obj) => {
+      domainConfig[obj.domainId] = { providers: [this.getRPCURL(parseInt(obj.chainId, 10)) as string] };


we should check that this.getRPCUrl actually does return something in case it could find the chainId

FiboApe · 2023-05-29T16:07:20Z

src/services/connextService.ts

+
+    const sdkConfig: SdkConfig = {
+      signerAddress: this.walletService.account as string,
+      network: 'mainnet', // can change it to testnet as well


What is this parameter for?

For initing the connext core SDK

Right but I mean, what does it imply if it is "mainnet"? or "testnet"? shouldn't it work the same regardless of what type of network it is?

So for initialising the SDK we have to define if this is for mainnet or testnet. If we define any env for the environment we can modify it according to that!

FiboApe · 2023-05-29T16:07:56Z

src/services/connextService.ts

+      .map(([key, value]) => ({ domainId: value.domainId, chainId: key }));
+
+    domainChainIds.forEach((obj) => {
+      domainConfig[obj.domainId] = { providers: [this.getRPCURL(parseInt(obj.chainId, 10)) as string] };


Same here, we should check that this.getRpcUrl at least returns something

FiboApe · 2023-05-29T16:11:48Z

src/services/positionService.ts

+
+    const forwardCallData = getForwardFunctionCallHelper(
+      destinantionUSDC as string, // destination USDC
+      POLYGON_WETH.address, // destinantion token


this should be generalized right?

FiboApe · 2023-05-29T16:12:29Z

src/services/positionService.ts

+    yieldFromPossible?: string,
+    yieldToPossible?: string
+  ) {
+    const destinantionUSDC = this.connextService.getNativeUSDCAddress(destinantionChainID);


would this actually be destinationUSDC? or it should be the token I want to get on the destination chain?, btw typo on destination

This should be destination USDC or any other token which we support underlying the bridge, i.e USDC, DAI, USDT or WETH

So the flow is -
Origin token -> Asset we support for bridging (USDC, USDT, DAI or WETH) -> Same asset on destination after bridge -> final token (after destination swap)

In this flow its the third one.

FiboApe · 2023-05-29T16:12:39Z

src/services/positionService.ts

+      yieldFromPossible,
+      yieldToPossible,
+      destinantionUSDC,
+      destinantionChainID


same typo here

FiboApe · 2023-05-29T16:13:29Z

src/services/positionService.ts

+    const destinantionCallDataParams = getDestinationCallDataParams(
+      this.walletService.account as string,
+      destinantionUSDC, // to the token on destination
+      poolFee as string


so getDestinationCallDataParams should take that into account, or fail here in case poolFee is not an accepted value

FiboApe · 2023-05-29T16:14:04Z

src/services/positionService.ts

+      this.walletService.account as string
+    );
+
+    return this.providerService.sendTransaction(txRequest as TransactionRequest);


then we should check for the txRequest being undefined

FiboApe · 2023-05-30T18:34:43Z

src/home/swap-container/components/step1/index.tsx

@@ -0,0 +1,394 @@
+import React from 'react';


you can remove this file :)

FiboApe · 2023-05-30T18:34:52Z

src/home/swap-container/components/swap/index.tsx

@@ -0,0 +1,1171 @@
+import React from 'react';


FiboApe · 2023-05-30T18:34:58Z

src/home/swap-container/index.tsx

@@ -0,0 +1,203 @@
+import * as React from 'react';


FiboApe · 2023-05-30T18:35:31Z

src/common/utils/connext.ts

+    swapForwarderData: {
+      toAsset: token,
+      swapData: {
+        amountOutMin: '0',


should this be 0 or should the value change?

This is fine

FiboApe · 2023-05-30T18:37:26Z

src/services/web3Service.ts

@@ -179,14 +182,16 @@ export default class Web3Service {
      this.providerService,
      this.safeService
    );
+    this.connextService = new ConnextService(this.walletService, 137); // hardcoding polygon ID


We should remove the second parameter right? Since its going to depend on when you create the position

FiboApe · 2023-05-30T18:42:17Z

src/services/positionService.ts

+    const POLYGON_WETH = getWrappedProtocolToken(destinationChainID as number);
+
+    const forwardCallData = getForwardFunctionCallHelper(
+      destinationUSDC as string, // destination USDC


destinationUSDC seems to be very specific for the connext integration, could we abstract that there?

FiboApe · 2023-05-30T18:42:38Z

src/services/positionService.ts

+    yieldFromPossible?: string,
+    yieldToPossible?: string
+  ) {
+    const destinationUSDC = this.connextService.getNativeUSDCAddress(destinantionChainID);


typo on destinantion

FiboApe · 2023-05-30T18:42:44Z

src/services/positionService.ts

+      yieldFromPossible,
+      yieldToPossible,
+      destinantionUSDC,
+      destinantionChainID


FiboApe · 2023-05-30T18:43:27Z

src/services/positionService.ts

+    const xTargetAddress = X_TARGET_ADDRESS[destinantionChainID]; // polygon address for mean target
+
+    const chainID = (await this.providerService.getNetwork()).chainId;
+    const DestinationToken = getWrappedProtocolToken(destinantionChainID); // can have any address in UI for destination


then lets accept a new parameter for this function that is fundWithToken which is a Token and is the address of the token that we are going to fund it with.

The Token type already has a chainid so you can infer it from there and not have to pass a specific chain as a parameter

So I think from parameter is the same, Cant we use chainID from from parameter and can do like if(from.chainID !== to.chainID).

FiboApe · 2023-05-30T18:45:24Z

src/services/positionService.ts

@@ -742,6 +834,35 @@ export default class PositionService {
    return this.safeService.submitMultipleTxs([approveTx, depositTx]);
  }

+  async xCallDeposit(


bump, from what I've said before about accepting a fundWithToken that is of Token type. If the from.chainId !== fundWithToken.chainId then we go through xCall, if not, we go through the normal flow

FiboApe · 2023-05-31T14:39:10Z

src/services/connextService.ts

+    const domainConfig: { [domainId: string]: { providers: string[] } } = {};
+
+    const domainChainIds = Object.entries(SUPPORTED_CHAINS_BY_CONNEXT)
+      .filter(([key]) => typeof key === 'number')
+      .map(([key, value]) => ({ domainId: value.domainId, chainId: key }));
+
+    domainChainIds.forEach((obj) => {
+      domainConfig[obj.domainId] = { providers: [this.getRPCURL(parseInt(obj.chainId, 10))] };
+    });
+
+    const sdkConfig: SdkConfig = {
+      signerAddress: this.walletService.getAccount(),
+      network: 'mainnet', // can change it to testnet as well


I woudl move this all into its own function, since walletService.getAccount() will return the current account and at the moment of the constructor the wallet is not yet connected, so its always going to be empty.

The idea would be that on the setAccount method of the web3Service.ts we call that function to regenerate the config with the new address

FiboApe · 2023-05-31T14:39:58Z

src/services/positionService.ts

@@ -629,6 +643,16 @@ export default class PositionService {
    if (yieldFrom || yieldTo) {
      permissions = [...permissions, PERMISSIONS.TERMINATE];
    }
+    const destinationToken = getWrappedProtocolToken(destinationChainID as number);


this would actually just be the from

FiboApe · 2023-05-31T14:41:01Z

src/services/positionService.ts

+    const xTargetAddress = X_TARGET_ADDRESS[destinationChainID]; // polygon address for mean target
+
+    const chainID = (await this.providerService.getNetwork()).chainId;
+    const DestinationToken = getWrappedProtocolToken(destinationChainID); // can have any address in UI for destination


this should just be the from right?

FiboApe · 2023-05-31T14:41:31Z

src/services/positionService.ts

+
+    const destinantionCallDataParams = getDestinationCallDataParams(
+      this.walletService.getAccount(),
+      destinationUSDC, // to the token on destination


shouldn't this be the to of the position?

FiboApe · 2023-05-31T14:41:55Z

src/services/positionService.ts

+    const swapAndXCallParams = getSwapAndXcallParams(
+      originDomainID,
+      destinantionDomainID,
+      fromToken.address,


this would be the fundWithToken right?

Prathmesh Khandelwal added 2 commits May 1, 2023 22:34

support tokens added

dad6850

fix: added custom config and tweaks to sdk config

fe6370a

prathmeshkhandelwal1 changed the title ~~Connext inetgration~~ Connext integration May 3, 2023

prathmeshkhandelwal1 mentioned this pull request May 3, 2023

Update Mean UI connext/monorepo#4053

Closed

3 tasks

fix: added arbi to polygon chain

4e377c8

FiboApe reviewed May 16, 2023

View reviewed changes

fix: added suggested changes

62a6fd7

prathmeshkhandelwal1 linked an issue May 18, 2023 that may be closed by this pull request

Mean Suggested Changes connext/monorepo#4260

Closed

Prathmesh Khandelwal and others added 2 commits May 18, 2023 19:21

fix: dynamic destination added

8939e94

feat: estimateAmountRecieved method added

8a8f32d

FiboApe reviewed May 29, 2023

View reviewed changes

prathmeshkhandelwal1 added 3 commits May 30, 2023 21:40

fix: suggested changes

dd67042

fix: change getting account method

428a3f7

feat: added getTransfer Status method

69cf19f

FiboApe reviewed May 30, 2023

View reviewed changes

fix: added suggested changes

74c9b07

FiboApe reviewed May 31, 2023

View reviewed changes

fix: tweaks on destination

ff1b7e4

FiboApe approved these changes May 31, 2023

View reviewed changes

		@@ -0,0 +1,15 @@
		import { DestinationCallDataParams } from '@connext/chain-abstraction/dist/types';

Connext integration #3

Are you sure you want to change the base?

Connext integration #3

Conversation

prathmeshkhandelwal1 commented May 3, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

FiboApe left a comment

Choose a reason for hiding this comment

prathmeshkhandelwal1 commented May 16, 2023

FiboApe left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment