fix(smart-contracts): deploy and verify batch contract (#868)

* xdeployer for batch - batch setup - deploy batch on rinkeby and update artifact

* batch ABI and xdeployer setup

* fix batch deployer nonce

* batch deployer nonce from 0 and update rinkeby address

* deploy batch on avalanche and bsc

* todo list - to delete

* batch deployer nonce from 0 and update rinkeby address

* verify contract on every network

* refacto networkRPC

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

Co-authored-by: Bertrand Juglas <[email protected]>

* Update packages/utils/src/providers.ts

Co-authored-by: Bertrand Juglas <[email protected]>

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

Co-authored-by: Bertrand Juglas <[email protected]>

* factorize hardhat file

* fix network

Co-authored-by: Bertrand Juglas <[email protected]>

Author: olivier7delf

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,
 };