feat: ERC20FeeProxy on Near testnet by yomarion · Pull Request #1086 · RequestNetwork/requestNetwork

yomarion · 2023-03-19T16:52:52Z

Description of the changes

ERC20FeeProxy extension supports Near fungible token transfers, in advanced-logic, and payment-detection.

The ERC20FeeProxy artifacts now refer to a version named near, aside 0.1.0 etc. This choice can be debated but the assumption is that we can update contracts on Near without changing their address.

chore: getFeeProxyContractErc20ForNetwork method in the AdvancedLogic object

Other changes

In @requestnetwork/currency:

chore: near is now supported as a NearChain identifier. This is mandatory to start preparing the removal of the wrong aurora alias.
chore: Utils.isSameNetwork(network1, network2) to deal with aliases such as aurora, even if we should get rid of it.

In @requestnetwork/types and @requestnetwork/smart-contracts:

chore: CurrencyTypes.VMChainName: Virtual machin chains, where payment proxy contracts can be deployed
chore: ArtifactInfo type now supports NearChains, except for the connect method that only supports EvmChainName
chore: artifacts can refer to Near deployment addresses

In @requestnetwork/payment-detection:

chore: some tests use the actual advanced-logic instead of mocks, to reduce mock maintenance. I don't think it impacts performances, maybe unit testing isolation but advanced-logic and payment-detection are strongly coupled anyway.

Credits

🙌 Shoutouts to @alexandre-abrioux for paving the way with #1056 and #950.

…y-on-near

packages/transaction-manager/README.md

yomarion · 2023-03-19T23:22:44Z

packages/types/src/extension-types.ts


 /** Extension interface is extended by the extensions implementation */
-export interface IExtension<T = any> {
+export interface IExtension<TCreationParameters = any> {


Minor unrelated clarification

yomarion · 2023-03-19T23:25:23Z

yarn.lock

TODO this yarn lock update is probably irrelevant or wrong

coveralls · 2023-03-22T18:52:39Z

Coverage: 87.584% (+0.02%) from 87.566% when pulling 87a1207 on feat/erc20-fee-proxy-on-near into 0629e45 on master.

…y-on-near

leoslr

I could not find any blocker.
Just a general, question, a saw that most of the test were using aurora / aurora-testnet. Are we sure they would pass as well using near / near-testnet ?
Or that is planned for later ?

leoslr · 2023-03-28T10:46:57Z

packages/payment-detection/codegen-near.yml

@@ -1,5 +1,5 @@
 overwrite: true
-schema: 'https://api.thegraph.com/subgraphs/name/requestnetwork/request-payments-near'
+schema: 'https://api.thegraph.com/subgraphs/name/requestnetwork/request-payments-near-testnet'


Why using the testnet ?

I have not deployed to mainnet yet, but I can actually. I noticed that for EVMs the schema is pulled from goerli.

@leoslr I'm guessing it is to retrieve the latest schema, even before it is deployed to mainnet

yomarion · 2023-03-28T13:28:37Z

I could not find any blocker. Just a general, question, a saw that most of the test were using aurora / aurora-testnet. Are we sure they would pass as well using near / near-testnet ? Or that is planned for later ?

Yes, we plan to make it a different change. With the recent strong typing of NearChains, it should be quite easy, we can use type the actual NearChains and NearChainsAlias differently, and little by little reduce the support surface for NearChainsAlias.

Thanks for your review @leoslr

alexandre-abrioux

Awesome changes, I like the new chain helpers! 🙂
And thank you for the shoutout 😇

packages/advanced-logic/src/extensions/payment-network/erc20/fee-proxy-contract.ts

packages/currency/src/chains/index.ts

packages/currency/src/chains/ChainsAbstract.ts

alexandre-abrioux · 2023-03-28T15:53:55Z

packages/payment-detection/codegen-near.yml

@@ -1,5 +1,5 @@
 overwrite: true
-schema: 'https://api.thegraph.com/subgraphs/name/requestnetwork/request-payments-near'
+schema: 'https://api.thegraph.com/subgraphs/name/requestnetwork/request-payments-near-testnet'


@leoslr I'm guessing it is to retrieve the latest schema, even before it is deployed to mainnet

packages/payment-detection/src/erc20/fee-proxy-contract.ts

packages/smart-contracts/scripts-create2/tenderly.ts

yarn.lock

…y-on-near

yomarion · 2023-03-20T11:36:34Z

packages/advanced-logic/src/advanced-logic.ts

-      anyToNativeTokenExtension.supportedNetworks.includes(network),
-    );
+    network?: CurrencyTypes.ChainName,
+  ): AnyToNative | undefined {


(Not related) Return type simplification for maintainability

yomarion · 2023-03-28T13:26:44Z

packages/payment-detection/codegen-near.yml

@@ -1,5 +1,5 @@
 overwrite: true
-schema: 'https://api.thegraph.com/subgraphs/name/requestnetwork/request-payments-near'
+schema: 'https://api.thegraph.com/subgraphs/name/requestnetwork/request-payments-near-testnet'


I have not deployed to mainnet yet, but I can actually. I noticed that for EVMs the schema is pulled from goerli.

packages/advanced-logic/src/extensions/payment-network/erc20/fee-proxy-contract.ts

packages/smart-contracts/scripts-create2/tenderly.ts

yomarion added 8 commits March 19, 2023 13:08

advanced-logic and payment-detection

01a0afe

fix import

0dfe034

chore: replaced rinkeby with matic for TheGraph codegen

c671f5d

added payment-detection test for balance

8af51c7

fix: thegraph codegen issues with superfluid

5288331

Merge remote-tracking branch 'origin/master' into feat/erc20-fee-prox…

f8a60fd

…y-on-near

fix: chain utils

c22485c

fix deleted file

b77d304

yomarion commented Mar 19, 2023

View reviewed changes

packages/transaction-manager/README.md Show resolved Hide resolved

yomarion commented Mar 19, 2023

View reviewed changes

yarn.lock

Copy link

Contributor Author

yomarion Mar 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO this yarn lock update is probably irrelevant or wrong

yomarion added 15 commits March 20, 2023 12:34

fix artifact and tenderly related types

7fe103b

fix: Utils.isSameNetwork and test

957e3c6

fix: payment-detection near versionMap

cd5baa1

dirty-wip before inheriting the abstract class

7092478

working tests with ERC20NearFeeProxy detector

411dd1e

tests running with standard retriever design

37c0e47

standard info retriever for native token detections

9d78781

minor type fix

dc3fcca

got rid of ERC20NearFeeProxy

e3ebcde

fix prettier

aeb51d3

fix prettier

5454cd4

prettier nycrc files

1a30b10

fix: mock types

4a54df9

fix: wrong mocked advanced-logic types

6e2b501

minor test fix

83531e0

yomarion added 2 commits March 23, 2023 07:53

chore: reduce irrelevant strong typing in tests

d1fd986

chore: improve type details in payment detector

e89e7de

yomarion mentioned this pull request Mar 23, 2023

chore: type cleaning #1089

Merged

yomarion and others added 8 commits March 24, 2023 18:04

Merge branch 'master' into feat/erc20-fee-proxy-on-near

5a6b0ba

Merge remote-tracking branch 'origin/master' into feat/erc20-fee-prox…

b6b39e9

…y-on-near

fix: merge details

2e45994

Strongly typing NearChainName 1/n

ebfe888

Strongly typing NearChainName 2/n

d4add72

fix: test unit test not unit-testable

db7f5a8

Enforce TGetSubGraphClient usage

66fd5ae

tiny type fix

3dd4d96

yomarion marked this pull request as ready for review March 27, 2023 10:55

github-actions bot requested review from MantisClone, alexandre-abrioux, kevindavee and olivier7delf March 27, 2023 10:55

yomarion requested review from benjlevesque and leoslr and removed request for alexandre-abrioux, kevindavee and olivier7delf March 27, 2023 10:56

leoslr approved these changes Mar 28, 2023

View reviewed changes

alexandre-abrioux approved these changes Mar 28, 2023

View reviewed changes

yomarion added 3 commits March 29, 2023 10:25

Merge remote-tracking branch 'origin/master' into feat/erc20-fee-prox…

b2c542e

…y-on-near

fixes Alex' feedback

c71835e

reset yarn.lock

87a1207

yomarion commented Mar 30, 2023

View reviewed changes

yomarion enabled auto-merge (squash) March 30, 2023 15:46

yomarion merged commit 6ac8c28 into master Mar 30, 2023

yomarion deleted the feat/erc20-fee-proxy-on-near branch March 30, 2023 15:53

Conversation

yomarion commented Mar 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of the changes

Other changes

Credits

Uh oh!

Uh oh!

yomarion Mar 19, 2023

Choose a reason for hiding this comment

Uh oh!

yomarion Mar 19, 2023

Choose a reason for hiding this comment

Uh oh!

coveralls commented Mar 22, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

leoslr left a comment

Choose a reason for hiding this comment

Uh oh!

leoslr Mar 28, 2023

Choose a reason for hiding this comment

Uh oh!

yomarion Mar 28, 2023

Choose a reason for hiding this comment

Uh oh!

alexandre-abrioux Mar 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yomarion commented Mar 28, 2023

Uh oh!

alexandre-abrioux left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

alexandre-abrioux Mar 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

yomarion Mar 20, 2023

Choose a reason for hiding this comment

Uh oh!

yomarion Mar 28, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

yomarion commented Mar 19, 2023 •

edited

Loading

coveralls commented Mar 22, 2023 •

edited

Loading

alexandre-abrioux Mar 28, 2023 •

edited

Loading

alexandre-abrioux Mar 28, 2023 •

edited

Loading