@openzeppelin/upgrades-core 1.45.0-alpha.1 → 1.46.0

package/dist/storage-erc7201-builtin.test.js

@@ -0,0 +1,105 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ava_1 = __importDefault(require("ava"));
+const utils_1 = require("solidity-ast/utils");
+const hardhat_1 = require("hardhat");
+const storage_1 = require("./storage");
+const extract_1 = require("./storage/extract");
+const test = ava_1.default;
+const SOURCE = 'contracts/test/Erc7201Builtin.sol';
+test.before(async (t) => {
+    const buildInfo = await hardhat_1.artifacts.getBuildInfo(`${SOURCE}:Erc7201Builtin`);
+    if (buildInfo === undefined) {
+        throw new Error('Build info not found');
+    }
+    const solcOutput = buildInfo.output;
+    const contracts = {};
+    const storageLayouts = {};
+    for (const def of (0, utils_1.findAll)('ContractDefinition', solcOutput.sources[SOURCE].ast)) {
+        contracts[def.name] = def;
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        storageLayouts[def.name] = solcOutput.contracts[SOURCE][def.name].storageLayout;
+    }
+    const deref = (0, utils_1.astDereferencer)(solcOutput);
+    t.context.extractStorageLayout = name => (0, extract_1.extractStorageLayout)(contracts[name], dummyDecodeSrc, deref, storageLayouts[name]);
+    t.context.extractStorageLayoutFallback = name => (0, extract_1.extractStorageLayout)(contracts[name], dummyDecodeSrc, deref, undefined);
+});
+const dummyDecodeSrc = () => 'file.sol:1';
+test('erc7201 builtin base slot - extract', t => {
+    const layout = t.context.extractStorageLayout('Erc7201Builtin');
+    t.is(layout.baseSlot, '0x183a6125c38840424c4a85fa12bab2ab606c4b6d0e7cc73c0c06ba5300eab500');
+    t.is(layout.storage.length, 1);
+    t.is(layout.storage[0].label, 'a');
+});
+test('erc7201 builtin base slot - append - ok', t => {
+    const v1 = t.context.extractStorageLayout('Erc7201Builtin');
+    const v2 = t.context.extractStorageLayout('Erc7201Builtin_Append_Ok');
+    t.deepEqual((0, storage_1.getStorageUpgradeErrors)(v1, v2), []);
+});
+test('erc7201 builtin base slot - append - fallback - ok', t => {
+    const v1 = t.context.extractStorageLayoutFallback('Erc7201Builtin');
+    const v2 = t.context.extractStorageLayoutFallback('Erc7201Builtin_Append_Ok');
+    t.deepEqual((0, storage_1.getStorageUpgradeErrors)(v1, v2), []);
+});
+test('erc7201 builtin base slot - changed id - bad', t => {
+    const v1 = t.context.extractStorageLayout('Erc7201Builtin');
+    const v2 = t.context.extractStorageLayout('Erc7201Builtin_Changed_Id_Bad');
+    const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
+    t.true(comparison.length > 0);
+    t.is(comparison[0].kind, 'layoutchange');
+});
+test('erc7201 builtin base slot - changed id - fallback - bad', t => {
+    const v1 = t.context.extractStorageLayoutFallback('Erc7201Builtin');
+    const v2 = t.context.extractStorageLayoutFallback('Erc7201Builtin_Changed_Id_Bad');
+    // Base slot differs between the two erc7201 ids, so the fallback base-slot check must fail.
+    t.throws(() => (0, storage_1.getStorageUpgradeErrors)(v1, v2), {
+        message: /Base slot for custom storage layout changed/,
+    });
+});
+test('erc7201 builtin and literal-equivalent base slots compare equal', t => {
+    const builtin = t.context.extractStorageLayout('Erc7201Builtin');
+    const literal = t.context.extractStorageLayout('Erc7201Builtin_Literal_Equivalent');
+    // Both resolve to the same base slot; the fallback (base-slot) check must treat them as unchanged.
+    const builtinFallback = t.context.extractStorageLayoutFallback('Erc7201Builtin');
+    const literalFallback = t.context.extractStorageLayoutFallback('Erc7201Builtin_Literal_Equivalent');
+    t.deepEqual((0, storage_1.getStorageUpgradeErrors)(builtin, literal), []);
+    t.deepEqual((0, storage_1.getStorageUpgradeErrors)(builtinFallback, literalFallback), []);
+});
+test('erc7201 builtin base slot clashes with namespace - error', t => {
+    t.throws(() => t.context.extractStorageLayout('Erc7201Builtin_Clash'), {
+        message: /Custom layout for contract Erc7201Builtin_Clash clashes with the storage location for namespace erc7201:example\.main/,
+    });
+});
+test('erc7201 builtin base slot different from namespace - no error and no warning', t => {
+    const warnings = captureWarnings(() => {
+        const layout = t.context.extractStorageLayout('Erc7201Builtin_NoClash_NoWarning');
+        t.truthy(layout.baseSlot);
+    });
+    t.deepEqual(warnings, []);
+});
+test('erc7201 builtin accepts a unicode string literal argument', t => {
+    const layout = t.context.extractStorageLayout('Erc7201Builtin_Unicode');
+    t.is(layout.baseSlot, '0x2d3e72b7d91644a80150e2643e65016def7067dc9568719707e7eca1a5dab800');
+});
+test('literal base slot with namespace - warning not suppressed', t => {
+    const warnings = captureWarnings(() => t.context.extractStorageLayout('Erc7201Builtin_LiteralBase_Warns'));
+    t.true(warnings.some(w => w.includes('custom storage layout')));
+});
+function captureWarnings(fn) {
+    const warnings = [];
+    const original = console.error;
+    console.error = (...args) => {
+        warnings.push(args.map(String).join(' '));
+    };
+    try {
+        fn();
+    }
+    finally {
+        console.error = original;
+    }
+    return warnings;
+}
+//# sourceMappingURL=storage-erc7201-builtin.test.js.map

package/dist/storage-erc7201-builtin.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage-erc7201-builtin.test.js","sourceRoot":"","sources":["../src/storage-erc7201-builtin.test.ts"],"names":[],"mappings":"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"}

package/dist/utils/erc7201-builtin.d.ts

@@ -0,0 +1,24 @@
+import { Expression } from 'solidity-ast';
+/**
+ * Recognizes the Solidity 0.8.35+ `erc7201(string)` comptime builtin, which evaluates the ERC-7201
+ * storage location for a namespace id and can be used in a compile-time context such as a `layout at`
+ * specifier (e.g. `contract C layout at erc7201("example.main")`).
+ *
+ * The builtin compiles to an ordinary `FunctionCall` node, so it is matched by its shape rather than
+ * by a dedicated AST node type.
+ *
+ * @param node The expression to check.
+ * @returns The namespace id passed to the builtin (without the `erc7201:` prefix), or undefined if the
+ *   expression is not a call to the `erc7201` builtin with a single string literal argument.
+ */
+export declare function getErc7201BuiltinNamespaceId(node: Expression): string | undefined;
+/**
+ * Resolves an expression to its base slot as a normalized uint256 hex string, for either a numeric
+ * literal or an `erc7201(...)` builtin call.
+ *
+ * @param node The expression to resolve.
+ * @returns The normalized base slot hex string, or undefined if the expression is neither a numeric
+ *   literal nor a resolvable `erc7201(...)` builtin call.
+ */
+export declare function resolveBaseSlot(node: Expression): string | undefined;
+//# sourceMappingURL=erc7201-builtin.d.ts.map

package/dist/utils/erc7201-builtin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"erc7201-builtin.d.ts","sourceRoot":"","sources":["../../src/utils/erc7201-builtin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAW,MAAM,cAAc,CAAC;AAKnD;;;;;;;;;;;GAWG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,SAAS,CAmCjF;AAUD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,SAAS,CAWpE"}

package/dist/utils/erc7201-builtin.js

@@ -0,0 +1,83 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getErc7201BuiltinNamespaceId = getErc7201BuiltinNamespaceId;
+exports.resolveBaseSlot = resolveBaseSlot;
+const erc7201_1 = require("./erc7201");
+const integer_literals_1 = require("./integer-literals");
+const error_1 = require("../error");
+/**
+ * Recognizes the Solidity 0.8.35+ `erc7201(string)` comptime builtin, which evaluates the ERC-7201
+ * storage location for a namespace id and can be used in a compile-time context such as a `layout at`
+ * specifier (e.g. `contract C layout at erc7201("example.main")`).
+ *
+ * The builtin compiles to an ordinary `FunctionCall` node, so it is matched by its shape rather than
+ * by a dedicated AST node type.
+ *
+ * @param node The expression to check.
+ * @returns The namespace id passed to the builtin (without the `erc7201:` prefix), or undefined if the
+ *   expression is not a call to the `erc7201` builtin with a single string literal argument.
+ */
+function getErc7201BuiltinNamespaceId(node) {
+    // Check that this is a function call to an identifier named `erc7201`. Return undefined for
+    // anything else so the caller can fall through to other base-slot forms.
+    if (node.nodeType !== 'FunctionCall' || node.kind !== 'functionCall') {
+        return undefined;
+    }
+    const callee = node.expression;
+    if (callee.nodeType !== 'Identifier' || callee.name !== 'erc7201') {
+        return undefined;
+    }
+    // Beyond this point, the call is to `erc7201(...)`. Check its expected shape — one string-literal
+    // argument with no user-defined declaration shadowing the builtin — and throw if anything is off.
+    // Valid Solidity 0.8.35+ cannot produce these mismatches in a call to the builtin:
+    //   - User-defined `erc7201` (`referencedDeclaration >= 0`): solc resolves the call to the builtin
+    //     when both are in scope, so this shape doesn't reach a successful compile.
+    //   - Wrong number of arguments: enforced by the builtin's signature.
+    //   - Non-`Literal` argument or non-string literal `kind`: the builtin's signature requires a
+    //     comptime-constant string literal. `hex"..."` is type `bytes` and wouldn't typecheck.
+    // We throw instead of returning undefined so a future solc emitting one of these surfaces loudly.
+    if (typeof callee.referencedDeclaration === 'number' && callee.referencedDeclaration >= 0) {
+        throw unexpectedErc7201BuiltinAst('callee resolves to a user-defined declaration');
+    }
+    if (node.arguments.length !== 1) {
+        throw unexpectedErc7201BuiltinAst(`expected 1 argument, got ${node.arguments.length}`);
+    }
+    const arg = node.arguments[0];
+    if (arg.nodeType !== 'Literal') {
+        throw unexpectedErc7201BuiltinAst(`argument is ${arg.nodeType}, expected Literal`);
+    }
+    if (arg.kind !== 'string' && arg.kind !== 'unicodeString') {
+        throw unexpectedErc7201BuiltinAst(`argument literal kind is ${arg.kind}, expected string or unicodeString`);
+    }
+    return getStringLiteralValue(arg);
+}
+function unexpectedErc7201BuiltinAst(detail) {
+    return new error_1.UpgradesError(`Unexpected AST for \`erc7201(...)\` builtin call: ${detail}`, () => 'Please report this at https://zpl.in/upgrades/report and include the `erc7201(...)` expression from your contract.');
+}
+/**
+ * Resolves an expression to its base slot as a normalized uint256 hex string, for either a numeric
+ * literal or an `erc7201(...)` builtin call.
+ *
+ * @param node The expression to resolve.
+ * @returns The normalized base slot hex string, or undefined if the expression is neither a numeric
+ *   literal nor a resolvable `erc7201(...)` builtin call.
+ */
+function resolveBaseSlot(node) {
+    if (node.nodeType === 'Literal') {
+        return (0, integer_literals_1.normalizeUint256Literal)(node.value);
+    }
+    const id = getErc7201BuiltinNamespaceId(node);
+    if (id !== undefined) {
+        return (0, erc7201_1.calculateERC7201StorageLocation)(id);
+    }
+    return undefined;
+}
+function getStringLiteralValue(literal) {
+    // solc populates `value` for `kind: 'string'`/`'unicodeString'` literals; throw defensively if
+    // a future solc ever produces a null/missing `value` for such a literal.
+    if (literal.value === undefined || literal.value === null) {
+        throw unexpectedErc7201BuiltinAst('string literal `value` is null or missing');
+    }
+    return literal.value;
+}
+//# sourceMappingURL=erc7201-builtin.js.map

package/dist/utils/erc7201-builtin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"erc7201-builtin.js","sourceRoot":"","sources":["../../src/utils/erc7201-builtin.ts"],"names":[],"mappings":";;AAiBA,oEAmCC;AAkBD,0CAWC;AAhFD,uCAA4D;AAC5D,yDAA6D;AAC7D,oCAAyC;AAEzC;;;;;;;;;;;GAWG;AACH,SAAgB,4BAA4B,CAAC,IAAgB;IAC3D,4FAA4F;IAC5F,yEAAyE;IACzE,IAAI,IAAI,CAAC,QAAQ,KAAK,cAAc,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;QACrE,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC;IAC/B,IAAI,MAAM,CAAC,QAAQ,KAAK,YAAY,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAClE,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,kGAAkG;IAClG,kGAAkG;IAClG,mFAAmF;IACnF,mGAAmG;IACnG,gFAAgF;IAChF,sEAAsE;IACtE,8FAA8F;IAC9F,2FAA2F;IAC3F,kGAAkG;IAClG,IAAI,OAAO,MAAM,CAAC,qBAAqB,KAAK,QAAQ,IAAI,MAAM,CAAC,qBAAqB,IAAI,CAAC,EAAE,CAAC;QAC1F,MAAM,2BAA2B,CAAC,+CAA+C,CAAC,CAAC;IACrF,CAAC;IACD,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChC,MAAM,2BAA2B,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;IACzF,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC9B,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,2BAA2B,CAAC,eAAe,GAAG,CAAC,QAAQ,oBAAoB,CAAC,CAAC;IACrF,CAAC;IACD,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QAC1D,MAAM,2BAA2B,CAAC,4BAA4B,GAAG,CAAC,IAAI,oCAAoC,CAAC,CAAC;IAC9G,CAAC;IAED,OAAO,qBAAqB,CAAC,GAAG,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,2BAA2B,CAAC,MAAc;IACjD,OAAO,IAAI,qBAAa,CACtB,qDAAqD,MAAM,EAAE,EAC7D,GAAG,EAAE,CACH,oHAAoH,CACvH,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,eAAe,CAAC,IAAgB;IAC9C,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO,IAAA,0CAAuB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,EAAE,GAAG,4BAA4B,CAAC,IAAI,CAAC,CAAC;IAC9C,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;QACrB,OAAO,IAAA,yCAA+B,EAAC,EAAE,CAAC,CAAC;IAC7C,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAgB;IAC7C,+FAA+F;IAC/F,yEAAyE;IACzE,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,IAAI,OAAO,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;QAC1D,MAAM,2BAA2B,CAAC,2CAA2C,CAAC,CAAC;IACjF,CAAC;IACD,OAAO,OAAO,CAAC,KAAK,CAAC;AACvB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"erc7201.d.ts","sourceRoot":"","sources":["../../src/utils/erc7201.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,sBAAsB,aAAa,CAAC;AAEjD;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAalE"}
+{"version":3,"file":"erc7201.d.ts","sourceRoot":"","sources":["../../src/utils/erc7201.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,sBAAsB,aAAa,CAAC;AAEjD;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAalE"}

package/dist/utils/erc7201.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ERC7201_FORMULA_PREFIX = void 0;
 exports.calculateERC7201StorageLocation = calculateERC7201StorageLocation;
 const ethereumjs_util_1 = require("ethereumjs-util");
+const integer_literals_1 = require("./integer-literals");
 exports.ERC7201_FORMULA_PREFIX = 'erc7201:';
 /**
  * Returns the ERC-7201 storage location hash for a given namespace id using formula:
@@ -14,11 +15,12 @@ exports.ERC7201_FORMULA_PREFIX = 'erc7201:';
 function calculateERC7201StorageLocation(id) {
     const firstHash = (0, ethereumjs_util_1.keccak256)(Buffer.from(id));
     const minusOne = BigInt(`0x${firstHash.toString('hex')}`) - 1n;
-    const minusOneBuffer = Buffer.from(minusOne.toString(16), 'hex');
+    // Pad to 64 hex chars so that `Buffer.from` doesn't silently truncate odd-length input;
+    // `abi.encode(uint256)` is always 32 bytes.
+    const minusOneBuffer = Buffer.from(minusOne.toString(16).padStart(64, '0'), 'hex');
     const secondHash = (0, ethereumjs_util_1.keccak256)(minusOneBuffer);
     const mask = BigInt('0xff');
     const masked = BigInt(`0x${secondHash.toString('hex')}`) & ~mask;
-    const padded = masked.toString(16).padStart(64, '0');
-    return `0x${padded}`;
+    return (0, integer_literals_1.toBytes32Hex)(masked);
 }
 //# sourceMappingURL=erc7201.js.map

package/dist/utils/erc7201.js.map

@@ -1 +1 @@
-{"version":3,"file":"erc7201.js","sourceRoot":"","sources":["../../src/utils/erc7201.ts"],"names":[],"mappings":";;;AAWA,0EAaC;AAxBD,qDAA4C;AAE/B,QAAA,sBAAsB,GAAG,UAAU,CAAC;AAEjD;;;;;;GAMG;AACH,SAAgB,+BAA+B,CAAC,EAAU;IACxD,MAAM,SAAS,GAAG,IAAA,2BAAS,EAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;IAC/D,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAEjE,MAAM,UAAU,GAAG,IAAA,2BAAS,EAAC,cAAc,CAAC,CAAC;IAE7C,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5B,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;IAEjE,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAErD,OAAO,KAAK,MAAM,EAAE,CAAC;AACvB,CAAC"}
+{"version":3,"file":"erc7201.js","sourceRoot":"","sources":["../../src/utils/erc7201.ts"],"names":[],"mappings":";;;AAaA,0EAaC;AA1BD,qDAA4C;AAE5C,yDAAkD;AAErC,QAAA,sBAAsB,GAAG,UAAU,CAAC;AAEjD;;;;;;GAMG;AACH,SAAgB,+BAA+B,CAAC,EAAU;IACxD,MAAM,SAAS,GAAG,IAAA,2BAAS,EAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;IAC/D,wFAAwF;IACxF,4CAA4C;IAC5C,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;IAEnF,MAAM,UAAU,GAAG,IAAA,2BAAS,EAAC,cAAc,CAAC,CAAC;IAE7C,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5B,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;IAEjE,OAAO,IAAA,+BAAY,EAAC,MAAM,CAAC,CAAC;AAC9B,CAAC"}

package/dist/utils/erc7201.test.js

@@ -8,4 +8,14 @@ const erc7201_1 = require("./erc7201");
 (0, ava_1.default)('calculateERC7201StorageLocation', t => {
     t.is((0, erc7201_1.calculateERC7201StorageLocation)('example.main'), '0x183a6125c38840424c4a85fa12bab2ab606c4b6d0e7cc73c0c06ba5300eab500');
 });
+// `keccak256("ns2") - 1` is 63 hex chars (odd-length), which must be zero-padded to 32 bytes
+// before hashing. Regression test for truncation of the intermediate buffer.
+(0, ava_1.default)('calculateERC7201StorageLocation - odd-length intermediate hash', t => {
+    t.is((0, erc7201_1.calculateERC7201StorageLocation)('ns2'), '0xa61069020885c09e922542fb3fa98c8d50e6481fc1251ff86c3319a70f0f7d00');
+});
+// `keccak256("ns297") - 1` is 62 hex chars (i.e., its top byte is `0x00`). Without zero-padding,
+// `Buffer.from('hex')` would interpret it as a 31-byte buffer rather than 32, producing the wrong hash.
+(0, ava_1.default)('calculateERC7201StorageLocation - leading-zero-byte intermediate hash', t => {
+    t.is((0, erc7201_1.calculateERC7201StorageLocation)('ns297'), '0xe06f9faa11c8032ea604e1764972c1a5594987f1678d8fabf921c28d1a7a4c00');
+});
 //# sourceMappingURL=erc7201.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"erc7201.test.js","sourceRoot":"","sources":["../../src/utils/erc7201.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AAEvB,uCAA4D;AAE5D,IAAA,aAAI,EAAC,iCAAiC,EAAE,CAAC,CAAC,EAAE;IAC1C,CAAC,CAAC,EAAE,CACF,IAAA,yCAA+B,EAAC,cAAc,CAAC,EAC/C,oEAAoE,CACrE,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"erc7201.test.js","sourceRoot":"","sources":["../../src/utils/erc7201.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AAEvB,uCAA4D;AAE5D,IAAA,aAAI,EAAC,iCAAiC,EAAE,CAAC,CAAC,EAAE;IAC1C,CAAC,CAAC,EAAE,CACF,IAAA,yCAA+B,EAAC,cAAc,CAAC,EAC/C,oEAAoE,CACrE,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,6FAA6F;AAC7F,6EAA6E;AAC7E,IAAA,aAAI,EAAC,gEAAgE,EAAE,CAAC,CAAC,EAAE;IACzE,CAAC,CAAC,EAAE,CAAC,IAAA,yCAA+B,EAAC,KAAK,CAAC,EAAE,oEAAoE,CAAC,CAAC;AACrH,CAAC,CAAC,CAAC;AAEH,iGAAiG;AACjG,wGAAwG;AACxG,IAAA,aAAI,EAAC,uEAAuE,EAAE,CAAC,CAAC,EAAE;IAChF,CAAC,CAAC,EAAE,CAAC,IAAA,yCAA+B,EAAC,OAAO,CAAC,EAAE,oEAAoE,CAAC,CAAC;AACvH,CAAC,CAAC,CAAC"}

package/dist/utils/integer-literals.d.ts

@@ -1,15 +1,28 @@
 /**
- * Converts a Solidity unsigned integer literal according to https://docs.soliditylang.org/en/latest/types.html#rational-literals
- * to a 64-byte padded hex string.
+ * Encodes a bigint as a 0x-prefixed, 64-char lowercase hex string — the canonical text encoding of
+ * a `bytes32` value, used throughout this package for storage slots and similar 256-bit identifiers.
+ * Throws if the value is outside the 0..2^256-1 range, since that almost certainly indicates a bug
+ * upstream (overflow, wrong hash, etc.) and would silently produce a string longer than 64 chars.
  *
- * Accepts decimal, hexadecimal, and scientific notation formats.
+ * @param value bigint value to encode
+ * @returns 0x-prefixed, 64-char lowercase hex string
+ */
+export declare function toBytes32Hex(value: bigint): string;
+/**
+ * Parses a Solidity unsigned integer literal source string (per
+ * https://docs.soliditylang.org/en/latest/types.html#rational-literals) and returns it in the
+ * canonical hex form produced by {@link toBytes32Hex}.
+ *
+ * Parsing is delegated to {@link BigNumber}, which accepts decimal (`1000`), hex (`0x1f`), and
+ * scientific notation (`1e18`). Underscore separators and uppercase digits, which BigNumber rejects
+ * but Solidity allows, are stripped/lowercased first. Non-integer results (e.g. `1.5e3`) are rejected.
  *
- * If the input is null or undefined, returns '0x0000000000000000000000000000000000000000000000000000000000000000'.
+ * If the input is null or undefined, returns the canonical hex form of zero.
  *
  * Assumes the input is a valid uint256-compatible literal for Solidity, and only performs minimal validation.
  *
- * @param literal Integer literal to convert
- * @returns Hex string with 0x prefix, padded to 64 bytes with leading zeroes
+ * @param literal Integer literal source string to parse
+ * @returns 0x-prefixed, 64-char lowercase hex string
  */
 export declare function normalizeUint256Literal(literal: string | null | undefined): string;
 //# sourceMappingURL=integer-literals.d.ts.map

package/dist/utils/integer-literals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"integer-literals.d.ts","sourceRoot":"","sources":["../../src/utils/integer-literals.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAalF"}
+{"version":3,"file":"integer-literals.d.ts","sourceRoot":"","sources":["../../src/utils/integer-literals.ts"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKlD;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAWlF"}

package/dist/utils/integer-literals.js

@@ -3,32 +3,50 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.toBytes32Hex = toBytes32Hex;
 exports.normalizeUint256Literal = normalizeUint256Literal;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const MAX_UINT256 = (1n << 256n) - 1n;
 /**
- * Converts a Solidity unsigned integer literal according to https://docs.soliditylang.org/en/latest/types.html#rational-literals
- * to a 64-byte padded hex string.
+ * Encodes a bigint as a 0x-prefixed, 64-char lowercase hex string — the canonical text encoding of
+ * a `bytes32` value, used throughout this package for storage slots and similar 256-bit identifiers.
+ * Throws if the value is outside the 0..2^256-1 range, since that almost certainly indicates a bug
+ * upstream (overflow, wrong hash, etc.) and would silently produce a string longer than 64 chars.
  *
- * Accepts decimal, hexadecimal, and scientific notation formats.
+ * @param value bigint value to encode
+ * @returns 0x-prefixed, 64-char lowercase hex string
+ */
+function toBytes32Hex(value) {
+    if (value < 0n || value > MAX_UINT256) {
+        throw new Error(`Value out of uint256 range: ${value}`);
+    }
+    return `0x${value.toString(16).padStart(64, '0')}`;
+}
+/**
+ * Parses a Solidity unsigned integer literal source string (per
+ * https://docs.soliditylang.org/en/latest/types.html#rational-literals) and returns it in the
+ * canonical hex form produced by {@link toBytes32Hex}.
+ *
+ * Parsing is delegated to {@link BigNumber}, which accepts decimal (`1000`), hex (`0x1f`), and
+ * scientific notation (`1e18`). Underscore separators and uppercase digits, which BigNumber rejects
+ * but Solidity allows, are stripped/lowercased first. Non-integer results (e.g. `1.5e3`) are rejected.
  *
- * If the input is null or undefined, returns '0x0000000000000000000000000000000000000000000000000000000000000000'.
+ * If the input is null or undefined, returns the canonical hex form of zero.
  *
  * Assumes the input is a valid uint256-compatible literal for Solidity, and only performs minimal validation.
  *
- * @param literal Integer literal to convert
- * @returns Hex string with 0x prefix, padded to 64 bytes with leading zeroes
+ * @param literal Integer literal source string to parse
+ * @returns 0x-prefixed, 64-char lowercase hex string
  */
 function normalizeUint256Literal(literal) {
     if (!literal) {
-        return '0x0000000000000000000000000000000000000000000000000000000000000000';
+        return toBytes32Hex(0n);
     }
     const lowercaseNoUnderscores = literal.replace(/_/g, '').toLowerCase();
     const parsed = new bignumber_js_1.default(lowercaseNoUnderscores);
     if (!parsed.isInteger()) {
         throw new Error(`Invalid integer literal: ${literal}`);
     }
-    const calculatedValueAsHex = parsed.toString(16);
-    const padded = calculatedValueAsHex.padStart(64, '0');
-    return `0x${padded}`;
+    return toBytes32Hex(BigInt(parsed.toFixed()));
 }
 //# sourceMappingURL=integer-literals.js.map

package/dist/utils/integer-literals.js.map

@@ -1 +1 @@
-{"version":3,"file":"integer-literals.js","sourceRoot":"","sources":["../../src/utils/integer-literals.ts"],"names":[],"mappings":";;;;;AAeA,0DAaC;AA5BD,gEAAqC;AAErC;;;;;;;;;;;;GAYG;AACH,SAAgB,uBAAuB,CAAC,OAAkC;IACxE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,oEAAoE,CAAC;IAC9E,CAAC;IACD,MAAM,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IAEvE,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,sBAAsB,CAAC,CAAC;IACrD,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,4BAA4B,OAAO,EAAE,CAAC,CAAC;IACzD,CAAC;IACD,MAAM,oBAAoB,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,oBAAoB,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACtD,OAAO,KAAK,MAAM,EAAE,CAAC;AACvB,CAAC"}
+{"version":3,"file":"integer-literals.js","sourceRoot":"","sources":["../../src/utils/integer-literals.ts"],"names":[],"mappings":";;;;;AAaA,oCAKC;AAkBD,0DAWC;AA/CD,gEAAqC;AAErC,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;AAEtC;;;;;;;;GAQG;AACH,SAAgB,YAAY,CAAC,KAAa;IACxC,IAAI,KAAK,GAAG,EAAE,IAAI,KAAK,GAAG,WAAW,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,+BAA+B,KAAK,EAAE,CAAC,CAAC;IAC1D,CAAC;IACD,OAAO,KAAK,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC;AACrD,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,uBAAuB,CAAC,OAAkC;IACxE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,YAAY,CAAC,EAAE,CAAC,CAAC;IAC1B,CAAC;IACD,MAAM,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IAEvE,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,sBAAsB,CAAC,CAAC;IACrD,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,4BAA4B,OAAO,EAAE,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;AAChD,CAAC"}

package/dist/utils/integer-literals.test.js

@@ -54,4 +54,16 @@ const ZEROES = '0x00000000000000000000000000000000000000000000000000000000000000
 (0, ava_1.default)('full hex with leading and trailing zeroes', t => {
     t.is((0, integer_literals_1.normalizeUint256Literal)('0x00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00'), '0x00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00');
 });
+(0, ava_1.default)('rejects values above uint256 max', t => {
+    const tooLarge = '0x10000000000000000000000000000000000000000000000000000000000000000';
+    const error = t.throws(() => (0, integer_literals_1.normalizeUint256Literal)(tooLarge));
+    t.regex(error?.message ?? '', /uint256 range/);
+});
+(0, ava_1.default)('toBytes32Hex - boundaries', t => {
+    const MAX_HEX = '0x' + 'f'.repeat(64);
+    t.is((0, integer_literals_1.toBytes32Hex)(0n), '0x' + '0'.repeat(64));
+    t.is((0, integer_literals_1.toBytes32Hex)(BigInt(MAX_HEX)), MAX_HEX);
+    t.throws(() => (0, integer_literals_1.toBytes32Hex)(BigInt(MAX_HEX) + 1n), { message: /uint256 range/ });
+    t.throws(() => (0, integer_literals_1.toBytes32Hex)(-1n), { message: /uint256 range/ });
+});
 //# sourceMappingURL=integer-literals.test.js.map

package/dist/utils/integer-literals.test.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/upgrades-core",
-  "version": "1.45.0-alpha.1",
+  "version": "1.46.0",
   "description": "",
   "repository": "https://github.com/OpenZeppelin/openzeppelin-upgrades",
   "license": "MIT",
@@ -57,7 +57,7 @@
     "ava": "^6.0.0",
     "dotenv": "^16.0.0",
     "fgbg": "^0.1.4",
-    "hardhat": "^2.19.1",
+    "hardhat": "^2.28.0",
     "rimraf": "^5.0.0",
     "typescript": "^5.0.0"
   },
@@ -72,6 +72,6 @@
     "minimist": "^1.2.7",
     "proper-lockfile": "^4.1.1",
     "solidity-ast": "^0.4.60",
-    "minimatch": "^9.0.5"
+    "minimatch": "^10.2.5"
   }
 }