@requestnetwork/smart-contracts 0.53.0 → 0.53.1-next.18be89d7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/scripts-create2/compute-one-address.d.ts.map +1 -1
- package/dist/scripts-create2/compute-one-address.js +4 -0
- package/dist/scripts-create2/compute-one-address.js.map +1 -1
- package/dist/scripts-create2/deploy.d.ts +4 -1
- package/dist/scripts-create2/deploy.d.ts.map +1 -1
- package/dist/scripts-create2/deploy.js +11 -4
- package/dist/scripts-create2/deploy.js.map +1 -1
- package/dist/scripts-create2/verify.d.ts.map +1 -1
- package/dist/scripts-create2/verify.js +5 -2
- package/dist/scripts-create2/verify.js.map +1 -1
- package/dist/scripts-create2/xdeployer.d.ts.map +1 -1
- package/dist/scripts-create2/xdeployer.js +11 -1
- package/dist/scripts-create2/xdeployer.js.map +1 -1
- package/dist/src/lib/artifacts/BatchConversionPayments/0.2.0.json +766 -0
- package/dist/src/lib/artifacts/BatchConversionPayments/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/BatchConversionPayments/index.js +10 -0
- package/dist/src/lib/artifacts/BatchConversionPayments/index.js.map +1 -1
- package/dist/src/lib/artifacts/ERC20RecurringPaymentProxy/0.2.0.json +531 -0
- package/dist/src/lib/artifacts/ERC20RecurringPaymentProxy/index.d.ts +2 -2
- package/dist/src/lib/artifacts/ERC20RecurringPaymentProxy/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/ERC20RecurringPaymentProxy/index.js +5 -0
- package/dist/src/lib/artifacts/ERC20RecurringPaymentProxy/index.js.map +1 -1
- package/dist/src/types/@openzeppelin/contracts/interfaces/IERC1271.d.ts +45 -0
- package/dist/src/types/@openzeppelin/contracts/interfaces/IERC1271.d.ts.map +1 -0
- package/dist/src/types/@openzeppelin/contracts/interfaces/IERC1271.js +3 -0
- package/dist/src/types/@openzeppelin/contracts/interfaces/IERC1271.js.map +1 -0
- package/dist/src/types/@openzeppelin/contracts/interfaces/index.d.ts +1 -0
- package/dist/src/types/@openzeppelin/contracts/interfaces/index.d.ts.map +1 -1
- package/dist/src/types/factories/@openzeppelin/contracts/interfaces/IERC1271__factory.d.ts +27 -0
- package/dist/src/types/factories/@openzeppelin/contracts/interfaces/IERC1271__factory.d.ts.map +1 -0
- package/dist/src/types/factories/@openzeppelin/contracts/interfaces/IERC1271__factory.js +44 -0
- package/dist/src/types/factories/@openzeppelin/contracts/interfaces/IERC1271__factory.js.map +1 -0
- package/dist/src/types/factories/@openzeppelin/contracts/interfaces/index.d.ts +1 -0
- package/dist/src/types/factories/@openzeppelin/contracts/interfaces/index.d.ts.map +1 -1
- package/dist/src/types/factories/@openzeppelin/contracts/interfaces/index.js +3 -1
- package/dist/src/types/factories/@openzeppelin/contracts/interfaces/index.js.map +1 -1
- package/dist/src/types/factories/src/contracts/BatchConversionPayments__factory.d.ts +15 -1
- package/dist/src/types/factories/src/contracts/BatchConversionPayments__factory.d.ts.map +1 -1
- package/dist/src/types/factories/src/contracts/BatchConversionPayments__factory.js +19 -1
- package/dist/src/types/factories/src/contracts/BatchConversionPayments__factory.js.map +1 -1
- package/dist/src/types/factories/src/contracts/BatchNoConversionPayments__factory.d.ts +15 -1
- package/dist/src/types/factories/src/contracts/BatchNoConversionPayments__factory.d.ts.map +1 -1
- package/dist/src/types/factories/src/contracts/BatchNoConversionPayments__factory.js +19 -1
- package/dist/src/types/factories/src/contracts/BatchNoConversionPayments__factory.js.map +1 -1
- package/dist/src/types/factories/src/contracts/ERC20RecurringPaymentProxy__factory.d.ts +549 -71
- package/dist/src/types/factories/src/contracts/ERC20RecurringPaymentProxy__factory.d.ts.map +1 -1
- package/dist/src/types/factories/src/contracts/ERC20RecurringPaymentProxy__factory.js +695 -79
- package/dist/src/types/factories/src/contracts/ERC20RecurringPaymentProxy__factory.js.map +1 -1
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20BlockRecipient__factory.d.ts +255 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20BlockRecipient__factory.d.ts.map +1 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20BlockRecipient__factory.js +350 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20BlockRecipient__factory.js.map +1 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20FailTransfer__factory.d.ts +235 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20FailTransfer__factory.d.ts.map +1 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20FailTransfer__factory.js +324 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20FailTransfer__factory.js.map +1 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20FeeOnTransfer__factory.d.ts +235 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20FeeOnTransfer__factory.d.ts.map +1 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20FeeOnTransfer__factory.js +324 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20FeeOnTransfer__factory.js.map +1 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20SilentFail__factory.d.ts +235 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20SilentFail__factory.d.ts.map +1 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20SilentFail__factory.js +324 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20SilentFail__factory.js.map +1 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/index.d.ts +5 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/index.d.ts.map +1 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/index.js +15 -0
- package/dist/src/types/factories/src/contracts/test/ERC20PullTestTokens.sol/index.js.map +1 -0
- package/dist/src/types/factories/src/contracts/test/MockERC1271__factory.d.ts +75 -0
- package/dist/src/types/factories/src/contracts/test/MockERC1271__factory.d.ts.map +1 -0
- package/dist/src/types/factories/src/contracts/test/MockERC1271__factory.js +114 -0
- package/dist/src/types/factories/src/contracts/test/MockERC1271__factory.js.map +1 -0
- package/dist/src/types/factories/src/contracts/test/index.d.ts +2 -0
- package/dist/src/types/factories/src/contracts/test/index.d.ts.map +1 -1
- package/dist/src/types/factories/src/contracts/test/index.js +4 -1
- package/dist/src/types/factories/src/contracts/test/index.js.map +1 -1
- package/dist/src/types/hardhat.d.ts +54 -0
- package/dist/src/types/index.d.ts +12 -0
- package/dist/src/types/index.d.ts.map +1 -1
- package/dist/src/types/index.js +14 -2
- package/dist/src/types/index.js.map +1 -1
- package/dist/src/types/src/contracts/BatchConversionPayments.d.ts +17 -1
- package/dist/src/types/src/contracts/BatchConversionPayments.d.ts.map +1 -1
- package/dist/src/types/src/contracts/BatchNoConversionPayments.d.ts +17 -1
- package/dist/src/types/src/contracts/BatchNoConversionPayments.d.ts.map +1 -1
- package/dist/src/types/src/contracts/ERC20RecurringPaymentProxy.d.ts +280 -101
- package/dist/src/types/src/contracts/ERC20RecurringPaymentProxy.d.ts.map +1 -1
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20BlockRecipient.d.ts +219 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20BlockRecipient.d.ts.map +1 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20BlockRecipient.js +3 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20BlockRecipient.js.map +1 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20FailTransfer.d.ts +187 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20FailTransfer.d.ts.map +1 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20FailTransfer.js +3 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20FailTransfer.js.map +1 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20FeeOnTransfer.d.ts +195 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20FeeOnTransfer.d.ts.map +1 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20FeeOnTransfer.js +3 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20FeeOnTransfer.js.map +1 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20SilentFail.d.ts +195 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20SilentFail.d.ts.map +1 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20SilentFail.js +3 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20SilentFail.js.map +1 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/index.d.ts +5 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/index.d.ts.map +1 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/index.js +3 -0
- package/dist/src/types/src/contracts/test/ERC20PullTestTokens.sol/index.js.map +1 -0
- package/dist/src/types/src/contracts/test/MockERC1271.d.ts +67 -0
- package/dist/src/types/src/contracts/test/MockERC1271.d.ts.map +1 -0
- package/dist/src/types/src/contracts/test/MockERC1271.js +3 -0
- package/dist/src/types/src/contracts/test/MockERC1271.js.map +1 -0
- package/dist/src/types/src/contracts/test/index.d.ts +3 -0
- package/dist/src/types/src/contracts/test/index.d.ts.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +5 -6
- package/types/@openzeppelin/contracts/interfaces/IERC1271.d.ts +45 -0
- package/types/@openzeppelin/contracts/interfaces/IERC1271.d.ts.map +1 -0
- package/types/@openzeppelin/contracts/interfaces/IERC1271.js +3 -0
- package/types/@openzeppelin/contracts/interfaces/IERC1271.js.map +1 -0
- package/types/@openzeppelin/contracts/interfaces/index.d.ts +1 -0
- package/types/@openzeppelin/contracts/interfaces/index.d.ts.map +1 -1
- package/types/factories/@openzeppelin/contracts/interfaces/IERC1271__factory.d.ts +27 -0
- package/types/factories/@openzeppelin/contracts/interfaces/IERC1271__factory.d.ts.map +1 -0
- package/types/factories/@openzeppelin/contracts/interfaces/IERC1271__factory.js +44 -0
- package/types/factories/@openzeppelin/contracts/interfaces/IERC1271__factory.js.map +1 -0
- package/types/factories/@openzeppelin/contracts/interfaces/index.d.ts +1 -0
- package/types/factories/@openzeppelin/contracts/interfaces/index.d.ts.map +1 -1
- package/types/factories/@openzeppelin/contracts/interfaces/index.js +3 -1
- package/types/factories/@openzeppelin/contracts/interfaces/index.js.map +1 -1
- package/types/factories/src/contracts/BatchConversionPayments__factory.d.ts +15 -1
- package/types/factories/src/contracts/BatchConversionPayments__factory.d.ts.map +1 -1
- package/types/factories/src/contracts/BatchConversionPayments__factory.js +19 -1
- package/types/factories/src/contracts/BatchConversionPayments__factory.js.map +1 -1
- package/types/factories/src/contracts/BatchNoConversionPayments__factory.d.ts +15 -1
- package/types/factories/src/contracts/BatchNoConversionPayments__factory.d.ts.map +1 -1
- package/types/factories/src/contracts/BatchNoConversionPayments__factory.js +19 -1
- package/types/factories/src/contracts/BatchNoConversionPayments__factory.js.map +1 -1
- package/types/factories/src/contracts/ERC20RecurringPaymentProxy__factory.d.ts +549 -71
- package/types/factories/src/contracts/ERC20RecurringPaymentProxy__factory.d.ts.map +1 -1
- package/types/factories/src/contracts/ERC20RecurringPaymentProxy__factory.js +695 -79
- package/types/factories/src/contracts/ERC20RecurringPaymentProxy__factory.js.map +1 -1
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20BlockRecipient__factory.d.ts +255 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20BlockRecipient__factory.d.ts.map +1 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20BlockRecipient__factory.js +350 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20BlockRecipient__factory.js.map +1 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20FailTransfer__factory.d.ts +235 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20FailTransfer__factory.d.ts.map +1 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20FailTransfer__factory.js +324 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20FailTransfer__factory.js.map +1 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20FeeOnTransfer__factory.d.ts +235 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20FeeOnTransfer__factory.d.ts.map +1 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20FeeOnTransfer__factory.js +324 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20FeeOnTransfer__factory.js.map +1 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20SilentFail__factory.d.ts +235 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20SilentFail__factory.d.ts.map +1 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20SilentFail__factory.js +324 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/ERC20SilentFail__factory.js.map +1 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/index.d.ts +5 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/index.d.ts.map +1 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/index.js +15 -0
- package/types/factories/src/contracts/test/ERC20PullTestTokens.sol/index.js.map +1 -0
- package/types/factories/src/contracts/test/MockERC1271__factory.d.ts +75 -0
- package/types/factories/src/contracts/test/MockERC1271__factory.d.ts.map +1 -0
- package/types/factories/src/contracts/test/MockERC1271__factory.js +114 -0
- package/types/factories/src/contracts/test/MockERC1271__factory.js.map +1 -0
- package/types/factories/src/contracts/test/index.d.ts +2 -0
- package/types/factories/src/contracts/test/index.d.ts.map +1 -1
- package/types/factories/src/contracts/test/index.js +4 -1
- package/types/factories/src/contracts/test/index.js.map +1 -1
- package/types/hardhat.d.ts +54 -0
- package/types/index.d.ts +12 -0
- package/types/index.d.ts.map +1 -1
- package/types/index.js +14 -2
- package/types/index.js.map +1 -1
- package/types/src/contracts/BatchConversionPayments.d.ts +17 -1
- package/types/src/contracts/BatchConversionPayments.d.ts.map +1 -1
- package/types/src/contracts/BatchNoConversionPayments.d.ts +17 -1
- package/types/src/contracts/BatchNoConversionPayments.d.ts.map +1 -1
- package/types/src/contracts/ERC20RecurringPaymentProxy.d.ts +280 -101
- package/types/src/contracts/ERC20RecurringPaymentProxy.d.ts.map +1 -1
- package/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20BlockRecipient.d.ts +219 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20BlockRecipient.d.ts.map +1 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20BlockRecipient.js +3 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20BlockRecipient.js.map +1 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20FailTransfer.d.ts +187 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20FailTransfer.d.ts.map +1 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20FailTransfer.js +3 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20FailTransfer.js.map +1 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20FeeOnTransfer.d.ts +195 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20FeeOnTransfer.d.ts.map +1 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20FeeOnTransfer.js +3 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20FeeOnTransfer.js.map +1 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20SilentFail.d.ts +195 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20SilentFail.d.ts.map +1 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20SilentFail.js +3 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/ERC20SilentFail.js.map +1 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/index.d.ts +5 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/index.d.ts.map +1 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/index.js +3 -0
- package/types/src/contracts/test/ERC20PullTestTokens.sol/index.js.map +1 -0
- package/types/src/contracts/test/MockERC1271.d.ts +67 -0
- package/types/src/contracts/test/MockERC1271.d.ts.map +1 -0
- package/types/src/contracts/test/MockERC1271.js +3 -0
- package/types/src/contracts/test/MockERC1271.js.map +1 -0
- package/types/src/contracts/test/index.d.ts +3 -0
- package/types/src/contracts/test/index.d.ts.map +1 -1
package/README.md
CHANGED
|
@@ -67,7 +67,7 @@ The package stores the following smart contracts:
|
|
|
67
67
|
- `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.
|
|
68
68
|
- `StorageFeeCollector` parent contract (not deployed) of `RequestOpenHashSubmitter`, computes the fees and send them to the burner.
|
|
69
69
|
|
|
70
|
-
**Smart contracts for advanced-logic package**
|
|
70
|
+
**Smart contracts for payments (advanced-logic package)**
|
|
71
71
|
|
|
72
72
|
- `TestERC20` minimal erc20 token used for tests.
|
|
73
73
|
- `ERC20Proxy` used to pay requests with an ERC20 proxy contract payment network
|
|
@@ -1 +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,
|
|
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,CAsCjB;AAED,eAAO,MAAM,yCAAyC,QAC/C,iCAAiC,KACrC,QAAQ,IAAI,CAqCd,CAAC"}
|
|
@@ -33,6 +33,10 @@ function computeCreate2DeploymentAddress(deploymentParams, hre) {
|
|
|
33
33
|
return computedAddress;
|
|
34
34
|
}
|
|
35
35
|
catch (e) {
|
|
36
|
+
console.warn('Error while computing the deployment address', {
|
|
37
|
+
'deploymentParams.contract': deploymentParams.contract,
|
|
38
|
+
WEB3_PROVIDER_URL: process.env.WEB3_PROVIDER_URL,
|
|
39
|
+
});
|
|
36
40
|
throw new Error(e.toString());
|
|
37
41
|
}
|
|
38
42
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compute-one-address.js","sourceRoot":"","sources":["../../scripts-create2/compute-one-address.ts"],"names":[],"mappings":";;;;AACA,oCAA6C;AAC7C,mCAAwD;AACxD,yDAAwD;AACxD,uDAAqD;AAErD,gCAAgC;AAChC,SAAsB,+BAA+B,CACnD,gBAAmC,EACnC,GAAsC;;QAEtC,IAAI;YACF,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE;gBAC5B,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;aACjC;YAED,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE;gBACvC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;aAC7C;YAED,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,CACvD,uCAAuC,CACxC,CAAC;YACF,MAAM,eAAe,GAAG,qBAAe,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACvE,MAAM,gBAAgB,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YACxF,IAAI,QAAQ,CAAC;YACb,IAAI,gBAAgB,CAAC,eAAe,EAAE;gBACpC,QAAQ,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,CAAC,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;aAC7F;iBAAM;gBACL,QAAQ,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,EAAE,CAAC;aAC1D;YAED,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;gBAC/B,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;aACzE;YACD,MAAM,eAAe,GAAG,MAAM,eAAe,CAAC,0BAA0B,CACtE,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,EACzC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CACnC,CAAC;YACF,OAAO,eAAe,CAAC;SACxB;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC/B;IACH,CAAC;CAAA;
|
|
1
|
+
{"version":3,"file":"compute-one-address.js","sourceRoot":"","sources":["../../scripts-create2/compute-one-address.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,10 @@ import { HardhatRuntimeEnvironmentExtended, IDeploymentParams } from './types';
|
|
|
6
6
|
* @param hre hardhat runtime environment
|
|
7
7
|
* @returns The address of the deployed contract - same for all network
|
|
8
8
|
*/
|
|
9
|
-
export declare const deployOneWithCreate2: (deploymentParams: IDeploymentParams, hre: HardhatRuntimeEnvironmentExtended) => Promise<
|
|
9
|
+
export declare const deployOneWithCreate2: (deploymentParams: IDeploymentParams, hre: HardhatRuntimeEnvironmentExtended) => Promise<{
|
|
10
|
+
deployed: 'success' | 'yes' | 'no';
|
|
11
|
+
address: string;
|
|
12
|
+
}>;
|
|
10
13
|
/**
|
|
11
14
|
* Deploy all the contracts specified in create2ContractDeploymentList.
|
|
12
15
|
* Once deployed, do the setup.
|
|
@@ -1 +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,
|
|
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;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"}
|
|
@@ -19,6 +19,7 @@ const deployOneWithCreate2 = (deploymentParams, hre) => tslib_1.__awaiter(void 0
|
|
|
19
19
|
throw new Error('Invalid networks');
|
|
20
20
|
}
|
|
21
21
|
// Deploy the contract on several network through xdeployer
|
|
22
|
+
let deployed = 'no';
|
|
22
23
|
const deploymentResult = yield (0, xdeployer_1.xdeploy)(deploymentParams, hre);
|
|
23
24
|
hre.config.xdeploy.networks.forEach((network, i) => {
|
|
24
25
|
if (deploymentResult[i].deployed) {
|
|
@@ -26,12 +27,14 @@ const deployOneWithCreate2 = (deploymentParams, hre) => tslib_1.__awaiter(void 0
|
|
|
26
27
|
console.log(` On network: ${network}`);
|
|
27
28
|
console.log(` At address: ${deploymentResult[i].address}`);
|
|
28
29
|
console.log(` At block: ${deploymentResult[i].receipt.blockNumber}`);
|
|
30
|
+
deployed = 'success';
|
|
29
31
|
}
|
|
30
32
|
else {
|
|
31
33
|
if ((0, utils_1.isContractDeployed)(deploymentParams.contract, network, deploymentResult[i].address)) {
|
|
32
34
|
console.log(`${deploymentParams.contract} already deployed:`);
|
|
33
35
|
console.log(` On network: ${network}`);
|
|
34
36
|
console.log(` At address: ${deploymentResult[i].address}`);
|
|
37
|
+
deployed = 'yes';
|
|
35
38
|
}
|
|
36
39
|
else {
|
|
37
40
|
console.log(`${deploymentParams.contract} has not been deployed:`);
|
|
@@ -41,7 +44,7 @@ const deployOneWithCreate2 = (deploymentParams, hre) => tslib_1.__awaiter(void 0
|
|
|
41
44
|
}
|
|
42
45
|
}
|
|
43
46
|
});
|
|
44
|
-
return deploymentResult[0].address;
|
|
47
|
+
return { deployed, address: deploymentResult[0].address };
|
|
45
48
|
});
|
|
46
49
|
exports.deployOneWithCreate2 = deployOneWithCreate2;
|
|
47
50
|
/**
|
|
@@ -50,11 +53,15 @@ exports.deployOneWithCreate2 = deployOneWithCreate2;
|
|
|
50
53
|
* @param hre
|
|
51
54
|
*/
|
|
52
55
|
const deployWithCreate2FromList = (hre) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
56
|
+
const network = hre.config.xdeploy.networks[0];
|
|
57
|
+
currency_1.EvmChains.assertChainSupported(network);
|
|
53
58
|
for (const contract of utils_1.create2ContractDeploymentList) {
|
|
54
|
-
const network = hre.config.xdeploy.networks[0];
|
|
55
|
-
currency_1.EvmChains.assertChainSupported(network);
|
|
56
59
|
const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract, network);
|
|
57
|
-
const address = yield (0, exports.deployOneWithCreate2)({ contract, constructorArgs }, hre);
|
|
60
|
+
const { deployed, address } = yield (0, exports.deployOneWithCreate2)({ contract, constructorArgs }, hre);
|
|
61
|
+
if (deployed === 'no') {
|
|
62
|
+
console.warn('Skipping contract setup');
|
|
63
|
+
continue;
|
|
64
|
+
}
|
|
58
65
|
yield (0, setups_1.setupContract)({
|
|
59
66
|
contractAddress: address,
|
|
60
67
|
contractName: contract,
|
|
@@ -1 +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,
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../scripts-create2/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +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,
|
|
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,CAuDjG"}
|
|
@@ -32,6 +32,9 @@ function VerifyCreate2FromList(hre) {
|
|
|
32
32
|
});
|
|
33
33
|
};
|
|
34
34
|
let address;
|
|
35
|
+
const network = hre.config.xdeploy.networks[0];
|
|
36
|
+
currency_1.EvmChains.assertChainSupported(network);
|
|
37
|
+
console.debug(`Verifying ${utils_1.create2ContractDeploymentList.length} contracts on ${network}`);
|
|
35
38
|
for (const contract of utils_1.create2ContractDeploymentList) {
|
|
36
39
|
try {
|
|
37
40
|
yield delay();
|
|
@@ -51,11 +54,11 @@ function VerifyCreate2FromList(hre) {
|
|
|
51
54
|
case 'SingleRequestProxyFactory':
|
|
52
55
|
case 'ERC20RecurringPaymentProxy':
|
|
53
56
|
case 'ERC20CommerceEscrowWrapper': {
|
|
54
|
-
const network = hre.config.xdeploy.networks[0];
|
|
55
|
-
currency_1.EvmChains.assertChainSupported(network);
|
|
56
57
|
const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract, network);
|
|
57
58
|
address = yield (0, compute_one_address_1.computeCreate2DeploymentAddress)({ contract, constructorArgs }, hre);
|
|
59
|
+
console.debug(`Verifying ${contract} at ${address} on ${network}`);
|
|
58
60
|
yield (0, exports.verifyOne)(address, { contract, constructorArgs }, hre);
|
|
61
|
+
console.debug(`Verified ${contract} on ${network}`);
|
|
59
62
|
break;
|
|
60
63
|
}
|
|
61
64
|
// Other cases to add when necessary
|
|
@@ -1 +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,
|
|
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,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"}
|
|
@@ -1 +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,
|
|
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,CAyGlC,CAAC"}
|
|
@@ -7,7 +7,11 @@ const utils_1 = require("@requestnetwork/utils");
|
|
|
7
7
|
const fee_suggestion_1 = require("./fee-suggestion");
|
|
8
8
|
const ZERO_ETH_INPUT = 0;
|
|
9
9
|
const xdeploy = (deploymentParams, hre) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
10
|
+
var _a;
|
|
10
11
|
const { contract, constructorArgs } = deploymentParams;
|
|
12
|
+
if (!hre.config.xdeploy.signer) {
|
|
13
|
+
throw new Error('Xdeployer signer (process.env.ADMIN_PRIVATE_KEY) missing');
|
|
14
|
+
}
|
|
11
15
|
console.log(`Deployment of ${contract} through xdeployer starting now, with ${new hre.ethers.Wallet(hre.config.xdeploy.signer).address}`);
|
|
12
16
|
yield hre.run('compile');
|
|
13
17
|
if (!hre.config.xdeploy.networks) {
|
|
@@ -47,6 +51,7 @@ const xdeploy = (deploymentParams, hre) => tslib_1.__awaiter(void 0, void 0, voi
|
|
|
47
51
|
catch (err) {
|
|
48
52
|
throw new Error('Contract address could not be computed, check your contract name and arguments');
|
|
49
53
|
}
|
|
54
|
+
console.log(`... at ${computedContractAddress}`);
|
|
50
55
|
let receipt = undefined;
|
|
51
56
|
let deployed = false;
|
|
52
57
|
let error = undefined;
|
|
@@ -64,7 +69,12 @@ const xdeploy = (deploymentParams, hre) => tslib_1.__awaiter(void 0, void 0, voi
|
|
|
64
69
|
deployed = true;
|
|
65
70
|
}
|
|
66
71
|
catch (err) {
|
|
67
|
-
|
|
72
|
+
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/)) {
|
|
73
|
+
error = 'Insufficient funds';
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
error = err;
|
|
77
|
+
}
|
|
68
78
|
}
|
|
69
79
|
result.push({
|
|
70
80
|
network,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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
|
|
1
|
+
{"version":3,"file":"xdeployer.js","sourceRoot":"","sources":["../../scripts-create2/xdeployer.ts"],"names":[],"mappings":"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"}
|