From af6f6f2e1ee59a4592423db6368f863f2b620639 Mon Sep 17 00:00:00 2001 From: MantisClone Date: Fri, 16 Aug 2024 14:40:41 -0400 Subject: [PATCH 1/5] fix: link script to use cd instead of pushd/popd (#1438) --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 73eacdee0f..6805d68cb6 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,8 @@ "test": "lerna run test", "format": "prettier . -w", "format:check": "prettier . -c", - "link:all": "for d in packages/*; do pushd $d; yarn link; popd; done", - "unlink:all": "for d in packages/*; do pushd $d; yarn unlink; popd; done" + "link:all": "for d in packages/*; do cd $d; yarn link; cd -; done", + "unlink:all": "for d in packages/*; do cd $d; yarn unlink; cd -; done" }, "devDependencies": { "@typescript-eslint/eslint-plugin": "4.18.0", From 8d41f353fe8e401368c055e7f89081ed280a51ef Mon Sep 17 00:00:00 2001 From: MantisClone Date: Tue, 27 Aug 2024 10:50:50 -0400 Subject: [PATCH 2/5] chore: add test - create and declare received payment in a single transaction (#1443) --- .../test/declarative-payments.test.ts | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/packages/request-client.js/test/declarative-payments.test.ts b/packages/request-client.js/test/declarative-payments.test.ts index ab83249298..ea70180b97 100644 --- a/packages/request-client.js/test/declarative-payments.test.ts +++ b/packages/request-client.js/test/declarative-payments.test.ts @@ -190,6 +190,33 @@ describe('request-client.js: declarative payments', () => { expect(requestData.balance!.balance).toEqual('10'); }); + it('allows to create a request and declare a received payment in the same transaction', async () => { + const requestNetwork = new RequestNetwork({ + useMockStorage: true, + signatureProvider: TestData.fakeSignatureProvider, + }); + const request = await requestNetwork.createRequest({ + ...requestCreationParams, + requestInfo: { + ...TestData.parametersWithoutExtensionsData, + extensionsData: [ + { + action: ExtensionTypes.PnAnyDeclarative.ACTION.DECLARE_RECEIVED_PAYMENT, + id: ExtensionTypes.PAYMENT_NETWORK_ID.ANY_DECLARATIVE, + parameters: { + amount: '10', + note: 'received payment', + txhash: '0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef', + network: 'mainnet', + }, + }, + ], + }, + }); + const requestData = await request.waitForConfirmation(); + expect(requestData.balance!.balance).toEqual('10'); + }); + it('allows to declare a sent refund', async () => { const requestNetwork = new RequestNetwork({ httpConfig, From 2b392900e45519d191edc8b256dc642cbbc31c98 Mon Sep 17 00:00:00 2001 From: MantisClone Date: Sat, 7 Sep 2024 11:10:06 -0400 Subject: [PATCH 3/5] chore: Update Mantle Payments Subgraph URL (#1450) --- packages/payment-detection/src/thegraph/client.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/payment-detection/src/thegraph/client.ts b/packages/payment-detection/src/thegraph/client.ts index e1acb4a2ff..eb25181970 100644 --- a/packages/payment-detection/src/thegraph/client.ts +++ b/packages/payment-detection/src/thegraph/client.ts @@ -16,7 +16,7 @@ const THE_GRAPH_URL_MANTLE_TESTNET = 'https://graph.testnet.mantle.xyz/subgraphs/name/requestnetwork/request-payments-mantle-testnet'; const THE_GRAPH_URL_MANTLE = - 'https://graph.fusionx.finance/subgraphs/name/requestnetwork/request-payments-mantle'; + 'https://subgraph-api.mantle.xyz/api/public/555176e7-c1f4-49f9-9180-f2f03538b039/subgraphs/requestnetwork/request-payments-mantle/v0.1.0/gn'; const THE_GRAPH_URL_CORE = 'https://thegraph.coredao.org/subgraphs/name/requestnetwork/request-payments-core'; From badef504aa3bb3a73bca3c4bb702f59a038f98f9 Mon Sep 17 00:00:00 2001 From: leoslr <50319677+leoslr@users.noreply.github.com> Date: Wed, 11 Sep 2024 09:58:26 +0200 Subject: [PATCH 4/5] feat: xdai eth conversion (#1451) --- .../src/lib/artifacts/ChainlinkConversionPath/index.ts | 5 ++--- .../src/lib/artifacts/EthConversionProxy/index.ts | 8 ++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/smart-contracts/src/lib/artifacts/ChainlinkConversionPath/index.ts b/packages/smart-contracts/src/lib/artifacts/ChainlinkConversionPath/index.ts index 238f8fdbb7..52b6fc5cca 100644 --- a/packages/smart-contracts/src/lib/artifacts/ChainlinkConversionPath/index.ts +++ b/packages/smart-contracts/src/lib/artifacts/ChainlinkConversionPath/index.ts @@ -89,10 +89,9 @@ export const chainlinkConversionPath = new ContractArtifact( address: '0xEdfD8386d5DE52072B4Ad8dC69BBD0bB89f9A1fb', creationBlockNumber: 10827267, }, + xdai: { + address: '0x3E3B04e1bF170522a5c5DDE628C4d365c0342239', + creationBlockNumber: 35929105, + }, }, }, '0.2.1': { @@ -118,6 +122,10 @@ export const ethConversionArtifact = new ContractArtifact( address: '0xEdfD8386d5DE52072B4Ad8dC69BBD0bB89f9A1fb', creationBlockNumber: 10827267, }, + xdai: { + address: '0x3E3B04e1bF170522a5c5DDE628C4d365c0342239', + creationBlockNumber: 35929105, + }, }, }, }, From 8d2d5d2939559322ee8ecb62196605682ab64e0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:36:34 -0400 Subject: [PATCH 5/5] build(deps): Bump dset from 3.1.3 to 3.1.4 (#1452) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index e7c8e75e8a..1b213a803c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9999,9 +9999,9 @@ dotignore@~0.1.2: minimatch "^3.0.4" dset@^3.1.2: - version "3.1.3" - resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.3.tgz#c194147f159841148e8e34ca41f638556d9542d2" - integrity sha512-20TuZZHCEZ2O71q9/+8BwKwZ0QtD9D8ObhrihJPr+vLLYlSuAU3/zL4cSlgbfeoGHTjCSJBa7NGcrF9/Bx/WJQ== + version "3.1.4" + resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.4.tgz#f8eaf5f023f068a036d08cd07dc9ffb7d0065248" + integrity sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA== duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2, duplexer2@~0.1.4: version "0.1.4"