Merge branch 'master' into ipfs-rpc-post

Author: benjlevesque

packages/smart-contracts/hardhat.config.ts

@@ -13,6 +13,7 @@ import { HardhatRuntimeEnvironmentExtended } from './scripts-create2/types';
 import { computeCreate2DeploymentAddressesFromList } from './scripts-create2/compute-one-address';
 import { VerifyCreate2FromList } from './scripts-create2/verify-one';
 import { deployWithCreate2FromList } from './scripts-create2/deploy-one';
+import utils from '@requestnetwork/utils';
 
 config();
 
@@ -43,6 +44,9 @@ const requestDeployer = process.env.REQUEST_DEPLOYER_LIVE
   ? LIVE_DEPLOYER_ADDRESS
   : LOCAL_DEPLOYER_ADDRESS;
 
+const url = (network: string): string =>
+  process.env.WEB3_PROVIDER_URL || utils.networkRpcs[network];
+
 export default {
   solidity: '0.8.9',
   paths: {
@@ -66,52 +70,52 @@ export default {
       accounts,
     },
     matic: {
-      url: process.env.WEB3_PROVIDER_URL || 'https://polygon-rpc.com',
+      url: url('matic'),
       chainId: 137,
       accounts,
     },
     celo: {
-      url: process.env.WEB3_PROVIDER_URL || 'https://forno.celo.org',
+      url: url('celo'),
       chainId: 42220,
       accounts,
     },
     bsctest: {
-      url: process.env.WEB3_PROVIDER_URL || 'https://data-seed-prebsc-1-s1.binance.org:8545',
+      url: url('bsctest'),
       chainId: 97,
       accounts,
     },
     bsc: {
-      url: process.env.WEB3_PROVIDER_URL || 'https://bsc-dataseed1.binance.org',
+      url: url('bsc'),
       chainId: 56,
       accounts,
     },
     xdai: {
-      url: process.env.WEB3_PROVIDER_URL || 'https://rpc.xdaichain.com/',
+      url: url('xdai'),
       chainId: 100,
       accounts,
     },
     fuse: {
-      url: process.env.WEB3_PROVIDER_URL || 'https://rpc.fuse.io',
+      url: url('fuse'),
       chainId: 122,
       accounts,
     },
     fantom: {
-      url: process.env.WEB3_PROVIDER_URL || 'https://rpcapi.fantom.network',
+      url: url('fantom'),
       chainId: 250,
       accounts,
     },
     'arbitrum-one': {
-      url: process.env.WEB3_PROVIDER_URL || 'https://arb1.arbitrum.io/rpc',
+      url: url('arbitrum-one'),
       chainId: 42161,
       accounts,
     },
     'arbitrum-rinkeby': {
-      url: process.env.WEB3_PROVIDER_URL || 'https://rinkeby.arbitrum.io/rpc',
+      url: url('arbitrum-rinkeby'),
       chainId: 421611,
       accounts,
     },
     avalanche: {
-      url: process.env.WEB3_PROVIDER_URL || 'https://api.avax.network/ext/bc/C/rpc',
+      url: url('avalanche'),
       chainId: 43114,
       accounts,
     },

packages/smart-contracts/scripts-create2/contract-setup/setupBatchPayments.ts

@@ -9,7 +9,7 @@ import {
 
 /**
  * Updates the values of the batch fees of the BatchPayments contract, if needed
- * @param contractAddress address of the BatchPayment Proxy
+ * @param contractAddress address of the BatchPayments Proxy
  * @param hre Hardhat runtime environment
  */
 export const setupBatchPayments = async (
@@ -35,10 +35,11 @@ export const setupBatchPayments = async (
       const adminNonce = await signer.getTransactionCount();
       const gasPrice = await provider.getGasPrice();
 
+      // start from the adminNonce, increase gasPrice if needed
       await Promise.all([
-        updateBatchPaymentFees(batchPaymentConnected, adminNonce + 3, gasPrice),
-        updatePaymentErc20FeeProxy(batchPaymentConnected, network, adminNonce + 4, gasPrice),
-        updatePaymentEthFeeProxy(batchPaymentConnected, network, adminNonce + 5, gasPrice),
+        updateBatchPaymentFees(batchPaymentConnected, adminNonce, gasPrice),
+        updatePaymentErc20FeeProxy(batchPaymentConnected, network, adminNonce + 1, gasPrice),
+        updatePaymentEthFeeProxy(batchPaymentConnected, network, adminNonce + 2, gasPrice),
       ]);
     }),
   );

packages/smart-contracts/scripts-create2/verify-one.ts

@@ -41,7 +41,7 @@ export async function VerifyCreate2FromList(hre: HardhatRuntimeEnvironmentExtend
             await verifyOne(address, { contract, constructorArgs }, hre);
             break;
           }
-          case 'batchPayment': {
+          case 'BatchPayments': {
             const network = hre.config.xdeploy.networks[0];
             const constructorArgs = getConstructorArgs(contract, network);
             address = await computeCreate2DeploymentAddress({ contract, constructorArgs }, hre);

packages/smart-contracts/src/lib/artifacts/BatchPayments/index.ts

@@ -14,8 +14,8 @@ export const batchPaymentsArtifact = new ContractArtifact<BatchPayments>(
           creationBlockNumber: 0,
         },
         rinkeby: {
-          address: '0xfeE3f8937Ca62DA486a4E067Ed11aA6Bc6B21b4B',
-          creationBlockNumber: 10732960,
+          address: '0x0DD57FFe83a53bCbd657e234B16A3e74fEDb8fBA',
+          creationBlockNumber: 10857190,
         },
         mainnet: {
           address: '0x0DD57FFe83a53bCbd657e234B16A3e74fEDb8fBA',
@@ -37,10 +37,10 @@ export const batchPaymentsArtifact = new ContractArtifact<BatchPayments>(
           address: '0x0DD57FFe83a53bCbd657e234B16A3e74fEDb8fBA',
           creationBlockNumber: 22438505,
         },
-        // bsc: {
-        //   address: '',
-        //   creationBlockNumber: ,
-        // },
+        bsc: {
+          address: '0x0DD57FFe83a53bCbd657e234B16A3e74fEDb8fBA',
+          creationBlockNumber: 18772049,
+        },
         fantom: {
           address: '0x0DD57FFe83a53bCbd657e234B16A3e74fEDb8fBA',
           creationBlockNumber: 39541135,
@@ -49,10 +49,10 @@ export const batchPaymentsArtifact = new ContractArtifact<BatchPayments>(
           address: '0x0DD57FFe83a53bCbd657e234B16A3e74fEDb8fBA',
           creationBlockNumber: 13425347,
         },
-        // avalanche: {
-        //   address: '',
-        //   creationBlockNumber: ,
-        // },
+        avalanche: {
+          address: '0x0DD57FFe83a53bCbd657e234B16A3e74fEDb8fBA',
+          creationBlockNumber: 16157128,
+        },
       },
     },
   },

packages/utils/src/providers.ts

@@ -36,7 +36,8 @@ const networkRpcs: Record<string, string> = {
   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/',
+  xdai: 'https://gnosischain-rpc.gateway.pokt.network/',
+  celo: 'https://forno.celo.org',
   'arbitrum-rinkeby': 'https://rinkeby.arbitrum.io/rpc',
   'arbitrum-one': 'https://arb1.arbitrum.io/rpc',
   avalanche: 'https://api.avax.network/ext/bc/C/rpc',
@@ -149,4 +150,5 @@ export default {
   initPaymentDetectionApiKeys,
   getDefaultProvider,
   getCeloProvider,
+  networkRpcs,
 };

yarn.lock

@@ -10518,27 +10518,20 @@ [email protected]:
   dependencies:
     node-fetch "2.6.1"
 
-[email protected], cross-fetch@^3.0.6:
+[email protected], cross-fetch@^3.0.4, cross-fetch@^3.0.6:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39"
   integrity sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==
   dependencies:
     node-fetch "2.6.1"
 
 cross-fetch@^2.1.0, cross-fetch@^2.1.1:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.3.tgz#e8a0b3c54598136e037f8650f8e823ccdfac198e"
-  integrity sha512-PrWWNH3yL2NYIb/7WF/5vFG3DCQiXDOVf8k3ijatbrtnwNuhMWLC7YF7uqf53tbTFDzHIUD8oITw4Bxt8ST3Nw==
-  dependencies:
-    node-fetch "2.1.2"
-    whatwg-fetch "2.0.4"
-
-cross-fetch@^3.0.4:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.2.tgz#ee0c2f18844c4fde36150c2a4ddc068d20c1bc41"
-  integrity sha512-+JhD65rDNqLbGmB3Gzs3HrEKC0aQnD+XA3SY6RjgkF88jV2q5cTc5+CwxlS3sdmLk98gpPt5CF9XRnPdlxZe6w==
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.6.tgz#2ef0bb39a24ac034787965c457368a28730e220a"
+  integrity sha512-9JZz+vXCmfKUZ68zAptS7k4Nu8e2qcibe7WVZYps7sAgk5R8GYTc+T1WR0v1rlP9HxgARmOX1UTIJZFytajpNA==
   dependencies:
-    node-fetch "2.6.1"
+    node-fetch "^2.6.7"
+    whatwg-fetch "^2.0.4"
 
 [email protected], cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
@@ -13246,11 +13239,9 @@ events@^3.0.0:
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
 eventsource@^1.0.7:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf"
-  integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==
-  dependencies:
-    original "^1.0.0"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.2.tgz#bc75ae1c60209e7cb1541231980460343eaea7c2"
+  integrity sha512-xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA==
 
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
@@ -19554,17 +19545,12 @@ node-fetch-npm@^2.0.2:
     json-parse-better-errors "^1.0.0"
     safe-buffer "^5.1.1"
 
-[email protected]:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5"
-  integrity sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=
-
-[email protected], node-fetch@^2.5.0, node-fetch@^2.6.1:
+[email protected]:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
   integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
-node-fetch@^2.6.0, node-fetch@^2.6.7:
+node-fetch@^2.5.0, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
   integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
@@ -20299,13 +20285,6 @@ ora@^5.4.1:
     strip-ansi "^6.0.0"
     wcwidth "^1.0.1"
 
-original@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
-  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
-  dependencies:
-    url-parse "^1.4.3"
-
 os-browserify@^0.3.0, os-browserify@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
@@ -25682,7 +25661,7 @@ tr46@^2.0.2:
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
 traverse@^0.6.6:
   version "0.6.6"
@@ -26618,7 +26597,7 @@ url-parse-lax@^3.0.0:
   dependencies:
     prepend-http "^2.0.0"
 
-url-parse@^1.4.3, url-parse@^1.4.7:
+url-parse@^1.4.7:
   version "1.5.10"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
   integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
@@ -28662,7 +28641,7 @@ web3@^1.0.0-beta.34, web3@^1.2.1:
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
 webidl-conversions@^4.0.2:
   version "4.0.2"
@@ -28927,7 +28906,7 @@ whatwg-encoding@^1.0.5:
   dependencies:
     iconv-lite "0.4.24"
 
-[email protected]:
+whatwg-fetch@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
   integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
@@ -28945,7 +28924,7 @@ whatwg-mimetype@^2.3.0:
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
   dependencies:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"