@requestnetwork/smart-contracts 0.29.1-next.1822 → 0.29.1-next.1823
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/dist/hardhat.config.d.ts +14 -0
- package/dist/hardhat.config.d.ts.map +1 -1
- package/dist/hardhat.config.js +17 -0
- package/dist/hardhat.config.js.map +1 -1
- package/dist/scripts/deploy-payments.d.ts.map +1 -1
- package/dist/scripts/deploy-payments.js +3 -8
- package/dist/scripts/deploy-payments.js.map +1 -1
- package/dist/scripts/utils.d.ts.map +1 -1
- package/dist/scripts/utils.js +2 -0
- package/dist/scripts/utils.js.map +1 -1
- package/dist/scripts-create2/constructor-args.d.ts.map +1 -1
- package/dist/scripts-create2/constructor-args.js +3 -1
- package/dist/scripts-create2/constructor-args.js.map +1 -1
- package/dist/scripts-create2/contract-setup/adminTasks.d.ts +12 -7
- package/dist/scripts-create2/contract-setup/adminTasks.d.ts.map +1 -1
- package/dist/scripts-create2/contract-setup/adminTasks.js +41 -21
- package/dist/scripts-create2/contract-setup/adminTasks.js.map +1 -1
- package/dist/scripts-create2/contract-setup/setupBatchPayments.d.ts.map +1 -1
- package/dist/scripts-create2/contract-setup/setupBatchPayments.js +10 -17
- package/dist/scripts-create2/contract-setup/setupBatchPayments.js.map +1 -1
- package/dist/scripts-create2/contract-setup/setupERC20SwapToConversion.d.ts.map +1 -1
- package/dist/scripts-create2/contract-setup/setupERC20SwapToConversion.js +10 -17
- package/dist/scripts-create2/contract-setup/setupERC20SwapToConversion.js.map +1 -1
- package/dist/scripts-create2/contract-setup/setupETHConversionProxy.d.ts.map +1 -1
- package/dist/scripts-create2/contract-setup/setupETHConversionProxy.js +10 -18
- package/dist/scripts-create2/contract-setup/setupETHConversionProxy.js.map +1 -1
- package/dist/scripts-create2/contract-setup/setupErc20ConversionProxy.d.ts +8 -0
- package/dist/scripts-create2/contract-setup/setupErc20ConversionProxy.d.ts.map +1 -0
- package/dist/scripts-create2/contract-setup/setupErc20ConversionProxy.js +30 -0
- package/dist/scripts-create2/contract-setup/setupErc20ConversionProxy.js.map +1 -0
- package/dist/scripts-create2/deploy.d.ts.map +1 -1
- package/dist/scripts-create2/deploy.js +17 -3
- package/dist/scripts-create2/deploy.js.map +1 -1
- package/dist/scripts-create2/utils.d.ts.map +1 -1
- package/dist/scripts-create2/utils.js +3 -1
- package/dist/scripts-create2/utils.js.map +1 -1
- package/dist/scripts-create2/verify.d.ts.map +1 -1
- package/dist/scripts-create2/verify.js +45 -30
- package/dist/scripts-create2/verify.js.map +1 -1
- package/dist/src/lib/artifacts/BatchPayments/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/BatchPayments/index.js +4 -0
- package/dist/src/lib/artifacts/BatchPayments/index.js.map +1 -1
- package/dist/src/lib/artifacts/ChainlinkConversionPath/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/ChainlinkConversionPath/index.js +4 -0
- package/dist/src/lib/artifacts/ChainlinkConversionPath/index.js.map +1 -1
- package/dist/src/lib/artifacts/ERC20EscrowToPay/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/ERC20EscrowToPay/index.js +5 -0
- package/dist/src/lib/artifacts/ERC20EscrowToPay/index.js.map +1 -1
- package/dist/src/lib/artifacts/ERC20FeeProxy/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/ERC20FeeProxy/index.js +4 -0
- package/dist/src/lib/artifacts/ERC20FeeProxy/index.js.map +1 -1
- package/dist/src/lib/artifacts/ERC20SwapToPay/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/ERC20SwapToPay/index.js +4 -0
- package/dist/src/lib/artifacts/ERC20SwapToPay/index.js.map +1 -1
- package/dist/src/lib/artifacts/Erc20ConversionProxy/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/Erc20ConversionProxy/index.js +8 -0
- package/dist/src/lib/artifacts/Erc20ConversionProxy/index.js.map +1 -1
- package/dist/src/lib/artifacts/Erc20SwapConversion/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/Erc20SwapConversion/index.js +5 -0
- package/dist/src/lib/artifacts/Erc20SwapConversion/index.js.map +1 -1
- package/dist/src/lib/artifacts/EthConversionProxy/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/EthConversionProxy/index.js +4 -0
- package/dist/src/lib/artifacts/EthConversionProxy/index.js.map +1 -1
- package/dist/src/lib/artifacts/EthereumFeeProxy/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/EthereumFeeProxy/index.js +4 -0
- package/dist/src/lib/artifacts/EthereumFeeProxy/index.js.map +1 -1
- package/dist/src/lib/artifacts/EthereumProxy/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/EthereumProxy/index.js +4 -0
- package/dist/src/lib/artifacts/EthereumProxy/index.js.map +1 -1
- package/dist/src/lib/artifacts/RequestDeployer/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/RequestDeployer/index.js +4 -0
- package/dist/src/lib/artifacts/RequestDeployer/index.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +6 -6
package/dist/hardhat.config.d.ts
CHANGED
|
@@ -80,6 +80,11 @@ declare const _default: {
|
|
|
80
80
|
chainId: number;
|
|
81
81
|
accounts: string[] | undefined;
|
|
82
82
|
};
|
|
83
|
+
optimism: {
|
|
84
|
+
url: string;
|
|
85
|
+
chainId: number;
|
|
86
|
+
accounts: string[] | undefined;
|
|
87
|
+
};
|
|
83
88
|
};
|
|
84
89
|
etherscan: {
|
|
85
90
|
apiKey: {
|
|
@@ -94,10 +99,19 @@ declare const _default: {
|
|
|
94
99
|
arbitrumOne: string | undefined;
|
|
95
100
|
avalanche: string | undefined;
|
|
96
101
|
xdai: string | undefined;
|
|
102
|
+
optimism: string | undefined;
|
|
97
103
|
sokol: string;
|
|
98
104
|
aurora: string;
|
|
99
105
|
auroraTestnet: string;
|
|
100
106
|
};
|
|
107
|
+
customChains: {
|
|
108
|
+
network: string;
|
|
109
|
+
chainId: number;
|
|
110
|
+
urls: {
|
|
111
|
+
apiURL: string;
|
|
112
|
+
browserURL: string;
|
|
113
|
+
};
|
|
114
|
+
}[];
|
|
101
115
|
};
|
|
102
116
|
typechain: {
|
|
103
117
|
outDir: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hardhat.config.d.ts","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAC;AAC5B,OAAO,2BAA2B,CAAC;AACnC,OAAO,4BAA4B,CAAC;AACpC,OAAO,8BAA8B,CAAC;AACtC,OAAO,2BAA2B,CAAC
|
|
1
|
+
{"version":3,"file":"hardhat.config.d.ts","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAC;AAC5B,OAAO,2BAA2B,CAAC;AACnC,OAAO,4BAA4B,CAAC;AACpC,OAAO,8BAA8B,CAAC;AACtC,OAAO,2BAA2B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8CnC,wBA0IE"}
|
package/dist/hardhat.config.js
CHANGED
|
@@ -116,6 +116,11 @@ exports.default = {
|
|
|
116
116
|
chainId: 43114,
|
|
117
117
|
accounts,
|
|
118
118
|
},
|
|
119
|
+
optimism: {
|
|
120
|
+
url: url('optimism'),
|
|
121
|
+
chainId: 10,
|
|
122
|
+
accounts,
|
|
123
|
+
},
|
|
119
124
|
},
|
|
120
125
|
etherscan: {
|
|
121
126
|
apiKey: {
|
|
@@ -136,12 +141,24 @@ exports.default = {
|
|
|
136
141
|
avalanche: process.env.SNOWTRACE_API_KEY,
|
|
137
142
|
// xdai
|
|
138
143
|
xdai: process.env.GNOSISSCAN_API_KEY,
|
|
144
|
+
// optimism
|
|
145
|
+
optimism: process.env.OPTIMISM_API_KEY,
|
|
139
146
|
// other networks don't need an API key, but you still need
|
|
140
147
|
// to specify one; any string placeholder will work
|
|
141
148
|
sokol: 'api-key',
|
|
142
149
|
aurora: 'api-key',
|
|
143
150
|
auroraTestnet: 'api-key',
|
|
144
151
|
},
|
|
152
|
+
customChains: [
|
|
153
|
+
{
|
|
154
|
+
network: 'optimism',
|
|
155
|
+
chainId: 10,
|
|
156
|
+
urls: {
|
|
157
|
+
apiURL: 'https://api-optimistic.etherscan.io/api',
|
|
158
|
+
browserURL: 'https://optimistic.etherscan.io/',
|
|
159
|
+
},
|
|
160
|
+
},
|
|
161
|
+
],
|
|
145
162
|
},
|
|
146
163
|
typechain: {
|
|
147
164
|
outDir: 'src/types',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hardhat.config.js","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":";;;AAAA,8BAA4B;AAC5B,qCAAmC;AACnC,sCAAoC;AACpC,wCAAsC;AACtC,qCAAmC;AACnC,2CAA+C;AAC/C,mCAAgC;AAChC,+DAA2D;AAC3D,+DAAsE;AACtE,qEAAwE;AACxE,uFAA2E;AAE3E,+EAAkG;AAClG,qDAAiE;AACjE,qDAAqE;AACrE,iDAA0C;AAC1C,2CAAgD;AAEhD,IAAA,eAAM,GAAE,CAAC;AAET,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB;IACjD,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;IACtC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB;QACjC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;QACnC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB;YAC/B,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;YACjC,CAAC,CAAC,SAAS,CAAC;AAEd,IAAI,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE;IAC7C,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;CAC9C;AAED,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEhD,+CAA+C;AAC/C,MAAM,sBAAsB,GAAG,4CAA4C,CAAC;AAE5E,+CAA+C;AAC/C,MAAM,qBAAqB,GAAG,4CAA4C,CAAC;AAE3E,sEAAsE;AACtE,MAAM,YAAY,GAAG,oEAAoE,CAAC;AAE1F,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB;IACvD,CAAC,CAAC,qBAAqB;IACvB,CAAC,CAAC,sBAAsB,CAAC;AAE3B,MAAM,GAAG,GAAG,CAAC,OAAe,EAAU,EAAE,CACtC,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,eAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;AAE9D,kBAAe;IACb,QAAQ,EAAE,OAAO;IACjB,KAAK,EAAE;QACL,OAAO,EAAE,eAAe;QACxB,KAAK,EAAE,gBAAgB;QACvB,SAAS,EAAE,OAAO;KACnB;IACD,QAAQ,EAAE;QACR,OAAO,EAAE;YACP,GAAG,EAAE,uBAAuB;YAC5B,QAAQ,EAAE,SAAS;SACpB;QACD,OAAO,EAAE;YACP,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,2CAA2C;YACjF,OAAO,EAAE,CAAC;YACV,QAAQ;SACT;QACD,OAAO,EAAE;YACP,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,2CAA2C;YACjF,OAAO,EAAE,CAAC;YACV,QAAQ;SACT;QACD,MAAM,EAAE;YACN,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,0CAA0C;YAChF,OAAO,EAAE,CAAC;YACV,QAAQ;SACT;QACD,KAAK,EAAE;YACL,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC;YACjB,OAAO,EAAE,GAAG;YACZ,QAAQ;SACT;QACD,IAAI,EAAE;YACJ,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;YAChB,OAAO,EAAE,KAAK;YACd,QAAQ;SACT;QACD,OAAO,EAAE;YACP,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC;YACnB,OAAO,EAAE,EAAE;YACX,QAAQ;SACT;QACD,GAAG,EAAE;YACH,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC;YACf,OAAO,EAAE,EAAE;YACX,QAAQ;SACT;QACD,IAAI,EAAE;YACJ,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;YAChB,OAAO,EAAE,GAAG;YACZ,QAAQ;SACT;QACD,IAAI,EAAE;YACJ,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;YAChB,OAAO,EAAE,GAAG;YACZ,QAAQ;SACT;QACD,MAAM,EAAE;YACN,GAAG,EAAE,GAAG,CAAC,QAAQ,CAAC;YAClB,OAAO,EAAE,GAAG;YACZ,QAAQ;SACT;QACD,cAAc,EAAE;YACd,GAAG,EAAE,GAAG,CAAC,cAAc,CAAC;YACxB,OAAO,EAAE,KAAK;YACd,QAAQ;SACT;QACD,kBAAkB,EAAE;YAClB,GAAG,EAAE,GAAG,CAAC,kBAAkB,CAAC;YAC5B,OAAO,EAAE,MAAM;YACf,QAAQ;SACT;QACD,SAAS,EAAE;YACT,GAAG,EAAE,GAAG,CAAC,WAAW,CAAC;YACrB,OAAO,EAAE,KAAK;YACd,QAAQ;SACT;KACF;IACD,SAAS,EAAE;QACT,MAAM,EAAE;YACN,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACtC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACtC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACrC,sBAAsB;YACtB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;YAChC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;YACvC,iBAAiB;YACjB,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;YAClC,UAAU;YACV,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;YACxC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;YAC9C,WAAW;YACX,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;YACzC,YAAY;YACZ,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACxC,OAAO;YACP,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;YACpC,2DAA2D;YAC3D,mDAAmD;YACnD,KAAK,EAAE,SAAS;YAChB,MAAM,EAAE,SAAS;YACjB,aAAa,EAAE,SAAS;SACzB;KACF;IACD,SAAS,EAAE;QACT,MAAM,EAAE,WAAW;QACnB,MAAM,EAAE,WAAW;QACnB,uBAAuB,EAAE,KAAK,EAAE,mHAAmH;KACpJ;IACD,KAAK,EAAE;QACL,OAAO,EAAE,KAAK,EAAE,2BAA2B;KAC5C;IACD,OAAO,EAAE;QACP,IAAI,EAAE,YAAY;QAClB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;QACrC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;YAC3B,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;YACvB,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,CAAC;QAC9F,QAAQ,EAAE,SAAS;QACnB,eAAe,EAAE,eAAe;KACjC;CACF,CAAC;AAEF,iFAAiF;AACjF,IAAA,aAAI,EAAC,kBAAkB,EAAE,4BAA4B,CAAC,CAAC,SAAS,CAAC,CAAO,IAAI,EAAE,GAAG,EAAE,EAAE;IACnF,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IAClB,MAAM,IAAA,yBAAkB,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACpC,IAAI,qBAAa,GAAG,CAAC,EAAE;QACrB,OAAO,CAAC,GAAG,CAAC,uCAAuC,qBAAa,SAAS,CAAC,CAAC;KAC5E;SAAM;QACL,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;KACnD;AACH,CAAC,CAAA,CAAC,CAAC;AAEH,IAAA,aAAI,EACF,sBAAsB,EACtB,+FAA+F,CAChG;KACE,OAAO,CAAC,QAAQ,EAAE,2BAA2B,CAAC;KAC9C,OAAO,CAAC,OAAO,EAAE,wBAAwB,CAAC;KAC1C,SAAS,CAAC,CAAO,IAAI,EAAE,GAAG,EAAE,EAAE;;IAC7B,IAAI,CAAC,KAAK,GAAG,MAAA,IAAI,CAAC,KAAK,mCAAI,KAAK,CAAC;IACjC,IAAI,CAAC,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,mCAAI,KAAK,CAAC;IACnC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC;IAC5B,MAAM,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAClC,MAAM,IAAA,2CAAyB,EAAC,IAAI,EAAE,GAAwC,CAAC,CAAC;AAClF,CAAC,CAAA,CAAC,CAAC;AAEL,kDAAkD;AAClD,IAAA,aAAI,EACF,0BAA0B,EAC1B,2DAA2D,CAC5D,CAAC,SAAS,CAAC,CAAO,KAAK,EAAE,GAAG,EAAE,EAAE;IAC/B,MAAM,IAAA,wCAAc,EAAC,GAAG,CAAC,CAAC;AAC5B,CAAC,CAAA,CAAC,CAAC;AAEH,IAAA,aAAI,EACF,4BAA4B,EAC5B,wFAAwF,CACzF,CAAC,SAAS,CAAC,CAAO,KAAK,EAAE,GAAG,EAAE,EAAE;IAC/B,MAAM,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACzB,MAAM,IAAA,+DAAyC,EAAC,GAAwC,CAAC,CAAC;AAC5F,CAAC,CAAA,CAAC,CAAC;AAEH,IAAA,aAAI,EACF,mCAAmC,EACnC,8EAA8E,CAC/E,CAAC,SAAS,CAAC,CAAO,KAAK,EAAE,GAAG,EAAE,EAAE;IAC/B,MAAM,IAAA,qCAAoB,EAAC,GAAwC,CAAC,CAAC;IACrE,MAAM,IAAA,kCAAyB,EAAC,GAAwC,CAAC,CAAC;AAC5E,CAAC,CAAA,CAAC,CAAC;AAEH,IAAA,aAAI,EACF,+BAA+B,EAC/B,4EAA4E,CAC7E,CAAC,SAAS,CAAC,CAAO,KAAK,EAAE,GAAG,EAAE,EAAE;IAC/B,MAAM,IAAA,8BAAqB,EAAC,GAAwC,CAAC,CAAC;AACxE,CAAC,CAAA,CAAC,CAAC;AAEH,IAAA,gBAAO,EAAC,kBAAkB,EAAE,0CAA0C,CAAC,CAAC,SAAS,CAAC,GAAS,EAAE;IAC3F,IAAI,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE;QAC/D,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;KAC/E;AACH,CAAC,CAAA,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"hardhat.config.js","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-payments.d.ts","sourceRoot":"","sources":["../../scripts/deploy-payments.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy-payments.d.ts","sourceRoot":"","sources":["../../scripts/deploy-payments.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AAkBnC,OAAO,EAAE,iCAAiC,EAAE,MAAM,0BAA0B,CAAC;AAG7E;;;;;;;;;;;;;GAaG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,GAAG,EACT,GAAG,EAAE,iCAAiC,GACrC,OAAO,CAAC,IAAI,CAAC,CA4Vf"}
|
|
@@ -217,16 +217,11 @@ function deployAllPaymentContracts(args, hre) {
|
|
|
217
217
|
});
|
|
218
218
|
// #endregion
|
|
219
219
|
// #region MAIN - Deployments
|
|
220
|
-
// Batch 1
|
|
221
|
-
yield (0,
|
|
222
|
-
const { address: erc20FeeProxyAddress } = yield runEasyDeployment({
|
|
223
|
-
contractName: 'ERC20FeeProxy',
|
|
224
|
-
artifact: lib_1.erc20FeeProxyArtifact,
|
|
225
|
-
nonceCondition: 1,
|
|
226
|
-
});
|
|
220
|
+
// Batch 1 - REMOVED -> Deployment CREATE2
|
|
221
|
+
const erc20FeeProxyAddress = yield (0, compute_one_address_1.computeCreate2DeploymentAddress)({ contract: 'ERC20FeeProxy' }, hre);
|
|
227
222
|
// Batch 2
|
|
228
223
|
yield runDeploymentBatch_2(erc20FeeProxyAddress);
|
|
229
|
-
// Batch 3 -
|
|
224
|
+
// Batch 3 - REMOVED -> Deployment CREATE2
|
|
230
225
|
// Compute EthereumFeeProxy address (CREATE2)
|
|
231
226
|
const ethFeeProxyAddress = yield (0, compute_one_address_1.computeCreate2DeploymentAddress)({ contract: 'EthereumFeeProxy' }, hre);
|
|
232
227
|
// Batch 4
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-payments.js","sourceRoot":"","sources":["../../scripts/deploy-payments.ts"],"names":[],"mappings":";;;;AAAA,qCAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"deploy-payments.js","sourceRoot":"","sources":["../../scripts/deploy-payments.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../scripts/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D;;;GAGG;AACH,eAAO,MAAM,wBAAwB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../scripts/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D;;;GAGG;AACH,eAAO,MAAM,wBAAwB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAqB3D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,SAAgB,GAAG,OAAO,yBAAyB,SAAS,MAAM,kBAezF,CAAC;AAEF,mFAAmF;AACnF,eAAO,IAAI,aAAa,QAAI,CAAC;AAE7B;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,gBACnB,MAAM,mBACF,MAAM,2BACE,MAAM,KAC9B,IAMF,CAAC"}
|
package/dist/scripts/utils.js
CHANGED
|
@@ -25,6 +25,8 @@ exports.uniswapV2RouterAddresses = {
|
|
|
25
25
|
'arbitrum-rinkeby': '0x0000000000000000000000000000000000000000',
|
|
26
26
|
'arbitrum-one': '0x0000000000000000000000000000000000000000',
|
|
27
27
|
avalanche: '0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506',
|
|
28
|
+
// No swap v2 found
|
|
29
|
+
optimism: '0x0000000000000000000000000000000000000000',
|
|
28
30
|
};
|
|
29
31
|
/**
|
|
30
32
|
* Executes as many empty transactions as needed for the nonce goes up to a certain target.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../scripts/utils.ts"],"names":[],"mappings":";;;;AAEA;;;GAGG;AACU,QAAA,wBAAwB,GAA2B;IAC9D,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,KAAK,EAAE,4CAA4C;IACnD,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,GAAG,EAAE,4CAA4C;IACjD,IAAI,EAAE,4CAA4C;IAClD,kDAAkD;IAClD,MAAM,EAAE,4CAA4C;IACpD,8CAA8C;IAC9C,KAAK,EAAE,4CAA4C;IACnD,iCAAiC;IACjC,IAAI,EAAE,4CAA4C;IAClD,mBAAmB;IACnB,kBAAkB,EAAE,4CAA4C;IAChE,cAAc,EAAE,4CAA4C;IAC5D,SAAS,EAAE,4CAA4C;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../scripts/utils.ts"],"names":[],"mappings":";;;;AAEA;;;GAGG;AACU,QAAA,wBAAwB,GAA2B;IAC9D,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,KAAK,EAAE,4CAA4C;IACnD,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,GAAG,EAAE,4CAA4C;IACjD,IAAI,EAAE,4CAA4C;IAClD,kDAAkD;IAClD,MAAM,EAAE,4CAA4C;IACpD,8CAA8C;IAC9C,KAAK,EAAE,4CAA4C;IACnD,iCAAiC;IACjC,IAAI,EAAE,4CAA4C;IAClD,mBAAmB;IACnB,kBAAkB,EAAE,4CAA4C;IAChE,cAAc,EAAE,4CAA4C;IAC5D,SAAS,EAAE,4CAA4C;IACvD,mBAAmB;IACnB,QAAQ,EAAE,4CAA4C;CACvD,CAAC;AAEF;;;GAGG;AACI,MAAM,WAAW,GAAG,CAAO,IAAS,EAAE,GAA8B,EAAE,KAAa,EAAE,EAAE;IAC5F,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IACjD,IAAI,SAAS,GAAG,MAAM,QAAQ,CAAC,mBAAmB,EAAE,CAAC;IACrD,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,IAAI,SAAS,GAAG,KAAK,EAAE;YACrB,OAAO,CAAC,GAAG,CAAC,8BAA8B,KAAK,cAAc,SAAS,GAAG,CAAC,CAAC;SAC5E;QACD,OAAO;KACR;IACD,OAAO,SAAS,GAAG,KAAK,EAAE;QACxB,uCAAuC;QACvC,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACtF,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,SAAS,GAAG,MAAM,QAAQ,CAAC,mBAAmB,EAAE,CAAC;KAClD;AACH,CAAC,CAAA,CAAC;AAfW,QAAA,WAAW,eAetB;AAEF,mFAAmF;AACxE,QAAA,aAAa,GAAG,CAAC,CAAC;AAE7B;;;;;GAKG;AACI,MAAM,qBAAqB,GAAG,CACnC,WAAmB,EACnB,eAAuB,EACvB,uBAA+B,EACzB,EAAE;IACR,IAAI,eAAe,KAAK,uBAAuB,EAAE;QAC/C,qBAAa,IAAI,CAAC,CAAC;QACnB,MAAM,GAAG,GAAG,GAAG,WAAW,gBAAgB,eAAe,wCAAwC,uBAAuB,2CAA2C,CAAC;QACpK,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;KAClB;AACH,CAAC,CAAC;AAVW,QAAA,qBAAqB,yBAUhC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constructor-args.d.ts","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,kBAAkB,aAAc,MAAM,mCAAqB,MAAM,
|
|
1
|
+
{"version":3,"file":"constructor-args.d.ts","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,kBAAkB,aAAc,MAAM,mCAAqB,MAAM,EA+C7E,CAAC"}
|
|
@@ -21,9 +21,11 @@ const getConstructorArgs = (contract, network) => {
|
|
|
21
21
|
return [
|
|
22
22
|
'0x0000000000000000000000000000000000000000',
|
|
23
23
|
'0x0000000000000000000000000000000000000000',
|
|
24
|
+
// FIXME: This is not right the NativeTokenHash is not the same accross all networks
|
|
25
|
+
// It should be set to 0x0, and then updated through setup functions
|
|
26
|
+
// These functions needs to be implemented in the contract before it can deployed using xdeployer
|
|
24
27
|
'0x39e19aa5b69466dfdc313c7cda37cb2a599015cd',
|
|
25
28
|
];
|
|
26
|
-
// TODO setupETHConversionProxy
|
|
27
29
|
}
|
|
28
30
|
case 'ERC20SwapToConversion': {
|
|
29
31
|
return [getAdminWalletAddress(contract)];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constructor-args.js","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AAExC,MAAM,qBAAqB,GAAG,CAAC,QAAgB,EAAU,EAAE;IACzD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;KAC1F;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;AAC1C,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAE,OAAgB,EAAY,EAAE;IACjF,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAsB,CAAC,CAAC;YAC3B,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,qBAAqB,CAAC,QAAQ,CAAC;aAChC,CAAC;SACH;QACD,KAAK,oBAAoB,CAAC,CAAC;YACzB,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,4CAA4C;aAC7C,CAAC;
|
|
1
|
+
{"version":3,"file":"constructor-args.js","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AAExC,MAAM,qBAAqB,GAAG,CAAC,QAAgB,EAAU,EAAE;IACzD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;KAC1F;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;AAC1C,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAE,OAAgB,EAAY,EAAE;IACjF,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAsB,CAAC,CAAC;YAC3B,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,qBAAqB,CAAC,QAAQ,CAAC;aAChC,CAAC;SACH;QACD,KAAK,oBAAoB,CAAC,CAAC;YACzB,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,oFAAoF;gBACpF,2EAA2E;gBAC3E,wGAAwG;gBACxG,4CAA4C;aAC7C,CAAC;SACH;QACD,KAAK,uBAAuB,CAAC,CAAC;YAC5B,OAAO,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;SAC1C;QACD,KAAK,kBAAkB,CAAC,CAAC;YACvB,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CACb,oFAAoF,CACrF,CAAC;aACH;YACD,MAAM,aAAa,GAAG,SAAS,CAAC,qBAAqB,CAAC;YACtD,MAAM,oBAAoB,GAAG,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC/D,OAAO,CAAC,oBAAoB,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;SAChE;QACD,KAAK,eAAe,CAAC,CAAC;YACpB,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CACb,wGAAwG,CACzG,CAAC;aACH;YACD,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,qBAAqB,CAAC,QAAQ,CAAC;aAChC,CAAC;SACH;QACD;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC,CAAC;AA/CW,QAAA,kBAAkB,sBA+C7B"}
|
|
@@ -1,10 +1,15 @@
|
|
|
1
|
-
import { BigNumber } from 'ethers';
|
|
1
|
+
import { BigNumber, Wallet } from 'ethers';
|
|
2
|
+
import { HardhatRuntimeEnvironmentExtended } from '../types';
|
|
2
3
|
export declare const REQUEST_SWAP_FEES = 5;
|
|
3
4
|
export declare const BATCH_FEE = 3;
|
|
4
|
-
export declare const updateChainlinkConversionPath: (contract: any, network: string,
|
|
5
|
-
export declare const updateSwapRouter: (contract: any, network: string,
|
|
6
|
-
export declare const updateRequestSwapFees: (contract: any,
|
|
7
|
-
export declare const updateBatchPaymentFees: (contract: any,
|
|
8
|
-
export declare const updatePaymentErc20FeeProxy: (contract: any, network: string,
|
|
9
|
-
export declare const updatePaymentEthFeeProxy: (contract: any, network: string,
|
|
5
|
+
export declare const updateChainlinkConversionPath: (contract: any, network: string, gasPrice: BigNumber, version?: undefined) => Promise<void>;
|
|
6
|
+
export declare const updateSwapRouter: (contract: any, network: string, gasPrice: BigNumber) => Promise<void>;
|
|
7
|
+
export declare const updateRequestSwapFees: (contract: any, gasPrice: BigNumber) => Promise<void>;
|
|
8
|
+
export declare const updateBatchPaymentFees: (contract: any, gasPrice: BigNumber) => Promise<void>;
|
|
9
|
+
export declare const updatePaymentErc20FeeProxy: (contract: any, network: string, gasPrice: BigNumber) => Promise<void>;
|
|
10
|
+
export declare const updatePaymentEthFeeProxy: (contract: any, network: string, gasPrice: BigNumber) => Promise<void>;
|
|
11
|
+
export declare const getSignerAndGasPrice: (network: string, hre: HardhatRuntimeEnvironmentExtended) => Promise<{
|
|
12
|
+
signer: Wallet;
|
|
13
|
+
gasPrice: BigNumber;
|
|
14
|
+
}>;
|
|
10
15
|
//# sourceMappingURL=adminTasks.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adminTasks.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"adminTasks.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE3C,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAG7D,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,eAAO,MAAM,SAAS,IAAI,CAAC;AAE3B,eAAO,MAAM,6BAA6B,aAC9B,GAAG,WACJ,MAAM,YACL,SAAS,0BAElB,QAAQ,IAAI,CASd,CAAC;AAEF,eAAO,MAAM,gBAAgB,aACjB,GAAG,WACJ,MAAM,YACL,SAAS,KAClB,QAAQ,IAAI,CAQd,CAAC;AAEF,eAAO,MAAM,qBAAqB,aAAoB,GAAG,YAAY,SAAS,KAAG,QAAQ,IAAI,CAO5F,CAAC;AAEF,eAAO,MAAM,sBAAsB,aAAoB,GAAG,YAAY,SAAS,KAAG,QAAQ,IAAI,CAQ7F,CAAC;AAEF,eAAO,MAAM,0BAA0B,aAC3B,GAAG,WACJ,MAAM,YACL,SAAS,KAClB,QAAQ,IAAI,CAUd,CAAC;AAEF,eAAO,MAAM,wBAAwB,aACzB,GAAG,WACJ,MAAM,YACL,SAAS,KAClB,QAAQ,IAAI,CAUd,CAAC;AAEF,eAAO,MAAM,oBAAoB,YACtB,MAAM,OACV,iCAAiC;YACnB,MAAM;cAAY,SAAS;EAc/C,CAAC"}
|
|
@@ -1,73 +1,93 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.updatePaymentEthFeeProxy = exports.updatePaymentErc20FeeProxy = exports.updateBatchPaymentFees = exports.updateRequestSwapFees = exports.updateSwapRouter = exports.updateChainlinkConversionPath = exports.BATCH_FEE = exports.REQUEST_SWAP_FEES = void 0;
|
|
3
|
+
exports.getSignerAndGasPrice = exports.updatePaymentEthFeeProxy = exports.updatePaymentErc20FeeProxy = exports.updateBatchPaymentFees = exports.updateRequestSwapFees = exports.updateSwapRouter = exports.updateChainlinkConversionPath = exports.BATCH_FEE = exports.REQUEST_SWAP_FEES = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const lib_1 = require("../../src/lib");
|
|
6
6
|
const utils_1 = require("../../scripts/utils");
|
|
7
7
|
const artifacts = require("../../src/lib");
|
|
8
|
+
const utils_2 = require("@requestnetwork/utils");
|
|
8
9
|
// Fees: 0.5%
|
|
9
10
|
exports.REQUEST_SWAP_FEES = 5;
|
|
10
11
|
// Batch Fees: .3%
|
|
11
12
|
exports.BATCH_FEE = 3;
|
|
12
|
-
const updateChainlinkConversionPath = (contract, network,
|
|
13
|
+
const updateChainlinkConversionPath = (contract, network, gasPrice, version = undefined) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
13
14
|
const currentChainlinkAddress = yield contract.chainlinkConversionPath();
|
|
14
|
-
const chainlinkConversionPathAddress = lib_1.chainlinkConversionPath.getAddress(network,
|
|
15
|
+
const chainlinkConversionPathAddress = lib_1.chainlinkConversionPath.getAddress(network, version);
|
|
15
16
|
if (currentChainlinkAddress !== chainlinkConversionPathAddress) {
|
|
16
|
-
yield contract.updateConversionPathAddress(chainlinkConversionPathAddress, {
|
|
17
|
-
nonce: nonce,
|
|
17
|
+
const tx = yield contract.updateConversionPathAddress(chainlinkConversionPathAddress, {
|
|
18
18
|
gasPrice: gasPrice,
|
|
19
19
|
});
|
|
20
|
+
yield tx.wait(1);
|
|
20
21
|
}
|
|
21
22
|
});
|
|
22
23
|
exports.updateChainlinkConversionPath = updateChainlinkConversionPath;
|
|
23
|
-
const updateSwapRouter = (contract, network,
|
|
24
|
+
const updateSwapRouter = (contract, network, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
24
25
|
const currentSwapRouter = yield contract.swapRouter();
|
|
25
26
|
if (currentSwapRouter !== utils_1.uniswapV2RouterAddresses[network]) {
|
|
26
|
-
yield contract.setRouter(utils_1.uniswapV2RouterAddresses[network], {
|
|
27
|
-
nonce: nonce,
|
|
27
|
+
const tx = yield contract.setRouter(utils_1.uniswapV2RouterAddresses[network], {
|
|
28
28
|
gasPrice: gasPrice,
|
|
29
29
|
});
|
|
30
|
+
yield tx.wait(1);
|
|
30
31
|
}
|
|
31
32
|
});
|
|
32
33
|
exports.updateSwapRouter = updateSwapRouter;
|
|
33
|
-
const updateRequestSwapFees = (contract,
|
|
34
|
+
const updateRequestSwapFees = (contract, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
34
35
|
const currentFees = yield contract.requestSwapFees();
|
|
35
|
-
if (currentFees
|
|
36
|
-
yield contract.updateRequestSwapFees(exports.REQUEST_SWAP_FEES, {
|
|
36
|
+
if (!currentFees.eq(exports.REQUEST_SWAP_FEES)) {
|
|
37
|
+
const tx = yield contract.updateRequestSwapFees(exports.REQUEST_SWAP_FEES, { gasPrice: gasPrice });
|
|
38
|
+
yield tx.wait(1);
|
|
39
|
+
console.log(`currentFees: ${currentFees.toString()}, new fees: ${exports.REQUEST_SWAP_FEES}`);
|
|
37
40
|
}
|
|
38
41
|
});
|
|
39
42
|
exports.updateRequestSwapFees = updateRequestSwapFees;
|
|
40
|
-
const updateBatchPaymentFees = (contract,
|
|
43
|
+
const updateBatchPaymentFees = (contract, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
41
44
|
const currentFees = yield contract.batchFee();
|
|
42
|
-
if (currentFees
|
|
43
|
-
|
|
45
|
+
if (!currentFees.eq(exports.BATCH_FEE)) {
|
|
46
|
+
const tx = yield contract.setBatchFee(exports.BATCH_FEE, { gasPrice: gasPrice });
|
|
47
|
+
yield tx.wait(1);
|
|
48
|
+
// Log is useful to have a direct view on what is being updated
|
|
44
49
|
console.log(`currentFees: ${currentFees.toString()}, new fees: ${exports.BATCH_FEE}`);
|
|
45
|
-
yield contract.setBatchFee(exports.BATCH_FEE, { nonce: nonce, gasPrice: gasPrice });
|
|
46
50
|
}
|
|
47
51
|
});
|
|
48
52
|
exports.updateBatchPaymentFees = updateBatchPaymentFees;
|
|
49
|
-
const updatePaymentErc20FeeProxy = (contract, network,
|
|
53
|
+
const updatePaymentErc20FeeProxy = (contract, network, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
50
54
|
const erc20FeeProxy = artifacts.erc20FeeProxyArtifact;
|
|
51
55
|
const erc20FeeProxyAddress = erc20FeeProxy.getAddress(network);
|
|
52
56
|
const currentAddress = yield contract.paymentErc20FeeProxy();
|
|
53
57
|
if (currentAddress !== erc20FeeProxyAddress) {
|
|
54
|
-
yield contract.setPaymentErc20FeeProxy(erc20FeeProxyAddress, {
|
|
55
|
-
nonce: nonce,
|
|
58
|
+
const tx = yield contract.setPaymentErc20FeeProxy(erc20FeeProxyAddress, {
|
|
56
59
|
gasPrice: gasPrice,
|
|
57
60
|
});
|
|
61
|
+
yield tx.wait(1);
|
|
58
62
|
}
|
|
59
63
|
});
|
|
60
64
|
exports.updatePaymentErc20FeeProxy = updatePaymentErc20FeeProxy;
|
|
61
|
-
const updatePaymentEthFeeProxy = (contract, network,
|
|
65
|
+
const updatePaymentEthFeeProxy = (contract, network, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
62
66
|
const ethereumFeeProxy = artifacts.ethereumFeeProxyArtifact;
|
|
63
67
|
const ethereumFeeProxyAddress = ethereumFeeProxy.getAddress(network);
|
|
64
68
|
const currentAddress = yield contract.paymentEthFeeProxy();
|
|
65
69
|
if (currentAddress !== ethereumFeeProxyAddress) {
|
|
66
|
-
yield contract.setPaymentEthFeeProxy(ethereumFeeProxyAddress, {
|
|
67
|
-
nonce: nonce,
|
|
70
|
+
const tx = yield contract.setPaymentEthFeeProxy(ethereumFeeProxyAddress, {
|
|
68
71
|
gasPrice: gasPrice,
|
|
69
72
|
});
|
|
73
|
+
yield tx.wait(1);
|
|
70
74
|
}
|
|
71
75
|
});
|
|
72
76
|
exports.updatePaymentEthFeeProxy = updatePaymentEthFeeProxy;
|
|
77
|
+
const getSignerAndGasPrice = (network, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
78
|
+
let provider;
|
|
79
|
+
if (network === 'celo') {
|
|
80
|
+
provider = utils_2.default.getCeloProvider();
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
provider = utils_2.default.getDefaultProvider(network);
|
|
84
|
+
}
|
|
85
|
+
const signer = new hre.ethers.Wallet(hre.config.xdeploy.signer).connect(provider);
|
|
86
|
+
const gasPrice = yield provider.getGasPrice();
|
|
87
|
+
return {
|
|
88
|
+
signer,
|
|
89
|
+
gasPrice,
|
|
90
|
+
};
|
|
91
|
+
});
|
|
92
|
+
exports.getSignerAndGasPrice = getSignerAndGasPrice;
|
|
73
93
|
//# sourceMappingURL=adminTasks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adminTasks.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":";;;;AAAA,uCAAwD;AACxD,+CAA+D;AAC/D,2CAA2C;
|
|
1
|
+
{"version":3,"file":"adminTasks.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupBatchPayments.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupBatchPayments.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAQ7D;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,oBACZ,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,
|
|
1
|
+
{"version":3,"file":"setupBatchPayments.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupBatchPayments.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAQ7D;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,oBACZ,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CAuBd,CAAC"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.setupBatchPayments = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const lib_1 = require("../../src/lib");
|
|
6
|
-
const utils_1 = require("@requestnetwork/utils");
|
|
7
6
|
const adminTasks_1 = require("./adminTasks");
|
|
8
7
|
/**
|
|
9
8
|
* Updates the values of the batch fees of the BatchPayments contract, if needed
|
|
@@ -14,24 +13,18 @@ const setupBatchPayments = (contractAddress, hre) => (0, tslib_1.__awaiter)(void
|
|
|
14
13
|
// Setup contract parameters
|
|
15
14
|
const batchPaymentContract = new hre.ethers.Contract(contractAddress, lib_1.batchPaymentsArtifact.getContractAbi());
|
|
16
15
|
yield Promise.all(hre.config.xdeploy.networks.map((network) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
try {
|
|
17
|
+
const { signer, gasPrice } = yield (0, adminTasks_1.getSignerAndGasPrice)(network, hre);
|
|
18
|
+
const batchPaymentConnected = yield batchPaymentContract.connect(signer);
|
|
19
|
+
yield (0, adminTasks_1.updateBatchPaymentFees)(batchPaymentConnected, gasPrice.mul(2));
|
|
20
|
+
yield (0, adminTasks_1.updatePaymentErc20FeeProxy)(batchPaymentConnected, network, gasPrice.mul(2));
|
|
21
|
+
yield (0, adminTasks_1.updatePaymentEthFeeProxy)(batchPaymentConnected, network, gasPrice.mul(2));
|
|
22
|
+
console.log(`Setup of BatchPayment successful on ${network}`);
|
|
20
23
|
}
|
|
21
|
-
|
|
22
|
-
|
|
24
|
+
catch (err) {
|
|
25
|
+
console.warn(`An error occurred during the setup of BatchPayment on ${network}`);
|
|
26
|
+
console.warn(err);
|
|
23
27
|
}
|
|
24
|
-
const wallet = new hre.ethers.Wallet(hre.config.xdeploy.signer, provider);
|
|
25
|
-
const signer = wallet.connect(provider);
|
|
26
|
-
const batchPaymentConnected = yield batchPaymentContract.connect(signer);
|
|
27
|
-
const adminNonce = yield signer.getTransactionCount();
|
|
28
|
-
const gasPrice = yield provider.getGasPrice();
|
|
29
|
-
// start from the adminNonce, increase gasPrice if needed
|
|
30
|
-
yield Promise.all([
|
|
31
|
-
(0, adminTasks_1.updateBatchPaymentFees)(batchPaymentConnected, adminNonce, gasPrice.mul(2)),
|
|
32
|
-
(0, adminTasks_1.updatePaymentErc20FeeProxy)(batchPaymentConnected, network, adminNonce + 1, gasPrice.mul(2)),
|
|
33
|
-
(0, adminTasks_1.updatePaymentEthFeeProxy)(batchPaymentConnected, network, adminNonce + 2, gasPrice.mul(2)),
|
|
34
|
-
]);
|
|
35
28
|
})));
|
|
36
29
|
console.log('Setup for setupBatchPayment successfull');
|
|
37
30
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupBatchPayments.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupBatchPayments.ts"],"names":[],"mappings":";;;;AAAA,uCAAsD;AAEtD,
|
|
1
|
+
{"version":3,"file":"setupBatchPayments.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupBatchPayments.ts"],"names":[],"mappings":";;;;AAAA,uCAAsD;AAEtD,6CAKsB;AAEtB;;;;GAIG;AACI,MAAM,kBAAkB,GAAG,CAChC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAClD,eAAe,EACf,2BAAqB,CAAC,cAAc,EAAE,CACvC,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;QAChD,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,iCAAoB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACtE,MAAM,qBAAqB,GAAG,MAAM,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAEzE,MAAM,IAAA,mCAAsB,EAAC,qBAAqB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACrE,MAAM,IAAA,uCAA0B,EAAC,qBAAqB,EAAE,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAClF,MAAM,IAAA,qCAAwB,EAAC,qBAAqB,EAAE,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAChF,OAAO,CAAC,GAAG,CAAC,uCAAuC,OAAO,EAAE,CAAC,CAAC;SAC/D;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,yDAAyD,OAAO,EAAE,CAAC,CAAC;YACjF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;IACH,CAAC,CAAA,CAAC,CACH,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;AACzD,CAAC,CAAA,CAAC;AA1BW,QAAA,kBAAkB,sBA0B7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupERC20SwapToConversion.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupERC20SwapToConversion.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAQ7D;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,oBACpB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,
|
|
1
|
+
{"version":3,"file":"setupERC20SwapToConversion.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupERC20SwapToConversion.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAQ7D;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,oBACpB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CAsBd,CAAC"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.setupERC20SwapToConversion = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const lib_1 = require("../../src/lib");
|
|
6
|
-
const utils_1 = require("@requestnetwork/utils");
|
|
7
6
|
const adminTasks_1 = require("./adminTasks");
|
|
8
7
|
/**
|
|
9
8
|
* Updates the values of the chainlinkConversionPath and swap router of the ERC20SwapToConversion contract, if needed
|
|
@@ -14,25 +13,19 @@ const setupERC20SwapToConversion = (contractAddress, hre) => (0, tslib_1.__await
|
|
|
14
13
|
// Setup contract parameters
|
|
15
14
|
const ERC20SwapToConversionContract = new hre.ethers.Contract(contractAddress, lib_1.erc20SwapConversionArtifact.getContractAbi());
|
|
16
15
|
yield Promise.all(hre.config.xdeploy.networks.map((network) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
try {
|
|
17
|
+
const { signer, gasPrice } = yield (0, adminTasks_1.getSignerAndGasPrice)(network, hre);
|
|
18
|
+
const ERC20SwapToConversionConnected = yield ERC20SwapToConversionContract.connect(signer);
|
|
19
|
+
yield (0, adminTasks_1.updateChainlinkConversionPath)(ERC20SwapToConversionConnected, network, gasPrice);
|
|
20
|
+
yield (0, adminTasks_1.updateSwapRouter)(ERC20SwapToConversionConnected, network, gasPrice);
|
|
21
|
+
yield (0, adminTasks_1.updateRequestSwapFees)(ERC20SwapToConversionConnected, gasPrice);
|
|
22
|
+
console.log(`Setup of Erc20SwapToConversion successful on ${network}`);
|
|
20
23
|
}
|
|
21
|
-
|
|
22
|
-
|
|
24
|
+
catch (err) {
|
|
25
|
+
console.warn(`An error occurred during the setup of Erc20SwapToConversion on ${network}`);
|
|
26
|
+
console.warn(err);
|
|
23
27
|
}
|
|
24
|
-
const wallet = new hre.ethers.Wallet(hre.config.xdeploy.signer, provider);
|
|
25
|
-
const signer = wallet.connect(provider);
|
|
26
|
-
const ERC20SwapToConversionConnected = yield ERC20SwapToConversionContract.connect(signer);
|
|
27
|
-
const adminNonce = yield signer.getTransactionCount();
|
|
28
|
-
const gasPrice = yield provider.getGasPrice();
|
|
29
|
-
yield Promise.all([
|
|
30
|
-
(0, adminTasks_1.updateChainlinkConversionPath)(ERC20SwapToConversionConnected, network, adminNonce, gasPrice),
|
|
31
|
-
(0, adminTasks_1.updateSwapRouter)(ERC20SwapToConversionConnected, network, adminNonce + 1, gasPrice),
|
|
32
|
-
(0, adminTasks_1.updateRequestSwapFees)(ERC20SwapToConversionConnected, adminNonce + 2, gasPrice),
|
|
33
|
-
]);
|
|
34
28
|
})));
|
|
35
|
-
console.log('Setup for ERC20SwapToConversion successfull');
|
|
36
29
|
});
|
|
37
30
|
exports.setupERC20SwapToConversion = setupERC20SwapToConversion;
|
|
38
31
|
//# sourceMappingURL=setupERC20SwapToConversion.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupERC20SwapToConversion.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupERC20SwapToConversion.ts"],"names":[],"mappings":";;;;AAAA,uCAA4D;AAE5D,
|
|
1
|
+
{"version":3,"file":"setupERC20SwapToConversion.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupERC20SwapToConversion.ts"],"names":[],"mappings":";;;;AAAA,uCAA4D;AAE5D,6CAKsB;AAEtB;;;;GAIG;AACI,MAAM,0BAA0B,GAAG,CACxC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,6BAA6B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC3D,eAAe,EACf,iCAA2B,CAAC,cAAc,EAAE,CAC7C,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;QAChD,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,iCAAoB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACtE,MAAM,8BAA8B,GAAG,MAAM,6BAA6B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAE3F,MAAM,IAAA,0CAA6B,EAAC,8BAA8B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACvF,MAAM,IAAA,6BAAgB,EAAC,8BAA8B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC1E,MAAM,IAAA,kCAAqB,EAAC,8BAA8B,EAAE,QAAQ,CAAC,CAAC;YACtE,OAAO,CAAC,GAAG,CAAC,gDAAgD,OAAO,EAAE,CAAC,CAAC;SACxE;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,kEAAkE,OAAO,EAAE,CAAC,CAAC;YAC1F,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;IACH,CAAC,CAAA,CAAC,CACH,CAAC;AACJ,CAAC,CAAA,CAAC;AAzBW,QAAA,0BAA0B,8BAyBrC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupETHConversionProxy.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupETHConversionProxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"setupETHConversionProxy.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupETHConversionProxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAO7D;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,oBACjB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CAqBd,CAAC"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.setupETHConversionProxy = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const lib_1 = require("../../src/lib");
|
|
6
|
-
const utils_1 = require("@requestnetwork/utils");
|
|
7
6
|
const adminTasks_1 = require("./adminTasks");
|
|
8
7
|
/**
|
|
9
8
|
* Updates the values of the batch fees of the BatchPayments contract, if needed
|
|
@@ -12,27 +11,20 @@ const adminTasks_1 = require("./adminTasks");
|
|
|
12
11
|
*/
|
|
13
12
|
const setupETHConversionProxy = (contractAddress, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
14
13
|
// Setup contract parameters
|
|
15
|
-
const EthConversionProxyContract = new hre.ethers.Contract(contractAddress, lib_1.
|
|
14
|
+
const EthConversionProxyContract = new hre.ethers.Contract(contractAddress, lib_1.ethConversionArtifact.getContractAbi());
|
|
16
15
|
yield Promise.all(hre.config.xdeploy.networks.map((network) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
try {
|
|
17
|
+
const { signer, gasPrice } = yield (0, adminTasks_1.getSignerAndGasPrice)(network, hre);
|
|
18
|
+
const EthConversionProxyConnected = yield EthConversionProxyContract.connect(signer);
|
|
19
|
+
yield (0, adminTasks_1.updatePaymentEthFeeProxy)(EthConversionProxyConnected, network, gasPrice);
|
|
20
|
+
yield (0, adminTasks_1.updateChainlinkConversionPath)(EthConversionProxyConnected, network, gasPrice);
|
|
21
|
+
console.log(`Setup of EthConversionProxy successful on ${network}`);
|
|
20
22
|
}
|
|
21
|
-
|
|
22
|
-
|
|
23
|
+
catch (err) {
|
|
24
|
+
console.warn(`An error occurred during the setup of EthConversionProxy on ${network}`);
|
|
25
|
+
console.warn(err);
|
|
23
26
|
}
|
|
24
|
-
const wallet = new hre.ethers.Wallet(hre.config.xdeploy.signer, provider);
|
|
25
|
-
const signer = wallet.connect(provider);
|
|
26
|
-
const EthConversionProxyConnected = yield EthConversionProxyContract.connect(signer);
|
|
27
|
-
const adminNonce = yield signer.getTransactionCount();
|
|
28
|
-
const gasPrice = yield provider.getGasPrice();
|
|
29
|
-
// start from the adminNonce, increase gasPrice if needed
|
|
30
|
-
yield Promise.all([
|
|
31
|
-
(0, adminTasks_1.updatePaymentErc20FeeProxy)(EthConversionProxyConnected, network, adminNonce, gasPrice),
|
|
32
|
-
(0, adminTasks_1.updateChainlinkConversionPath)(EthConversionProxyConnected, network, adminNonce + 1, gasPrice),
|
|
33
|
-
]);
|
|
34
27
|
})));
|
|
35
|
-
console.log('Setup for EthConversionProxy successful');
|
|
36
28
|
});
|
|
37
29
|
exports.setupETHConversionProxy = setupETHConversionProxy;
|
|
38
30
|
//# sourceMappingURL=setupETHConversionProxy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupETHConversionProxy.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupETHConversionProxy.ts"],"names":[],"mappings":";;;;AAAA,uCAAsD;AAEtD,
|
|
1
|
+
{"version":3,"file":"setupETHConversionProxy.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupETHConversionProxy.ts"],"names":[],"mappings":";;;;AAAA,uCAAsD;AAEtD,6CAIsB;AAEtB;;;;GAIG;AACI,MAAM,uBAAuB,GAAG,CACrC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CACxD,eAAe,EACf,2BAAqB,CAAC,cAAc,EAAE,CACvC,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;QAChD,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,iCAAoB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACtE,MAAM,2BAA2B,GAAG,MAAM,0BAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAErF,MAAM,IAAA,qCAAwB,EAAC,2BAA2B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC/E,MAAM,IAAA,0CAA6B,EAAC,2BAA2B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACpF,OAAO,CAAC,GAAG,CAAC,6CAA6C,OAAO,EAAE,CAAC,CAAC;SACrE;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,+DAA+D,OAAO,EAAE,CAAC,CAAC;YACvF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;IACH,CAAC,CAAA,CAAC,CACH,CAAC;AACJ,CAAC,CAAA,CAAC;AAxBW,QAAA,uBAAuB,2BAwBlC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { HardhatRuntimeEnvironmentExtended } from '../types';
|
|
2
|
+
/**
|
|
3
|
+
* Updates the values of the chainlinkConversionPath and ERC20FeeProxy addresses if needed
|
|
4
|
+
* @param contractAddress address of the BatchPayments Proxy
|
|
5
|
+
* @param hre Hardhat runtime environment
|
|
6
|
+
*/
|
|
7
|
+
export declare const setupErc20ConversionProxy: (contractAddress: string, hre: HardhatRuntimeEnvironmentExtended) => Promise<void>;
|
|
8
|
+
//# sourceMappingURL=setupErc20ConversionProxy.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setupErc20ConversionProxy.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupErc20ConversionProxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAO7D;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,oBACnB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CAqBd,CAAC"}
|