@openzeppelin/upgrades-core 1.9.0 → 1.11.0

package/dist/utils/address.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseAddress = void 0;
+const ethereumjs_util_1 = require("ethereumjs-util");
+/**
+ * Parses an address from a hex string which may come from storage or a returned address via eth_call.
+ *
+ * @param addressString The address hex string.
+ * @returns The parsed checksum address, or undefined if the input string is not an address.
+ */
+function parseAddress(addressString) {
+    const buf = Buffer.from(addressString.replace(/^0x/, ''), 'hex');
+    if (!buf.slice(0, 12).equals(Buffer.alloc(12, 0))) {
+        return undefined;
+    }
+    const address = '0x' + buf.toString('hex', 12, 32); // grab the last 20 bytes
+    return (0, ethereumjs_util_1.toChecksumAddress)(address);
+}
+exports.parseAddress = parseAddress;
+//# sourceMappingURL=address.js.map

package/dist/utils/address.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"address.js","sourceRoot":"","sources":["../../src/utils/address.ts"],"names":[],"mappings":";;;AAAA,qDAAoD;AAEpD;;;;;GAKG;AACH,SAAgB,YAAY,CAAC,aAAqB;IAChD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IACjE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE;QACjD,OAAO,SAAS,CAAC;KAClB;IACD,MAAM,OAAO,GAAG,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,yBAAyB;IAC7E,OAAO,IAAA,mCAAiB,EAAC,OAAO,CAAC,CAAC;AACpC,CAAC;AAPD,oCAOC"}

package/dist/utils/debug.js

@@ -4,5 +4,5 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const debug_1 = __importDefault(require("debug"));
-exports.default = debug_1.default('@openzeppelin:upgrades:core');
+exports.default = (0, debug_1.default)('@openzeppelin:upgrades:core');
 //# sourceMappingURL=debug.js.map

package/dist/utils/debug.js.map

@@ -1 +1 @@
-{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../src/utils/debug.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAE1B,kBAAe,eAAK,CAAC,6BAA6B,CAAC,CAAC"}
+{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../src/utils/debug.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAE1B,kBAAe,IAAA,eAAK,EAAC,6BAA6B,CAAC,CAAC"}

package/dist/utils/deep-array.test.js

@@ -5,19 +5,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const ava_1 = __importDefault(require("ava"));
 const deep_array_1 = require("./deep-array");
-ava_1.default('depth 0', t => {
-    t.true(deep_array_1.deepEqual('a', 'a'));
-    t.false(deep_array_1.deepEqual('a', 'b'));
-    t.false(deep_array_1.deepEqual('a', ['a']));
-    t.false(deep_array_1.deepEqual(['a'], 'a'));
+(0, ava_1.default)('depth 0', t => {
+    t.true((0, deep_array_1.deepEqual)('a', 'a'));
+    t.false((0, deep_array_1.deepEqual)('a', 'b'));
+    t.false((0, deep_array_1.deepEqual)('a', ['a']));
+    t.false((0, deep_array_1.deepEqual)(['a'], 'a'));
 });
-ava_1.default('depth 1', t => {
-    t.true(deep_array_1.deepEqual(['a', 'b'], ['a', 'b']));
-    t.false(deep_array_1.deepEqual(['a'], ['a', 'b']));
-    t.false(deep_array_1.deepEqual(['a', 'b'], ['a', 'c']));
+(0, ava_1.default)('depth 1', t => {
+    t.true((0, deep_array_1.deepEqual)(['a', 'b'], ['a', 'b']));
+    t.false((0, deep_array_1.deepEqual)(['a'], ['a', 'b']));
+    t.false((0, deep_array_1.deepEqual)(['a', 'b'], ['a', 'c']));
 });
-ava_1.default('depth 2', t => {
-    t.true(deep_array_1.deepEqual([['a'], ['b']], [['a'], ['b']]));
-    t.false(deep_array_1.deepEqual([['a'], ['b']], [['a'], ['c']]));
+(0, ava_1.default)('depth 2', t => {
+    t.true((0, deep_array_1.deepEqual)([['a'], ['b']], [['a'], ['b']]));
+    t.false((0, deep_array_1.deepEqual)([['a'], ['b']], [['a'], ['c']]));
 });
 //# sourceMappingURL=deep-array.test.js.map

package/dist/utils/deep-array.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"deep-array.test.js","sourceRoot":"","sources":["../../src/utils/deep-array.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AAEvB,6CAAyC;AAEzC,aAAI,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE;IAClB,CAAC,CAAC,IAAI,CAAC,sBAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC,KAAK,CAAC,sBAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,KAAK,CAAC,sBAAS,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC,CAAC,KAAK,CAAC,sBAAS,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;AACjC,CAAC,CAAC,CAAC;AAEH,aAAI,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE;IAClB,CAAC,CAAC,IAAI,CAAC,sBAAS,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC,KAAK,CAAC,sBAAS,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC,CAAC,KAAK,CAAC,sBAAS,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;AAC7C,CAAC,CAAC,CAAC;AAEH,aAAI,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE;IAClB,CAAC,CAAC,IAAI,CAAC,sBAAS,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC,KAAK,CAAC,sBAAS,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC,CAAC,CAAC"}
+{"version":3,"file":"deep-array.test.js","sourceRoot":"","sources":["../../src/utils/deep-array.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AAEvB,6CAAyC;AAEzC,IAAA,aAAI,EAAC,SAAS,EAAE,CAAC,CAAC,EAAE;IAClB,CAAC,CAAC,IAAI,CAAC,IAAA,sBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC,KAAK,CAAC,IAAA,sBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,KAAK,CAAC,IAAA,sBAAS,EAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC,CAAC,KAAK,CAAC,IAAA,sBAAS,EAAC,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;AACjC,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,SAAS,EAAE,CAAC,CAAC,EAAE;IAClB,CAAC,CAAC,IAAI,CAAC,IAAA,sBAAS,EAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC,KAAK,CAAC,IAAA,sBAAS,EAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC,CAAC,KAAK,CAAC,IAAA,sBAAS,EAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;AAC7C,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,SAAS,EAAE,CAAC,CAAC,EAAE;IAClB,CAAC,CAAC,IAAI,CAAC,IAAA,sBAAS,EAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC,KAAK,CAAC,IAAA,sBAAS,EAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC,CAAC,CAAC"}

package/dist/utils/function.js

@@ -4,15 +4,15 @@ exports.getFunctionSignature = void 0;
 const assert_1 = require("./assert");
 function serializeTypeName(parameter, deref) {
     const { typeName, storageLocation } = parameter;
-    assert_1.assert(!!typeName);
+    (0, assert_1.assert)(!!typeName);
     if (storageLocation === 'storage') {
-        assert_1.assert(typeof typeName.typeDescriptions.typeString === 'string');
+        (0, assert_1.assert)(typeof typeName.typeDescriptions.typeString === 'string');
         return typeName.typeDescriptions.typeString.replace(/^struct /, '') + ' storage';
     }
     switch (typeName.nodeType) {
         case 'ArrayTypeName':
         case 'ElementaryTypeName': {
-            assert_1.assert(typeof typeName.typeDescriptions.typeString === 'string');
+            (0, assert_1.assert)(typeof typeName.typeDescriptions.typeString === 'string');
             return typeName.typeDescriptions.typeString;
         }
         case 'UserDefinedTypeName': {
@@ -21,12 +21,12 @@ function serializeTypeName(parameter, deref) {
                 case 'StructDefinition':
                     return '(' + userDefinedType.members.map(member => serializeTypeName(member, deref)) + ')';
                 case 'EnumDefinition':
-                    assert_1.assert(userDefinedType.members.length < 256);
+                    (0, assert_1.assert)(userDefinedType.members.length < 256);
                     return 'uint8';
                 case 'ContractDefinition':
                     return 'address';
                 default:
-                    return assert_1.assertUnreachable(userDefinedType);
+                    return (0, assert_1.assertUnreachable)(userDefinedType);
             }
         }
         case 'FunctionTypeName': {

package/dist/utils/function.js.map

@@ -1 +1 @@
-{"version":3,"file":"function.js","sourceRoot":"","sources":["../../src/utils/function.ts"],"names":[],"mappings":";;;AAEA,qCAAqD;AAErD,SAAS,iBAAiB,CAAC,SAA8B,EAAE,KAAsB;IAC/E,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC;IAChD,eAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAEnB,IAAI,eAAe,KAAK,SAAS,EAAE;QACjC,eAAM,CAAC,OAAO,QAAQ,CAAC,gBAAgB,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC;QACjE,OAAO,QAAQ,CAAC,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC;KAClF;IAED,QAAQ,QAAQ,CAAC,QAAQ,EAAE;QACzB,KAAK,eAAe,CAAC;QACrB,KAAK,oBAAoB,CAAC,CAAC;YACzB,eAAM,CAAC,OAAO,QAAQ,CAAC,gBAAgB,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC;YACjE,OAAO,QAAQ,CAAC,gBAAgB,CAAC,UAAU,CAAC;SAC7C;QAED,KAAK,qBAAqB,CAAC,CAAC;YAC1B,MAAM,eAAe,GAAG,KAAK,CAC3B,CAAC,kBAAkB,EAAE,gBAAgB,EAAE,oBAAoB,CAAC,EAC5D,QAAQ,CAAC,qBAAqB,CAC/B,CAAC;YACF,QAAQ,eAAe,CAAC,QAAQ,EAAE;gBAChC,KAAK,kBAAkB;oBACrB,OAAO,GAAG,GAAG,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC;gBAE7F,KAAK,gBAAgB;oBACnB,eAAM,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC;oBAC7C,OAAO,OAAO,CAAC;gBAEjB,KAAK,oBAAoB;oBACvB,OAAO,SAAS,CAAC;gBAEnB;oBACE,OAAO,0BAAiB,CAAC,eAAe,CAAC,CAAC;aAC7C;SACF;QAED,KAAK,kBAAkB,CAAC,CAAC;YACvB,OAAO,UAAU,CAAC;SACnB;QAED;YACE,MAAM,IAAI,KAAK,CAAC,kCAAkC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;KAC1E;AACH,CAAC;AAED,SAAgB,oBAAoB,CAAC,KAAyB,EAAE,KAAsB;IACpF,OAAO,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC;AACtH,CAAC;AAFD,oDAEC"}
+{"version":3,"file":"function.js","sourceRoot":"","sources":["../../src/utils/function.ts"],"names":[],"mappings":";;;AAEA,qCAAqD;AAErD,SAAS,iBAAiB,CAAC,SAA8B,EAAE,KAAsB;IAC/E,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC;IAChD,IAAA,eAAM,EAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAEnB,IAAI,eAAe,KAAK,SAAS,EAAE;QACjC,IAAA,eAAM,EAAC,OAAO,QAAQ,CAAC,gBAAgB,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC;QACjE,OAAO,QAAQ,CAAC,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC;KAClF;IAED,QAAQ,QAAQ,CAAC,QAAQ,EAAE;QACzB,KAAK,eAAe,CAAC;QACrB,KAAK,oBAAoB,CAAC,CAAC;YACzB,IAAA,eAAM,EAAC,OAAO,QAAQ,CAAC,gBAAgB,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC;YACjE,OAAO,QAAQ,CAAC,gBAAgB,CAAC,UAAU,CAAC;SAC7C;QAED,KAAK,qBAAqB,CAAC,CAAC;YAC1B,MAAM,eAAe,GAAG,KAAK,CAC3B,CAAC,kBAAkB,EAAE,gBAAgB,EAAE,oBAAoB,CAAC,EAC5D,QAAQ,CAAC,qBAAqB,CAC/B,CAAC;YACF,QAAQ,eAAe,CAAC,QAAQ,EAAE;gBAChC,KAAK,kBAAkB;oBACrB,OAAO,GAAG,GAAG,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC;gBAE7F,KAAK,gBAAgB;oBACnB,IAAA,eAAM,EAAC,eAAe,CAAC,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC;oBAC7C,OAAO,OAAO,CAAC;gBAEjB,KAAK,oBAAoB;oBACvB,OAAO,SAAS,CAAC;gBAEnB;oBACE,OAAO,IAAA,0BAAiB,EAAC,eAAe,CAAC,CAAC;aAC7C;SACF;QAED,KAAK,kBAAkB,CAAC,CAAC;YACvB,OAAO,UAAU,CAAC;SACnB;QAED;YACE,MAAM,IAAI,KAAK,CAAC,kCAAkC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;KAC1E;AACH,CAAC;AAED,SAAgB,oBAAoB,CAAC,KAAyB,EAAE,KAAsB;IACpF,OAAO,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC;AACtH,CAAC;AAFD,oDAEC"}

package/dist/utils/function.test.js

@@ -11,7 +11,7 @@ const ast_dereferencer_1 = require("../ast-dereferencer");
 testContract('ContractFunctionSignatures');
 testContract('LibraryFunctionSignatures');
 function testContract(contractName) {
-    ava_1.default(contractName, async (t) => {
+    (0, ava_1.default)(contractName, async (t) => {
         const fileName = 'contracts/test/FunctionSignatures.sol';
         const buildInfo = await hardhat_1.artifacts.getBuildInfo(`${fileName}:${contractName}`);
         if (buildInfo === undefined) {
@@ -21,13 +21,13 @@ function testContract(contractName) {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const signatures = Object.keys(solcOutput.contracts[fileName][contractName].evm.methodIdentifiers);
         const functions = {};
-        for (const def of utils_1.findAll('FunctionDefinition', solcOutput.sources[fileName].ast)) {
+        for (const def of (0, utils_1.findAll)('FunctionDefinition', solcOutput.sources[fileName].ast)) {
             functions[def.name] = def;
         }
-        const deref = ast_dereferencer_1.astDereferencer(solcOutput);
+        const deref = (0, ast_dereferencer_1.astDereferencer)(solcOutput);
         for (const signature of signatures) {
             const name = signature.replace(/\(.*/, '');
-            t.is(function_1.getFunctionSignature(functions[name], deref), signature);
+            t.is((0, function_1.getFunctionSignature)(functions[name], deref), signature);
         }
     });
 }

package/dist/utils/function.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"function.test.js","sourceRoot":"","sources":["../../src/utils/function.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AACvB,qCAAoC;AAEpC,8CAA6C;AAE7C,yCAAkD;AAElD,0DAAsD;AAEtD,YAAY,CAAC,4BAA4B,CAAC,CAAC;AAC3C,YAAY,CAAC,2BAA2B,CAAC,CAAC;AAE1C,SAAS,YAAY,CAAC,YAAoB;IACxC,aAAI,CAAC,YAAY,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;QAC3B,MAAM,QAAQ,GAAG,uCAAuC,CAAC;QACzD,MAAM,SAAS,GAAG,MAAM,mBAAS,CAAC,YAAY,CAAC,GAAG,QAAQ,IAAI,YAAY,EAAE,CAAC,CAAC;QAC9E,IAAI,SAAS,KAAK,SAAS,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACzC;QAED,MAAM,UAAU,GAAe,SAAS,CAAC,MAAM,CAAC;QAEhD,oEAAoE;QACpE,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,iBAAkB,CAAC,CAAC;QAEpG,MAAM,SAAS,GAAuC,EAAE,CAAC;QACzD,KAAK,MAAM,GAAG,IAAI,eAAO,CAAC,oBAAoB,EAAE,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,EAAE;YACjF,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;SAC3B;QACD,MAAM,KAAK,GAAG,kCAAe,CAAC,UAAU,CAAC,CAAC;QAE1C,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAClC,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC3C,CAAC,CAAC,EAAE,CAAC,+BAAoB,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC,CAAC;SAC/D;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"function.test.js","sourceRoot":"","sources":["../../src/utils/function.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AACvB,qCAAoC;AAEpC,8CAA6C;AAE7C,yCAAkD;AAElD,0DAAsD;AAEtD,YAAY,CAAC,4BAA4B,CAAC,CAAC;AAC3C,YAAY,CAAC,2BAA2B,CAAC,CAAC;AAE1C,SAAS,YAAY,CAAC,YAAoB;IACxC,IAAA,aAAI,EAAC,YAAY,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;QAC3B,MAAM,QAAQ,GAAG,uCAAuC,CAAC;QACzD,MAAM,SAAS,GAAG,MAAM,mBAAS,CAAC,YAAY,CAAC,GAAG,QAAQ,IAAI,YAAY,EAAE,CAAC,CAAC;QAC9E,IAAI,SAAS,KAAK,SAAS,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACzC;QAED,MAAM,UAAU,GAAe,SAAS,CAAC,MAAM,CAAC;QAEhD,oEAAoE;QACpE,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,iBAAkB,CAAC,CAAC;QAEpG,MAAM,SAAS,GAAuC,EAAE,CAAC;QACzD,KAAK,MAAM,GAAG,IAAI,IAAA,eAAO,EAAC,oBAAoB,EAAE,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,EAAE;YACjF,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;SAC3B;QACD,MAAM,KAAK,GAAG,IAAA,kCAAe,EAAC,UAAU,CAAC,CAAC;QAE1C,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAClC,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC3C,CAAC,CAAC,EAAE,CAAC,IAAA,+BAAoB,EAAC,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC,CAAC;SAC/D;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/utils/is-nullish.test.js

@@ -5,13 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const ava_1 = __importDefault(require("ava"));
 const is_nullish_1 = require("./is-nullish");
-ava_1.default('null', t => {
-    t.true(is_nullish_1.isNullish(null));
+(0, ava_1.default)('null', t => {
+    t.true((0, is_nullish_1.isNullish)(null));
 });
-ava_1.default('undefined', t => {
-    t.true(is_nullish_1.isNullish(undefined));
+(0, ava_1.default)('undefined', t => {
+    t.true((0, is_nullish_1.isNullish)(undefined));
 });
-ava_1.default('number 5', t => {
-    t.false(is_nullish_1.isNullish(5));
+(0, ava_1.default)('number 5', t => {
+    t.false((0, is_nullish_1.isNullish)(5));
 });
 //# sourceMappingURL=is-nullish.test.js.map

package/dist/utils/is-nullish.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-nullish.test.js","sourceRoot":"","sources":["../../src/utils/is-nullish.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AAEvB,6CAAyC;AAEzC,aAAI,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;IACf,CAAC,CAAC,IAAI,CAAC,sBAAS,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1B,CAAC,CAAC,CAAC;AAEH,aAAI,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE;IACpB,CAAC,CAAC,IAAI,CAAC,sBAAS,CAAC,SAAS,CAAC,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC;AAEH,aAAI,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE;IACnB,CAAC,CAAC,KAAK,CAAC,sBAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AACxB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"is-nullish.test.js","sourceRoot":"","sources":["../../src/utils/is-nullish.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AAEvB,6CAAyC;AAEzC,IAAA,aAAI,EAAC,MAAM,EAAE,CAAC,CAAC,EAAE;IACf,CAAC,CAAC,IAAI,CAAC,IAAA,sBAAS,EAAC,IAAI,CAAC,CAAC,CAAC;AAC1B,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,WAAW,EAAE,CAAC,CAAC,EAAE;IACpB,CAAC,CAAC,IAAI,CAAC,IAAA,sBAAS,EAAC,SAAS,CAAC,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC;AAEH,IAAA,aAAI,EAAC,UAAU,EAAE,CAAC,CAAC,EAAE;IACnB,CAAC,CAAC,KAAK,CAAC,IAAA,sBAAS,EAAC,CAAC,CAAC,CAAC,CAAC;AACxB,CAAC,CAAC,CAAC"}

package/dist/utils/itemize.js

@@ -12,7 +12,7 @@ function itemize(...items) {
 }
 exports.itemize = itemize;
 function itemizeWith(bullet, ...items) {
-    return items.map(item => bullet + indent_1.indent(item, 2, 1)).join('\n');
+    return items.map(item => bullet + (0, indent_1.indent)(item, 2, 1)).join('\n');
 }
 exports.itemizeWith = itemizeWith;
 //# sourceMappingURL=itemize.js.map

package/dist/utils/itemize.js.map

@@ -1 +1 @@
-{"version":3,"file":"itemize.js","sourceRoot":"","sources":["../../src/utils/itemize.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;AAEpD,yBAAyB;AACzB,MAAM;AACN,MAAM;AACN,MAAM;AAEN,qCAAkC;AAElC,SAAgB,OAAO,CAAC,GAAG,KAAe;IACxC,OAAO,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC;AACpC,CAAC;AAFD,0BAEC;AAED,SAAgB,WAAW,CAAC,MAAc,EAAE,GAAG,KAAe;IAC5D,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,eAAM,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACnE,CAAC;AAFD,kCAEC"}
+{"version":3,"file":"itemize.js","sourceRoot":"","sources":["../../src/utils/itemize.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;AAEpD,yBAAyB;AACzB,MAAM;AACN,MAAM;AACN,MAAM;AAEN,qCAAkC;AAElC,SAAgB,OAAO,CAAC,GAAG,KAAe;IACxC,OAAO,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC;AACpC,CAAC;AAFD,0BAEC;AAED,SAAgB,WAAW,CAAC,MAAc,EAAE,GAAG,KAAe;IAC5D,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,IAAA,eAAM,EAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACnE,CAAC;AAFD,kCAEC"}

package/dist/utils/log.d.ts

@@ -1,2 +1,4 @@
+export declare function logNote(title: string, lines?: string[]): void;
 export declare function logWarning(title: string, lines?: string[]): void;
+export declare function silenceWarnings(): void;
 //# sourceMappingURL=log.d.ts.map

package/dist/utils/log.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../src/utils/log.ts"],"names":[],"mappings":"AAIA,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,GAAE,MAAM,EAAO,GAAG,IAAI,CAQpE"}
+{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../src/utils/log.ts"],"names":[],"mappings":"AAoBA,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,GAAE,MAAM,EAAO,GAAG,IAAI,CAEjE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,GAAE,MAAM,EAAO,GAAG,IAAI,CAEpE;AAED,wBAAgB,eAAe,IAAI,IAAI,CAKtC"}

package/dist/utils/log.js

@@ -3,15 +3,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logWarning = void 0;
+exports.silenceWarnings = exports.logWarning = exports.logNote = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const indent_1 = require("./indent");
-function logWarning(title, lines = []) {
-    const parts = [chalk_1.default.yellow.bold('Warning:') + ' ' + title + '\n'];
+let silenced = false;
+function log(prefix, title, lines) {
+    if (silenced) {
+        return;
+    }
+    const parts = [chalk_1.default.yellow.bold(prefix + ':') + ' ' + title + '\n'];
     if (lines.length > 0) {
-        parts.push(lines.map(l => indent_1.indent(l, 4) + '\n').join(''));
+        parts.push(lines.map(l => (0, indent_1.indent)(l, 4) + '\n').join(''));
     }
     console.error(parts.join('\n'));
 }
+function logNote(title, lines = []) {
+    log('Note', title, lines);
+}
+exports.logNote = logNote;
+function logWarning(title, lines = []) {
+    log('Warning', title, lines);
+}
 exports.logWarning = logWarning;
+function silenceWarnings() {
+    logWarning(`All subsequent Upgrades warnings will be silenced.`, [
+        `Make sure you have manually checked all uses of unsafe flags.`,
+    ]);
+    silenced = true;
+}
+exports.silenceWarnings = silenceWarnings;
 //# sourceMappingURL=log.js.map

package/dist/utils/log.js.map

@@ -1 +1 @@
-{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/utils/log.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,qCAAkC;AAElC,SAAgB,UAAU,CAAC,KAAa,EAAE,QAAkB,EAAE;IAC5D,MAAM,KAAK,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,GAAG,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC;IAEnE,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACpB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,eAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;KAC1D;IAED,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAClC,CAAC;AARD,gCAQC"}
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/utils/log.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,qCAAkC;AAElC,IAAI,QAAQ,GAAG,KAAK,CAAC;AAErB,SAAS,GAAG,CAAC,MAAc,EAAE,KAAa,EAAE,KAAe;IACzD,IAAI,QAAQ,EAAE;QACZ,OAAO;KACR;IAED,MAAM,KAAK,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC;IAErE,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACpB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,eAAM,EAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;KAC1D;IAED,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAClC,CAAC;AAED,SAAgB,OAAO,CAAC,KAAa,EAAE,QAAkB,EAAE;IACzD,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAC5B,CAAC;AAFD,0BAEC;AAED,SAAgB,UAAU,CAAC,KAAa,EAAE,QAAkB,EAAE;IAC5D,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAC/B,CAAC;AAFD,gCAEC;AAED,SAAgB,eAAe;IAC7B,UAAU,CAAC,oDAAoD,EAAE;QAC/D,+DAA+D;KAChE,CAAC,CAAC;IACH,QAAQ,GAAG,IAAI,CAAC;AAClB,CAAC;AALD,0CAKC"}

package/dist/utils/make-non-enumerable.d.ts

@@ -1,2 +1,2 @@
-export declare function makeNonEnumerable<O extends any>(obj: O, key: keyof O): void;
+export declare function makeNonEnumerable<O>(obj: O, key: keyof O): void;
 //# sourceMappingURL=make-non-enumerable.d.ts.map

package/dist/utils/make-non-enumerable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"make-non-enumerable.d.ts","sourceRoot":"","sources":["../../src/utils/make-non-enumerable.ts"],"names":[],"mappings":"AACA,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,IAAI,CAE3E"}
+{"version":3,"file":"make-non-enumerable.d.ts","sourceRoot":"","sources":["../../src/utils/make-non-enumerable.ts"],"names":[],"mappings":"AAAA,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,IAAI,CAE/D"}

package/dist/utils/make-non-enumerable.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeNonEnumerable = void 0;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function makeNonEnumerable(obj, key) {
     Object.defineProperty(obj, key, { enumerable: false });
 }

package/dist/utils/make-non-enumerable.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-non-enumerable.js","sourceRoot":"","sources":["../../src/utils/make-non-enumerable.ts"],"names":[],"mappings":";;;AAAA,8DAA8D;AAC9D,SAAgB,iBAAiB,CAAgB,GAAM,EAAE,GAAY;IACnE,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;AACzD,CAAC;AAFD,8CAEC"}
+{"version":3,"file":"make-non-enumerable.js","sourceRoot":"","sources":["../../src/utils/make-non-enumerable.ts"],"names":[],"mappings":";;;AAAA,SAAgB,iBAAiB,CAAI,GAAM,EAAE,GAAY;IACvD,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;AACzD,CAAC;AAFD,8CAEC"}

package/dist/utils/parse-type-id.js

@@ -67,7 +67,7 @@ function parseTypeId(id) {
             tail = id.slice(startTail) || undefined;
         }
         else {
-            assert_1.default(id.slice(startTail, openRet.index) === 'returns', `Malformed type id ${id}`);
+            (0, assert_1.default)(id.slice(startTail, openRet.index) === 'returns', `Malformed type id ${id}`);
             rets = parseList();
         }
     }

package/dist/utils/parse-type-id.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-type-id.js","sourceRoot":"","sources":["../../src/utils/parse-type-id.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parse-type-id.js","sourceRoot":"","sources":["../../src/utils/parse-type-id.ts"],"names":[],"mappings":"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"}

package/dist/utils/parse-type-id.test.js

@@ -18,8 +18,8 @@ const fixtures = [
     't_array(t_function_internal_nonpayable(t_uint256)returns(t_address))10_storage',
 ];
 for (const f of fixtures) {
-    ava_1.default(f, t => {
-        t.snapshot(parse_type_id_1.parseTypeId(f));
+    (0, ava_1.default)(f, t => {
+        t.snapshot((0, parse_type_id_1.parseTypeId)(f));
     });
 }
 //# sourceMappingURL=parse-type-id.test.js.map

package/dist/utils/parse-type-id.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-type-id.test.js","sourceRoot":"","sources":["../../src/utils/parse-type-id.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AAEvB,mDAA8C;AAE9C,MAAM,QAAQ,GAAG;IACf,WAAW;IACX,gBAAgB;IAChB,kCAAkC;IAClC,6BAA6B;IAC7B,gCAAgC;IAChC,8BAA8B;IAC9B,iDAAiD;IACjD,+DAA+D;IAC/D,oDAAoD;IACpD,gFAAgF;CACjF,CAAC;AAEF,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE;IACxB,aAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;QACV,CAAC,CAAC,QAAQ,CAAC,2BAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;CACJ"}
+{"version":3,"file":"parse-type-id.test.js","sourceRoot":"","sources":["../../src/utils/parse-type-id.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AAEvB,mDAA8C;AAE9C,MAAM,QAAQ,GAAG;IACf,WAAW;IACX,gBAAgB;IAChB,kCAAkC;IAClC,6BAA6B;IAC7B,gCAAgC;IAChC,8BAA8B;IAC9B,iDAAiD;IACjD,+DAA+D;IAC/D,oDAAoD;IACpD,gFAAgF;CACjF,CAAC;AAEF,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE;IACxB,IAAA,aAAI,EAAC,CAAC,EAAE,CAAC,CAAC,EAAE;QACV,CAAC,CAAC,QAAQ,CAAC,IAAA,2BAAW,EAAC,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;CACJ"}

package/dist/utils/type-id.js

@@ -46,7 +46,7 @@ function stabilizeTypeIdentifier(typeIdentifier) {
         let i;
         let d = 1;
         for (i = match.index + match[0].length; d !== 0; i++) {
-            assert_1.default(i < decoded.length, 'index out of bounds');
+            (0, assert_1.default)(i < decoded.length, 'index out of bounds');
             const c = decoded[i];
             if (c === '(') {
                 d += 1;

package/dist/utils/type-id.js.map

@@ -1 +1 @@
-{"version":3,"file":"type-id.js","sourceRoot":"","sources":["../../src/utils/type-id.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAE5B,6EAA6E;AAC7E,yEAAyE;AACzE,eAAe;AACf,eAAe;AACf,gBAAgB;AAChB,4EAA4E;AAC5E,4EAA4E;AAC5E,0BAA0B;AAC1B,SAAgB,oBAAoB,CAAC,cAAsB;IACzD,OAAO,cAAc,CAAC,OAAO,CAAC,6CAA6C,EAAE,CAAC,CAAC,EAAE;QAC/E,QAAQ,CAAC,EAAE;YACT,KAAK,IAAI;gBACP,OAAO,GAAG,CAAC;YACb,KAAK,IAAI;gBACP,OAAO,GAAG,CAAC;YACb,KAAK,KAAK;gBACR,OAAO,GAAG,CAAC;YACb;gBACE,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;SAClC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAbD,oDAaC;AAED,yEAAyE;AACzE,6EAA6E;AAC7E,4CAA4C;AAC5C,SAAgB,uBAAuB,CAAC,cAAsB;IAC5D,OAAO,oBAAoB,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;AACrF,CAAC;AAFD,0DAEC;AAED,yEAAyE;AACzE,wEAAwE;AACxE,sCAAsC;AACtC,SAAgB,uBAAuB,CAAC,cAAsB;IAC5D,IAAI,OAAO,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;IACnD,MAAM,EAAE,GAAG,iCAAiC,CAAC;IAC7C,IAAI,KAAK,CAAC;IACV,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE;QACjC,IAAI,CAAC,CAAC;QACN,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,CAAC,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE;YACpD,gBAAM,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;YAClD,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YACrB,IAAI,CAAC,KAAK,GAAG,EAAE;gBACb,CAAC,IAAI,CAAC,CAAC;aACR;iBAAM,IAAI,CAAC,KAAK,GAAG,EAAE;gBACpB,CAAC,IAAI,CAAC,CAAC;aACR;SACF;QACD,MAAM,GAAG,GAAG,QAAQ,CAAC;QACrB,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC;QAClB,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;KACpC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AArBD,0DAqBC"}
+{"version":3,"file":"type-id.js","sourceRoot":"","sources":["../../src/utils/type-id.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAE5B,6EAA6E;AAC7E,yEAAyE;AACzE,eAAe;AACf,eAAe;AACf,gBAAgB;AAChB,4EAA4E;AAC5E,4EAA4E;AAC5E,0BAA0B;AAC1B,SAAgB,oBAAoB,CAAC,cAAsB;IACzD,OAAO,cAAc,CAAC,OAAO,CAAC,6CAA6C,EAAE,CAAC,CAAC,EAAE;QAC/E,QAAQ,CAAC,EAAE;YACT,KAAK,IAAI;gBACP,OAAO,GAAG,CAAC;YACb,KAAK,IAAI;gBACP,OAAO,GAAG,CAAC;YACb,KAAK,KAAK;gBACR,OAAO,GAAG,CAAC;YACb;gBACE,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;SAClC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAbD,oDAaC;AAED,yEAAyE;AACzE,6EAA6E;AAC7E,4CAA4C;AAC5C,SAAgB,uBAAuB,CAAC,cAAsB;IAC5D,OAAO,oBAAoB,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;AACrF,CAAC;AAFD,0DAEC;AAED,yEAAyE;AACzE,wEAAwE;AACxE,sCAAsC;AACtC,SAAgB,uBAAuB,CAAC,cAAsB;IAC5D,IAAI,OAAO,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;IACnD,MAAM,EAAE,GAAG,iCAAiC,CAAC;IAC7C,IAAI,KAAK,CAAC;IACV,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE;QACjC,IAAI,CAAC,CAAC;QACN,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,CAAC,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE;YACpD,IAAA,gBAAM,EAAC,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;YAClD,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YACrB,IAAI,CAAC,KAAK,GAAG,EAAE;gBACb,CAAC,IAAI,CAAC,CAAC;aACR;iBAAM,IAAI,CAAC,KAAK,GAAG,EAAE;gBACpB,CAAC,IAAI,CAAC,CAAC;aACR;SACF;QACD,MAAM,GAAG,GAAG,QAAQ,CAAC;QACrB,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC;QAClB,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;KACpC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AArBD,0DAqBC"}

package/dist/validate/error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/validate/error.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,aAAa,EAAqB,MAAM,UAAU,CAAC;AAE5D,qBAAa,gBAAiB,SAAQ,aAAa;IACf,QAAQ,CAAC,MAAM,EAAE,eAAe,EAAE;gBAAxD,YAAY,EAAE,MAAM,EAAW,MAAM,EAAE,eAAe,EAAE;CAKrE"}
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/validate/error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGzC,qBAAa,gBAAiB,SAAQ,aAAa;IACf,QAAQ,CAAC,MAAM,EAAE,eAAe,EAAE;gBAAxD,YAAY,EAAE,MAAM,EAAW,MAAM,EAAE,eAAe,EAAE;CAKrE"}

package/dist/validate/error.js

@@ -1,78 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ValidationErrors = void 0;
-const chalk_1 = __importDefault(require("chalk"));
 const error_1 = require("../error");
+const report_1 = require("./report");
 class ValidationErrors extends error_1.UpgradesError {
     constructor(contractName, errors) {
-        super(`Contract \`${contractName}\` is not upgrade safe`, () => {
-            return errors.map(describeError).join('\n\n');
-        });
+        super(`Contract \`${contractName}\` is not upgrade safe`, () => new report_1.UpgradeableContractErrorReport(errors).explain());
         this.errors = errors;
     }
 }
 exports.ValidationErrors = ValidationErrors;
-const errorInfo = {
-    constructor: {
-        msg: e => `Contract \`${e.contract}\` has a constructor`,
-        hint: () => 'Define an initializer instead',
-        link: 'https://zpl.in/upgrades/error-001',
-    },
-    delegatecall: {
-        msg: () => `Use of delegatecall is not allowed`,
-        link: 'https://zpl.in/upgrades/error-002',
-    },
-    selfdestruct: {
-        msg: () => `Use of selfdestruct is not allowed`,
-        link: 'https://zpl.in/upgrades/error-003',
-    },
-    'state-variable-assignment': {
-        msg: e => `Variable \`${e.name}\` is assigned an initial value`,
-        hint: () => 'Move the assignment to the initializer',
-        link: 'https://zpl.in/upgrades/error-004',
-    },
-    'state-variable-immutable': {
-        msg: e => `Variable \`${e.name}\` is immutable`,
-        hint: () => `Use a constant or mutable variable instead`,
-        link: 'https://zpl.in/upgrades/error-005',
-    },
-    'external-library-linking': {
-        msg: e => `Linking external libraries like \`${e.name}\` is not yet supported`,
-        hint: () => `Use libraries with internal functions only, or skip this check with the \`unsafeAllowLinkedLibraries\` flag \n` +
-            `    if you have manually checked that the libraries are upgrade safe`,
-        link: 'https://zpl.in/upgrades/error-006',
-    },
-    'struct-definition': {
-        msg: e => `Structs like \`${e.name}\` are supported in the latest version of the plugin`,
-        hint: () => `Update your dependency and run again`,
-    },
-    'enum-definition': {
-        msg: e => `Enums like \`${e.name}\` are supported in the latest version of the plugin`,
-        hint: () => `Update your dependency and run again`,
-    },
-    'missing-public-upgradeto': {
-        msg: () => `Implementation is missing a public \`upgradeTo(address)\` function`,
-        hint: () => `Inherit UUPSUpgradeable to include this function in your contract\n` +
-            `    @openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol`,
-        link: 'https://zpl.in/upgrades/error-008',
-    },
-};
-function describeError(e) {
-    var _a;
-    const info = errorInfo[e.kind];
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const log = [chalk_1.default.bold(e.src) + ': ' + info.msg(e)];
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const hint = (_a = info.hint) === null || _a === void 0 ? void 0 : _a.call(info, e);
-    if (hint) {
-        log.push(hint);
-    }
-    if (info.link) {
-        log.push(chalk_1.default.dim(info.link));
-    }
-    return log.join('\n    ');
-}
 //# sourceMappingURL=error.js.map

package/dist/validate/error.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/validate/error.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAG1B,oCAA4D;AAE5D,MAAa,gBAAiB,SAAQ,qBAAa;IACjD,YAAY,YAAoB,EAAW,MAAyB;QAClE,KAAK,CAAC,cAAc,YAAY,wBAAwB,EAAE,GAAG,EAAE;YAC7D,OAAO,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAHsC,WAAM,GAAN,MAAM,CAAmB;IAIpE,CAAC;CACF;AAND,4CAMC;AAED,MAAM,SAAS,GAAuC;IACpD,WAAW,EAAE;QACX,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,QAAQ,sBAAsB;QACxD,IAAI,EAAE,GAAG,EAAE,CAAC,+BAA+B;QAC3C,IAAI,EAAE,mCAAmC;KAC1C;IACD,YAAY,EAAE;QACZ,GAAG,EAAE,GAAG,EAAE,CAAC,oCAAoC;QAC/C,IAAI,EAAE,mCAAmC;KAC1C;IACD,YAAY,EAAE;QACZ,GAAG,EAAE,GAAG,EAAE,CAAC,oCAAoC;QAC/C,IAAI,EAAE,mCAAmC;KAC1C;IACD,2BAA2B,EAAE;QAC3B,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,IAAI,iCAAiC;QAC/D,IAAI,EAAE,GAAG,EAAE,CAAC,wCAAwC;QACpD,IAAI,EAAE,mCAAmC;KAC1C;IACD,0BAA0B,EAAE;QAC1B,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,IAAI,iBAAiB;QAC/C,IAAI,EAAE,GAAG,EAAE,CAAC,4CAA4C;QACxD,IAAI,EAAE,mCAAmC;KAC1C;IACD,0BAA0B,EAAE;QAC1B,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,qCAAqC,CAAC,CAAC,IAAI,yBAAyB;QAC9E,IAAI,EAAE,GAAG,EAAE,CACT,gHAAgH;YAChH,sEAAsE;QACxE,IAAI,EAAE,mCAAmC;KAC1C;IACD,mBAAmB,EAAE;QACnB,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,IAAI,sDAAsD;QACxF,IAAI,EAAE,GAAG,EAAE,CAAC,sCAAsC;KACnD;IACD,iBAAiB,EAAE;QACjB,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,IAAI,sDAAsD;QACtF,IAAI,EAAE,GAAG,EAAE,CAAC,sCAAsC;KACnD;IACD,0BAA0B,EAAE;QAC1B,GAAG,EAAE,GAAG,EAAE,CAAC,oEAAoE;QAC/E,IAAI,EAAE,GAAG,EAAE,CACT,qEAAqE;YACrE,yEAAyE;QAC3E,IAAI,EAAE,mCAAmC;KAC1C;CACF,CAAC;AAEF,SAAS,aAAa,CAAC,CAAkB;;IACvC,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC/B,8DAA8D;IAC9D,MAAM,GAAG,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAQ,CAAC,CAAC,CAAC;IAC5D,8DAA8D;IAC9D,MAAM,IAAI,GAAG,MAAA,IAAI,CAAC,IAAI,+CAAT,IAAI,EAAQ,CAAQ,CAAC,CAAC;IACnC,IAAI,IAAI,EAAE;QACR,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KAChB;IACD,IAAI,IAAI,CAAC,IAAI,EAAE;QACb,GAAG,CAAC,IAAI,CAAC,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;KAChC;IACD,OAAO,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/validate/error.ts"],"names":[],"mappings":";;;AACA,oCAAyC;AACzC,qCAA0D;AAE1D,MAAa,gBAAiB,SAAQ,qBAAa;IACjD,YAAY,YAAoB,EAAW,MAAyB;QAClE,KAAK,CAAC,cAAc,YAAY,wBAAwB,EAAE,GAAG,EAAE,CAC7D,IAAI,uCAA8B,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CACrD,CAAC;QAHuC,WAAM,GAAN,MAAM,CAAmB;IAIpE,CAAC;CACF;AAND,4CAMC"}

package/dist/validate/index.d.ts

@@ -1,7 +1,9 @@
 export { validate, ValidationRunData, ContractValidation } from './run';
-export { ValidationOptions, withValidationDefaults, silenceWarnings } from './overrides';
+export { ValidationOptions, withValidationDefaults } from './overrides';
 export { ValidationErrors } from './error';
 export { RunValidation, ValidationLog, Validation, ValidationResult } from './compat';
 export { ValidationData, ValidationDataCurrent, isCurrentValidationData, concatRunData } from './data';
-export { getContractVersion, getContractNameAndRunValidation, getStorageLayout, assertUpgradeSafe, getUnlinkedBytecode, getErrors, isUpgradeSafe, } from './query';
+export { getContractVersion, getContractNameAndRunValidation, getStorageLayout, assertUpgradeSafe, getUnlinkedBytecode, getErrors, isUpgradeSafe, inferProxyKind, } from './query';
+export { UpgradeableContractErrorReport } from './report';
+export { silenceWarnings } from '../utils/log';
 //# sourceMappingURL=index.d.ts.map

package/dist/validate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/validate/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACtF,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACvG,OAAO,EACL,kBAAkB,EAClB,+BAA+B,EAC/B,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,SAAS,EACT,aAAa,GACd,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/validate/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACtF,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACvG,OAAO,EACL,kBAAkB,EAClB,+BAA+B,EAC/B,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,SAAS,EACT,aAAa,EACb,cAAc,GACf,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAC;AAG1D,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC"}

package/dist/validate/index.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isUpgradeSafe = exports.getErrors = exports.getUnlinkedBytecode = exports.assertUpgradeSafe = exports.getStorageLayout = exports.getContractNameAndRunValidation = exports.getContractVersion = exports.concatRunData = exports.isCurrentValidationData = exports.ValidationErrors = exports.silenceWarnings = exports.withValidationDefaults = exports.validate = void 0;
+exports.silenceWarnings = exports.UpgradeableContractErrorReport = exports.inferProxyKind = exports.isUpgradeSafe = exports.getErrors = exports.getUnlinkedBytecode = exports.assertUpgradeSafe = exports.getStorageLayout = exports.getContractNameAndRunValidation = exports.getContractVersion = exports.concatRunData = exports.isCurrentValidationData = exports.ValidationErrors = exports.withValidationDefaults = exports.validate = void 0;
 var run_1 = require("./run");
 Object.defineProperty(exports, "validate", { enumerable: true, get: function () { return run_1.validate; } });
 var overrides_1 = require("./overrides");
 Object.defineProperty(exports, "withValidationDefaults", { enumerable: true, get: function () { return overrides_1.withValidationDefaults; } });
-Object.defineProperty(exports, "silenceWarnings", { enumerable: true, get: function () { return overrides_1.silenceWarnings; } });
 var error_1 = require("./error");
 Object.defineProperty(exports, "ValidationErrors", { enumerable: true, get: function () { return error_1.ValidationErrors; } });
 var data_1 = require("./data");
@@ -19,4 +18,10 @@ Object.defineProperty(exports, "assertUpgradeSafe", { enumerable: true, get: fun
 Object.defineProperty(exports, "getUnlinkedBytecode", { enumerable: true, get: function () { return query_1.getUnlinkedBytecode; } });
 Object.defineProperty(exports, "getErrors", { enumerable: true, get: function () { return query_1.getErrors; } });
 Object.defineProperty(exports, "isUpgradeSafe", { enumerable: true, get: function () { return query_1.isUpgradeSafe; } });
+Object.defineProperty(exports, "inferProxyKind", { enumerable: true, get: function () { return query_1.inferProxyKind; } });
+var report_1 = require("./report");
+Object.defineProperty(exports, "UpgradeableContractErrorReport", { enumerable: true, get: function () { return report_1.UpgradeableContractErrorReport; } });
+// Backwards compatibility
+var log_1 = require("../utils/log");
+Object.defineProperty(exports, "silenceWarnings", { enumerable: true, get: function () { return log_1.silenceWarnings; } });
 //# sourceMappingURL=index.js.map

package/dist/validate/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validate/index.ts"],"names":[],"mappings":";;;AAAA,6BAAwE;AAA/D,+FAAA,QAAQ,OAAA;AACjB,yCAAyF;AAA7D,mHAAA,sBAAsB,OAAA;AAAE,4GAAA,eAAe,OAAA;AACnE,iCAA2C;AAAlC,yGAAA,gBAAgB,OAAA;AAEzB,+BAAuG;AAAvD,+GAAA,uBAAuB,OAAA;AAAE,qGAAA,aAAa,OAAA;AACtF,iCAQiB;AAPf,2GAAA,kBAAkB,OAAA;AAClB,wHAAA,+BAA+B,OAAA;AAC/B,yGAAA,gBAAgB,OAAA;AAChB,0GAAA,iBAAiB,OAAA;AACjB,4GAAA,mBAAmB,OAAA;AACnB,kGAAA,SAAS,OAAA;AACT,sGAAA,aAAa,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validate/index.ts"],"names":[],"mappings":";;;AAAA,6BAAwE;AAA/D,+FAAA,QAAQ,OAAA;AACjB,yCAAwE;AAA5C,mHAAA,sBAAsB,OAAA;AAClD,iCAA2C;AAAlC,yGAAA,gBAAgB,OAAA;AAEzB,+BAAuG;AAAvD,+GAAA,uBAAuB,OAAA;AAAE,qGAAA,aAAa,OAAA;AACtF,iCASiB;AARf,2GAAA,kBAAkB,OAAA;AAClB,wHAAA,+BAA+B,OAAA;AAC/B,yGAAA,gBAAgB,OAAA;AAChB,0GAAA,iBAAiB,OAAA;AACjB,4GAAA,mBAAmB,OAAA;AACnB,kGAAA,SAAS,OAAA;AACT,sGAAA,aAAa,OAAA;AACb,uGAAA,cAAc,OAAA;AAEhB,mCAA0D;AAAjD,wHAAA,8BAA8B,OAAA;AAEvC,0BAA0B;AAC1B,oCAA+C;AAAtC,sGAAA,eAAe,OAAA"}

package/dist/validate/overrides.d.ts

@@ -1,5 +1,6 @@
 import { ValidationError } from './run';
 import { ProxyDeployment } from '../manifest';
+export { silenceWarnings } from '../utils/log';
 export interface ValidationOptions {
     unsafeAllowCustomTypes?: boolean;
     unsafeAllowLinkedLibraries?: boolean;
@@ -10,6 +11,4 @@ export interface ValidationOptions {
 export declare const ValidationErrorUnsafeMessages: Record<ValidationError['kind'], string[]>;
 export declare function withValidationDefaults(opts: ValidationOptions): Required<ValidationOptions>;
 export declare function processExceptions(contractName: string, errors: ValidationError[], opts: ValidationOptions): ValidationError[];
-export declare function silenceWarnings(): void;
-export declare function isSilencingWarnings(): boolean;
 //# sourceMappingURL=overrides.d.ts.map

package/dist/validate/overrides.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"overrides.d.ts","sourceRoot":"","sources":["../../src/validate/overrides.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAG9C,MAAM,WAAW,iBAAiB;IAChC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;IACxC,IAAI,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;CAChC;AAED,eAAO,MAAM,6BAA6B,EAAE,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CA0BnF,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAmB3F;AAED,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,eAAe,EAAE,EACzB,IAAI,EAAE,iBAAiB,GACtB,eAAe,EAAE,CAwBnB;AAID,wBAAgB,eAAe,IAAI,IAAI,CAOtC;AAED,wBAAgB,mBAAmB,IAAI,OAAO,CAE7C"}
+{"version":3,"file":"overrides.d.ts","sourceRoot":"","sources":["../../src/validate/overrides.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAI9C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,iBAAiB;IAChC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;IACxC,IAAI,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;CAChC;AAED,eAAO,MAAM,6BAA6B,EAAE,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CA0BnF,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAmB3F;AAED,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,eAAe,EAAE,EACzB,IAAI,EAAE,iBAAiB,GACtB,eAAe,EAAE,CAwBnB"}

package/dist/validate/overrides.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSilencingWarnings = exports.silenceWarnings = exports.processExceptions = exports.withValidationDefaults = exports.ValidationErrorUnsafeMessages = void 0;
+exports.processExceptions = exports.withValidationDefaults = exports.ValidationErrorUnsafeMessages = exports.silenceWarnings = void 0;
 const log_1 = require("../utils/log");
+// Backwards compatibility
+var log_2 = require("../utils/log");
+Object.defineProperty(exports, "silenceWarnings", { enumerable: true, get: function () { return log_2.silenceWarnings; } });
 exports.ValidationErrorUnsafeMessages = {
     'state-variable-assignment': [
         `You are using the \`unsafeAllow.state-variable-assignment\` flag.`,
@@ -47,7 +50,7 @@ function withValidationDefaults(opts) {
 exports.withValidationDefaults = withValidationDefaults;
 function processExceptions(contractName, errors, opts) {
     const { unsafeAllow } = withValidationDefaults(opts);
-    if (opts.kind === 'transparent') {
+    if (opts.kind === 'transparent' || opts.kind === 'beacon') {
         errors = errors.filter(error => error.kind !== 'missing-public-upgradeto');
     }
     for (const [errorType, errorDescription] of Object.entries(exports.ValidationErrorUnsafeMessages)) {
@@ -58,26 +61,12 @@ function processExceptions(contractName, errors, opts) {
                 exceptionsFound = exceptionsFound || isException;
                 return !isException;
             });
-            if (exceptionsFound && !silenced && errorDescription) {
-                log_1.logWarning(`Potentially unsafe deployment of ${contractName}`, errorDescription);
+            if (exceptionsFound && errorDescription) {
+                (0, log_1.logWarning)(`Potentially unsafe deployment of ${contractName}`, errorDescription);
             }
         }
     }
     return errors;
 }
 exports.processExceptions = processExceptions;
-let silenced = false;
-function silenceWarnings() {
-    if (!silenced) {
-        log_1.logWarning(`All subsequent Upgrades warnings will be silenced.`, [
-            `Make sure you have manually checked all uses of unsafe flags.`,
-        ]);
-        silenced = true;
-    }
-}
-exports.silenceWarnings = silenceWarnings;
-function isSilencingWarnings() {
-    return silenced;
-}
-exports.isSilencingWarnings = isSilencingWarnings;
 //# sourceMappingURL=overrides.js.map

package/dist/validate/overrides.js.map

@@ -1 +1 @@
-{"version":3,"file":"overrides.js","sourceRoot":"","sources":["../../src/validate/overrides.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"overrides.js","sourceRoot":"","sources":["../../src/validate/overrides.ts"],"names":[],"mappings":";;;AAEA,sCAA0C;AAE1C,0BAA0B;AAC1B,oCAA+C;AAAtC,sGAAA,eAAe,OAAA;AAUX,QAAA,6BAA6B,GAA8C;IACtF,2BAA2B,EAAE;QAC3B,mEAAmE;QACnE,mEAAmE;KACpE;IACD,0BAA0B,EAAE,CAAC,kEAAkE,CAAC;IAChG,0BAA0B,EAAE;QAC1B,gGAAgG;QAChG,iFAAiF;KAClF;IACD,mBAAmB,EAAE;QACnB,8FAA8F;QAC9F,+EAA+E;KAChF;IACD,iBAAiB,EAAE;QACjB,0FAA0F;QAC1F,+EAA+E;KAChF;IACD,WAAW,EAAE,CAAC,qDAAqD,CAAC;IACpE,YAAY,EAAE,CAAC,sDAAsD,CAAC;IACtE,YAAY,EAAE,CAAC,sDAAsD,CAAC;IACtE,0BAA0B,EAAE;QAC1B,kFAAkF;QAClF,yFAAyF;QACzF,gFAAgF;KACjF;CACF,CAAC;AAEF,SAAgB,sBAAsB,CAAC,IAAuB;;IAC5D,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,WAAW,mCAAI,EAAE,CAAC;IAC3C,MAAM,sBAAsB,GAC1B,MAAA,IAAI,CAAC,sBAAsB,mCAC3B,CAAC,WAAW,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACzF,MAAM,0BAA0B,GAC9B,MAAA,IAAI,CAAC,0BAA0B,mCAAI,WAAW,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC;IAEtF,IAAI,sBAAsB,EAAE;QAC1B,WAAW,CAAC,IAAI,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,CAAC;KAC1D;IACD,IAAI,0BAA0B,EAAE;QAC9B,WAAW,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;KAC9C;IACD,MAAM,IAAI,GAAG,MAAA,IAAI,CAAC,IAAI,mCAAI,aAAa,CAAC;IAExC,MAAM,kBAAkB,GAAG,MAAA,IAAI,CAAC,kBAAkB,mCAAI,KAAK,CAAC;IAE5D,OAAO,EAAE,sBAAsB,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;AACvG,CAAC;AAnBD,wDAmBC;AAED,SAAgB,iBAAiB,CAC/B,YAAoB,EACpB,MAAyB,EACzB,IAAuB;IAEvB,MAAM,EAAE,WAAW,EAAE,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAErD,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;QACzD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,0BAA0B,CAAC,CAAC;KAC5E;IAED,KAAK,MAAM,CAAC,SAAS,EAAE,gBAAgB,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,qCAA6B,CAAC,EAAE;QACzF,IAAI,WAAW,CAAC,QAAQ,CAAC,SAAoC,CAAC,EAAE;YAC9D,IAAI,eAAe,GAAG,KAAK,CAAC;YAE5B,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBAC7B,MAAM,WAAW,GAAG,SAAS,KAAK,KAAK,CAAC,IAAI,CAAC;gBAC7C,eAAe,GAAG,eAAe,IAAI,WAAW,CAAC;gBACjD,OAAO,CAAC,WAAW,CAAC;YACtB,CAAC,CAAC,CAAC;YAEH,IAAI,eAAe,IAAI,gBAAgB,EAAE;gBACvC,IAAA,gBAAU,EAAC,oCAAoC,YAAY,EAAE,EAAE,gBAAgB,CAAC,CAAC;aAClF;SACF;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AA5BD,8CA4BC"}