@requestnetwork/smart-contracts 0.53.1-next.af792b64.0 → 0.53.1-next.b2a1665f.0

package/README.md

@@ -67,7 +67,7 @@ The package stores the following smart contracts:
 - `RequestOpenHashSubmitter` entry point to add hashes in `RequestHashStorage`. It gives the rules to get the right to submit hashes and collect the fees. This contract must be whitelisted in `RequestHashStorage`. The only condition for adding hash is to pay the fees.
 - `StorageFeeCollector` parent contract (not deployed) of `RequestOpenHashSubmitter`, computes the fees and send them to the burner.
 
-**Smart contracts for advanced-logic package**
+**Smart contracts for payments (advanced-logic package)**
 
 - `TestERC20` minimal erc20 token used for tests.
 - `ERC20Proxy` used to pay requests with an ERC20 proxy contract payment network

package/dist/scripts-create2/compute-one-address.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compute-one-address.d.ts","sourceRoot":"","sources":["../../scripts-create2/compute-one-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAO/E,wBAAsB,+BAA+B,CACnD,gBAAgB,EAAE,iBAAiB,EACnC,GAAG,EAAE,iCAAiC,GACrC,OAAO,CAAC,MAAM,CAAC,CAkCjB;AAED,eAAO,MAAM,yCAAyC,QAC/C,iCAAiC,KACrC,QAAQ,IAAI,CAqCd,CAAC"}
+{"version":3,"file":"compute-one-address.d.ts","sourceRoot":"","sources":["../../scripts-create2/compute-one-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAO/E,wBAAsB,+BAA+B,CACnD,gBAAgB,EAAE,iBAAiB,EACnC,GAAG,EAAE,iCAAiC,GACrC,OAAO,CAAC,MAAM,CAAC,CAsCjB;AAED,eAAO,MAAM,yCAAyC,QAC/C,iCAAiC,KACrC,QAAQ,IAAI,CAqCd,CAAC"}

package/dist/scripts-create2/compute-one-address.js

@@ -33,6 +33,10 @@ function computeCreate2DeploymentAddress(deploymentParams, hre) {
             return computedAddress;
         }
         catch (e) {
+            console.warn('Error while computing the deployment address', {
+                'deploymentParams.contract': deploymentParams.contract,
+                WEB3_PROVIDER_URL: process.env.WEB3_PROVIDER_URL,
+            });
             throw new Error(e.toString());
         }
     });

package/dist/scripts-create2/compute-one-address.js.map

@@ -1 +1 @@
-{"version":3,"file":"compute-one-address.js","sourceRoot":"","sources":["../../scripts-create2/compute-one-address.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compute-one-address.js","sourceRoot":"","sources":["../../scripts-create2/compute-one-address.ts"],"names":[],"mappings":"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"}

package/dist/scripts-create2/constructor-args.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constructor-args.d.ts","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAkBtD,eAAO,MAAM,kBAAkB,aACnB,MAAM,YACN,cAAc,YAAY,KACnC,MAAM,EA8FR,CAAC"}
+{"version":3,"file":"constructor-args.d.ts","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AA6BtD,eAAO,MAAM,kBAAkB,aACnB,MAAM,YACN,cAAc,YAAY,KACnC,MAAM,EA8FR,CAAC"}

package/dist/scripts-create2/constructor-args.js

@@ -16,6 +16,14 @@ const getAdminWalletAddress = (contract) => {
 const getRecurringPaymentExecutorWalletAddress = (contract) => {
     return getEnvVariable('RECURRING_PAYMENT_EXECUTOR_WALLET_ADDRESS', contract);
 };
+const getRecurringPaymentAdminSafe = (contract, network) => {
+    try {
+        return artifacts.safeAdminArtifact.getAddress(network);
+    }
+    catch (_a) {
+        return getEnvVariable('RECURRING_PAYMENT_ADMIN_ADDRESS', contract);
+    }
+};
 const getConstructorArgs = (contract, network) => {
     switch (contract) {
         case 'ChainlinkConversionPath': {
@@ -84,7 +92,7 @@ const getConstructorArgs = (contract, network) => {
             }
             const erc20FeeProxy = artifacts.erc20FeeProxyArtifact;
             const erc20FeeProxyAddress = erc20FeeProxy.getAddress(network);
-            const adminSafe = getAdminWalletAddress(contract);
+            const adminSafe = getRecurringPaymentAdminSafe(contract, network);
             const executorEOA = getRecurringPaymentExecutorWalletAddress(contract);
             return [adminSafe, executorEOA, erc20FeeProxyAddress];
         }

package/dist/scripts-create2/constructor-args.js.map

@@ -1 +1 @@
-{"version":3,"file":"constructor-args.js","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"constructor-args.js","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":"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"}

package/dist/scripts-create2/deploy.d.ts

@@ -6,7 +6,10 @@ import { HardhatRuntimeEnvironmentExtended, IDeploymentParams } from './types';
  * @param hre hardhat runtime environment
  * @returns The address of the deployed contract - same for all network
  */
-export declare const deployOneWithCreate2: (deploymentParams: IDeploymentParams, hre: HardhatRuntimeEnvironmentExtended) => Promise<string>;
+export declare const deployOneWithCreate2: (deploymentParams: IDeploymentParams, hre: HardhatRuntimeEnvironmentExtended) => Promise<{
+    deployed: 'success' | 'yes' | 'no';
+    address: string;
+}>;
 /**
  * Deploy all the contracts specified in create2ContractDeploymentList.
  * Once deployed, do the setup.

package/dist/scripts-create2/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../scripts-create2/deploy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAM/E;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,qBACb,iBAAiB,OAC9B,iCAAiC,KACrC,QAAQ,MAAM,CA4BhB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,QAC/B,iCAAiC,KACrC,QAAQ,IAAI,CAad,CAAC"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../scripts-create2/deploy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAM/E;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,qBACb,iBAAiB,OAC9B,iCAAiC;cACjB,SAAS,GAAG,KAAK,GAAG,IAAI;aAAW,MAAM;EA+B/D,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,QAC/B,iCAAiC,KACrC,QAAQ,IAAI,CAiBd,CAAC"}

package/dist/scripts-create2/deploy.js

@@ -19,6 +19,7 @@ const deployOneWithCreate2 = (deploymentParams, hre) => tslib_1.__awaiter(void 0
         throw new Error('Invalid networks');
     }
     // Deploy the contract on several network through xdeployer
+    let deployed = 'no';
     const deploymentResult = yield (0, xdeployer_1.xdeploy)(deploymentParams, hre);
     hre.config.xdeploy.networks.forEach((network, i) => {
         if (deploymentResult[i].deployed) {
@@ -26,12 +27,14 @@ const deployOneWithCreate2 = (deploymentParams, hre) => tslib_1.__awaiter(void 0
             console.log(`         On network:        ${network}`);
             console.log(`         At address:        ${deploymentResult[i].address}`);
             console.log(`         At block:          ${deploymentResult[i].receipt.blockNumber}`);
+            deployed = 'success';
         }
         else {
             if ((0, utils_1.isContractDeployed)(deploymentParams.contract, network, deploymentResult[i].address)) {
                 console.log(`${deploymentParams.contract} already deployed:`);
                 console.log(`         On network:        ${network}`);
                 console.log(`         At address:        ${deploymentResult[i].address}`);
+                deployed = 'yes';
             }
             else {
                 console.log(`${deploymentParams.contract} has not been deployed:`);
@@ -41,7 +44,7 @@ const deployOneWithCreate2 = (deploymentParams, hre) => tslib_1.__awaiter(void 0
             }
         }
     });
-    return deploymentResult[0].address;
+    return { deployed, address: deploymentResult[0].address };
 });
 exports.deployOneWithCreate2 = deployOneWithCreate2;
 /**
@@ -50,11 +53,15 @@ exports.deployOneWithCreate2 = deployOneWithCreate2;
  * @param hre
  */
 const deployWithCreate2FromList = (hre) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    const network = hre.config.xdeploy.networks[0];
+    currency_1.EvmChains.assertChainSupported(network);
     for (const contract of utils_1.create2ContractDeploymentList) {
-        const network = hre.config.xdeploy.networks[0];
-        currency_1.EvmChains.assertChainSupported(network);
         const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract, network);
-        const address = yield (0, exports.deployOneWithCreate2)({ contract, constructorArgs }, hre);
+        const { deployed, address } = yield (0, exports.deployOneWithCreate2)({ contract, constructorArgs }, hre);
+        if (deployed === 'no') {
+            console.warn('Skipping contract setup');
+            continue;
+        }
         yield (0, setups_1.setupContract)({
             contractAddress: address,
             contractName: contract,

package/dist/scripts-create2/deploy.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../scripts-create2/deploy.ts"],"names":[],"mappings":";;;;AAAA,mCAA4E;AAE5E,2CAAsC;AACtC,yDAAwD;AACxD,uDAAqD;AACrD,oDAAwD;AAExD;;;;;;GAMG;AACI,MAAM,oBAAoB,GAAG,CAClC,gBAAmC,EACnC,GAAsC,EACrB,EAAE;IACnB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5E,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;KACrC;IACD,2DAA2D;IAC3D,MAAM,gBAAgB,GAAG,MAAM,IAAA,mBAAO,EAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IAC9D,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;QACjD,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;YAChC,OAAO,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,QAAQ,yBAAyB,CAAC,CAAC;YACnE,OAAO,CAAC,GAAG,CAAC,+BAA+B,OAAO,EAAE,CAAC,CAAC;YACtD,OAAO,CAAC,GAAG,CAAC,+BAA+B,gBAAgB,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YAC1E,OAAO,CAAC,GAAG,CAAC,+BAA+B,gBAAgB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;SACvF;aAAM;YACL,IAAI,IAAA,0BAAkB,EAAC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE;gBACvF,OAAO,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,QAAQ,oBAAoB,CAAC,CAAC;gBAC9D,OAAO,CAAC,GAAG,CAAC,+BAA+B,OAAO,EAAE,CAAC,CAAC;gBACtD,OAAO,CAAC,GAAG,CAAC,+BAA+B,gBAAgB,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;aAC3E;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,QAAQ,yBAAyB,CAAC,CAAC;gBACnE,OAAO,CAAC,GAAG,CAAC,+BAA+B,OAAO,EAAE,CAAC,CAAC;gBACtD,OAAO,CAAC,GAAG,CAAC,+BAA+B,gBAAgB,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;gBACxE,OAAO,CAAC,GAAG,CACT,+FAA+F,CAChG,CAAC;aACH;SACF;IACH,CAAC,CAAC,CAAC;IACH,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;AACrC,CAAC,CAAA,CAAC;AA/BW,QAAA,oBAAoB,wBA+B/B;AAEF;;;;GAIG;AACI,MAAM,yBAAyB,GAAG,CACvC,GAAsC,EACvB,EAAE;IACjB,KAAK,MAAM,QAAQ,IAAI,qCAA6B,EAAE;QACpD,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC/C,oBAAS,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACxC,MAAM,eAAe,GAAG,IAAA,qCAAkB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,OAAO,GAAG,MAAM,IAAA,4BAAoB,EAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;QAC/E,MAAM,IAAA,sBAAa,EAAC;YAClB,eAAe,EAAE,OAAO;YACxB,YAAY,EAAE,QAAQ;YACtB,GAAG;YACH,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;KACJ;AACH,CAAC,CAAA,CAAC;AAfW,QAAA,yBAAyB,6BAepC"}
+{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../scripts-create2/deploy.ts"],"names":[],"mappings":"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"}

package/dist/scripts-create2/verify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../scripts-create2/verify.ts"],"names":[],"mappings":"AAAA,OAAO,iCAAiC,CAAC;AAIzC,OAAO,EAAE,iCAAiC,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAI/E,eAAO,MAAM,SAAS,oBACH,MAAM,oBACL,iBAAiB,OAC9B,iCAAiC,KACrC,QAAQ,IAAI,CASd,CAAC;AAEF,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,iCAAiC,GAAG,OAAO,CAAC,IAAI,CAAC,CAoDjG"}
+{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../scripts-create2/verify.ts"],"names":[],"mappings":"AAAA,OAAO,iCAAiC,CAAC;AAIzC,OAAO,EAAE,iCAAiC,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAI/E,eAAO,MAAM,SAAS,oBACH,MAAM,oBACL,iBAAiB,OAC9B,iCAAiC,KACrC,QAAQ,IAAI,CASd,CAAC;AAEF,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,iCAAiC,GAAG,OAAO,CAAC,IAAI,CAAC,CAuDjG"}

package/dist/scripts-create2/verify.js

@@ -32,6 +32,9 @@ function VerifyCreate2FromList(hre) {
                 });
             };
             let address;
+            const network = hre.config.xdeploy.networks[0];
+            currency_1.EvmChains.assertChainSupported(network);
+            console.debug(`Verifying ${utils_1.create2ContractDeploymentList.length} contracts on ${network}`);
             for (const contract of utils_1.create2ContractDeploymentList) {
                 try {
                     yield delay();
@@ -51,11 +54,11 @@ function VerifyCreate2FromList(hre) {
                         case 'SingleRequestProxyFactory':
                         case 'ERC20RecurringPaymentProxy':
                         case 'ERC20CommerceEscrowWrapper': {
-                            const network = hre.config.xdeploy.networks[0];
-                            currency_1.EvmChains.assertChainSupported(network);
                             const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract, network);
                             address = yield (0, compute_one_address_1.computeCreate2DeploymentAddress)({ contract, constructorArgs }, hre);
+                            console.debug(`Verifying ${contract} at ${address} on ${network}`);
                             yield (0, exports.verifyOne)(address, { contract, constructorArgs }, hre);
+                            console.debug(`Verified ${contract} on ${network}`);
                             break;
                         }
                         // Other cases to add when necessary

package/dist/scripts-create2/verify.js.map

@@ -1 +1 @@
-{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../scripts-create2/verify.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AAEzC,+DAAwE;AACxE,yDAAwD;AAExD,mCAAwD;AACxD,uDAAqD;AAE9C,MAAM,SAAS,GAAG,CACvB,eAAuB,EACvB,gBAAmC,EACnC,GAAsC,EACvB,EAAE;IACjB,IAAI;QACF,MAAM,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE;YAC7B,OAAO,EAAE,eAAe;YACxB,oBAAoB,EAAE,gBAAgB,CAAC,eAAe;SACvD,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KAClB;AACH,CAAC,CAAA,CAAC;AAbW,QAAA,SAAS,aAapB;AAEF,SAAsB,qBAAqB,CAAC,GAAsC;;QAChF,IAAI;YACF;;;eAGG;YACH,MAAM,KAAK,GAAG,GAAG,EAAE;gBACjB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBAC7B,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;gBAC3B,CAAC,CAAC,CAAC;YACL,CAAC,CAAC;YAEF,IAAI,OAAe,CAAC;YACpB,KAAK,MAAM,QAAQ,IAAI,qCAA6B,EAAE;gBACpD,IAAI;oBACF,MAAM,KAAK,EAAE,CAAC;oBACd,QAAQ,QAAQ,EAAE;wBAChB,KAAK,yBAAyB,CAAC;wBAC/B,KAAK,eAAe,CAAC;wBACrB,KAAK,kBAAkB,CAAC;wBACxB,KAAK,oBAAoB,CAAC;wBAC1B,KAAK,YAAY,CAAC;wBAClB,KAAK,eAAe,CAAC;wBACrB,KAAK,gBAAgB,CAAC;wBACtB,KAAK,uBAAuB,CAAC;wBAC7B,KAAK,sBAAsB,CAAC;wBAC5B,KAAK,kBAAkB,CAAC;wBACxB,KAAK,yBAAyB,CAAC;wBAC/B,KAAK,6BAA6B,CAAC;wBACnC,KAAK,2BAA2B,CAAC;wBACjC,KAAK,4BAA4B,CAAC;wBAClC,KAAK,4BAA4B,CAAC,CAAC;4BACjC,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;4BAC/C,oBAAS,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;4BACxC,MAAM,eAAe,GAAG,IAAA,qCAAkB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;4BAC9D,OAAO,GAAG,MAAM,IAAA,qDAA+B,EAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;4BACpF,MAAM,IAAA,iBAAS,EAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;4BAC7D,MAAM;yBACP;wBACD,oCAAoC;wBACpC;4BACE,MAAM,IAAI,KAAK,CACb,gBAAgB,QAAQ,iDAAiD,CAC1E,CAAC;qBACL;iBACF;gBAAC,OAAO,GAAG,EAAE;oBACZ,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBACnB;aACF;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;IACH,CAAC;CAAA;AApDD,sDAoDC"}
+{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../scripts-create2/verify.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AAEzC,+DAAwE;AACxE,yDAAwD;AAExD,mCAAwD;AACxD,uDAAqD;AAE9C,MAAM,SAAS,GAAG,CACvB,eAAuB,EACvB,gBAAmC,EACnC,GAAsC,EACvB,EAAE;IACjB,IAAI;QACF,MAAM,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE;YAC7B,OAAO,EAAE,eAAe;YACxB,oBAAoB,EAAE,gBAAgB,CAAC,eAAe;SACvD,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KAClB;AACH,CAAC,CAAA,CAAC;AAbW,QAAA,SAAS,aAapB;AAEF,SAAsB,qBAAqB,CAAC,GAAsC;;QAChF,IAAI;YACF;;;eAGG;YACH,MAAM,KAAK,GAAG,GAAG,EAAE;gBACjB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBAC7B,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;gBAC3B,CAAC,CAAC,CAAC;YACL,CAAC,CAAC;YAEF,IAAI,OAAe,CAAC;YACpB,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC/C,oBAAS,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;YACxC,OAAO,CAAC,KAAK,CAAC,aAAa,qCAA6B,CAAC,MAAM,iBAAiB,OAAO,EAAE,CAAC,CAAC;YAC3F,KAAK,MAAM,QAAQ,IAAI,qCAA6B,EAAE;gBACpD,IAAI;oBACF,MAAM,KAAK,EAAE,CAAC;oBACd,QAAQ,QAAQ,EAAE;wBAChB,KAAK,yBAAyB,CAAC;wBAC/B,KAAK,eAAe,CAAC;wBACrB,KAAK,kBAAkB,CAAC;wBACxB,KAAK,oBAAoB,CAAC;wBAC1B,KAAK,YAAY,CAAC;wBAClB,KAAK,eAAe,CAAC;wBACrB,KAAK,gBAAgB,CAAC;wBACtB,KAAK,uBAAuB,CAAC;wBAC7B,KAAK,sBAAsB,CAAC;wBAC5B,KAAK,kBAAkB,CAAC;wBACxB,KAAK,yBAAyB,CAAC;wBAC/B,KAAK,6BAA6B,CAAC;wBACnC,KAAK,2BAA2B,CAAC;wBACjC,KAAK,4BAA4B,CAAC;wBAClC,KAAK,4BAA4B,CAAC,CAAC;4BACjC,MAAM,eAAe,GAAG,IAAA,qCAAkB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;4BAC9D,OAAO,GAAG,MAAM,IAAA,qDAA+B,EAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;4BACpF,OAAO,CAAC,KAAK,CAAC,aAAa,QAAQ,OAAO,OAAO,OAAO,OAAO,EAAE,CAAC,CAAC;4BACnE,MAAM,IAAA,iBAAS,EAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;4BAC7D,OAAO,CAAC,KAAK,CAAC,YAAY,QAAQ,OAAO,OAAO,EAAE,CAAC,CAAC;4BACpD,MAAM;yBACP;wBACD,oCAAoC;wBACpC;4BACE,MAAM,IAAI,KAAK,CACb,gBAAgB,QAAQ,iDAAiD,CAC1E,CAAC;qBACL;iBACF;gBAAC,OAAO,GAAG,EAAE;oBACZ,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBACnB;aACF;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;IACH,CAAC;CAAA;AAvDD,sDAuDC"}

package/dist/scripts-create2/xdeployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xdeployer.d.ts","sourceRoot":"","sources":["../../scripts-create2/xdeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAalG,eAAO,MAAM,OAAO,qBACA,iBAAiB,OAC9B,iCAAiC,KACrC,QAAQ,MAAM,iBAAiB,CAAC,CAiGlC,CAAC"}
+{"version":3,"file":"xdeployer.d.ts","sourceRoot":"","sources":["../../scripts-create2/xdeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAalG,eAAO,MAAM,OAAO,qBACA,iBAAiB,OAC9B,iCAAiC,KACrC,QAAQ,MAAM,iBAAiB,CAAC,CAyGlC,CAAC"}

package/dist/scripts-create2/xdeployer.js

@@ -7,7 +7,11 @@ const utils_1 = require("@requestnetwork/utils");
 const fee_suggestion_1 = require("./fee-suggestion");
 const ZERO_ETH_INPUT = 0;
 const xdeploy = (deploymentParams, hre) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const { contract, constructorArgs } = deploymentParams;
+    if (!hre.config.xdeploy.signer) {
+        throw new Error('Xdeployer signer (process.env.ADMIN_PRIVATE_KEY) missing');
+    }
     console.log(`Deployment of ${contract} through xdeployer starting now, with ${new hre.ethers.Wallet(hre.config.xdeploy.signer).address}`);
     yield hre.run('compile');
     if (!hre.config.xdeploy.networks) {
@@ -47,6 +51,7 @@ const xdeploy = (deploymentParams, hre) => tslib_1.__awaiter(void 0, void 0, voi
         catch (err) {
             throw new Error('Contract address could not be computed, check your contract name and arguments');
         }
+        console.log(`... at ${computedContractAddress}`);
         let receipt = undefined;
         let deployed = false;
         let error = undefined;
@@ -64,7 +69,12 @@ const xdeploy = (deploymentParams, hre) => tslib_1.__awaiter(void 0, void 0, voi
             deployed = true;
         }
         catch (err) {
-            error = err;
+            if ((_a = err === null || err === void 0 ? void 0 : err.message) === null || _a === void 0 ? void 0 : _a.match(/insufficient funds for intrinsic transaction cost/)) {
+                error = 'Insufficient funds';
+            }
+            else {
+                error = err;
+            }
         }
         result.push({
             network,

package/dist/scripts-create2/xdeployer.js.map

@@ -1 +1 @@
-{"version":3,"file":"xdeployer.js","sourceRoot":"","sources":["../../scripts-create2/xdeployer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"xdeployer.js","sourceRoot":"","sources":["../../scripts-create2/xdeployer.ts"],"names":[],"mappings":";;;;AACA,oCAA6C;AAE7C,iDAK+B;AAC/B,qDAAsD;AAEtD,MAAM,cAAc,GAAG,CAAC,CAAC;AAElB,MAAM,OAAO,GAAG,CACrB,gBAAmC,EACnC,GAAsC,EACH,EAAE;;IACrC,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,gBAAgB,CAAC;IACvD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;QAC9B,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;KAC7E;IACD,OAAO,CAAC,GAAG,CACT,iBAAiB,QAAQ,yCACvB,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OACnD,EAAE,CACH,CAAC;IAEF,MAAM,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAEzB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;KAC9C;IAED,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;KACjC;IAED,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC7C;IAED,MAAM,MAAM,GAA6B,EAAE,CAAC;IAC5C,IAAI,QAAa,CAAC;IAElB,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAC/D,IAAI,eAAe,IAAI,QAAQ,EAAE;QAC/B,QAAQ,GAAG,MAAM,QAAQ,CAAC,oBAAoB,CAAC,GAAG,eAAe,CAAC,CAAC;KACpE;SAAM,IAAI,CAAC,eAAe,IAAI,QAAQ,EAAE;QACvC,QAAQ,GAAG,MAAM,QAAQ,CAAC,oBAAoB,EAAE,CAAC;KAClD;IAED,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;QACjD,OAAO,CAAC,GAAG,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC;QACjC,IAAI,QAAQ,CAAC;QACb,IAAI,OAAO,KAAK,MAAM,EAAE;YACtB,QAAQ,GAAG,IAAA,uBAAe,GAAE,CAAC;SAC9B;aAAM;YACL,QAAQ,GAAG,IAAA,0BAAkB,EAAC,OAAO,CAAC,CAAC;SACxC;QACD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC1E,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAExC,IAAI,uBAA+B,CAAC;QACpC,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC7C,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAClC,qBAAe,CAAC,cAAc,EAAE,EAChC,MAAM,CACP,CAAC;QACF,IAAI;YACF,uBAAuB,GAAG,MAAM,eAAe,CAAC,cAAc,CAC5D,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAC5C,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAC1C,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,KAAK,CACb,gFAAgF,CACjF,CAAC;SACH;QACD,OAAO,CAAC,GAAG,CAAC,UAAU,uBAAuB,EAAE,CAAC,CAAC;QAEjD,IAAI,OAAO,GAAG,SAAS,CAAC;QACxB,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,KAAK,GAAG,SAAS,CAAC;QACtB,IAAI,WAAW,GAAc,EAAE,CAAC;QAEhC,IAAI,MAAM,IAAA,0BAAkB,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAE;YAC/C,WAAW,GAAG,MAAM,IAAA,wBAAgB,EAAC;gBACnC,MAAM,EAAE,OAAO;gBACf,WAAW,EAAE,IAAA,mCAAkB,EAAC,QAAQ,CAAC;aAC1C,CAAC,CAAC;SACJ;QACD,WAAW,CAAC,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;QAEnD,IAAI;YACF,MAAM,aAAa,GAAG,MAAM,CAC1B,MAAM,eAAe,CAAC,MAAM,CAC1B,cAAc,EACd,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAC5C,QAAQ,CAAC,IAAI,EACb,WAAW,CACZ,CACF,CAAC,IAAI,EAAE,CAAC;YACT,OAAO,GAAG,aAAa,CAAC;YACxB,QAAQ,GAAG,IAAI,CAAC;SACjB;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,0CAAE,KAAK,CAAC,mDAAmD,CAAC,EAAE;gBAC5E,KAAK,GAAG,oBAAoB,CAAC;aAC9B;iBAAM;gBACL,KAAK,GAAG,GAAG,CAAC;aACb;SACF;QACD,MAAM,CAAC,IAAI,CAAC;YACV,OAAO;YACP,QAAQ;YACR,OAAO,EAAE,uBAAuB;YAChC,OAAO;YACP,QAAQ;YACR,KAAK;SACN,CAAC,CAAC;KACJ;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAA,CAAC;AA5GW,QAAA,OAAO,WA4GlB"}