From c7ad054fdd38a69ef2d719bcb0ea40d5259c4fff Mon Sep 17 00:00:00 2001 From: Mohammad Ranjbar Z Date: Wed, 15 Mar 2023 16:13:11 +0330 Subject: [PATCH 1/4] 1.11.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2a233bd06..dc1f0dc46 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "giveth-graphql-api", - "version": "1.10.5", + "version": "1.11.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "giveth-graphql-api", - "version": "1.10.5", + "version": "1.11.0", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 8fd4acbdf..409b59690 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "giveth-graphql-api", - "version": "1.10.5", + "version": "1.11.0", "description": "Backend GraphQL server for Giveth originally forked from Topia", "main": "./dist/index.js", "dependencies": { From b171aa870bc0772a6001c8d5cbb993fd81ca491c Mon Sep 17 00:00:00 2001 From: Amin Latifi Date: Thu, 16 Mar 2023 15:03:34 +0330 Subject: [PATCH 2/4] Upgraded polygon to v1.1.0 Added POLYGON_MAINNET_NODE_HTTP_URL config --- config/example.env | 5 ++--- package-lock.json | 14 +++++++------- package.json | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/config/example.env b/config/example.env index 256850edd..5ecdb38dc 100644 --- a/config/example.env +++ b/config/example.env @@ -34,10 +34,9 @@ GNOSISSCAN_API_URL=https://api.gnosisscan.io/api ETHERSCAN_API_KEY=0000000000000000000000000000000000 GNOSISSCAN_API_KEY=0000000000000000000000000000000000 INFURA_API_KEY=0000000000000000000000000000000000 -# It should have same value as INFURA_API_KEY, but we should use it because monoswap needs to read this from .env -ETHEREUM_NODE_ID= NUMBER_OF_VERIFY_DONATION_CONCURRENT_JOB=1 - +# Optional - polygon dedicated RPC url +POLYGON_MAINNET_NODE_HTTP_URL= # This means every second VERIFY_DONATION_CRONJOB_EXPRESSION=0 * * * * * diff --git a/package-lock.json b/package-lock.json index dc1f0dc46..442664b96 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@apollo/server": "4.3.1", "@apollo/server-plugin-landing-page-graphql-playground": "4.0.0", "@chainvine/sdk": "1.0.19", - "@giveth/monoswap": "^1.0.4", + "@giveth/monoswap": "^1.1.0", "@sentry/node": "6.16.1", "@sentry/tracing": "^6.2.0", "@types/bcryptjs": "^2.4.2", @@ -3130,9 +3130,9 @@ } }, "node_modules/@giveth/monoswap": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@giveth/monoswap/-/monoswap-1.0.4.tgz", - "integrity": "sha512-PBgf6r30YPZQyZ6vgPGsrzDtZURzxfLRNrKwpkpUsryPXEGza4Mpj5+wU3TDrdMuA8wX3gCP0TwAXgoZh3vx1Q==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@giveth/monoswap/-/monoswap-1.1.0.tgz", + "integrity": "sha512-FzgHsig6l+g8ndm7RmCFgZ+2HM5kBe3T+QZz4W79zmAGCzyZC1g4AcRH45j6dXCaoC/tZP/6LKGfonc+JS4pZg==", "dependencies": { "@bscswap/sdk": "^3.0.15", "@pancakeswap-libs/sdk": "^1.0.1", @@ -19161,9 +19161,9 @@ } }, "@giveth/monoswap": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@giveth/monoswap/-/monoswap-1.0.4.tgz", - "integrity": "sha512-PBgf6r30YPZQyZ6vgPGsrzDtZURzxfLRNrKwpkpUsryPXEGza4Mpj5+wU3TDrdMuA8wX3gCP0TwAXgoZh3vx1Q==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@giveth/monoswap/-/monoswap-1.1.0.tgz", + "integrity": "sha512-FzgHsig6l+g8ndm7RmCFgZ+2HM5kBe3T+QZz4W79zmAGCzyZC1g4AcRH45j6dXCaoC/tZP/6LKGfonc+JS4pZg==", "requires": { "@bscswap/sdk": "^3.0.15", "@pancakeswap-libs/sdk": "^1.0.1", diff --git a/package.json b/package.json index 409b59690..5fe81c190 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "@apollo/server": "4.3.1", "@apollo/server-plugin-landing-page-graphql-playground": "4.0.0", "@chainvine/sdk": "1.0.19", - "@giveth/monoswap": "^1.0.4", + "@giveth/monoswap": "^1.1.0", "@sentry/node": "6.16.1", "@sentry/tracing": "^6.2.0", "@types/bcryptjs": "^2.4.2", From 271671e6b841d958d7656ef956202a186c849d48 Mon Sep 17 00:00:00 2001 From: Mohammad Ranjbar Z Date: Thu, 16 Mar 2023 17:11:56 +0330 Subject: [PATCH 3/4] Add POLYGON_MAINNET_NODE_HTTP_URL to test config --- config/test.env | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/test.env b/config/test.env index 62462a7fd..31b57b727 100644 --- a/config/test.env +++ b/config/test.env @@ -158,3 +158,6 @@ CHAINVINE_ADAPTER=mock CHAINVINE_API_ENABLE_TEST_MODE=true # We should not try to verify donaitons after some hours, because checking old donations would make lots of requests to web3 providers DONATION_VERIFICAITON_EXPIRATION_HOURS=24 + +# We need it for monoswap +POLYGON_MAINNET_NODE_HTTP_URL=https://polygon-rpc.com From f3b98741c7fe2d96bc76ae974412d1aee762093a Mon Sep 17 00:00:00 2001 From: Amin Latifi Date: Thu, 16 Mar 2023 21:02:46 +0330 Subject: [PATCH 4/4] Upgraded monoswap --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 442664b96..fcc5a14b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@apollo/server": "4.3.1", "@apollo/server-plugin-landing-page-graphql-playground": "4.0.0", "@chainvine/sdk": "1.0.19", - "@giveth/monoswap": "^1.1.0", + "@giveth/monoswap": "^1.1.1", "@sentry/node": "6.16.1", "@sentry/tracing": "^6.2.0", "@types/bcryptjs": "^2.4.2", @@ -3130,9 +3130,9 @@ } }, "node_modules/@giveth/monoswap": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@giveth/monoswap/-/monoswap-1.1.0.tgz", - "integrity": "sha512-FzgHsig6l+g8ndm7RmCFgZ+2HM5kBe3T+QZz4W79zmAGCzyZC1g4AcRH45j6dXCaoC/tZP/6LKGfonc+JS4pZg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@giveth/monoswap/-/monoswap-1.1.1.tgz", + "integrity": "sha512-RbiXXPG+Y5TryWqlGkE4yJ+E/569vgNcVnlM1dJqE8gk1HNq1u0GYH2Fkvh3DnfgCzmYdbG1RMr+PIBwf9blcA==", "dependencies": { "@bscswap/sdk": "^3.0.15", "@pancakeswap-libs/sdk": "^1.0.1", @@ -19161,9 +19161,9 @@ } }, "@giveth/monoswap": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@giveth/monoswap/-/monoswap-1.1.0.tgz", - "integrity": "sha512-FzgHsig6l+g8ndm7RmCFgZ+2HM5kBe3T+QZz4W79zmAGCzyZC1g4AcRH45j6dXCaoC/tZP/6LKGfonc+JS4pZg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@giveth/monoswap/-/monoswap-1.1.1.tgz", + "integrity": "sha512-RbiXXPG+Y5TryWqlGkE4yJ+E/569vgNcVnlM1dJqE8gk1HNq1u0GYH2Fkvh3DnfgCzmYdbG1RMr+PIBwf9blcA==", "requires": { "@bscswap/sdk": "^3.0.15", "@pancakeswap-libs/sdk": "^1.0.1", diff --git a/package.json b/package.json index 5fe81c190..ff3adb1f6 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "@apollo/server": "4.3.1", "@apollo/server-plugin-landing-page-graphql-playground": "4.0.0", "@chainvine/sdk": "1.0.19", - "@giveth/monoswap": "^1.1.0", + "@giveth/monoswap": "^1.1.1", "@sentry/node": "6.16.1", "@sentry/tracing": "^6.2.0", "@types/bcryptjs": "^2.4.2",