dequanto 0.2.36 → 0.2.38
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/hardhat.config.js +10 -1
- package/lib/cjs/contracts/deploy/Deployments.js +33 -6
- package/lib/cjs/contracts/deploy/Deployments.js.map +1 -1
- package/lib/cjs/contracts/deploy/proxy/ProxyDeployment.js +37 -4
- package/lib/cjs/contracts/deploy/proxy/ProxyDeployment.js.map +1 -1
- package/lib/cjs/gen/Generator.js +15 -0
- package/lib/cjs/gen/Generator.js.map +1 -1
- package/lib/cjs/utils/$crypto.js +1 -1
- package/lib/cjs/utils/$crypto.js.map +1 -1
- package/lib/cjs/utils/$require.js +12 -5
- package/lib/cjs/utils/$require.js.map +1 -1
- package/lib/esm/contracts/deploy/Deployments.js.map +1 -1
- package/lib/esm/contracts/deploy/Deployments.mjs +33 -6
- package/lib/esm/contracts/deploy/proxy/ProxyDeployment.js.map +1 -1
- package/lib/esm/contracts/deploy/proxy/ProxyDeployment.mjs +37 -4
- package/lib/esm/gen/Generator.js.map +1 -1
- package/lib/esm/gen/Generator.mjs +15 -0
- package/lib/esm/utils/$crypto.js.map +1 -1
- package/lib/esm/utils/$crypto.mjs +1 -1
- package/lib/esm/utils/$require.js.map +1 -1
- package/lib/esm/utils/$require.mjs +12 -5
- package/lib/types/contracts/deploy/Deployments.d.ts +16 -10
- package/lib/types/contracts/deploy/proxy/ProxyDeployment.d.ts +2 -0
- package/lib/types/gen/Generator.d.ts +8 -0
- package/lib/types/utils/$require.d.ts +3 -1
- package/package.json +1 -1
- package/src/contracts/deploy/Deployments.ts +62 -18
- package/src/contracts/deploy/proxy/ProxyDeployment.ts +61 -16
- package/src/gen/Generator.ts +17 -0
- package/src/utils/$crypto.ts +1 -1
- package/src/utils/$require.ts +11 -5
|
@@ -7,11 +7,11 @@ import { BlockchainExplorerFactory } from '../../explorer/BlockchainExplorerFact
|
|
|
7
7
|
import { ContractVerifier } from '../../explorer/ContractVerifier.mjs';
|
|
8
8
|
import { LoggerService } from '../../loggers/LoggerService.mjs';
|
|
9
9
|
import { $is } from '../../utils/$is.mjs';
|
|
10
|
+
import { $bytecode } from '../../evm/utils/$bytecode.mjs';
|
|
11
|
+
import { l } from '../../utils/$logger.mjs';
|
|
12
|
+
import { $promise } from '../../utils/$promise.mjs';
|
|
10
13
|
import { ProxyDeployment } from './proxy/ProxyDeployment.mjs';
|
|
11
14
|
import { DeploymentsStorage } from './storage/DeploymentsStorage.mjs';
|
|
12
|
-
import { $promise } from '../../utils/$promise.mjs';
|
|
13
|
-
import { l } from '../../utils/$logger.mjs';
|
|
14
|
-
import { $bytecode } from '../../evm/utils/$bytecode.mjs';
|
|
15
15
|
export class Deployments {
|
|
16
16
|
constructor(client, deployer, opts = {}) {
|
|
17
17
|
this.client = client;
|
|
@@ -163,7 +163,8 @@ export class Deployments {
|
|
|
163
163
|
verification: opts?.verification,
|
|
164
164
|
deployment: opts?.deployment
|
|
165
165
|
});
|
|
166
|
-
let
|
|
166
|
+
let initData = serializeInitData(id, contractImpl, opts.initialize);
|
|
167
|
+
let { migrationData, migrationV } = serializeMigrationData(id, contractImpl, opts);
|
|
167
168
|
let implementationAddress = contractImplDeployment.implementation ?? contractImplDeployment.address;
|
|
168
169
|
let { contractProxy, contractProxyDeployment, contractProxyAdmin } = await this._proxyDeployment.ensureProxy({
|
|
169
170
|
ImplementationContract: CtorImpl,
|
|
@@ -173,7 +174,9 @@ export class Deployments {
|
|
|
173
174
|
deployments: this,
|
|
174
175
|
implementation: {
|
|
175
176
|
address: implementationAddress,
|
|
176
|
-
initData
|
|
177
|
+
initData,
|
|
178
|
+
migrationData,
|
|
179
|
+
migrationV,
|
|
177
180
|
},
|
|
178
181
|
upgradeImplementation: opts.deployment?.upgradeProxy ?? this.opts?.whenUpgradeRequired !== 'ignore'
|
|
179
182
|
});
|
|
@@ -223,7 +226,9 @@ export class Deployments {
|
|
|
223
226
|
deployments: this,
|
|
224
227
|
implementation: {
|
|
225
228
|
address: implementationAddress,
|
|
226
|
-
initData: data
|
|
229
|
+
initData: data,
|
|
230
|
+
// @TODO implement migrations for Beacons
|
|
231
|
+
migrationData: null
|
|
227
232
|
}
|
|
228
233
|
});
|
|
229
234
|
let contract = new CtorImpl(contractBeaconProxy.address, this.client);
|
|
@@ -420,6 +425,28 @@ function serializeInitData(id, contract, initializeParams) {
|
|
|
420
425
|
}
|
|
421
426
|
return data;
|
|
422
427
|
}
|
|
428
|
+
function serializeMigrationData(id, contract, opts) {
|
|
429
|
+
let rgx = /^initializeV(?<version>[\d+])$/;
|
|
430
|
+
let migrations = contract
|
|
431
|
+
.abi
|
|
432
|
+
.map(x => rgx.exec(x.name))
|
|
433
|
+
.filter(x => x != null)
|
|
434
|
+
.map(match => Number(match.groups.version));
|
|
435
|
+
if (migrations.length === 0) {
|
|
436
|
+
return { migrationData: null, migrationV: 1 };
|
|
437
|
+
}
|
|
438
|
+
let v = alot(migrations).max(x => x);
|
|
439
|
+
let key = `initializeV${v}`;
|
|
440
|
+
let migrationAbi = contract.abi.find(x => x.name === key);
|
|
441
|
+
let migrationParams = opts?.[key] ?? [];
|
|
442
|
+
if (migrationParams?.length !== migrationAbi.inputs.length) {
|
|
443
|
+
throw new Error(`Wrong number of arguments (${migrationParams?.length}) for initializer method (${migrationAbi.inputs.length}) in ${id}.`);
|
|
444
|
+
}
|
|
445
|
+
return {
|
|
446
|
+
migrationData: $abiUtils.serializeMethodCallData(migrationAbi, migrationParams ?? []),
|
|
447
|
+
migrationV: v
|
|
448
|
+
};
|
|
449
|
+
}
|
|
423
450
|
/**
|
|
424
451
|
* Normalize the contract name by removing any versions from name
|
|
425
452
|
* "FooV1" is actually the "Foo" contract
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProxyDeployment.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/proxy/ProxyDeployment.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ProxyDeployment.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/proxy/ProxyDeployment.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,9 @@ import { ContractWriter } from '../../ContractWriter.mjs';
|
|
|
7
7
|
import { $proxyDeploy } from './$proxyDeploy.mjs';
|
|
8
8
|
import { File } from 'atma-io';
|
|
9
9
|
import { HardhatProvider } from '../../../hardhat/HardhatProvider.mjs';
|
|
10
|
+
import { $hex } from '../../../utils/$hex.mjs';
|
|
11
|
+
import { SlotsStorage } from '../../../solidity/SlotsStorage.mjs';
|
|
12
|
+
import { SlotsParser } from '../../../solidity/SlotsParser.mjs';
|
|
10
13
|
// Supports OpenZeppelin proxy deployments
|
|
11
14
|
export class ProxyDeployment {
|
|
12
15
|
constructor(store, opts) {
|
|
@@ -29,7 +32,7 @@ export class ProxyDeployment {
|
|
|
29
32
|
async ensureTransparentProxy(ctx) {
|
|
30
33
|
let { proxyId, deployer, deployments, ImplementationContract } = ctx;
|
|
31
34
|
let { client } = deployments;
|
|
32
|
-
let { address: implAddress, initData } = ctx.implementation;
|
|
35
|
+
let { address: implAddress, initData, migrationData, migrationV, } = ctx.implementation;
|
|
33
36
|
let { Proxy, ProxyAdmin, } = ctx.TransparentProxy ?? this.opts.TransparentProxy;
|
|
34
37
|
if (Proxy == null) {
|
|
35
38
|
let internal = await this.getOpenzeppelinUpgradable({ beacon: false, proxy: true });
|
|
@@ -93,9 +96,15 @@ export class ProxyDeployment {
|
|
|
93
96
|
if ($address.eq(address, implAddress) === false) {
|
|
94
97
|
if (shouldUpdate) {
|
|
95
98
|
await this.requireCompatibleStorageLayout(proxyId, ctx);
|
|
99
|
+
if ($hex.isEmpty(migrationData) === false) {
|
|
100
|
+
let version = await Interfaces.TransparentProxy[v].contractProxy.version(contractProxy);
|
|
101
|
+
if (migrationV <= version) {
|
|
102
|
+
// Clear migration call; This upgrade is raw implementation upgrade
|
|
103
|
+
migrationData = null;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
96
106
|
$logger.log(`Upgrading ProxyAdmin(${contractProxyAdmin.address}) to ${implAddress} (${v}) from ${address}`);
|
|
97
|
-
let receipt = await Interfaces.call(ctx.owner ?? deployer, contractProxyAdmin, Interfaces.TransparentProxy[v].contractProxyAdmin.upgradeAndCall, contractProxy.address, implAddress,
|
|
98
|
-
);
|
|
107
|
+
let receipt = await Interfaces.call(ctx.owner ?? deployer, contractProxyAdmin, Interfaces.TransparentProxy[v].contractProxyAdmin.upgradeAndCall, contractProxy.address, implAddress, migrationData);
|
|
99
108
|
await this.saveStorageLayout(proxyId, ctx);
|
|
100
109
|
}
|
|
101
110
|
else {
|
|
@@ -293,15 +302,39 @@ var Interfaces;
|
|
|
293
302
|
TransparentProxy.V4 = {
|
|
294
303
|
contractProxy: {
|
|
295
304
|
changeAdmin: 'changeAdmin(address newAdmin) external',
|
|
305
|
+
async version(contract) {
|
|
306
|
+
const slots = await SlotsParser.slotsFromAbi(`
|
|
307
|
+
(uint8 _version, bool initializing)
|
|
308
|
+
`);
|
|
309
|
+
const storage = SlotsStorage.createWithClient(contract.client, contract.address, slots);
|
|
310
|
+
let v = await storage.get('_version');
|
|
311
|
+
return v;
|
|
312
|
+
},
|
|
296
313
|
},
|
|
297
314
|
contractProxyAdmin: {
|
|
298
315
|
async upgradeAndCall(account, contract, proxyAddress, implementationAddress, data) {
|
|
316
|
+
if (data != null && $hex.isEmpty(data) === false) {
|
|
317
|
+
return call(account, contract, 'upgradeAndCall(address proxy, address implementation, bytes data) external', proxyAddress, implementationAddress, data);
|
|
318
|
+
}
|
|
299
319
|
return call(account, contract, 'upgrade(address proxy, address implementation) external', proxyAddress, implementationAddress);
|
|
300
320
|
}
|
|
301
321
|
}
|
|
302
322
|
};
|
|
303
323
|
TransparentProxy.V5 = {
|
|
304
|
-
contractProxy: {
|
|
324
|
+
contractProxy: {
|
|
325
|
+
async version(contract) {
|
|
326
|
+
// keccak256(abi.encode(uint256(keccak256("openzeppelin.storage.Initializable")) - 1)) & ~bytes32(uint256(0xff))
|
|
327
|
+
const position = '0xf0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00';
|
|
328
|
+
const slots = await SlotsParser.slotsFromAbi(`
|
|
329
|
+
(uint8 initialized, bool initializing)
|
|
330
|
+
`);
|
|
331
|
+
const storage = SlotsStorage.createWithClient(contract.client, contract.address, slots, {
|
|
332
|
+
storageOffset: position
|
|
333
|
+
});
|
|
334
|
+
const v = await storage.get('initialized');
|
|
335
|
+
return v;
|
|
336
|
+
},
|
|
337
|
+
},
|
|
305
338
|
contractProxyAdmin: {
|
|
306
339
|
upgradeAndCall: 'upgradeAndCall(address proxy, address implementation, bytes memory data) external'
|
|
307
340
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Generator.js","sourceRoot":"","sources":["../../../src/gen/Generator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Generator.js","sourceRoot":"","sources":["../../../src/gen/Generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,6 +48,21 @@ export class Generator {
|
|
|
48
48
|
});
|
|
49
49
|
return generator.generate();
|
|
50
50
|
}
|
|
51
|
+
static async generateFromJson(artifact) {
|
|
52
|
+
$require.True(await File.existsAsync(artifact), `${artifact} does not exist`);
|
|
53
|
+
let name = /(?<contractName>[^\\/]+).json$/.exec(artifact)?.groups?.contractName;
|
|
54
|
+
$require.notEmpty(name, `Contract name not resolved from the path ${artifact}`);
|
|
55
|
+
let generator = new Generator({
|
|
56
|
+
platform: 'hardhat',
|
|
57
|
+
name: name,
|
|
58
|
+
source: {
|
|
59
|
+
path: artifact
|
|
60
|
+
},
|
|
61
|
+
output: './0xc/hardhat/',
|
|
62
|
+
saveSources: false,
|
|
63
|
+
});
|
|
64
|
+
return generator.generate();
|
|
65
|
+
}
|
|
51
66
|
/**
|
|
52
67
|
* @deprecated Was possible to generate the Contract Class based on the meta information header in TS file
|
|
53
68
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$crypto.js","sourceRoot":"","sources":["../../../src/utils/$crypto.ts"],"names":[],"mappings":";;;AACA,uCAAoC;AACpC,yCAAsC;AACtC,+BAA4B;AAuB5B,MAAM,WAAW,GAAG,aAAa,CAAC;AAElC,MAAe,UAAU;IAOrB,KAAK,CAAC,MAAM,CAAE,GAAmC,EAAE,IAAsC;QACrF,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,IAAI,EAAE,QAAQ,KAAK,KAAK,EAAE;YAC1B,OAAO,iBAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SAC9B;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAKD,KAAK,CAAC,OAAO,CAAC,GAAmC,EAAE,IAAuB;QACtE,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnC,mBAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,uCAAuC,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,mBAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"$crypto.js","sourceRoot":"","sources":["../../../src/utils/$crypto.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ class CryptoBase {
|
|
|
15
15
|
const buffer = utils.toBuffer(mix);
|
|
16
16
|
$require.gt(buffer.length, 0, `Buffer to encrypt must be a non-empty`);
|
|
17
17
|
const secret = opts.secret;
|
|
18
|
-
$require.
|
|
18
|
+
$require.notEmpty(secret, `Secret must be a non-empty`);
|
|
19
19
|
const bufferSecret = await this.prepareSecret(secret);
|
|
20
20
|
let encrypted = await this.encryptInner(buffer, bufferSecret);
|
|
21
21
|
switch (opts.encoding) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$require.js","sourceRoot":"","sources":["../../../src/utils/$require.ts"],"names":[],"mappings":";;;AAEA,+BAA4B;AAC5B,yCAAsC;AAEtC,MAAM,MAAM,GAAG,KAAK,CAAC;AACrB,IAAiB,QAAQ,
|
|
1
|
+
{"version":3,"file":"$require.js","sourceRoot":"","sources":["../../../src/utils/$require.ts"],"names":[],"mappings":";;;AAEA,+BAA4B;AAC5B,yCAAsC;AAEtC,MAAM,MAAM,GAAG,KAAK,CAAC;AACrB,IAAiB,QAAQ,CA6NxB;AA7ND,WAAiB,QAAQ;IACrB,SAAgB,MAAM,CAAM,GAAM,EAAE,UAAkB,EAAE,EAAE,IAA0B;QAChF,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzB,MAAM,IAAI,KAAK,CAAC,4BAA4B,OAAO,GAAG,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC,CAAC;SAChF;QACD,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,0BAA0B,OAAO,EAAE,CAAC,CAAC;SACxD;QACD,IAAI,IAAI,EAAE,GAAG,IAAI,IAAI,IAAK,GAAS,GAAG,IAAI,CAAC,GAAG,EAAE;YAC5C,MAAM,IAAI,KAAK,CAAC,SAAS,GAAG,iBAAiB,IAAI,CAAC,GAAG,KAAK,OAAO,EAAE,CAAC,CAAC;SACxE;QACD,IAAI,IAAI,EAAE,GAAG,IAAI,IAAI,IAAK,GAAS,GAAG,IAAI,CAAC,GAAG,EAAE;YAC5C,MAAM,IAAI,KAAK,CAAC,SAAS,GAAG,oBAAoB,IAAI,CAAC,GAAG,KAAK,OAAO,EAAE,CAAC,CAAC;SAC3E;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAde,eAAM,SAcrB,CAAA;IACD,SAAgB,MAAM,CAAK,GAAM,EAAE,UAAkB,EAAE,EAAE,IAA0B;QAC/E,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzB,MAAM,IAAI,KAAK,CAAC,4BAA4B,OAAO,GAAG,KAAK,GAAG,MAAM,OAAO,EAAE,CAAC,CAAC;SAClF;QACD,IAAI,IAAI,EAAE,GAAG,IAAI,IAAI,IAAK,GAAS,GAAG,IAAI,CAAC,GAAG,EAAE;YAC5C,MAAM,IAAI,KAAK,CAAC,SAAS,GAAG,iBAAiB,IAAI,CAAC,GAAG,KAAK,OAAO,EAAE,CAAC,CAAC;SACxE;QACD,IAAI,IAAI,EAAE,GAAG,IAAI,IAAI,IAAK,GAAS,GAAG,IAAI,CAAC,GAAG,EAAE;YAC5C,MAAM,IAAI,KAAK,CAAC,SAAS,GAAG,oBAAoB,IAAI,CAAC,GAAG,KAAK,OAAO,EAAE,CAAC,CAAC;SAC3E;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAXe,eAAM,SAWrB,CAAA;IACD,SAAgB,OAAO,CAAI,GAAM,EAAE,UAAkB,EAAE,EAAE,IAA0B;QAC/E,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzB,OAAO,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;SACrC;QACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzB,OAAO,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;SACrC;QACD,MAAM,IAAI,KAAK,CAAC,6BAA6B,OAAO,GAAG,KAAK,OAAO,EAAE,CAAC,CAAC;IAC3E,CAAC;IARe,gBAAO,UAQtB,CAAA;IAED,SAAgB,QAAQ,CAAI,GAAM,EAAE,OAAe;QAC/C,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,EAAE,CAAC,CAAC;SACzD;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IALe,iBAAQ,WAKvB,CAAA;IACD,SAAgB,KAAK,CAAI,GAAM,EAAE,OAAe;QAC5C,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,EAAE,CAAC,CAAC;SACzD;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IALe,cAAK,QAKpB,CAAA;IACD,SAAgB,MAAM,CAAI,GAAM,EAAE,OAAe;QAC7C,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzB,MAAM,IAAI,KAAK,CAAC,SAAS,GAAG,oBAAoB,OAAO,EAAE,CAAC,CAAC;SAC9D;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IALe,eAAM,SAKrB,CAAA;IACD,SAAgB,OAAO,CAAK,GAAM,EAAE,OAAe,EAAE,GAAG,IAAI;QACxD,IAAI,GAAG,IAAI,IAAI,EAAE;YACb,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YACzC,MAAM,IAAI,KAAK,CAAC,uBAAuB,OAAO,EAAE,CAAC,CAAC;SACrD;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IANe,gBAAO,UAMtB,CAAA;IACD,SAAgB,IAAI,CAAK,GAAM,EAAE,OAAe,EAAE,GAAG,IAAI;QACrD,IAAI,GAAG,IAAI,IAAI,EAAE;YACb,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YACzC,MAAM,IAAI,KAAK,CAAC,SAAS,GAAG,6BAA6B,OAAO,EAAE,CAAC,CAAC;SACvE;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IANe,aAAI,OAMnB,CAAA;IACD,SAAgB,QAAQ,CAAsD,GAAM,EAAE,OAAe;QACjG,IAAI,GAAG,IAAI,IAAI,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,uBAAuB,OAAO,EAAE,CAAC,CAAC;SACrD;QACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzB,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;gBACzB,MAAM,IAAI,KAAK,CAAC,0BAA0B,OAAO,EAAE,CAAC,CAAC;aACxD;SACJ;aAAM,IAAI,OAAO,GAAG,KAAI,QAAQ,IAAI,QAAQ,IAAI,GAAG,EAAE;YAClD,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;gBAClB,MAAM,IAAI,KAAK,CAAC,yBAAyB,OAAO,EAAE,CAAC,CAAC;aACvD;SACJ;aAAM;YACH,MAAM,IAAI,KAAK,CAAC,oCAAoC,OAAO,GAAG,KAAK,GAAG,EAAE,CAAC,CAAC;SAC7E;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAhBe,iBAAQ,WAgBvB,CAAA;IAEM,KAAK,UAAU,QAAQ,CAAM,CAAiB,EAAE,OAAe;QAClE,IAAI;YACA,OAAO,MAAM,CAAC,CAAC;SAClB;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;SAClD;IACL,CAAC;IANqB,iBAAQ,WAM7B,CAAA;IAED,SAAgB,IAAI,CAAC,KAAc,EAAE,OAAgB;QACjD,IAAI,KAAK,KAAK,IAAI,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,EAAE,CAAC,CAAC;SACtD;IACL,CAAC;IAJe,aAAI,OAInB,CAAA;IACD,SAAgB,KAAK,CAAU,CAAI,EAAE,CAAI,EAAE,UAAkB,EAAE;QAC3D,mBAAmB;QACnB,IAAI,CAAC,IAAI,CAAC,EAAE;YACR,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,wBAAwB,OAAO,EAAE,CAAC,CAAA;SAClE;IACL,CAAC;IALe,cAAK,QAKpB,CAAA;IACD,SAAgB,EAAE,CAAU,CAAI,EAAE,CAAI,EAAE,UAAkB,EAAE;QACxD,mBAAmB;QACnB,IAAI,CAAC,IAAI,CAAC,EAAE;YACR,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,qBAAqB,OAAO,EAAE,CAAC,CAAA;SAC/D;IACL,CAAC;IALe,WAAE,KAKjB,CAAA;IACD,SAAgB,KAAK,CAAE,GAAW,EAAE,GAAW,EAAE,OAAO,GAAG,EAAE;QACzD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzB,MAAM,IAAI,KAAK,CAAC,iCAAiC,OAAO,EAAE,CAAC,CAAC;SAC/D;QACD,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE;YACzB,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,cAAc,GAAG,CAAC,QAAQ,EAAE,KAAK,OAAO,EAAE,CAAC,CAAC;SACtF;IACL,CAAC;IAPe,cAAK,QAOpB,CAAA;IACD,SAAgB,KAAK,CAAU,CAAI,EAAE,GAAQ,EAAE,UAAkB,EAAE;QAC/D,mBAAmB;QACnB,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,qBAAqB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,OAAO,EAAE,CAAC,CAAA;SACzE;IACL,CAAC;IALe,cAAK,QAKpB,CAAA;IAID,SAAgB,GAAG,CAAU,CAAI,EAAE,GAAiB,EAAE,UAAkB,EAAE;QACtE,mBAAmB;QACnB,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAQ,CAAC,KAAK,KAAK,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,sBAAsB,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,OAAO,EAAE,CAAC,CAAA;SAC1G;QACD,OAAO,CAAC,CAAC;IACb,CAAC;IANe,YAAG,MAMlB,CAAA;IAED,SAAgB,OAAO,CAAE,GAAsB,EAAE,UAAkB,EAAE;QACjE,IAAI,SAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,SAAS,GAAG,4BAA4B,OAAO,EAAE,CAAC,CAAC;SACtE;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IALe,gBAAO,UAKtB,CAAA;IACD,SAAgB,eAAe,CAAE,GAAsB,EAAE,UAAkB,EAAE;QACzE,IAAI,mBAAQ,CAAC,OAAO,CAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,EAAE;YACnD,MAAM,IAAI,KAAK,CAAC,SAAS,GAAG,4BAA4B,OAAO,EAAE,CAAC,CAAC;SACtE;QACD,OAAO,GAAe,CAAC;IAC3B,CAAC;IALe,wBAAe,kBAK9B,CAAA;IACD,SAAgB,cAAc,CAAE,GAAa,EAAE,UAAkB,EAAE;QAC/D,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC/B,IAAI,QAAQ,GAAG,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,EAAc,CAAC,CAAC;QAClE,IAAI,QAAQ,KAAK,GAAG,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,QAAQ,GAAG,IAAI,OAAO,EAAE,CAAC,CAAC;SACzE;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAPe,uBAAc,iBAO7B,CAAA;IAED,SAAgB,MAAM,CAAE,GAAW,EAAE,UAAkB,EAAE;QACrD,IAAI,SAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,SAAS,GAAG,4BAA4B,OAAO,EAAE,CAAC,CAAC;SACtE;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IALe,eAAM,SAKrB,CAAA;IAED,SAAgB,GAAG,CAAE,GAAW,EAAE,UAAkB,EAAE;QAClD,IAAI,SAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,SAAS,GAAG,8BAA8B,OAAO,EAAE,CAAC,CAAC;SACxE;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IALe,YAAG,MAKlB,CAAA;IAED,SAAgB,KAAK,CAAE,KAAa,EAAE,UAAkB,EAAE;QACtD,IAAI,KAAK,IAAI,IAAI,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,uBAAuB,OAAO,EAAE,CAAC,CAAC;SACrD;QACD,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,wCAAwC,OAAO,EAAE,CAAC,CAAC;SACtE;QACD,IAAI,KAAK,CAAC,QAAQ,IAAI,IAAI,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,yCAAyC,OAAO,EAAE,CAAC,CAAC;SACvE;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAXe,cAAK,QAWpB,CAAA;IAED;;OAEG;IACH,SAAgB,EAAE,CAAuB,CAAI,EAAE,CAAI,EAAE,UAAkB,EAAE;QACrE,OAAO,CAAC,CAAC,CAAC,CAAC;QACX,OAAO,CAAC,CAAC,CAAC,CAAC;QACX,IAAI,CAAC,IAAI,CAAC,EAAE;YACR,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,MAAM,OAAO,EAAE,CAAC,CAAC;SAC7D;IACL,CAAC;IANe,WAAE,KAMjB,CAAA;IACD,SAAgB,GAAG,CAAuB,CAAI,EAAE,CAAI,EAAE,UAAkB,EAAE;QACtE,OAAO,CAAC,CAAC,CAAC,CAAC;QACX,OAAO,CAAC,CAAC,CAAC,CAAC;QACX,IAAI,CAAC,GAAG,CAAC,EAAE;YACP,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,MAAM,OAAO,EAAE,CAAC,CAAC;SAC7D;IACL,CAAC;IANe,YAAG,MAMlB,CAAA;IAED;;OAEG;IACH,SAAgB,EAAE,CAAuB,CAAI,EAAE,CAAI,EAAE,UAAkB,EAAE;QACrE,OAAO,CAAC,CAAC,CAAC,CAAC;QACX,OAAO,CAAC,CAAC,CAAC,CAAC;QACX,IAAI,CAAC,IAAI,CAAC,EAAE;YACR,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,MAAM,OAAO,EAAE,CAAC,CAAC;SAC7D;IACL,CAAC;IANe,WAAE,KAMjB,CAAA;IACD,SAAgB,GAAG,CAAuB,CAAI,EAAE,CAAI,EAAE,UAAkB,EAAE;QACtE,OAAO,CAAC,CAAC,CAAC,CAAC;QACX,OAAO,CAAC,CAAC,CAAC,CAAC;QACX,IAAI,CAAC,GAAG,CAAC,EAAE;YACP,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,MAAM,OAAO,EAAE,CAAC,CAAC;SAC7D;IACL,CAAC;IANe,YAAG,MAMlB,CAAA;AACL,CAAC,EA7NgB,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QA6NxB"}
|
|
@@ -83,11 +83,18 @@ export var $require;
|
|
|
83
83
|
if (val == null) {
|
|
84
84
|
throw new Error(`Value is undefined. ${message}`);
|
|
85
85
|
}
|
|
86
|
-
if (typeof val === 'string'
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
86
|
+
if (typeof val === 'string') {
|
|
87
|
+
if (val.trim().length === 0) {
|
|
88
|
+
throw new Error(`Value is empty string. ${message}`);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
else if (typeof val === 'object' && 'length' in val) {
|
|
92
|
+
if (val.length === 0) {
|
|
93
|
+
throw new Error(`Value is empty array. ${message}`);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
throw new Error(`Invalid type for notEmpty check: ${typeof val}: ${val}`);
|
|
91
98
|
}
|
|
92
99
|
return val;
|
|
93
100
|
}
|
|
@@ -2,11 +2,10 @@ import { Web3Client } from '../../clients/Web3Client';
|
|
|
2
2
|
import { ContractBase } from '../ContractBase';
|
|
3
3
|
import { IAccount } from '../../models/TAccount';
|
|
4
4
|
import { TEth } from '../../models/TEth';
|
|
5
|
-
import { ParametersFromSecond } from '../../utils/types';
|
|
6
|
-
import {
|
|
5
|
+
import { Constructor, ParametersFromSecond } from '../../utils/types';
|
|
6
|
+
import { TAddress } from '../../models/TAddress';
|
|
7
7
|
import { IBeacon, IBeaconProxy, IProxy, IProxyAdmin } from './proxy/ProxyDeployment';
|
|
8
8
|
import { DeploymentsStorage, IDeployment } from './storage/DeploymentsStorage';
|
|
9
|
-
import { TAddress } from '../../models/TAddress';
|
|
10
9
|
type TDeploymentOptions = {
|
|
11
10
|
id?: string;
|
|
12
11
|
/** Will deploy the contract */
|
|
@@ -97,11 +96,7 @@ export declare class Deployments {
|
|
|
97
96
|
receipt?: TEth.TxReceipt;
|
|
98
97
|
deployment: IDeployment;
|
|
99
98
|
}>;
|
|
100
|
-
ensureWithProxy<T extends (TContract & {
|
|
101
|
-
initialize?: TInit;
|
|
102
|
-
}), TInit extends TInitializer>(CtorImpl: Constructor<T>, opts?: TConstructorArgs<T> & TDeploymentOptions & {
|
|
103
|
-
initialize?: ParametersFromSecond<T['initialize']>;
|
|
104
|
-
}): Promise<{
|
|
99
|
+
ensureWithProxy<T extends (TContract & TInitializers<TInit>), TInit extends TFunction>(CtorImpl: Constructor<T>, opts?: TConstructorArgs<T> & TDeploymentOptions & TInitializerParams<T>): Promise<{
|
|
105
100
|
contract: T;
|
|
106
101
|
contractReceipt?: TEth.TxReceipt;
|
|
107
102
|
contractProxy: IProxy;
|
|
@@ -115,7 +110,7 @@ export declare class Deployments {
|
|
|
115
110
|
**/
|
|
116
111
|
ensureWithBeacon<T extends (TContract & {
|
|
117
112
|
initialize?: TInit;
|
|
118
|
-
}), TInit extends
|
|
113
|
+
}), TInit extends TFunction>(CtorImpl: Constructor<T>, opts: TConstructorArgs<T> & TDeploymentOptions & {
|
|
119
114
|
id: string;
|
|
120
115
|
initialize?: ParametersFromSecond<T['initialize']>;
|
|
121
116
|
}): Promise<{
|
|
@@ -143,7 +138,18 @@ export declare class Deployments {
|
|
|
143
138
|
title?: string;
|
|
144
139
|
}): Promise<void>;
|
|
145
140
|
}
|
|
146
|
-
type
|
|
141
|
+
type TFunction = (...args: any[]) => any;
|
|
142
|
+
type TInitializerName = 'initialize' | `initializeV${number}`;
|
|
143
|
+
type TInitializers<TInit extends TFunction> = {
|
|
144
|
+
[K in TInitializerName]?: TInit;
|
|
145
|
+
};
|
|
146
|
+
type TInitializerParams<T extends TInitializers<TFunction>> = {
|
|
147
|
+
initialize?: T['initialize'] extends TFunction ? ParametersFromSecond<T['initialize']> : never;
|
|
148
|
+
initializeV2?: T['initializeV2'] extends TFunction ? ParametersFromSecond<T['initializeV2']> : never;
|
|
149
|
+
initializeV3?: T['initializeV3'] extends TFunction ? ParametersFromSecond<T['initializeV3']> : never;
|
|
150
|
+
} & {
|
|
151
|
+
[K in Extract<keyof T, `initializeV${number}`>]?: T[K] extends TFunction ? ParametersFromSecond<T[K]> : any;
|
|
152
|
+
};
|
|
147
153
|
type TContract = ContractBase & {
|
|
148
154
|
$constructor?: (...args: any[]) => any;
|
|
149
155
|
};
|
|
@@ -45,6 +45,14 @@ export declare class Generator {
|
|
|
45
45
|
implementation: `0x${string}`;
|
|
46
46
|
contractName: string;
|
|
47
47
|
}>;
|
|
48
|
+
static generateFromJson(artifact: string): Promise<{
|
|
49
|
+
main: string;
|
|
50
|
+
sources: any[];
|
|
51
|
+
platform: string;
|
|
52
|
+
address: `0x${string}`;
|
|
53
|
+
implementation: `0x${string}`;
|
|
54
|
+
contractName: string;
|
|
55
|
+
}>;
|
|
48
56
|
/**
|
|
49
57
|
* @deprecated Was possible to generate the Contract Class based on the meta information header in TS file
|
|
50
58
|
*/
|
|
@@ -18,7 +18,9 @@ export declare namespace $require {
|
|
|
18
18
|
function String<T>(val: T, message: string): T;
|
|
19
19
|
function notNull<T>(val: T, message: string, ...logs: any[]): T;
|
|
20
20
|
function Null<T>(val: T, message: string, ...logs: any[]): T;
|
|
21
|
-
function notEmpty<T extends string | Array<any
|
|
21
|
+
function notEmpty<T extends string | Array<any> | {
|
|
22
|
+
length: number;
|
|
23
|
+
}>(val: T, message: string): T;
|
|
22
24
|
function resolved<T>(x: PromiseLike<T>, message: string): Promise<T>;
|
|
23
25
|
function True(value: boolean, message?: string): void;
|
|
24
26
|
function notEq<T = any>(a: T, b: T, message?: string): void;
|