@gearbox-protocol/deploy-tools 4.62.0 → 4.62.1
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/index.mjs +342 -262
- package/package.json +1 -1
package/dist/index.mjs
CHANGED
|
@@ -26628,8 +26628,8 @@ var require_transaction = __commonJS({
|
|
|
26628
26628
|
var BN_353 = BigInt(35);
|
|
26629
26629
|
var BN_MAX_UINT2 = BigInt("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
|
|
26630
26630
|
var BLOB_SIZE2 = 4096 * 32;
|
|
26631
|
-
function getVersionedHash2(
|
|
26632
|
-
let versioned =
|
|
26631
|
+
function getVersionedHash2(version2, hash2) {
|
|
26632
|
+
let versioned = version2.toString(16);
|
|
26633
26633
|
while (versioned.length < 2) {
|
|
26634
26634
|
versioned = "0" + versioned;
|
|
26635
26635
|
}
|
|
@@ -41405,8 +41405,8 @@ var require_websocket_server = __commonJS({
|
|
|
41405
41405
|
handleUpgrade(req, socket, head, cb) {
|
|
41406
41406
|
socket.on("error", socketOnError);
|
|
41407
41407
|
const key = req.headers["sec-websocket-key"] !== void 0 ? req.headers["sec-websocket-key"] : false;
|
|
41408
|
-
const
|
|
41409
|
-
if (req.method !== "GET" || req.headers.upgrade.toLowerCase() !== "websocket" || !key || !keyRegex.test(key) ||
|
|
41408
|
+
const version2 = +req.headers["sec-websocket-version"];
|
|
41409
|
+
if (req.method !== "GET" || req.headers.upgrade.toLowerCase() !== "websocket" || !key || !keyRegex.test(key) || version2 !== 8 && version2 !== 13 || !this.shouldHandle(req)) {
|
|
41410
41410
|
return abortHandshake(socket, 400);
|
|
41411
41411
|
}
|
|
41412
41412
|
const secWebSocketProtocol = req.headers["sec-websocket-protocol"];
|
|
@@ -41438,7 +41438,7 @@ var require_websocket_server = __commonJS({
|
|
|
41438
41438
|
}
|
|
41439
41439
|
if (this.options.verifyClient) {
|
|
41440
41440
|
const info = {
|
|
41441
|
-
origin: req.headers[`${
|
|
41441
|
+
origin: req.headers[`${version2 === 8 ? "sec-websocket-origin" : "origin"}`],
|
|
41442
41442
|
secure: !!(req.socket.authorized || req.socket.encrypted),
|
|
41443
41443
|
req
|
|
41444
41444
|
};
|
|
@@ -44548,8 +44548,8 @@ var require_json_keystore = __commonJS({
|
|
|
44548
44548
|
function isKeystoreJson(json) {
|
|
44549
44549
|
try {
|
|
44550
44550
|
const data = JSON.parse(json);
|
|
44551
|
-
const
|
|
44552
|
-
if (
|
|
44551
|
+
const version2 = data.version != null ? parseInt(data.version) : 0;
|
|
44552
|
+
if (version2 === 3) {
|
|
44553
44553
|
return true;
|
|
44554
44554
|
}
|
|
44555
44555
|
} catch (error) {
|
|
@@ -44583,8 +44583,8 @@ var require_json_keystore = __commonJS({
|
|
|
44583
44583
|
(0, index_js_4.assertArgument)((0, index_js_1.getAddress)(check) === address, "keystore address/privateKey mismatch", "address", data.address);
|
|
44584
44584
|
}
|
|
44585
44585
|
const account = { address, privateKey };
|
|
44586
|
-
const
|
|
44587
|
-
if (
|
|
44586
|
+
const version2 = (0, utils_js_1.spelunk)(data, "x-ethers.version:string");
|
|
44587
|
+
if (version2 === "0.1") {
|
|
44588
44588
|
const mnemonicKey = key.slice(32, 64);
|
|
44589
44589
|
const mnemonicCiphertext = (0, utils_js_1.spelunk)(data, "x-ethers.mnemonicCiphertext:data!");
|
|
44590
44590
|
const mnemonicIv = (0, utils_js_1.spelunk)(data, "x-ethers.mnemonicCounter:data!");
|
|
@@ -61480,10 +61480,10 @@ var require_supports_color = __commonJS({
|
|
|
61480
61480
|
return 3;
|
|
61481
61481
|
}
|
|
61482
61482
|
if ("TERM_PROGRAM" in env2) {
|
|
61483
|
-
const
|
|
61483
|
+
const version2 = parseInt((env2.TERM_PROGRAM_VERSION || "").split(".")[0], 10);
|
|
61484
61484
|
switch (env2.TERM_PROGRAM) {
|
|
61485
61485
|
case "iTerm.app":
|
|
61486
|
-
return
|
|
61486
|
+
return version2 >= 3 ? 3 : 2;
|
|
61487
61487
|
case "Apple_Terminal":
|
|
61488
61488
|
return 2;
|
|
61489
61489
|
}
|
|
@@ -64942,23 +64942,23 @@ var require_axios = __commonJS({
|
|
|
64942
64942
|
};
|
|
64943
64943
|
});
|
|
64944
64944
|
var deprecatedWarnings = {};
|
|
64945
|
-
validators$1.transitional = function transitional(validator2,
|
|
64945
|
+
validators$1.transitional = function transitional(validator2, version2, message) {
|
|
64946
64946
|
function formatMessage(opt, desc) {
|
|
64947
64947
|
return "[Axios v" + VERSION + "] Transitional option '" + opt + "'" + desc + (message ? ". " + message : "");
|
|
64948
64948
|
}
|
|
64949
64949
|
return (value, opt, opts) => {
|
|
64950
64950
|
if (validator2 === false) {
|
|
64951
64951
|
throw new AxiosError(
|
|
64952
|
-
formatMessage(opt, " has been removed" + (
|
|
64952
|
+
formatMessage(opt, " has been removed" + (version2 ? " in " + version2 : "")),
|
|
64953
64953
|
AxiosError.ERR_DEPRECATED
|
|
64954
64954
|
);
|
|
64955
64955
|
}
|
|
64956
|
-
if (
|
|
64956
|
+
if (version2 && !deprecatedWarnings[opt]) {
|
|
64957
64957
|
deprecatedWarnings[opt] = true;
|
|
64958
64958
|
console.warn(
|
|
64959
64959
|
formatMessage(
|
|
64960
64960
|
opt,
|
|
64961
|
-
" has been deprecated since v" +
|
|
64961
|
+
" has been deprecated since v" + version2 + " and will be removed in the near future"
|
|
64962
64962
|
)
|
|
64963
64963
|
);
|
|
64964
64964
|
}
|
|
@@ -68869,7 +68869,7 @@ var require_websocket_server2 = __commonJS({
|
|
|
68869
68869
|
socket.on("error", socketOnError);
|
|
68870
68870
|
const key = req.headers["sec-websocket-key"];
|
|
68871
68871
|
const upgrade = req.headers.upgrade;
|
|
68872
|
-
const
|
|
68872
|
+
const version2 = +req.headers["sec-websocket-version"];
|
|
68873
68873
|
if (req.method !== "GET") {
|
|
68874
68874
|
const message = "Invalid HTTP method";
|
|
68875
68875
|
abortHandshakeOrEmitwsClientError(this, req, socket, 405, message);
|
|
@@ -68885,7 +68885,7 @@ var require_websocket_server2 = __commonJS({
|
|
|
68885
68885
|
abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
|
|
68886
68886
|
return;
|
|
68887
68887
|
}
|
|
68888
|
-
if (
|
|
68888
|
+
if (version2 !== 8 && version2 !== 13) {
|
|
68889
68889
|
const message = "Missing or invalid Sec-WebSocket-Version header";
|
|
68890
68890
|
abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
|
|
68891
68891
|
return;
|
|
@@ -68927,7 +68927,7 @@ var require_websocket_server2 = __commonJS({
|
|
|
68927
68927
|
}
|
|
68928
68928
|
if (this.options.verifyClient) {
|
|
68929
68929
|
const info = {
|
|
68930
|
-
origin: req.headers[`${
|
|
68930
|
+
origin: req.headers[`${version2 === 8 ? "sec-websocket-origin" : "origin"}`],
|
|
68931
68931
|
secure: !!(req.socket.authorized || req.socket.encrypted),
|
|
68932
68932
|
req
|
|
68933
68933
|
};
|
|
@@ -69367,10 +69367,10 @@ var require_lib4 = __commonJS({
|
|
|
69367
69367
|
var Logger2 = (
|
|
69368
69368
|
/** @class */
|
|
69369
69369
|
function() {
|
|
69370
|
-
function Logger3(
|
|
69370
|
+
function Logger3(version2) {
|
|
69371
69371
|
Object.defineProperty(this, "version", {
|
|
69372
69372
|
enumerable: true,
|
|
69373
|
-
value:
|
|
69373
|
+
value: version2,
|
|
69374
69374
|
writable: false
|
|
69375
69375
|
});
|
|
69376
69376
|
}
|
|
@@ -69597,8 +69597,8 @@ var require_lib4 = __commonJS({
|
|
|
69597
69597
|
}
|
|
69598
69598
|
_logLevel = level;
|
|
69599
69599
|
};
|
|
69600
|
-
Logger3.from = function(
|
|
69601
|
-
return new Logger3(
|
|
69600
|
+
Logger3.from = function(version2) {
|
|
69601
|
+
return new Logger3(version2);
|
|
69602
69602
|
};
|
|
69603
69603
|
Logger3.errors = ErrorCode;
|
|
69604
69604
|
Logger3.levels = LogLevel;
|
|
@@ -70370,33 +70370,33 @@ var require_detect_libc = __commonJS({
|
|
|
70370
70370
|
}
|
|
70371
70371
|
return null;
|
|
70372
70372
|
};
|
|
70373
|
-
var
|
|
70374
|
-
let
|
|
70373
|
+
var version2 = async () => {
|
|
70374
|
+
let version3 = null;
|
|
70375
70375
|
if (isLinux()) {
|
|
70376
|
-
|
|
70377
|
-
if (!
|
|
70378
|
-
|
|
70376
|
+
version3 = await versionFromFilesystem();
|
|
70377
|
+
if (!version3) {
|
|
70378
|
+
version3 = versionFromReport();
|
|
70379
70379
|
}
|
|
70380
|
-
if (!
|
|
70380
|
+
if (!version3) {
|
|
70381
70381
|
const out = await safeCommand();
|
|
70382
|
-
|
|
70382
|
+
version3 = versionFromCommand(out);
|
|
70383
70383
|
}
|
|
70384
70384
|
}
|
|
70385
|
-
return
|
|
70385
|
+
return version3;
|
|
70386
70386
|
};
|
|
70387
70387
|
var versionSync = () => {
|
|
70388
|
-
let
|
|
70388
|
+
let version3 = null;
|
|
70389
70389
|
if (isLinux()) {
|
|
70390
|
-
|
|
70391
|
-
if (!
|
|
70392
|
-
|
|
70390
|
+
version3 = versionFromFilesystemSync();
|
|
70391
|
+
if (!version3) {
|
|
70392
|
+
version3 = versionFromReport();
|
|
70393
70393
|
}
|
|
70394
|
-
if (!
|
|
70394
|
+
if (!version3) {
|
|
70395
70395
|
const out = safeCommandSync();
|
|
70396
|
-
|
|
70396
|
+
version3 = versionFromCommand(out);
|
|
70397
70397
|
}
|
|
70398
70398
|
}
|
|
70399
|
-
return
|
|
70399
|
+
return version3;
|
|
70400
70400
|
};
|
|
70401
70401
|
module2.exports = {
|
|
70402
70402
|
GLIBC,
|
|
@@ -70405,7 +70405,7 @@ var require_detect_libc = __commonJS({
|
|
|
70405
70405
|
familySync,
|
|
70406
70406
|
isNonGlibcLinux,
|
|
70407
70407
|
isNonGlibcLinuxSync,
|
|
70408
|
-
version:
|
|
70408
|
+
version: version2,
|
|
70409
70409
|
versionSync
|
|
70410
70410
|
};
|
|
70411
70411
|
}
|
|
@@ -72617,10 +72617,10 @@ var require_node2 = __commonJS({
|
|
|
72617
72617
|
}
|
|
72618
72618
|
}
|
|
72619
72619
|
var SharedData = class {
|
|
72620
|
-
constructor(structures, values,
|
|
72620
|
+
constructor(structures, values, version2) {
|
|
72621
72621
|
this.structures = structures;
|
|
72622
72622
|
this.packedValues = values;
|
|
72623
|
-
this.version =
|
|
72623
|
+
this.version = version2;
|
|
72624
72624
|
}
|
|
72625
72625
|
};
|
|
72626
72626
|
function writeArrayHeader(length) {
|
|
@@ -93455,10 +93455,10 @@ var require_commitmentToVersionedHash = __commonJS({
|
|
|
93455
93455
|
var toHex_js_1 = require_toHex();
|
|
93456
93456
|
var sha256_js_1 = require_sha2564();
|
|
93457
93457
|
function commitmentToVersionedHash(parameters) {
|
|
93458
|
-
const { commitment, version:
|
|
93458
|
+
const { commitment, version: version2 = 1 } = parameters;
|
|
93459
93459
|
const to = parameters.to ?? (typeof commitment === "string" ? "hex" : "bytes");
|
|
93460
93460
|
const versionedHash = (0, sha256_js_1.sha256)(commitment, "bytes");
|
|
93461
|
-
versionedHash.set([
|
|
93461
|
+
versionedHash.set([version2], 0);
|
|
93462
93462
|
return to === "bytes" ? versionedHash : (0, toHex_js_1.bytesToHex)(versionedHash);
|
|
93463
93463
|
}
|
|
93464
93464
|
}
|
|
@@ -93472,14 +93472,14 @@ var require_commitmentsToVersionedHashes = __commonJS({
|
|
|
93472
93472
|
exports2.commitmentsToVersionedHashes = commitmentsToVersionedHashes;
|
|
93473
93473
|
var commitmentToVersionedHash_js_1 = require_commitmentToVersionedHash();
|
|
93474
93474
|
function commitmentsToVersionedHashes(parameters) {
|
|
93475
|
-
const { commitments, version:
|
|
93475
|
+
const { commitments, version: version2 } = parameters;
|
|
93476
93476
|
const to = parameters.to ?? (typeof commitments[0] === "string" ? "hex" : "bytes");
|
|
93477
93477
|
const hashes = [];
|
|
93478
93478
|
for (const commitment of commitments) {
|
|
93479
93479
|
hashes.push((0, commitmentToVersionedHash_js_1.commitmentToVersionedHash)({
|
|
93480
93480
|
commitment,
|
|
93481
93481
|
to,
|
|
93482
|
-
version:
|
|
93482
|
+
version: version2
|
|
93483
93483
|
}));
|
|
93484
93484
|
}
|
|
93485
93485
|
return hashes;
|
|
@@ -93544,11 +93544,11 @@ var require_blob2 = __commonJS({
|
|
|
93544
93544
|
};
|
|
93545
93545
|
exports2.InvalidVersionedHashSizeError = InvalidVersionedHashSizeError;
|
|
93546
93546
|
var InvalidVersionedHashVersionError = class extends base_js_1.BaseError {
|
|
93547
|
-
constructor({ hash: hash2, version:
|
|
93547
|
+
constructor({ hash: hash2, version: version2 }) {
|
|
93548
93548
|
super(`Versioned hash "${hash2}" version is invalid.`, {
|
|
93549
93549
|
metaMessages: [
|
|
93550
93550
|
`Expected: ${kzg_js_1.versionedHashVersionKzg}`,
|
|
93551
|
-
`Received: ${
|
|
93551
|
+
`Received: ${version2}`
|
|
93552
93552
|
],
|
|
93553
93553
|
name: "InvalidVersionedHashVersionError"
|
|
93554
93554
|
});
|
|
@@ -98875,7 +98875,7 @@ var require_getEip712Domain = __commonJS({
|
|
|
98875
98875
|
async function getEip712Domain(client, parameters) {
|
|
98876
98876
|
const { address, factory, factoryData } = parameters;
|
|
98877
98877
|
try {
|
|
98878
|
-
const [fields, name,
|
|
98878
|
+
const [fields, name, version2, chainId, verifyingContract, salt, extensions] = await (0, getAction_js_1.getAction)(client, readContract_js_1.readContract, "readContract")({
|
|
98879
98879
|
abi,
|
|
98880
98880
|
address,
|
|
98881
98881
|
functionName: "eip712Domain",
|
|
@@ -98885,7 +98885,7 @@ var require_getEip712Domain = __commonJS({
|
|
|
98885
98885
|
return {
|
|
98886
98886
|
domain: {
|
|
98887
98887
|
name,
|
|
98888
|
-
version:
|
|
98888
|
+
version: version2,
|
|
98889
98889
|
chainId: Number(chainId),
|
|
98890
98890
|
verifyingContract,
|
|
98891
98891
|
salt
|
|
@@ -102572,7 +102572,7 @@ var require_websocket_server3 = __commonJS({
|
|
|
102572
102572
|
socket.on("error", socketOnError);
|
|
102573
102573
|
const key = req.headers["sec-websocket-key"];
|
|
102574
102574
|
const upgrade = req.headers.upgrade;
|
|
102575
|
-
const
|
|
102575
|
+
const version2 = +req.headers["sec-websocket-version"];
|
|
102576
102576
|
if (req.method !== "GET") {
|
|
102577
102577
|
const message = "Invalid HTTP method";
|
|
102578
102578
|
abortHandshakeOrEmitwsClientError(this, req, socket, 405, message);
|
|
@@ -102588,7 +102588,7 @@ var require_websocket_server3 = __commonJS({
|
|
|
102588
102588
|
abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
|
|
102589
102589
|
return;
|
|
102590
102590
|
}
|
|
102591
|
-
if (
|
|
102591
|
+
if (version2 !== 8 && version2 !== 13) {
|
|
102592
102592
|
const message = "Missing or invalid Sec-WebSocket-Version header";
|
|
102593
102593
|
abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
|
|
102594
102594
|
return;
|
|
@@ -102630,7 +102630,7 @@ var require_websocket_server3 = __commonJS({
|
|
|
102630
102630
|
}
|
|
102631
102631
|
if (this.options.verifyClient) {
|
|
102632
102632
|
const info = {
|
|
102633
|
-
origin: req.headers[`${
|
|
102633
|
+
origin: req.headers[`${version2 === 8 ? "sec-websocket-origin" : "origin"}`],
|
|
102634
102634
|
secure: !!(req.socket.authorized || req.socket.encrypted),
|
|
102635
102635
|
req
|
|
102636
102636
|
};
|
|
@@ -104018,13 +104018,13 @@ var require_assertTransaction = __commonJS({
|
|
|
104018
104018
|
throw new blob_js_1.EmptyBlobError();
|
|
104019
104019
|
for (const hash2 of blobVersionedHashes) {
|
|
104020
104020
|
const size_ = (0, size_js_1.size)(hash2);
|
|
104021
|
-
const
|
|
104021
|
+
const version2 = (0, fromHex_js_1.hexToNumber)((0, slice_js_1.slice)(hash2, 0, 1));
|
|
104022
104022
|
if (size_ !== 32)
|
|
104023
104023
|
throw new blob_js_1.InvalidVersionedHashSizeError({ hash: hash2, size: size_ });
|
|
104024
|
-
if (
|
|
104024
|
+
if (version2 !== kzg_js_1.versionedHashVersionKzg)
|
|
104025
104025
|
throw new blob_js_1.InvalidVersionedHashVersionError({
|
|
104026
104026
|
hash: hash2,
|
|
104027
|
-
version:
|
|
104027
|
+
version: version2
|
|
104028
104028
|
});
|
|
104029
104029
|
}
|
|
104030
104030
|
}
|
|
@@ -107930,14 +107930,14 @@ var require_sidecarsToVersionedHashes = __commonJS({
|
|
|
107930
107930
|
exports2.sidecarsToVersionedHashes = sidecarsToVersionedHashes;
|
|
107931
107931
|
var commitmentToVersionedHash_js_1 = require_commitmentToVersionedHash();
|
|
107932
107932
|
function sidecarsToVersionedHashes(parameters) {
|
|
107933
|
-
const { sidecars, version:
|
|
107933
|
+
const { sidecars, version: version2 } = parameters;
|
|
107934
107934
|
const to = parameters.to ?? (typeof sidecars[0].blob === "string" ? "hex" : "bytes");
|
|
107935
107935
|
const hashes = [];
|
|
107936
107936
|
for (const { commitment } of sidecars) {
|
|
107937
107937
|
hashes.push((0, commitmentToVersionedHash_js_1.commitmentToVersionedHash)({
|
|
107938
107938
|
commitment,
|
|
107939
107939
|
to,
|
|
107940
|
-
version:
|
|
107940
|
+
version: version2
|
|
107941
107941
|
}));
|
|
107942
107942
|
}
|
|
107943
107943
|
return hashes;
|
|
@@ -124286,31 +124286,31 @@ var require_semver = __commonJS({
|
|
|
124286
124286
|
var parseOptions = require_parse_options();
|
|
124287
124287
|
var { compareIdentifiers } = require_identifiers();
|
|
124288
124288
|
var SemVer = class _SemVer {
|
|
124289
|
-
constructor(
|
|
124289
|
+
constructor(version2, options) {
|
|
124290
124290
|
options = parseOptions(options);
|
|
124291
|
-
if (
|
|
124292
|
-
if (
|
|
124293
|
-
return
|
|
124291
|
+
if (version2 instanceof _SemVer) {
|
|
124292
|
+
if (version2.loose === !!options.loose && version2.includePrerelease === !!options.includePrerelease) {
|
|
124293
|
+
return version2;
|
|
124294
124294
|
} else {
|
|
124295
|
-
|
|
124295
|
+
version2 = version2.version;
|
|
124296
124296
|
}
|
|
124297
|
-
} else if (typeof
|
|
124298
|
-
throw new TypeError(`Invalid version. Must be a string. Got type "${typeof
|
|
124297
|
+
} else if (typeof version2 !== "string") {
|
|
124298
|
+
throw new TypeError(`Invalid version. Must be a string. Got type "${typeof version2}".`);
|
|
124299
124299
|
}
|
|
124300
|
-
if (
|
|
124300
|
+
if (version2.length > MAX_LENGTH) {
|
|
124301
124301
|
throw new TypeError(
|
|
124302
124302
|
`version is longer than ${MAX_LENGTH} characters`
|
|
124303
124303
|
);
|
|
124304
124304
|
}
|
|
124305
|
-
debug("SemVer",
|
|
124305
|
+
debug("SemVer", version2, options);
|
|
124306
124306
|
this.options = options;
|
|
124307
124307
|
this.loose = !!options.loose;
|
|
124308
124308
|
this.includePrerelease = !!options.includePrerelease;
|
|
124309
|
-
const m =
|
|
124309
|
+
const m = version2.trim().match(options.loose ? re[t.LOOSE] : re[t.FULL]);
|
|
124310
124310
|
if (!m) {
|
|
124311
|
-
throw new TypeError(`Invalid Version: ${
|
|
124311
|
+
throw new TypeError(`Invalid Version: ${version2}`);
|
|
124312
124312
|
}
|
|
124313
|
-
this.raw =
|
|
124313
|
+
this.raw = version2;
|
|
124314
124314
|
this.major = +m[1];
|
|
124315
124315
|
this.minor = +m[2];
|
|
124316
124316
|
this.patch = +m[3];
|
|
@@ -124683,19 +124683,19 @@ var require_comparator = __commonJS({
|
|
|
124683
124683
|
toString() {
|
|
124684
124684
|
return this.value;
|
|
124685
124685
|
}
|
|
124686
|
-
test(
|
|
124687
|
-
debug("Comparator.test",
|
|
124688
|
-
if (this.semver === ANY ||
|
|
124686
|
+
test(version2) {
|
|
124687
|
+
debug("Comparator.test", version2, this.options.loose);
|
|
124688
|
+
if (this.semver === ANY || version2 === ANY) {
|
|
124689
124689
|
return true;
|
|
124690
124690
|
}
|
|
124691
|
-
if (typeof
|
|
124691
|
+
if (typeof version2 === "string") {
|
|
124692
124692
|
try {
|
|
124693
|
-
|
|
124693
|
+
version2 = new SemVer(version2, this.options);
|
|
124694
124694
|
} catch (er) {
|
|
124695
124695
|
return false;
|
|
124696
124696
|
}
|
|
124697
124697
|
}
|
|
124698
|
-
return cmp(
|
|
124698
|
+
return cmp(version2, this.operator, this.semver, this.options);
|
|
124699
124699
|
}
|
|
124700
124700
|
intersects(comp, options) {
|
|
124701
124701
|
if (!(comp instanceof _Comparator)) {
|
|
@@ -124870,19 +124870,19 @@ var require_range = __commonJS({
|
|
|
124870
124870
|
});
|
|
124871
124871
|
}
|
|
124872
124872
|
// if ANY of the sets match ALL of its comparators, then pass
|
|
124873
|
-
test(
|
|
124874
|
-
if (!
|
|
124873
|
+
test(version2) {
|
|
124874
|
+
if (!version2) {
|
|
124875
124875
|
return false;
|
|
124876
124876
|
}
|
|
124877
|
-
if (typeof
|
|
124877
|
+
if (typeof version2 === "string") {
|
|
124878
124878
|
try {
|
|
124879
|
-
|
|
124879
|
+
version2 = new SemVer(version2, this.options);
|
|
124880
124880
|
} catch (er) {
|
|
124881
124881
|
return false;
|
|
124882
124882
|
}
|
|
124883
124883
|
}
|
|
124884
124884
|
for (let i = 0; i < this.set.length; i++) {
|
|
124885
|
-
if (testSet(this.set[i],
|
|
124885
|
+
if (testSet(this.set[i], version2, this.options)) {
|
|
124886
124886
|
return true;
|
|
124887
124887
|
}
|
|
124888
124888
|
}
|
|
@@ -125096,13 +125096,13 @@ var require_range = __commonJS({
|
|
|
125096
125096
|
}
|
|
125097
125097
|
return `${from} ${to}`.trim();
|
|
125098
125098
|
};
|
|
125099
|
-
var testSet = (set,
|
|
125099
|
+
var testSet = (set, version2, options) => {
|
|
125100
125100
|
for (let i = 0; i < set.length; i++) {
|
|
125101
|
-
if (!set[i].test(
|
|
125101
|
+
if (!set[i].test(version2)) {
|
|
125102
125102
|
return false;
|
|
125103
125103
|
}
|
|
125104
125104
|
}
|
|
125105
|
-
if (
|
|
125105
|
+
if (version2.prerelease.length && !options.includePrerelease) {
|
|
125106
125106
|
for (let i = 0; i < set.length; i++) {
|
|
125107
125107
|
debug(set[i].semver);
|
|
125108
125108
|
if (set[i].semver === Comparator.ANY) {
|
|
@@ -125110,7 +125110,7 @@ var require_range = __commonJS({
|
|
|
125110
125110
|
}
|
|
125111
125111
|
if (set[i].semver.prerelease.length > 0) {
|
|
125112
125112
|
const allowed = set[i].semver;
|
|
125113
|
-
if (allowed.major ===
|
|
125113
|
+
if (allowed.major === version2.major && allowed.minor === version2.minor && allowed.patch === version2.patch) {
|
|
125114
125114
|
return true;
|
|
125115
125115
|
}
|
|
125116
125116
|
}
|
|
@@ -125126,13 +125126,13 @@ var require_range = __commonJS({
|
|
|
125126
125126
|
var require_satisfies = __commonJS({
|
|
125127
125127
|
"../../node_modules/semver/functions/satisfies.js"(exports2, module2) {
|
|
125128
125128
|
var Range = require_range();
|
|
125129
|
-
var satisfies = (
|
|
125129
|
+
var satisfies = (version2, range2, options) => {
|
|
125130
125130
|
try {
|
|
125131
125131
|
range2 = new Range(range2, options);
|
|
125132
125132
|
} catch (er) {
|
|
125133
125133
|
return false;
|
|
125134
125134
|
}
|
|
125135
|
-
return range2.test(
|
|
125135
|
+
return range2.test(version2);
|
|
125136
125136
|
};
|
|
125137
125137
|
module2.exports = satisfies;
|
|
125138
125138
|
}
|
|
@@ -125167,9 +125167,9 @@ var require_utils14 = __commonJS({
|
|
|
125167
125167
|
) : deployment.deployments[addressTypes].address
|
|
125168
125168
|
])) });
|
|
125169
125169
|
function findDeployment(criteria = DEFAULT_FILTER, deployments, format = "singleton") {
|
|
125170
|
-
const { version:
|
|
125170
|
+
const { version: version2, released, network } = Object.assign(Object.assign({}, DEFAULT_FILTER), criteria);
|
|
125171
125171
|
const deploymentJson = deployments.find((deployment) => {
|
|
125172
|
-
if (
|
|
125172
|
+
if (version2 && !(0, satisfies_1.default)(deployment.version, version2))
|
|
125173
125173
|
return false;
|
|
125174
125174
|
if (typeof released === "boolean" && deployment.released !== released)
|
|
125175
125175
|
return false;
|
|
@@ -149227,11 +149227,11 @@ var require_safeVersions = __commonJS({
|
|
|
149227
149227
|
[SAFE_FEATURES.PASSKEY_SIGNER]: ">=1.3.0",
|
|
149228
149228
|
[SAFE_FEATURES.SAFE_L2_CONTRACTS]: ">=1.3.0"
|
|
149229
149229
|
};
|
|
149230
|
-
var hasSafeFeature = (feature,
|
|
149230
|
+
var hasSafeFeature = (feature, version2) => {
|
|
149231
149231
|
if (!(feature in SAFE_FEATURES_BY_VERSION)) {
|
|
149232
149232
|
return false;
|
|
149233
149233
|
}
|
|
149234
|
-
return (0, satisfies_1.default)(
|
|
149234
|
+
return (0, satisfies_1.default)(version2, SAFE_FEATURES_BY_VERSION[feature]);
|
|
149235
149235
|
};
|
|
149236
149236
|
exports2.hasSafeFeature = hasSafeFeature;
|
|
149237
149237
|
async function isSafeContractCompatibleWithRequiredTxGas(safeContract) {
|
|
@@ -153838,7 +153838,7 @@ var require_lib9 = __commonJS({
|
|
|
153838
153838
|
static fromExtendedKey(base58key, versions = BITCOIN_VERSIONS) {
|
|
153839
153839
|
const keyBuffer = base58check.decode(base58key);
|
|
153840
153840
|
const keyView = (0, utils_1.createView)(keyBuffer);
|
|
153841
|
-
const
|
|
153841
|
+
const version2 = keyView.getUint32(0, false);
|
|
153842
153842
|
const opt = {
|
|
153843
153843
|
versions,
|
|
153844
153844
|
depth: keyBuffer[4],
|
|
@@ -153848,7 +153848,7 @@ var require_lib9 = __commonJS({
|
|
|
153848
153848
|
};
|
|
153849
153849
|
const key = keyBuffer.slice(45);
|
|
153850
153850
|
const isPriv = key[0] === 0;
|
|
153851
|
-
if (
|
|
153851
|
+
if (version2 !== versions[isPriv ? "private" : "public"]) {
|
|
153852
153852
|
throw new Error("Version mismatch");
|
|
153853
153853
|
}
|
|
153854
153854
|
if (isPriv) {
|
|
@@ -154001,12 +154001,12 @@ var require_lib9 = __commonJS({
|
|
|
154001
154001
|
xpub: this.publicExtendedKey
|
|
154002
154002
|
};
|
|
154003
154003
|
}
|
|
154004
|
-
serialize(
|
|
154004
|
+
serialize(version2, key) {
|
|
154005
154005
|
if (!this.chainCode) {
|
|
154006
154006
|
throw new Error("No chainCode set");
|
|
154007
154007
|
}
|
|
154008
154008
|
(0, _assert_1.abytes)(key, 33);
|
|
154009
|
-
return (0, utils_1.concatBytes)(toU32(
|
|
154009
|
+
return (0, utils_1.concatBytes)(toU32(version2), new Uint8Array([this.depth]), toU32(this.parentFingerprint), toU32(this.index), this.chainCode, key);
|
|
154010
154010
|
}
|
|
154011
154011
|
};
|
|
154012
154012
|
exports2.HDKey = HDKey;
|
|
@@ -188411,8 +188411,8 @@ var require_transaction6 = __commonJS({
|
|
|
188411
188411
|
var BN_353 = BigInt(35);
|
|
188412
188412
|
var BN_MAX_UINT2 = BigInt("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
|
|
188413
188413
|
var BLOB_SIZE2 = 4096 * 32;
|
|
188414
|
-
function getVersionedHash2(
|
|
188415
|
-
let versioned =
|
|
188414
|
+
function getVersionedHash2(version2, hash2) {
|
|
188415
|
+
let versioned = version2.toString(16);
|
|
188416
188416
|
while (versioned.length < 2) {
|
|
188417
188417
|
versioned = "0" + versioned;
|
|
188418
188418
|
}
|
|
@@ -202409,8 +202409,8 @@ var require_json_keystore2 = __commonJS({
|
|
|
202409
202409
|
function isKeystoreJson(json) {
|
|
202410
202410
|
try {
|
|
202411
202411
|
const data = JSON.parse(json);
|
|
202412
|
-
const
|
|
202413
|
-
if (
|
|
202412
|
+
const version2 = data.version != null ? parseInt(data.version) : 0;
|
|
202413
|
+
if (version2 === 3) {
|
|
202414
202414
|
return true;
|
|
202415
202415
|
}
|
|
202416
202416
|
} catch (error) {
|
|
@@ -202444,8 +202444,8 @@ var require_json_keystore2 = __commonJS({
|
|
|
202444
202444
|
(0, index_js_4.assertArgument)((0, index_js_1.getAddress)(check) === address, "keystore address/privateKey mismatch", "address", data.address);
|
|
202445
202445
|
}
|
|
202446
202446
|
const account = { address, privateKey };
|
|
202447
|
-
const
|
|
202448
|
-
if (
|
|
202447
|
+
const version2 = (0, utils_js_1.spelunk)(data, "x-ethers.version:string");
|
|
202448
|
+
if (version2 === "0.1") {
|
|
202449
202449
|
const mnemonicKey = key.slice(32, 64);
|
|
202450
202450
|
const mnemonicCiphertext = (0, utils_js_1.spelunk)(data, "x-ethers.mnemonicCiphertext:data!");
|
|
202451
202451
|
const mnemonicIv = (0, utils_js_1.spelunk)(data, "x-ethers.mnemonicCounter:data!");
|
|
@@ -204604,12 +204604,12 @@ var require_lib11 = __commonJS({
|
|
|
204604
204604
|
var require_parse = __commonJS({
|
|
204605
204605
|
"../../node_modules/semver/functions/parse.js"(exports2, module2) {
|
|
204606
204606
|
var SemVer = require_semver();
|
|
204607
|
-
var parse2 = (
|
|
204608
|
-
if (
|
|
204609
|
-
return
|
|
204607
|
+
var parse2 = (version2, options, throwErrors = false) => {
|
|
204608
|
+
if (version2 instanceof SemVer) {
|
|
204609
|
+
return version2;
|
|
204610
204610
|
}
|
|
204611
204611
|
try {
|
|
204612
|
-
return new SemVer(
|
|
204612
|
+
return new SemVer(version2, options);
|
|
204613
204613
|
} catch (er) {
|
|
204614
204614
|
if (!throwErrors) {
|
|
204615
204615
|
return null;
|
|
@@ -204625,8 +204625,8 @@ var require_parse = __commonJS({
|
|
|
204625
204625
|
var require_valid = __commonJS({
|
|
204626
204626
|
"../../node_modules/semver/functions/valid.js"(exports2, module2) {
|
|
204627
204627
|
var parse2 = require_parse();
|
|
204628
|
-
var valid = (
|
|
204629
|
-
const v = parse2(
|
|
204628
|
+
var valid = (version2, options) => {
|
|
204629
|
+
const v = parse2(version2, options);
|
|
204630
204630
|
return v ? v.version : null;
|
|
204631
204631
|
};
|
|
204632
204632
|
module2.exports = valid;
|
|
@@ -204637,8 +204637,8 @@ var require_valid = __commonJS({
|
|
|
204637
204637
|
var require_clean = __commonJS({
|
|
204638
204638
|
"../../node_modules/semver/functions/clean.js"(exports2, module2) {
|
|
204639
204639
|
var parse2 = require_parse();
|
|
204640
|
-
var clean = (
|
|
204641
|
-
const s = parse2(
|
|
204640
|
+
var clean = (version2, options) => {
|
|
204641
|
+
const s = parse2(version2.trim().replace(/^[=v]+/, ""), options);
|
|
204642
204642
|
return s ? s.version : null;
|
|
204643
204643
|
};
|
|
204644
204644
|
module2.exports = clean;
|
|
@@ -204649,7 +204649,7 @@ var require_clean = __commonJS({
|
|
|
204649
204649
|
var require_inc = __commonJS({
|
|
204650
204650
|
"../../node_modules/semver/functions/inc.js"(exports2, module2) {
|
|
204651
204651
|
var SemVer = require_semver();
|
|
204652
|
-
var inc = (
|
|
204652
|
+
var inc = (version2, release, options, identifier, identifierBase) => {
|
|
204653
204653
|
if (typeof options === "string") {
|
|
204654
204654
|
identifierBase = identifier;
|
|
204655
204655
|
identifier = options;
|
|
@@ -204657,7 +204657,7 @@ var require_inc = __commonJS({
|
|
|
204657
204657
|
}
|
|
204658
204658
|
try {
|
|
204659
204659
|
return new SemVer(
|
|
204660
|
-
|
|
204660
|
+
version2 instanceof SemVer ? version2.version : version2,
|
|
204661
204661
|
options
|
|
204662
204662
|
).inc(release, identifier, identifierBase).version;
|
|
204663
204663
|
} catch (er) {
|
|
@@ -204672,9 +204672,9 @@ var require_inc = __commonJS({
|
|
|
204672
204672
|
var require_diff = __commonJS({
|
|
204673
204673
|
"../../node_modules/semver/functions/diff.js"(exports2, module2) {
|
|
204674
204674
|
var parse2 = require_parse();
|
|
204675
|
-
var diff = (version1,
|
|
204675
|
+
var diff = (version1, version2) => {
|
|
204676
204676
|
const v1 = parse2(version1, null, true);
|
|
204677
|
-
const v2 = parse2(
|
|
204677
|
+
const v2 = parse2(version2, null, true);
|
|
204678
204678
|
const comparison = v1.compare(v2);
|
|
204679
204679
|
if (comparison === 0) {
|
|
204680
204680
|
return null;
|
|
@@ -204743,8 +204743,8 @@ var require_patch = __commonJS({
|
|
|
204743
204743
|
var require_prerelease = __commonJS({
|
|
204744
204744
|
"../../node_modules/semver/functions/prerelease.js"(exports2, module2) {
|
|
204745
204745
|
var parse2 = require_parse();
|
|
204746
|
-
var prerelease = (
|
|
204747
|
-
const parsed = parse2(
|
|
204746
|
+
var prerelease = (version2, options) => {
|
|
204747
|
+
const parsed = parse2(version2, options);
|
|
204748
204748
|
return parsed && parsed.prerelease.length ? parsed.prerelease : null;
|
|
204749
204749
|
};
|
|
204750
204750
|
module2.exports = prerelease;
|
|
@@ -204806,24 +204806,24 @@ var require_coerce = __commonJS({
|
|
|
204806
204806
|
var SemVer = require_semver();
|
|
204807
204807
|
var parse2 = require_parse();
|
|
204808
204808
|
var { safeRe: re, t } = require_re();
|
|
204809
|
-
var coerce2 = (
|
|
204810
|
-
if (
|
|
204811
|
-
return
|
|
204809
|
+
var coerce2 = (version2, options) => {
|
|
204810
|
+
if (version2 instanceof SemVer) {
|
|
204811
|
+
return version2;
|
|
204812
204812
|
}
|
|
204813
|
-
if (typeof
|
|
204814
|
-
|
|
204813
|
+
if (typeof version2 === "number") {
|
|
204814
|
+
version2 = String(version2);
|
|
204815
204815
|
}
|
|
204816
|
-
if (typeof
|
|
204816
|
+
if (typeof version2 !== "string") {
|
|
204817
204817
|
return null;
|
|
204818
204818
|
}
|
|
204819
204819
|
options = options || {};
|
|
204820
204820
|
let match2 = null;
|
|
204821
204821
|
if (!options.rtl) {
|
|
204822
|
-
match2 =
|
|
204822
|
+
match2 = version2.match(options.includePrerelease ? re[t.COERCEFULL] : re[t.COERCE]);
|
|
204823
204823
|
} else {
|
|
204824
204824
|
const coerceRtlRegex = options.includePrerelease ? re[t.COERCERTLFULL] : re[t.COERCERTL];
|
|
204825
204825
|
let next;
|
|
204826
|
-
while ((next = coerceRtlRegex.exec(
|
|
204826
|
+
while ((next = coerceRtlRegex.exec(version2)) && (!match2 || match2.index + match2[0].length !== version2.length)) {
|
|
204827
204827
|
if (!match2 || next.index + next[0].length !== match2.index + match2[0].length) {
|
|
204828
204828
|
match2 = next;
|
|
204829
204829
|
}
|
|
@@ -204995,8 +204995,8 @@ var require_outside = __commonJS({
|
|
|
204995
204995
|
var lt = require_lt();
|
|
204996
204996
|
var lte = require_lte();
|
|
204997
204997
|
var gte = require_gte();
|
|
204998
|
-
var outside = (
|
|
204999
|
-
|
|
204998
|
+
var outside = (version2, range2, hilo, options) => {
|
|
204999
|
+
version2 = new SemVer(version2, options);
|
|
205000
205000
|
range2 = new Range(range2, options);
|
|
205001
205001
|
let gtfn, ltefn, ltfn, comp, ecomp;
|
|
205002
205002
|
switch (hilo) {
|
|
@@ -205017,7 +205017,7 @@ var require_outside = __commonJS({
|
|
|
205017
205017
|
default:
|
|
205018
205018
|
throw new TypeError('Must provide a hilo val of "<" or ">"');
|
|
205019
205019
|
}
|
|
205020
|
-
if (satisfies(
|
|
205020
|
+
if (satisfies(version2, range2, options)) {
|
|
205021
205021
|
return false;
|
|
205022
205022
|
}
|
|
205023
205023
|
for (let i = 0; i < range2.set.length; ++i) {
|
|
@@ -205039,9 +205039,9 @@ var require_outside = __commonJS({
|
|
|
205039
205039
|
if (high.operator === comp || high.operator === ecomp) {
|
|
205040
205040
|
return false;
|
|
205041
205041
|
}
|
|
205042
|
-
if ((!low.operator || low.operator === comp) && ltefn(
|
|
205042
|
+
if ((!low.operator || low.operator === comp) && ltefn(version2, low.semver)) {
|
|
205043
205043
|
return false;
|
|
205044
|
-
} else if (low.operator === ecomp && ltfn(
|
|
205044
|
+
} else if (low.operator === ecomp && ltfn(version2, low.semver)) {
|
|
205045
205045
|
return false;
|
|
205046
205046
|
}
|
|
205047
205047
|
}
|
|
@@ -205055,7 +205055,7 @@ var require_outside = __commonJS({
|
|
|
205055
205055
|
var require_gtr = __commonJS({
|
|
205056
205056
|
"../../node_modules/semver/ranges/gtr.js"(exports2, module2) {
|
|
205057
205057
|
var outside = require_outside();
|
|
205058
|
-
var gtr = (
|
|
205058
|
+
var gtr = (version2, range2, options) => outside(version2, range2, ">", options);
|
|
205059
205059
|
module2.exports = gtr;
|
|
205060
205060
|
}
|
|
205061
205061
|
});
|
|
@@ -205064,7 +205064,7 @@ var require_gtr = __commonJS({
|
|
|
205064
205064
|
var require_ltr = __commonJS({
|
|
205065
205065
|
"../../node_modules/semver/ranges/ltr.js"(exports2, module2) {
|
|
205066
205066
|
var outside = require_outside();
|
|
205067
|
-
var ltr = (
|
|
205067
|
+
var ltr = (version2, range2, options) => outside(version2, range2, "<", options);
|
|
205068
205068
|
module2.exports = ltr;
|
|
205069
205069
|
}
|
|
205070
205070
|
});
|
|
@@ -205092,12 +205092,12 @@ var require_simplify = __commonJS({
|
|
|
205092
205092
|
let first = null;
|
|
205093
205093
|
let prev = null;
|
|
205094
205094
|
const v = versions.sort((a, b2) => compare(a, b2, options));
|
|
205095
|
-
for (const
|
|
205096
|
-
const included = satisfies(
|
|
205095
|
+
for (const version2 of v) {
|
|
205096
|
+
const included = satisfies(version2, range2, options);
|
|
205097
205097
|
if (included) {
|
|
205098
|
-
prev =
|
|
205098
|
+
prev = version2;
|
|
205099
205099
|
if (!first) {
|
|
205100
|
-
first =
|
|
205100
|
+
first = version2;
|
|
205101
205101
|
}
|
|
205102
205102
|
} else {
|
|
205103
205103
|
if (prev) {
|
|
@@ -206875,18 +206875,18 @@ var require_translate = __commonJS({
|
|
|
206875
206875
|
return mod2 && mod2.__esModule ? mod2 : { "default": mod2 };
|
|
206876
206876
|
};
|
|
206877
206877
|
var linker_1 = __importDefault3(require_linker());
|
|
206878
|
-
function versionToSemver(
|
|
206879
|
-
const parsed =
|
|
206878
|
+
function versionToSemver(version2) {
|
|
206879
|
+
const parsed = version2.match(/^([0-9]+\.[0-9]+\.[0-9]+)-([0-9a-f]{8})[/*].*$/);
|
|
206880
206880
|
if (parsed) {
|
|
206881
206881
|
return parsed[1] + "+commit." + parsed[2];
|
|
206882
206882
|
}
|
|
206883
|
-
if (
|
|
206883
|
+
if (version2.indexOf("0.1.3-0") !== -1) {
|
|
206884
206884
|
return "0.1.3";
|
|
206885
206885
|
}
|
|
206886
|
-
if (
|
|
206886
|
+
if (version2.indexOf("0.3.5-0") !== -1) {
|
|
206887
206887
|
return "0.3.5";
|
|
206888
206888
|
}
|
|
206889
|
-
return
|
|
206889
|
+
return version2;
|
|
206890
206890
|
}
|
|
206891
206891
|
function translateErrors(ret, errors) {
|
|
206892
206892
|
for (const error in errors) {
|
|
@@ -207167,73 +207167,73 @@ var require_semver3 = __commonJS({
|
|
|
207167
207167
|
}
|
|
207168
207168
|
var i;
|
|
207169
207169
|
exports2.parse = parse2;
|
|
207170
|
-
function parse2(
|
|
207170
|
+
function parse2(version2, options) {
|
|
207171
207171
|
if (!options || typeof options !== "object") {
|
|
207172
207172
|
options = {
|
|
207173
207173
|
loose: !!options,
|
|
207174
207174
|
includePrerelease: false
|
|
207175
207175
|
};
|
|
207176
207176
|
}
|
|
207177
|
-
if (
|
|
207178
|
-
return
|
|
207177
|
+
if (version2 instanceof SemVer) {
|
|
207178
|
+
return version2;
|
|
207179
207179
|
}
|
|
207180
|
-
if (typeof
|
|
207180
|
+
if (typeof version2 !== "string") {
|
|
207181
207181
|
return null;
|
|
207182
207182
|
}
|
|
207183
|
-
if (
|
|
207183
|
+
if (version2.length > MAX_LENGTH) {
|
|
207184
207184
|
return null;
|
|
207185
207185
|
}
|
|
207186
207186
|
var r = options.loose ? safeRe[LOOSE] : safeRe[FULL];
|
|
207187
|
-
if (!r.test(
|
|
207187
|
+
if (!r.test(version2)) {
|
|
207188
207188
|
return null;
|
|
207189
207189
|
}
|
|
207190
207190
|
try {
|
|
207191
|
-
return new SemVer(
|
|
207191
|
+
return new SemVer(version2, options);
|
|
207192
207192
|
} catch (er) {
|
|
207193
207193
|
return null;
|
|
207194
207194
|
}
|
|
207195
207195
|
}
|
|
207196
207196
|
exports2.valid = valid;
|
|
207197
|
-
function valid(
|
|
207198
|
-
var v = parse2(
|
|
207197
|
+
function valid(version2, options) {
|
|
207198
|
+
var v = parse2(version2, options);
|
|
207199
207199
|
return v ? v.version : null;
|
|
207200
207200
|
}
|
|
207201
207201
|
exports2.clean = clean;
|
|
207202
|
-
function clean(
|
|
207203
|
-
var s = parse2(
|
|
207202
|
+
function clean(version2, options) {
|
|
207203
|
+
var s = parse2(version2.trim().replace(/^[=v]+/, ""), options);
|
|
207204
207204
|
return s ? s.version : null;
|
|
207205
207205
|
}
|
|
207206
207206
|
exports2.SemVer = SemVer;
|
|
207207
|
-
function SemVer(
|
|
207207
|
+
function SemVer(version2, options) {
|
|
207208
207208
|
if (!options || typeof options !== "object") {
|
|
207209
207209
|
options = {
|
|
207210
207210
|
loose: !!options,
|
|
207211
207211
|
includePrerelease: false
|
|
207212
207212
|
};
|
|
207213
207213
|
}
|
|
207214
|
-
if (
|
|
207215
|
-
if (
|
|
207216
|
-
return
|
|
207214
|
+
if (version2 instanceof SemVer) {
|
|
207215
|
+
if (version2.loose === options.loose) {
|
|
207216
|
+
return version2;
|
|
207217
207217
|
} else {
|
|
207218
|
-
|
|
207218
|
+
version2 = version2.version;
|
|
207219
207219
|
}
|
|
207220
|
-
} else if (typeof
|
|
207221
|
-
throw new TypeError("Invalid Version: " +
|
|
207220
|
+
} else if (typeof version2 !== "string") {
|
|
207221
|
+
throw new TypeError("Invalid Version: " + version2);
|
|
207222
207222
|
}
|
|
207223
|
-
if (
|
|
207223
|
+
if (version2.length > MAX_LENGTH) {
|
|
207224
207224
|
throw new TypeError("version is longer than " + MAX_LENGTH + " characters");
|
|
207225
207225
|
}
|
|
207226
207226
|
if (!(this instanceof SemVer)) {
|
|
207227
|
-
return new SemVer(
|
|
207227
|
+
return new SemVer(version2, options);
|
|
207228
207228
|
}
|
|
207229
|
-
debug("SemVer",
|
|
207229
|
+
debug("SemVer", version2, options);
|
|
207230
207230
|
this.options = options;
|
|
207231
207231
|
this.loose = !!options.loose;
|
|
207232
|
-
var m =
|
|
207232
|
+
var m = version2.trim().match(options.loose ? safeRe[LOOSE] : safeRe[FULL]);
|
|
207233
207233
|
if (!m) {
|
|
207234
|
-
throw new TypeError("Invalid Version: " +
|
|
207234
|
+
throw new TypeError("Invalid Version: " + version2);
|
|
207235
207235
|
}
|
|
207236
|
-
this.raw =
|
|
207236
|
+
this.raw = version2;
|
|
207237
207237
|
this.major = +m[1];
|
|
207238
207238
|
this.minor = +m[2];
|
|
207239
207239
|
this.patch = +m[3];
|
|
@@ -207398,24 +207398,24 @@ var require_semver3 = __commonJS({
|
|
|
207398
207398
|
return this;
|
|
207399
207399
|
};
|
|
207400
207400
|
exports2.inc = inc;
|
|
207401
|
-
function inc(
|
|
207401
|
+
function inc(version2, release, loose, identifier) {
|
|
207402
207402
|
if (typeof loose === "string") {
|
|
207403
207403
|
identifier = loose;
|
|
207404
207404
|
loose = void 0;
|
|
207405
207405
|
}
|
|
207406
207406
|
try {
|
|
207407
|
-
return new SemVer(
|
|
207407
|
+
return new SemVer(version2, loose).inc(release, identifier).version;
|
|
207408
207408
|
} catch (er) {
|
|
207409
207409
|
return null;
|
|
207410
207410
|
}
|
|
207411
207411
|
}
|
|
207412
207412
|
exports2.diff = diff;
|
|
207413
|
-
function diff(version1,
|
|
207414
|
-
if (eq2(version1,
|
|
207413
|
+
function diff(version1, version2) {
|
|
207414
|
+
if (eq2(version1, version2)) {
|
|
207415
207415
|
return null;
|
|
207416
207416
|
} else {
|
|
207417
207417
|
var v1 = parse2(version1);
|
|
207418
|
-
var v2 = parse2(
|
|
207418
|
+
var v2 = parse2(version2);
|
|
207419
207419
|
var prefix = "";
|
|
207420
207420
|
if (v1.prerelease.length || v2.prerelease.length) {
|
|
207421
207421
|
prefix = "pre";
|
|
@@ -207589,15 +207589,15 @@ var require_semver3 = __commonJS({
|
|
|
207589
207589
|
Comparator.prototype.toString = function() {
|
|
207590
207590
|
return this.value;
|
|
207591
207591
|
};
|
|
207592
|
-
Comparator.prototype.test = function(
|
|
207593
|
-
debug("Comparator.test",
|
|
207592
|
+
Comparator.prototype.test = function(version2) {
|
|
207593
|
+
debug("Comparator.test", version2, this.options.loose);
|
|
207594
207594
|
if (this.semver === ANY) {
|
|
207595
207595
|
return true;
|
|
207596
207596
|
}
|
|
207597
|
-
if (typeof
|
|
207598
|
-
|
|
207597
|
+
if (typeof version2 === "string") {
|
|
207598
|
+
version2 = new SemVer(version2, this.options);
|
|
207599
207599
|
}
|
|
207600
|
-
return cmp(
|
|
207600
|
+
return cmp(version2, this.operator, this.semver, this.options);
|
|
207601
207601
|
};
|
|
207602
207602
|
Comparator.prototype.intersects = function(comp, options) {
|
|
207603
207603
|
if (!(comp instanceof Comparator)) {
|
|
@@ -207887,27 +207887,27 @@ var require_semver3 = __commonJS({
|
|
|
207887
207887
|
}
|
|
207888
207888
|
return (from + " " + to).trim();
|
|
207889
207889
|
}
|
|
207890
|
-
Range.prototype.test = function(
|
|
207891
|
-
if (!
|
|
207890
|
+
Range.prototype.test = function(version2) {
|
|
207891
|
+
if (!version2) {
|
|
207892
207892
|
return false;
|
|
207893
207893
|
}
|
|
207894
|
-
if (typeof
|
|
207895
|
-
|
|
207894
|
+
if (typeof version2 === "string") {
|
|
207895
|
+
version2 = new SemVer(version2, this.options);
|
|
207896
207896
|
}
|
|
207897
207897
|
for (var i2 = 0; i2 < this.set.length; i2++) {
|
|
207898
|
-
if (testSet(this.set[i2],
|
|
207898
|
+
if (testSet(this.set[i2], version2, this.options)) {
|
|
207899
207899
|
return true;
|
|
207900
207900
|
}
|
|
207901
207901
|
}
|
|
207902
207902
|
return false;
|
|
207903
207903
|
};
|
|
207904
|
-
function testSet(set,
|
|
207904
|
+
function testSet(set, version2, options) {
|
|
207905
207905
|
for (var i2 = 0; i2 < set.length; i2++) {
|
|
207906
|
-
if (!set[i2].test(
|
|
207906
|
+
if (!set[i2].test(version2)) {
|
|
207907
207907
|
return false;
|
|
207908
207908
|
}
|
|
207909
207909
|
}
|
|
207910
|
-
if (
|
|
207910
|
+
if (version2.prerelease.length && !options.includePrerelease) {
|
|
207911
207911
|
for (i2 = 0; i2 < set.length; i2++) {
|
|
207912
207912
|
debug(set[i2].semver);
|
|
207913
207913
|
if (set[i2].semver === ANY) {
|
|
@@ -207915,7 +207915,7 @@ var require_semver3 = __commonJS({
|
|
|
207915
207915
|
}
|
|
207916
207916
|
if (set[i2].semver.prerelease.length > 0) {
|
|
207917
207917
|
var allowed = set[i2].semver;
|
|
207918
|
-
if (allowed.major ===
|
|
207918
|
+
if (allowed.major === version2.major && allowed.minor === version2.minor && allowed.patch === version2.patch) {
|
|
207919
207919
|
return true;
|
|
207920
207920
|
}
|
|
207921
207921
|
}
|
|
@@ -207925,13 +207925,13 @@ var require_semver3 = __commonJS({
|
|
|
207925
207925
|
return true;
|
|
207926
207926
|
}
|
|
207927
207927
|
exports2.satisfies = satisfies;
|
|
207928
|
-
function satisfies(
|
|
207928
|
+
function satisfies(version2, range2, options) {
|
|
207929
207929
|
try {
|
|
207930
207930
|
range2 = new Range(range2, options);
|
|
207931
207931
|
} catch (er) {
|
|
207932
207932
|
return false;
|
|
207933
207933
|
}
|
|
207934
|
-
return range2.test(
|
|
207934
|
+
return range2.test(version2);
|
|
207935
207935
|
}
|
|
207936
207936
|
exports2.maxSatisfying = maxSatisfying;
|
|
207937
207937
|
function maxSatisfying(versions, range2, options) {
|
|
@@ -208025,16 +208025,16 @@ var require_semver3 = __commonJS({
|
|
|
208025
208025
|
}
|
|
208026
208026
|
}
|
|
208027
208027
|
exports2.ltr = ltr;
|
|
208028
|
-
function ltr(
|
|
208029
|
-
return outside(
|
|
208028
|
+
function ltr(version2, range2, options) {
|
|
208029
|
+
return outside(version2, range2, "<", options);
|
|
208030
208030
|
}
|
|
208031
208031
|
exports2.gtr = gtr;
|
|
208032
|
-
function gtr(
|
|
208033
|
-
return outside(
|
|
208032
|
+
function gtr(version2, range2, options) {
|
|
208033
|
+
return outside(version2, range2, ">", options);
|
|
208034
208034
|
}
|
|
208035
208035
|
exports2.outside = outside;
|
|
208036
|
-
function outside(
|
|
208037
|
-
|
|
208036
|
+
function outside(version2, range2, hilo, options) {
|
|
208037
|
+
version2 = new SemVer(version2, options);
|
|
208038
208038
|
range2 = new Range(range2, options);
|
|
208039
208039
|
var gtfn, ltefn, ltfn, comp, ecomp;
|
|
208040
208040
|
switch (hilo) {
|
|
@@ -208055,7 +208055,7 @@ var require_semver3 = __commonJS({
|
|
|
208055
208055
|
default:
|
|
208056
208056
|
throw new TypeError('Must provide a hilo val of "<" or ">"');
|
|
208057
208057
|
}
|
|
208058
|
-
if (satisfies(
|
|
208058
|
+
if (satisfies(version2, range2, options)) {
|
|
208059
208059
|
return false;
|
|
208060
208060
|
}
|
|
208061
208061
|
for (var i2 = 0; i2 < range2.set.length; ++i2) {
|
|
@@ -208077,17 +208077,17 @@ var require_semver3 = __commonJS({
|
|
|
208077
208077
|
if (high.operator === comp || high.operator === ecomp) {
|
|
208078
208078
|
return false;
|
|
208079
208079
|
}
|
|
208080
|
-
if ((!low.operator || low.operator === comp) && ltefn(
|
|
208080
|
+
if ((!low.operator || low.operator === comp) && ltefn(version2, low.semver)) {
|
|
208081
208081
|
return false;
|
|
208082
|
-
} else if (low.operator === ecomp && ltfn(
|
|
208082
|
+
} else if (low.operator === ecomp && ltfn(version2, low.semver)) {
|
|
208083
208083
|
return false;
|
|
208084
208084
|
}
|
|
208085
208085
|
}
|
|
208086
208086
|
return true;
|
|
208087
208087
|
}
|
|
208088
208088
|
exports2.prerelease = prerelease;
|
|
208089
|
-
function prerelease(
|
|
208090
|
-
var parsed = parse2(
|
|
208089
|
+
function prerelease(version2, options) {
|
|
208090
|
+
var parsed = parse2(version2, options);
|
|
208091
208091
|
return parsed && parsed.prerelease.length ? parsed.prerelease : null;
|
|
208092
208092
|
}
|
|
208093
208093
|
exports2.intersects = intersects;
|
|
@@ -208097,14 +208097,14 @@ var require_semver3 = __commonJS({
|
|
|
208097
208097
|
return r1.intersects(r2);
|
|
208098
208098
|
}
|
|
208099
208099
|
exports2.coerce = coerce2;
|
|
208100
|
-
function coerce2(
|
|
208101
|
-
if (
|
|
208102
|
-
return
|
|
208100
|
+
function coerce2(version2) {
|
|
208101
|
+
if (version2 instanceof SemVer) {
|
|
208102
|
+
return version2;
|
|
208103
208103
|
}
|
|
208104
|
-
if (typeof
|
|
208104
|
+
if (typeof version2 !== "string") {
|
|
208105
208105
|
return null;
|
|
208106
208106
|
}
|
|
208107
|
-
var match2 =
|
|
208107
|
+
var match2 = version2.match(safeRe[COERCE]);
|
|
208108
208108
|
if (match2 == null) {
|
|
208109
208109
|
return null;
|
|
208110
208110
|
}
|
|
@@ -208185,8 +208185,8 @@ var require_core = __commonJS({
|
|
|
208185
208185
|
function bindVersion(solJson) {
|
|
208186
208186
|
return (0, helpers_1.bindSolcMethodWithFallbackFunc)(solJson, "solidity_version", "string", [], "version");
|
|
208187
208187
|
}
|
|
208188
|
-
function versionToSemver(
|
|
208189
|
-
return translate_1.default.versionToSemver.bind(this,
|
|
208188
|
+
function versionToSemver(version2) {
|
|
208189
|
+
return translate_1.default.versionToSemver.bind(this, version2);
|
|
208190
208190
|
}
|
|
208191
208191
|
function bindLicense(solJson) {
|
|
208192
208192
|
return (0, helpers_1.bindSolcMethodWithFallbackFunc)(solJson, "solidity_license", "string", [], "license", () => {
|
|
@@ -211226,20 +211226,20 @@ var require_solidityCompiler = __commonJS({
|
|
|
211226
211226
|
return false;
|
|
211227
211227
|
}
|
|
211228
211228
|
exports2.findSolcPlatform = findSolcPlatform;
|
|
211229
|
-
async function useCompiler(
|
|
211229
|
+
async function useCompiler(version2, solcJsonInput, forceEmscripten = false) {
|
|
211230
211230
|
var _a, _b, _c;
|
|
211231
|
-
if (
|
|
211232
|
-
|
|
211231
|
+
if (version2.includes("-ci."))
|
|
211232
|
+
version2 = version2.replace("-ci.", "-nightly.");
|
|
211233
211233
|
const inputStringified = JSON.stringify(solcJsonInput);
|
|
211234
211234
|
let compiled;
|
|
211235
211235
|
const solcPlatform = findSolcPlatform();
|
|
211236
211236
|
let solcPath;
|
|
211237
211237
|
if (solcPlatform && !forceEmscripten) {
|
|
211238
|
-
solcPath = await getSolcExecutable(solcPlatform,
|
|
211238
|
+
solcPath = await getSolcExecutable(solcPlatform, version2);
|
|
211239
211239
|
}
|
|
211240
211240
|
let startCompilation;
|
|
211241
211241
|
if (solcPath && !forceEmscripten) {
|
|
211242
|
-
(0, logger_1.logDebug)(`Compiling with solc binary ${
|
|
211242
|
+
(0, logger_1.logDebug)(`Compiling with solc binary ${version2} at ${solcPath}`);
|
|
211243
211243
|
startCompilation = Date.now();
|
|
211244
211244
|
try {
|
|
211245
211245
|
compiled = await asyncExecSolc(inputStringified, solcPath);
|
|
@@ -211251,15 +211251,15 @@ var require_solidityCompiler = __commonJS({
|
|
|
211251
211251
|
throw error;
|
|
211252
211252
|
}
|
|
211253
211253
|
} else {
|
|
211254
|
-
const solJson = await getSolcJs(
|
|
211254
|
+
const solJson = await getSolcJs(version2);
|
|
211255
211255
|
startCompilation = Date.now();
|
|
211256
|
-
(0, logger_1.logDebug)(`Compiling with solc-js ${
|
|
211256
|
+
(0, logger_1.logDebug)(`Compiling with solc-js ${version2}`);
|
|
211257
211257
|
if (solJson) {
|
|
211258
|
-
const coercedVersion = (_b = (_a = semver_1.default.coerce(new semver_1.default.SemVer(
|
|
211258
|
+
const coercedVersion = (_b = (_a = semver_1.default.coerce(new semver_1.default.SemVer(version2))) === null || _a === void 0 ? void 0 : _a.version) !== null && _b !== void 0 ? _b : "";
|
|
211259
211259
|
if (semver_1.default.lt(coercedVersion, "0.4.0")) {
|
|
211260
211260
|
compiled = await new Promise((resolve2, reject) => {
|
|
211261
211261
|
const worker = importWorker(path_1.default.resolve(__dirname, "./compilerWorker.ts"), {
|
|
211262
|
-
workerData: { version:
|
|
211262
|
+
workerData: { version: version2, inputStringified }
|
|
211263
211263
|
});
|
|
211264
211264
|
worker.once("message", (result) => {
|
|
211265
211265
|
resolve2(result);
|
|
@@ -211323,19 +211323,19 @@ var require_solidityCompiler = __commonJS({
|
|
|
211323
211323
|
return metadataAndSources;
|
|
211324
211324
|
}
|
|
211325
211325
|
exports2.getAllMetadataAndSourcesFromSolcJson = getAllMetadataAndSourcesFromSolcJson;
|
|
211326
|
-
async function getSolcExecutable(platform,
|
|
211327
|
-
const fileName = `solc-${platform}-v${
|
|
211326
|
+
async function getSolcExecutable(platform, version2) {
|
|
211327
|
+
const fileName = `solc-${platform}-v${version2}`;
|
|
211328
211328
|
const repoPath = process.env.SOLC_REPO || path_1.default.join("/tmp", "solc-repo");
|
|
211329
211329
|
const solcPath = path_1.default.join(repoPath, fileName);
|
|
211330
211330
|
if (fs_1.default.existsSync(solcPath) && validateSolcPath(solcPath)) {
|
|
211331
|
-
(0, logger_1.logDebug)(`Found solc ${
|
|
211331
|
+
(0, logger_1.logDebug)(`Found solc ${version2} with platform ${platform} at ${solcPath}`);
|
|
211332
211332
|
return solcPath;
|
|
211333
211333
|
}
|
|
211334
|
-
(0, logger_1.logDebug)(`Downloading solc ${
|
|
211335
|
-
const success = await fetchAndSaveSolc(platform, solcPath,
|
|
211336
|
-
(0, logger_1.logDebug)(`Downloaded solc ${
|
|
211334
|
+
(0, logger_1.logDebug)(`Downloading solc ${version2} with platform ${platform} at ${solcPath}`);
|
|
211335
|
+
const success = await fetchAndSaveSolc(platform, solcPath, version2, fileName);
|
|
211336
|
+
(0, logger_1.logDebug)(`Downloaded solc ${version2} with platform ${platform} at ${solcPath}`);
|
|
211337
211337
|
if (success && !validateSolcPath(solcPath)) {
|
|
211338
|
-
(0, logger_1.logError)(`Cannot validate solc ${
|
|
211338
|
+
(0, logger_1.logError)(`Cannot validate solc ${version2}.`);
|
|
211339
211339
|
return null;
|
|
211340
211340
|
}
|
|
211341
211341
|
return success ? solcPath : null;
|
|
@@ -211351,10 +211351,10 @@ var require_solidityCompiler = __commonJS({
|
|
|
211351
211351
|
(0, logger_1.logWarn)(error);
|
|
211352
211352
|
return false;
|
|
211353
211353
|
}
|
|
211354
|
-
async function fetchAndSaveSolc(platform, solcPath,
|
|
211354
|
+
async function fetchAndSaveSolc(platform, solcPath, version2, fileName) {
|
|
211355
211355
|
const encodedURIFilename = encodeURIComponent(fileName);
|
|
211356
211356
|
const githubSolcURI = `${HOST_SOLC_REPO}${platform}/${encodedURIFilename}`;
|
|
211357
|
-
(0, logger_1.logDebug)(`Fetching solc ${
|
|
211357
|
+
(0, logger_1.logDebug)(`Fetching solc ${version2} on platform ${platform}: ${githubSolcURI}`);
|
|
211358
211358
|
let res = await (0, utils_1.fetchWithTimeout)(githubSolcURI);
|
|
211359
211359
|
let status = res.status;
|
|
211360
211360
|
let buffer;
|
|
@@ -211369,7 +211369,7 @@ var require_solidityCompiler = __commonJS({
|
|
|
211369
211369
|
}
|
|
211370
211370
|
}
|
|
211371
211371
|
if (status === http_status_codes_1.StatusCodes.OK && buffer) {
|
|
211372
|
-
(0, logger_1.logDebug)(`Fetched solc ${
|
|
211372
|
+
(0, logger_1.logDebug)(`Fetched solc ${version2} on platform ${platform}: ${githubSolcURI}`);
|
|
211373
211373
|
fs_1.default.mkdirSync(path_1.default.dirname(solcPath), { recursive: true });
|
|
211374
211374
|
try {
|
|
211375
211375
|
fs_1.default.unlinkSync(solcPath);
|
|
@@ -211378,20 +211378,20 @@ var require_solidityCompiler = __commonJS({
|
|
|
211378
211378
|
fs_1.default.writeFileSync(solcPath, new DataView(buffer), { mode: 493 });
|
|
211379
211379
|
return true;
|
|
211380
211380
|
} else {
|
|
211381
|
-
(0, logger_1.logWarn)(`Failed fetching solc ${
|
|
211381
|
+
(0, logger_1.logWarn)(`Failed fetching solc ${version2}: ${githubSolcURI}`);
|
|
211382
211382
|
}
|
|
211383
211383
|
return false;
|
|
211384
211384
|
}
|
|
211385
|
-
async function getSolcJs(
|
|
211386
|
-
|
|
211387
|
-
if (
|
|
211388
|
-
|
|
211385
|
+
async function getSolcJs(version2 = "latest") {
|
|
211386
|
+
version2 = version2.trim();
|
|
211387
|
+
if (version2 !== "latest" && !version2.startsWith("v")) {
|
|
211388
|
+
version2 = "v" + version2;
|
|
211389
211389
|
}
|
|
211390
211390
|
const soljsonRepo = process.env.SOLJSON_REPO || path_1.default.join("/tmp", "soljson-repo");
|
|
211391
|
-
const fileName = `soljson-${
|
|
211391
|
+
const fileName = `soljson-${version2}.js`;
|
|
211392
211392
|
const soljsonPath = path_1.default.resolve(soljsonRepo, fileName);
|
|
211393
211393
|
if (!fs_1.default.existsSync(soljsonPath)) {
|
|
211394
|
-
if (!await fetchAndSaveSolc("bin", soljsonPath,
|
|
211394
|
+
if (!await fetchAndSaveSolc("bin", soljsonPath, version2, fileName)) {
|
|
211395
211395
|
return false;
|
|
211396
211396
|
}
|
|
211397
211397
|
}
|
|
@@ -212595,8 +212595,8 @@ var require_CheckedContract = __commonJS({
|
|
|
212595
212595
|
if (!_CheckedContract.isValid(this)) {
|
|
212596
212596
|
await _CheckedContract.fetchMissing(this);
|
|
212597
212597
|
}
|
|
212598
|
-
const
|
|
212599
|
-
const output2 = await (0, solidityCompiler_1.useCompiler)(
|
|
212598
|
+
const version2 = this.metadata.compiler.version;
|
|
212599
|
+
const output2 = await (0, solidityCompiler_1.useCompiler)(version2, this.solcJsonInput, forceEmscripten);
|
|
212600
212600
|
if (!output2.contracts || !output2.contracts[this.compiledPath] || !output2.contracts[this.compiledPath][this.name] || !output2.contracts[this.compiledPath][this.name].evm || !output2.contracts[this.compiledPath][this.name].evm.bytecode) {
|
|
212601
212601
|
const errorMessages2 = output2.errors.filter((e) => e.severity === "error").map((e) => e.formattedMessage);
|
|
212602
212602
|
const error = new Error("Compiler error");
|
|
@@ -212714,7 +212714,7 @@ ${errorMessages2.join("\n ")}`);
|
|
|
212714
212714
|
(_a = solcJsonInput === null || solcJsonInput === void 0 ? void 0 : solcJsonInput.settings) === null || _a === void 0 ? true : delete _a.compilationTarget;
|
|
212715
212715
|
const versions = ["0.8.2", "0.8.3", "0.8.4"];
|
|
212716
212716
|
const coercedVersion = (_b = semver_1.default.coerce(metadata.compiler.version)) === null || _b === void 0 ? void 0 : _b.version;
|
|
212717
|
-
const affectedVersions = versions.filter((
|
|
212717
|
+
const affectedVersions = versions.filter((version2) => semver_1.default.eq(version2, coercedVersion || ""));
|
|
212718
212718
|
if (affectedVersions.length > 0) {
|
|
212719
212719
|
if ((_e = (_d = (_c = solcJsonInput.settings) === null || _c === void 0 ? void 0 : _c.optimizer) === null || _d === void 0 ? void 0 : _d.details) === null || _e === void 0 ? void 0 : _e.inliner) {
|
|
212720
212720
|
delete solcJsonInput.settings.optimizer.details.inliner;
|
|
@@ -261783,11 +261783,11 @@ function datetimeRegex(args) {
|
|
|
261783
261783
|
regex = `${regex}(${opts.join("|")})`;
|
|
261784
261784
|
return new RegExp(`^${regex}$`);
|
|
261785
261785
|
}
|
|
261786
|
-
function isValidIP(ip,
|
|
261787
|
-
if ((
|
|
261786
|
+
function isValidIP(ip, version2) {
|
|
261787
|
+
if ((version2 === "v4" || !version2) && ipv4Regex.test(ip)) {
|
|
261788
261788
|
return true;
|
|
261789
261789
|
}
|
|
261790
|
-
if ((
|
|
261790
|
+
if ((version2 === "v6" || !version2) && ipv6Regex.test(ip)) {
|
|
261791
261791
|
return true;
|
|
261792
261792
|
}
|
|
261793
261793
|
return false;
|
|
@@ -271813,8 +271813,8 @@ var BN_282 = BigInt(28);
|
|
|
271813
271813
|
var BN_352 = BigInt(35);
|
|
271814
271814
|
var BN_MAX_UINT = BigInt("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
|
|
271815
271815
|
var BLOB_SIZE = 4096 * 32;
|
|
271816
|
-
function getVersionedHash(
|
|
271817
|
-
let versioned =
|
|
271816
|
+
function getVersionedHash(version2, hash2) {
|
|
271817
|
+
let versioned = version2.toString(16);
|
|
271818
271818
|
while (versioned.length < 2) {
|
|
271819
271819
|
versioned = "0" + versioned;
|
|
271820
271820
|
}
|
|
@@ -339153,10 +339153,10 @@ var AbstractVisitor = class {
|
|
|
339153
339153
|
return entries;
|
|
339154
339154
|
}
|
|
339155
339155
|
getContractTypeFromVersion(e) {
|
|
339156
|
-
const
|
|
339156
|
+
const version2 = major(e.version);
|
|
339157
339157
|
switch (e.contract) {
|
|
339158
339158
|
case "ADDRESS_PROVIDER_V1":
|
|
339159
|
-
switch (
|
|
339159
|
+
switch (version2) {
|
|
339160
339160
|
case VERSION_V1:
|
|
339161
339161
|
return "ADDRESS_PROVIDER_V1";
|
|
339162
339162
|
case VERSION_V3:
|
|
@@ -339165,7 +339165,7 @@ var AbstractVisitor = class {
|
|
|
339165
339165
|
throw new Error(`unsupported version of ${e.contract}: ${e.version}`);
|
|
339166
339166
|
}
|
|
339167
339167
|
case "CREDIT_CONFIGURATOR_V2":
|
|
339168
|
-
switch (
|
|
339168
|
+
switch (version2) {
|
|
339169
339169
|
case VERSION_V2:
|
|
339170
339170
|
return "CREDIT_CONFIGURATOR_V2";
|
|
339171
339171
|
case VERSION_V3:
|
|
@@ -339174,7 +339174,7 @@ var AbstractVisitor = class {
|
|
|
339174
339174
|
throw new Error(`unsupported version of ${e.contract}: ${e.version}`);
|
|
339175
339175
|
}
|
|
339176
339176
|
case "CREDIT_FACADE_V2":
|
|
339177
|
-
switch (
|
|
339177
|
+
switch (version2) {
|
|
339178
339178
|
case VERSION_V2:
|
|
339179
339179
|
return "CREDIT_FACADE_V2";
|
|
339180
339180
|
case VERSION_V3:
|
|
@@ -339183,7 +339183,7 @@ var AbstractVisitor = class {
|
|
|
339183
339183
|
throw new Error(`unsupported version of ${e.contract}: ${e.version}`);
|
|
339184
339184
|
}
|
|
339185
339185
|
case "CREDIT_MANAGER_V1":
|
|
339186
|
-
switch (
|
|
339186
|
+
switch (version2) {
|
|
339187
339187
|
case VERSION_V1:
|
|
339188
339188
|
return "CREDIT_MANAGER_V1";
|
|
339189
339189
|
case VERSION_V2:
|
|
@@ -339194,7 +339194,7 @@ var AbstractVisitor = class {
|
|
|
339194
339194
|
throw new Error(`unsupported version of ${e.contract}: ${e.version}`);
|
|
339195
339195
|
}
|
|
339196
339196
|
case "POOL_V1":
|
|
339197
|
-
switch (
|
|
339197
|
+
switch (version2) {
|
|
339198
339198
|
case VERSION_V1:
|
|
339199
339199
|
case VERSION_V2:
|
|
339200
339200
|
return "POOL_V1";
|
|
@@ -339204,7 +339204,7 @@ var AbstractVisitor = class {
|
|
|
339204
339204
|
throw new Error(`unsupported version of ${e.contract}: ${e.version}`);
|
|
339205
339205
|
}
|
|
339206
339206
|
case "PRICE_ORACLE_V2":
|
|
339207
|
-
switch (
|
|
339207
|
+
switch (version2) {
|
|
339208
339208
|
case VERSION_V1:
|
|
339209
339209
|
case VERSION_V2:
|
|
339210
339210
|
return "PRICE_ORACLE_V2";
|
|
@@ -339214,7 +339214,7 @@ var AbstractVisitor = class {
|
|
|
339214
339214
|
throw new Error(`unsupported version of ${e.contract}: ${e.version}`);
|
|
339215
339215
|
}
|
|
339216
339216
|
case "INTEREST_RATE_MODEL_V1":
|
|
339217
|
-
switch (
|
|
339217
|
+
switch (version2) {
|
|
339218
339218
|
case VERSION_V1:
|
|
339219
339219
|
return "INTEREST_RATE_MODEL_V1";
|
|
339220
339220
|
case VERSION_V3:
|
|
@@ -339223,7 +339223,7 @@ var AbstractVisitor = class {
|
|
|
339223
339223
|
throw new Error(`unsupported version of ${e.contract}: ${e.version}`);
|
|
339224
339224
|
}
|
|
339225
339225
|
case "DATA_COMPRESSOR_V1":
|
|
339226
|
-
switch (
|
|
339226
|
+
switch (version2) {
|
|
339227
339227
|
case VERSION_V1:
|
|
339228
339228
|
return "DATA_COMPRESSOR_V1";
|
|
339229
339229
|
case VERSION_V2:
|
|
@@ -339300,7 +339300,7 @@ var AddressProviderV3Visitor = class extends AbstractVisitor {
|
|
|
339300
339300
|
const events = await ap.queryFilter(ap.filters.SetAddress(), lastVisitBlock ? lastVisitBlock + 1 : discoveryBlock, block);
|
|
339301
339301
|
const result = [];
|
|
339302
339302
|
for (const evt of events) {
|
|
339303
|
-
const { key, value, version:
|
|
339303
|
+
const { key, value, version: version2 } = evt.args;
|
|
339304
339304
|
let contract = decodeBytes32String(key);
|
|
339305
339305
|
switch (contract) {
|
|
339306
339306
|
case "ADDRESS_PROVIDER":
|
|
@@ -339378,7 +339378,7 @@ var AddressProviderV3Visitor = class extends AbstractVisitor {
|
|
|
339378
339378
|
address: value.toLowerCase(),
|
|
339379
339379
|
contract,
|
|
339380
339380
|
discoveryBlock: evt.blockNumber,
|
|
339381
|
-
version: Number(
|
|
339381
|
+
version: Number(version2)
|
|
339382
339382
|
};
|
|
339383
339383
|
entry.contract = this.getContractTypeFromVersion(entry);
|
|
339384
339384
|
result.push(entry);
|
|
@@ -341290,10 +341290,10 @@ var CreditManagerV2Visitor = class extends AbstractVisitor {
|
|
|
341290
341290
|
var CreditManagerV3Visitor = class extends AbstractVisitor {
|
|
341291
341291
|
async _visit(_entry, provider, block) {
|
|
341292
341292
|
const entry = _entry;
|
|
341293
|
-
const { address, lastVisitBlock, immutableState, version:
|
|
341293
|
+
const { address, lastVisitBlock, immutableState, version: version2 } = entry;
|
|
341294
341294
|
const contract = ICreditManagerV3__factory.connect(address, provider);
|
|
341295
341295
|
const [pool, name] = await Promise.all([contract.pool(), contract.name()]);
|
|
341296
|
-
entry.name = `Credit Manager V${
|
|
341296
|
+
entry.name = `Credit Manager V${version2} ${name}`;
|
|
341297
341297
|
entry.immutableState.pool = pool;
|
|
341298
341298
|
const events = await contract.queryFilter(contract.filters.SetCreditConfigurator(), lastVisitBlock ? lastVisitBlock + 1 : FIRST_GEARBOX_BLOCK, block);
|
|
341299
341299
|
const result = [];
|
|
@@ -341398,7 +341398,7 @@ var PoolV1Visitor = class extends AbstractVisitor {
|
|
|
341398
341398
|
var PoolV3Visitor = class extends AbstractVisitor {
|
|
341399
341399
|
async _visit(_entry, provider, block) {
|
|
341400
341400
|
const entry = _entry;
|
|
341401
|
-
const { address, lastVisitBlock, immutableState, version:
|
|
341401
|
+
const { address, lastVisitBlock, immutableState, version: version2 } = entry;
|
|
341402
341402
|
const contract = IPoolV3__factory.connect(address, provider);
|
|
341403
341403
|
const topics = {
|
|
341404
341404
|
SetInterestRateModel: getTopic(contract, "SetInterestRateModel"),
|
|
@@ -341442,7 +341442,7 @@ var PoolV3Visitor = class extends AbstractVisitor {
|
|
|
341442
341442
|
contract.name()
|
|
341443
341443
|
]);
|
|
341444
341444
|
immutableState.symbol = symbol;
|
|
341445
|
-
entry.name = `Pool v${
|
|
341445
|
+
entry.name = `Pool v${version2}: ${name}`;
|
|
341446
341446
|
return this.loadVersions(provider, result);
|
|
341447
341447
|
}
|
|
341448
341448
|
};
|
|
@@ -343612,7 +343612,7 @@ var YearnV2AdapterParser = class extends AbstractParser {
|
|
|
343612
343612
|
};
|
|
343613
343613
|
|
|
343614
343614
|
// ../../packages/node/dist/parsers/adapters/factory.js
|
|
343615
|
-
function adapterParser(contract,
|
|
343615
|
+
function adapterParser(contract, version2, contractName) {
|
|
343616
343616
|
switch (contract) {
|
|
343617
343617
|
case "ADAPTER_UNISWAP_V2_ROUTER":
|
|
343618
343618
|
return new UniswapV2AdapterParser(contract);
|
|
@@ -344826,7 +344826,7 @@ var ZeroPriceFeedParser = class extends AbstractParser {
|
|
|
344826
344826
|
};
|
|
344827
344827
|
|
|
344828
344828
|
// ../../packages/node/dist/parsers/feeds/factory.js
|
|
344829
|
-
function priceFeedParser(contract,
|
|
344829
|
+
function priceFeedParser(contract, version2, contractName) {
|
|
344830
344830
|
switch (contract) {
|
|
344831
344831
|
case "PRICE_FEED_WRAPPED_AAVE_V2_ORACLE":
|
|
344832
344832
|
return new WrappedAaveV2PriceFeedParser(contract);
|
|
@@ -345201,9 +345201,9 @@ var ZapperRegisterParser = class extends AbstractParser {
|
|
|
345201
345201
|
};
|
|
345202
345202
|
|
|
345203
345203
|
// ../../packages/node/dist/parsers/factory.js
|
|
345204
|
-
function parserFor({ contract, version:
|
|
345204
|
+
function parserFor({ contract, version: version2, address }) {
|
|
345205
345205
|
try {
|
|
345206
|
-
return parserForContractType(contract,
|
|
345206
|
+
return parserForContractType(contract, version2);
|
|
345207
345207
|
} catch (e) {
|
|
345208
345208
|
throw new Error(`cannot get parser for ${address}: ${e}`);
|
|
345209
345209
|
}
|
|
@@ -345250,8 +345250,8 @@ function parserForContractName(name) {
|
|
|
345250
345250
|
}
|
|
345251
345251
|
return parserForContractType(contractType, void 0, name);
|
|
345252
345252
|
}
|
|
345253
|
-
function parserForContractType(contract,
|
|
345254
|
-
let parser = adapterParser(contract,
|
|
345253
|
+
function parserForContractType(contract, version2, contractName) {
|
|
345254
|
+
let parser = adapterParser(contract, version2, contractName) ?? priceFeedParser(contract, version2, contractName);
|
|
345255
345255
|
if (parser) {
|
|
345256
345256
|
return parser;
|
|
345257
345257
|
}
|
|
@@ -345337,7 +345337,7 @@ function parserForContractType(contract, version3, contractName) {
|
|
|
345337
345337
|
case "ZAPPER":
|
|
345338
345338
|
return new ZapperParser(contract, contractName);
|
|
345339
345339
|
default: {
|
|
345340
|
-
const vstr =
|
|
345340
|
+
const vstr = version2 ? `version ${version2}` : "";
|
|
345341
345341
|
throw new Error(`cannot find parser for ${contract} ${vstr}`);
|
|
345342
345342
|
}
|
|
345343
345343
|
}
|
|
@@ -345354,9 +345354,9 @@ var UpdateParser = class extends ProviderBase {
|
|
|
345354
345354
|
batches: []
|
|
345355
345355
|
};
|
|
345356
345356
|
#metaRepo;
|
|
345357
|
-
constructor(options,
|
|
345357
|
+
constructor(options, version2) {
|
|
345358
345358
|
super(options);
|
|
345359
|
-
this.#output.version =
|
|
345359
|
+
this.#output.version = version2 ?? "dev";
|
|
345360
345360
|
this.logger = this.logger.getSubLogger({ name: "parser" });
|
|
345361
345361
|
this.#sandboxDir = path6.resolve(options.sandboxDir, "parser");
|
|
345362
345362
|
mkdirSync5(this.#sandboxDir, { recursive: true });
|
|
@@ -345899,10 +345899,10 @@ function _supportsColor(haveStream, { streamIsTTY, sniffFlags = true } = {}) {
|
|
|
345899
345899
|
return 3;
|
|
345900
345900
|
}
|
|
345901
345901
|
if ("TERM_PROGRAM" in env) {
|
|
345902
|
-
const
|
|
345902
|
+
const version2 = Number.parseInt((env.TERM_PROGRAM_VERSION || "").split(".")[0], 10);
|
|
345903
345903
|
switch (env.TERM_PROGRAM) {
|
|
345904
345904
|
case "iTerm.app": {
|
|
345905
|
-
return
|
|
345905
|
+
return version2 >= 3 ? 3 : 2;
|
|
345906
345906
|
}
|
|
345907
345907
|
case "Apple_Terminal": {
|
|
345908
345908
|
return 2;
|
|
@@ -346682,10 +346682,90 @@ function getRenderer(opts) {
|
|
|
346682
346682
|
}
|
|
346683
346683
|
|
|
346684
346684
|
// package.json
|
|
346685
|
-
var
|
|
346685
|
+
var package_default = {
|
|
346686
|
+
name: "@gearbox-protocol/deploy-tools",
|
|
346687
|
+
description: "Gearbox deploy tools",
|
|
346688
|
+
version: "4.62.1",
|
|
346689
|
+
homepage: "https://gearbox.fi",
|
|
346690
|
+
keywords: [
|
|
346691
|
+
"gearbox"
|
|
346692
|
+
],
|
|
346693
|
+
repository: {
|
|
346694
|
+
type: "git",
|
|
346695
|
+
url: "https://github.com/Gearbox-protocol/deploy-tools"
|
|
346696
|
+
},
|
|
346697
|
+
type: "module",
|
|
346698
|
+
bin: "./dist/index.mjs",
|
|
346699
|
+
files: [
|
|
346700
|
+
"dist"
|
|
346701
|
+
],
|
|
346702
|
+
engines: {
|
|
346703
|
+
node: ">=18"
|
|
346704
|
+
},
|
|
346705
|
+
license: "BUSL-1.1",
|
|
346706
|
+
publishConfig: {
|
|
346707
|
+
registry: "https://registry.npmjs.org/"
|
|
346708
|
+
},
|
|
346709
|
+
scripts: {
|
|
346710
|
+
clean: "rm -rf ./dist",
|
|
346711
|
+
build: "node esbuild.config.mjs",
|
|
346712
|
+
start: "tsx -r dotenv/config ./src/index.ts",
|
|
346713
|
+
prettier: "prettier --write .",
|
|
346714
|
+
"prettier:ci": "npx prettier --check .",
|
|
346715
|
+
lint: 'eslint "**/*.ts" --fix',
|
|
346716
|
+
"lint:ci": 'eslint "**/*.ts"',
|
|
346717
|
+
"typecheck:ci": "tsc --noEmit",
|
|
346718
|
+
prepublishOnly: "yarn build",
|
|
346719
|
+
"package:version": "yarn version"
|
|
346720
|
+
},
|
|
346721
|
+
dependencies: {},
|
|
346722
|
+
devDependencies: {
|
|
346723
|
+
"@actions/core": "^1.11.1",
|
|
346724
|
+
"@chialab/esbuild-plugin-commonjs": "^0.18.0",
|
|
346725
|
+
"@commander-js/extra-typings": "^12.1.0",
|
|
346726
|
+
"@ethereum-sourcify/bytecode-utils": "^1.2.12",
|
|
346727
|
+
"@ethereum-sourcify/lib-sourcify": "^1.4.1",
|
|
346728
|
+
"@gearbox-protocol/deploy-tools-node": "0.0.0",
|
|
346729
|
+
"@gearbox-protocol/deploy-tools-shared": "0.0.0",
|
|
346730
|
+
"@gearbox-protocol/deploy-tools-types": "0.0.0",
|
|
346731
|
+
"@gearbox-protocol/sdk-gov": "^2.32.2",
|
|
346732
|
+
"@types/lodash-es": "^4.17.12",
|
|
346733
|
+
"@types/node": "^22.10.1",
|
|
346734
|
+
"@types/react": "^19.0.1",
|
|
346735
|
+
"@types/react-dom": "^19.0.1",
|
|
346736
|
+
abitype: "^1.0.7",
|
|
346737
|
+
chalk: "^5.3.0",
|
|
346738
|
+
commander: "^12.1.0",
|
|
346739
|
+
"date-fns": "^4.1.0",
|
|
346740
|
+
dotenv: "^16.4.7",
|
|
346741
|
+
esbuild: "^0.24.0",
|
|
346742
|
+
ethers: "^6.13.4",
|
|
346743
|
+
"ethers-multisend": "^3.1.0",
|
|
346744
|
+
"lint-staged": "^15.2.10",
|
|
346745
|
+
"lodash-es": "^4.17.21",
|
|
346746
|
+
"p-retry": "^6.2.1",
|
|
346747
|
+
queue: "^7.0.0",
|
|
346748
|
+
react: "^19.0.0",
|
|
346749
|
+
"react-dom": "^19.0.0",
|
|
346750
|
+
table: "^6.9.0",
|
|
346751
|
+
tslog: "^4.9.3",
|
|
346752
|
+
tsx: "^4.19.2",
|
|
346753
|
+
yaml: "^2.6.1",
|
|
346754
|
+
zod: "^3.23.8"
|
|
346755
|
+
},
|
|
346756
|
+
prettier: "@gearbox-protocol/prettier-config",
|
|
346757
|
+
"lint-staged": {
|
|
346758
|
+
"*.{ts,tsx}": [
|
|
346759
|
+
"eslint --fix",
|
|
346760
|
+
"prettier --write"
|
|
346761
|
+
],
|
|
346762
|
+
"*.{json,md}": "prettier --write",
|
|
346763
|
+
"*.sol": "forge fmt"
|
|
346764
|
+
}
|
|
346765
|
+
};
|
|
346686
346766
|
|
|
346687
346767
|
// src/version.ts
|
|
346688
|
-
var version_default =
|
|
346768
|
+
var version_default = package_default.version;
|
|
346689
346769
|
|
|
346690
346770
|
// src/commands/parse.ts
|
|
346691
346771
|
function parse() {
|