From bee7e9f23352e19c288598e391326672ef523a78 Mon Sep 17 00:00:00 2001 From: Darko Kolev Date: Wed, 13 Oct 2021 19:36:36 +0200 Subject: [PATCH 1/7] feat: adding usdc token on xdai (#628) --- packages/currency/src/erc20/networks/index.ts | 2 ++ packages/currency/src/erc20/networks/xdai.ts | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 packages/currency/src/erc20/networks/xdai.ts diff --git a/packages/currency/src/erc20/networks/index.ts b/packages/currency/src/erc20/networks/index.ts index 253defeb96..d64c907abc 100644 --- a/packages/currency/src/erc20/networks/index.ts +++ b/packages/currency/src/erc20/networks/index.ts @@ -6,6 +6,7 @@ import type { TokenMap } from './types'; import { supportedFantomTokens } from './fantom'; import { supportedBSCTestERC20 } from './bsctest'; import { supportedBSCERC20 } from './bsc'; +import { supportedXDAIERC20 } from './xdai'; export const supportedNetworks: Record = { celo: supportedCeloERC20, @@ -15,6 +16,7 @@ export const supportedNetworks: Record = { fantom: supportedFantomTokens, bsctest: supportedBSCTestERC20, bsc: supportedBSCERC20, + xdai: supportedXDAIERC20, }; export type { TokenMap }; diff --git a/packages/currency/src/erc20/networks/xdai.ts b/packages/currency/src/erc20/networks/xdai.ts new file mode 100644 index 0000000000..51b31f8b23 --- /dev/null +++ b/packages/currency/src/erc20/networks/xdai.ts @@ -0,0 +1,10 @@ +import { TokenMap } from './types'; + +// List of the supported bsc network tokens +export const supportedXDAIERC20: TokenMap = { + '0xDDAfbb505ad214D7b80b1f830fcCc89B60fb7A83': { + name: 'USDC token on xDai', + symbol: 'USDC', + decimals: 6, + }, +}; From 64194e589092ff3d479ea3e5efc74cea797bae25 Mon Sep 17 00:00:00 2001 From: Kevin Dave Date: Thu, 14 Oct 2021 16:19:12 +0700 Subject: [PATCH 2/7] chore: add txHash in createExtensionsData (#629) --- packages/payment-detection/src/declarative.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/payment-detection/src/declarative.ts b/packages/payment-detection/src/declarative.ts index db187469e1..7ab917b64c 100644 --- a/packages/payment-detection/src/declarative.ts +++ b/packages/payment-detection/src/declarative.ts @@ -75,6 +75,7 @@ export default class PaymentNetworkDeclarative return this.extension.createDeclareSentPaymentAction({ amount: parameters.amount, note: parameters.note, + txHash: parameters.txHash, }); } @@ -90,6 +91,7 @@ export default class PaymentNetworkDeclarative return this.extension.createDeclareSentRefundAction({ amount: parameters.amount, note: parameters.note, + txHash: parameters.txHash, }); } @@ -105,6 +107,7 @@ export default class PaymentNetworkDeclarative return this.extension.createDeclareReceivedPaymentAction({ amount: parameters.amount, note: parameters.note, + txHash: parameters.txHash, }); } @@ -120,6 +123,7 @@ export default class PaymentNetworkDeclarative return this.extension.createDeclareReceivedRefundAction({ amount: parameters.amount, note: parameters.note, + txHash: parameters.txHash, }); } From 231bb5a43dd716817c8d2310aa8a5acafbe56b3b Mon Sep 17 00:00:00 2001 From: Yo <56731761+yomarion@users.noreply.github.com> Date: Thu, 14 Oct 2021 15:09:29 +0200 Subject: [PATCH 3/7] chore: added auto_assign file (#631) --- .github/auto_assign.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/auto_assign.yml diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml new file mode 100644 index 0000000000..984a6437a6 --- /dev/null +++ b/.github/auto_assign.yml @@ -0,0 +1,17 @@ +# Set to true to add reviewers to pull requests +addReviewers: true + +# Set to true to add assignees to pull requests +addAssignees: false + +# A list of reviewers to be added to pull requests (GitHub user name) +reviewers: + - RequestNetwork/protocol + +# A list of keywords to be skipped the process that add reviewers if pull requests include it +skipKeywords: + - wip + +# A number of reviewers added to the pull request +# Set 0 to add all the reviewers (default: 0) +numberOfReviewers: 0 From d43def758e8ab49083194d0f6a7d5ce984f668b4 Mon Sep 17 00:00:00 2001 From: Yo <56731761+yomarion@users.noreply.github.com> Date: Thu, 14 Oct 2021 17:51:28 +0200 Subject: [PATCH 4/7] chore: auto_assign as a worfklow (#633) --- .github/auto_assign.yml | 10 ++++++++-- .github/workflows/auto_assign_pr.yml | 10 ++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/auto_assign_pr.yml diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml index 984a6437a6..9b2ca14f98 100644 --- a/.github/auto_assign.yml +++ b/.github/auto_assign.yml @@ -6,7 +6,13 @@ addAssignees: false # A list of reviewers to be added to pull requests (GitHub user name) reviewers: - - RequestNetwork/protocol + - vrolland + - benjlevesque + - yomarion + - bertux + - kevindavee + - alexandre-abrioux + - KolevDarko # A list of keywords to be skipped the process that add reviewers if pull requests include it skipKeywords: @@ -14,4 +20,4 @@ skipKeywords: # A number of reviewers added to the pull request # Set 0 to add all the reviewers (default: 0) -numberOfReviewers: 0 +numberOfReviewers: 4 diff --git a/.github/workflows/auto_assign_pr.yml b/.github/workflows/auto_assign_pr.yml new file mode 100644 index 0000000000..f602f7f05d --- /dev/null +++ b/.github/workflows/auto_assign_pr.yml @@ -0,0 +1,10 @@ +name: 'Auto Assign' +on: + pull_request: + types: [opened, ready_for_review] + +jobs: + add-reviews: + runs-on: ubuntu-latest + steps: + - uses: kentaro-m/auto-assign-action@v1.2.0 From 799680f21d6a8bc32b4981f6668f6db04e841a64 Mon Sep 17 00:00:00 2001 From: Darko Kolev Date: Fri, 15 Oct 2021 11:43:43 +0200 Subject: [PATCH 5/7] feat: added xdai to fee-proxy-contract networks (#636) --- .../src/extensions/payment-network/erc20/fee-proxy-contract.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/advanced-logic/src/extensions/payment-network/erc20/fee-proxy-contract.ts b/packages/advanced-logic/src/extensions/payment-network/erc20/fee-proxy-contract.ts index 67f2c02e11..a5f3831d88 100644 --- a/packages/advanced-logic/src/extensions/payment-network/erc20/fee-proxy-contract.ts +++ b/packages/advanced-logic/src/extensions/payment-network/erc20/fee-proxy-contract.ts @@ -23,6 +23,7 @@ export default class Erc20FeeProxyPaymentNetwork< 'fuse', 'bsctest', 'bsc', + 'xdai', ], public supportedCurrencyType: RequestLogicTypes.CURRENCY = RequestLogicTypes.CURRENCY.ERC20, ) { From fc24e5e3c3033e01796aea2f2039a46f802b7ad9 Mon Sep 17 00:00:00 2001 From: Darko Kolev Date: Mon, 18 Oct 2021 09:56:28 +0200 Subject: [PATCH 6/7] feat: add xdai rpc provider (#637) --- packages/payment-detection/src/provider.ts | 1 + packages/payment-detection/test/provider.test.ts | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/payment-detection/src/provider.ts b/packages/payment-detection/src/provider.ts index 0b1ae348a7..6f533de8f8 100644 --- a/packages/payment-detection/src/provider.ts +++ b/packages/payment-detection/src/provider.ts @@ -38,6 +38,7 @@ const networkRpcs: Record = { fuse: 'https://rpc.fuse.io', bsctest: 'https://data-seed-prebsc-1-s1.binance.org:8545', bsc: 'https://bsc-dataseed1.binance.org/', + xdai: 'https://rpc.xdaichain.com/', }; /** diff --git a/packages/payment-detection/test/provider.test.ts b/packages/payment-detection/test/provider.test.ts index dd538dfb7a..adca8502c3 100644 --- a/packages/payment-detection/test/provider.test.ts +++ b/packages/payment-detection/test/provider.test.ts @@ -51,16 +51,17 @@ describe('getDefaultProvider', () => { }); it('Can override the RPC configuration for a new network', async () => { - expect(() => getDefaultProvider('xdai')).toThrowError('unsupported getDefaultProvider network'); + const fakenet = 'fakenet'; + expect(() => getDefaultProvider(fakenet)).toThrowError('unsupported getDefaultProvider network'); setProviderFactory((network, defaultFactory) => { - if (network === 'xdai') { - return 'http://xdaichain.fake'; + if (network === fakenet) { + return 'http://fakenet.fake'; } return defaultFactory(network); }); - expect(getDefaultProvider('xdai')).toBeInstanceOf(providers.JsonRpcProvider); - expect((getDefaultProvider('xdai') as providers.JsonRpcProvider).connection.url).toBe( - 'http://xdaichain.fake', + expect(getDefaultProvider(fakenet)).toBeInstanceOf(providers.JsonRpcProvider); + expect((getDefaultProvider(fakenet) as providers.JsonRpcProvider).connection.url).toBe( + 'http://fakenet.fake', ); // still works for standard providers expect((getDefaultProvider('rinkeby') as providers.JsonRpcProvider).connection.url).toMatch( From eff06e9e77f74e24e6d9e355f49f7fede11d74da Mon Sep 17 00:00:00 2001 From: Alexandre ABRIOUX Date: Mon, 18 Oct 2021 12:20:54 +0200 Subject: [PATCH 7/7] chore(request-node): add transaction hash debug log (#638) --- packages/request-node/src/request/persistTransaction.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/request-node/src/request/persistTransaction.ts b/packages/request-node/src/request/persistTransaction.ts index 5721a28d5d..689e25ec31 100644 --- a/packages/request-node/src/request/persistTransaction.ts +++ b/packages/request-node/src/request/persistTransaction.ts @@ -59,6 +59,7 @@ export default class PersistTransactionHandler { this.logger.debug( `Persisting Transaction: ${JSON.stringify({ + transactionHash, channelId: clientRequest.body.channelId, topics: clientRequest.body.topics, transactionData: clientRequest.body.transactionData,