@openzeppelin/upgrades-core 1.43.0 → 1.44.0
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/artifacts/@openzeppelin/contracts-v5/proxy/ERC1967/ERC1967Proxy.sol/ERC1967Proxy.json +3 -3
- package/artifacts/@openzeppelin/contracts-v5/proxy/beacon/BeaconProxy.sol/BeaconProxy.json +3 -3
- package/artifacts/@openzeppelin/contracts-v5/proxy/beacon/UpgradeableBeacon.sol/UpgradeableBeacon.json +2 -2
- package/artifacts/@openzeppelin/contracts-v5/proxy/transparent/ProxyAdmin.sol/ProxyAdmin.json +2 -2
- package/artifacts/@openzeppelin/contracts-v5/proxy/transparent/TransparentUpgradeableProxy.sol/ITransparentUpgradeableProxy.json +2 -2
- package/artifacts/@openzeppelin/contracts-v5/proxy/transparent/TransparentUpgradeableProxy.sol/TransparentUpgradeableProxy.json +3 -3
- package/artifacts/build-info-v5.json +5159 -2886
- package/dist/solidity-version.json +1 -1
- package/dist/storage/extract.d.ts.map +1 -1
- package/dist/storage/extract.js +14 -0
- package/dist/storage/extract.js.map +1 -1
- package/dist/storage/index.d.ts.map +1 -1
- package/dist/storage/index.js +23 -0
- package/dist/storage/index.js.map +1 -1
- package/dist/storage/layout.d.ts +1 -0
- package/dist/storage/layout.d.ts.map +1 -1
- package/dist/storage/layout.js.map +1 -1
- package/dist/storage/namespace.d.ts.map +1 -1
- package/dist/storage/namespace.js +47 -1
- package/dist/storage/namespace.js.map +1 -1
- package/dist/storage-custom-layout.test.d.ts +2 -0
- package/dist/storage-custom-layout.test.d.ts.map +1 -0
- package/dist/storage-custom-layout.test.js +314 -0
- package/dist/storage-custom-layout.test.js.map +1 -0
- package/dist/utils/erc7201.d.ts +10 -0
- package/dist/utils/erc7201.d.ts.map +1 -0
- package/dist/utils/erc7201.js +24 -0
- package/dist/utils/erc7201.js.map +1 -0
- package/dist/utils/erc7201.test.d.ts +2 -0
- package/dist/utils/erc7201.test.d.ts.map +1 -0
- package/dist/utils/erc7201.test.js +11 -0
- package/dist/utils/erc7201.test.js.map +1 -0
- package/dist/utils/integer-literals.d.ts +15 -0
- package/dist/utils/integer-literals.d.ts.map +1 -0
- package/dist/utils/integer-literals.js +34 -0
- package/dist/utils/integer-literals.js.map +1 -0
- package/dist/utils/integer-literals.test.d.ts +2 -0
- package/dist/utils/integer-literals.test.d.ts.map +1 -0
- package/dist/utils/integer-literals.test.js +57 -0
- package/dist/utils/integer-literals.test.js.map +1 -0
- package/dist/utils/make-namespaced.d.ts.map +1 -1
- package/dist/utils/make-namespaced.js +4 -0
- package/dist/utils/make-namespaced.js.map +1 -1
- package/dist/utils/make-namespaced.test.js +4 -0
- package/dist/utils/make-namespaced.test.js.map +1 -1
- package/dist/utils/stabilize-layout.d.ts +1 -0
- package/dist/utils/stabilize-layout.d.ts.map +1 -1
- package/dist/utils/stabilize-layout.js +1 -0
- package/dist/utils/stabilize-layout.js.map +1 -1
- package/dist/validate-initializers.test.js +1 -1
- package/dist/validate-initializers.test.js.map +1 -1
- package/package.json +7 -4
- package/src/solidity-version.json +1 -1
- package/src/storage/extract.ts +21 -0
- package/src/storage/index.ts +29 -0
- package/src/storage/layout.ts +1 -0
- package/src/storage/namespace.ts +67 -1
- package/src/storage-0.8.test.ts.md +4 -0
- package/src/storage-0.8.test.ts.snap +0 -0
- package/src/storage-custom-layout.test.ts +358 -0
- package/src/storage-custom-layout.test.ts.md +353 -0
- package/src/storage-custom-layout.test.ts.snap +0 -0
- package/src/storage-memory-0.5.test.ts.md +2 -0
- package/src/storage-memory-0.5.test.ts.snap +0 -0
- package/src/storage-namespaced-layout.test.ts.md +1 -0
- package/src/storage-namespaced-layout.test.ts.snap +0 -0
- package/src/storage-namespaced.test.ts.md +2 -0
- package/src/storage-namespaced.test.ts.snap +0 -0
- package/src/storage.test.ts.md +2 -0
- package/src/storage.test.ts.snap +0 -0
- package/src/utils/erc7201.test.ts +10 -0
- package/src/utils/erc7201.ts +25 -0
- package/src/utils/integer-literals.test.ts +73 -0
- package/src/utils/integer-literals.ts +29 -0
- package/src/utils/make-namespaced.test.ts +7 -0
- package/src/utils/make-namespaced.test.ts.md +50 -0
- package/src/utils/make-namespaced.test.ts.snap +0 -0
- package/src/utils/make-namespaced.ts +5 -0
- package/src/utils/stabilize-layout.ts +1 -0
- package/src/validate-initializers.test.ts +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storage-custom-layout.test.js","sourceRoot":"","sources":["../src/storage-custom-layout.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAoC;AAEpC,8CAA8D;AAC9D,qCAAoC;AAGpC,uCAAoD;AAEpD,+CAAyD;AACzD,+DAAkE;AAOlE,MAAM,IAAI,GAAG,aAAwB,CAAC;AAEtC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE;IACpB,MAAM,SAAS,GAAG,MAAM,mBAAS,CAAC,YAAY,CAAC,8CAA8C,CAAC,CAAC;IAC/F,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IACD,MAAM,UAAU,GAAe,SAAS,CAAC,MAAM,CAAC;IAChD,MAAM,SAAS,GAAuC,EAAE,CAAC;IACzD,MAAM,cAAc,GAAkC,EAAE,CAAC;IACzD,KAAK,MAAM,GAAG,IAAI,IAAA,eAAO,EAAC,oBAAoB,EAAE,UAAU,CAAC,OAAO,CAAC,iCAAiC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3G,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;QAC1B,oEAAoE;QACpE,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,SAAS,CAAC,iCAAiC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,aAAc,CAAC;IAC9G,CAAC;IACD,MAAM,KAAK,GAAG,IAAA,uBAAe,EAAC,UAAU,CAAC,CAAC;IAE1C,CAAC,CAAC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,EAAE,CACtC,IAAA,8BAAoB,EAAC,SAAS,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,KAAK,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;IAErF,uFAAuF;IACvF,CAAC,CAAC,OAAO,CAAC,4BAA4B,GAAG,IAAI,CAAC,EAAE,CAC9C,IAAA,8BAAoB,EAAC,SAAS,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;AAC5E,CAAC,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC;AAE1C,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE;IACvB,MAAM,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC9D,CAAC,CAAC,QAAQ,CAAC,IAAA,yCAAsB,EAAC,MAAM,CAAC,CAAC,CAAC;AAC7C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yBAAyB,EAAE,CAAC,CAAC,EAAE;IAClC,MAAM,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAC;IACtE,CAAC,CAAC,QAAQ,CAAC,IAAA,yCAAsB,EAAC,MAAM,CAAC,CAAC,CAAC;AAC7C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6BAA6B,EAAE,CAAC,CAAC,EAAE;IACtC,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC1D,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,CAAC;IACvE,MAAM,UAAU,GAAG,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wCAAwC,EAAE,CAAC,CAAC,EAAE;IACjD,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAC;IAClE,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,2BAA2B,CAAC,CAAC;IAC/E,MAAM,UAAU,GAAG,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qCAAqC,EAAE,CAAC,CAAC,EAAE;IAC9C,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC1D,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,mCAAmC,CAAC,CAAC;IAC/E,MAAM,UAAU,GAAG,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gDAAgD,EAAE,CAAC,CAAC,EAAE;IACzD,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAC;IAClE,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,mCAAmC,CAAC,CAAC;IACvF,MAAM,UAAU,GAAG,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iDAAiD,EAAE,CAAC,CAAC,EAAE;IAC1D,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC1D,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,8CAA8C,CAAC,CAAC;IAC1F,MAAM,UAAU,GAAG,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4DAA4D,EAAE,CAAC,CAAC,EAAE;IACrE,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAC;IAClE,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,8CAA8C,CAAC,CAAC;IAClG,MAAM,UAAU,GAAG,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iCAAiC,EAAE,CAAC,CAAC,EAAE;IAC1C,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC1D,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,+BAA+B,CAAC,CAAC;IAC3E,MAAM,UAAU,GAAG,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE;QACjB,MAAM,EAAE,CAAC;QACT,CAAC,EAAE;YACD,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE;gBACN,IAAI,EAAE;oBACJ,IAAI,EAAE,GAAG;oBACT,EAAE,EAAE,GAAG;iBACR;aACF;YACD,QAAQ,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;YACxB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;SACxB;QACD,CAAC,EAAE;YACD,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE;gBACN,IAAI,EAAE;oBACJ,IAAI,EAAE,GAAG;oBACT,EAAE,EAAE,GAAG;iBACR;aACF;YACD,QAAQ,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;YACxB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;SACxB;KACF,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4CAA4C,EAAE,CAAC,CAAC,EAAE;IACrD,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAC;IAClE,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,+BAA+B,CAAC,CAAC;IACnF,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yCAAyC,EAAE,CAAC,CAAC,EAAE;IAClD,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC1D,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,uCAAuC,CAAC,CAAC;IACnF,MAAM,UAAU,GAAG,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE;QACjB,MAAM,EAAE,CAAC;QACT,CAAC,EAAE;YACD,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE;gBACN,IAAI,EAAE;oBACJ,IAAI,EAAE,GAAG;oBACT,EAAE,EAAE,GAAG;iBACR;aACF;YACD,QAAQ,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;YACxB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;SACxB;QACD,CAAC,EAAE;YACD,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE;gBACN,IAAI,EAAE;oBACJ,IAAI,EAAE,GAAG;oBACT,EAAE,EAAE,GAAG;iBACR;aACF;YACD,QAAQ,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;YACxB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;SACxB;KACF,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oDAAoD,EAAE,CAAC,CAAC,EAAE;IAC7D,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAC;IAClE,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,uCAAuC,CAAC,CAAC;IAC3F,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qDAAqD,EAAE,CAAC,CAAC,EAAE;IAC9D,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC1D,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,kDAAkD,CAAC,CAAC;IAC9F,MAAM,UAAU,GAAG,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE;QACjB,MAAM,EAAE,CAAC;QACT,CAAC,EAAE;YACD,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE;gBACN,IAAI,EAAE;oBACJ,IAAI,EAAE,GAAG;oBACT,EAAE,EAAE,aAAa;iBAClB;aACF;YACD,QAAQ,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;YACxB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;SACxB;QACD,CAAC,EAAE;YACD,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE;gBACN,IAAI,EAAE;oBACJ,IAAI,EAAE,GAAG;oBACT,EAAE,EAAE,aAAa;iBAClB;aACF;YACD,QAAQ,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;YACxB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;SACxB;KACF,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gEAAgE,EAAE,CAAC,CAAC,EAAE;IACzE,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAC;IAClE,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,kDAAkD,CAAC,CAAC;IACtG,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uCAAuC,EAAE,CAAC,CAAC,EAAE;IAChD,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC1D,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,qCAAqC,CAAC,CAAC;IACjF,MAAM,UAAU,GAAG,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE;QACjB,MAAM,EAAE,CAAC;QACT,CAAC,EAAE;YACD,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE;gBACN,IAAI,EAAE;oBACJ,IAAI,EAAE,GAAG;oBACT,EAAE,EAAE,GAAG;iBACR;aACF;YACD,QAAQ,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;YACxB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;SACxB;QACD,CAAC,EAAE;YACD,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE;gBACN,IAAI,EAAE;oBACJ,IAAI,EAAE,GAAG;oBACT,EAAE,EAAE,GAAG;iBACR;aACF;YACD,QAAQ,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;YACxB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;SACxB;KACF,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kDAAkD,EAAE,CAAC,CAAC,EAAE;IAC3D,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAC;IAClE,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,qCAAqC,CAAC,CAAC;IACzF,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gCAAgC,EAAE,CAAC,CAAC,EAAE;IACzC,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC1D,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,8BAA8B,CAAC,CAAC;IAC1E,MAAM,UAAU,GAAG,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6DAA6D,EAAE,CAAC,CAAC,EAAE;IACtE,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAC;IAClE,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,8BAA8B,CAAC,CAAC;IAClF,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+DAA+D,EAAE,CAAC,CAAC,EAAE;IACxE,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAC;IAClE,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,8BAA8B,CAAC,CAAC;IAClF,MAAM,UAAU,GAAG,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,EAAE,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAC;IACrF,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sCAAsC,EAAE,CAAC,CAAC,EAAE;IAC/C,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC1D,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,oCAAoC,CAAC,CAAC;IAChF,MAAM,UAAU,GAAG,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mEAAmE,EAAE,CAAC,CAAC,EAAE;IAC5E,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAC;IAClE,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,oCAAoC,CAAC,CAAC;IACxF,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qEAAqE,EAAE,CAAC,CAAC,EAAE;IAC9E,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAC;IAClE,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,oCAAoC,CAAC,CAAC;IACxF,MAAM,UAAU,GAAG,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,EAAE,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAC;IACrF,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oCAAoC,EAAE,CAAC,CAAC,EAAE;IAC7C,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,oCAAoC,CAAC,CAAC,CAAC;IACnG,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sEAAsE,EAAE,CAAC,CAAC,EAAE;IAC/E,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,CAAC;IACvE,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,qCAAqC,CAAC,CAAC;IACjF,MAAM,UAAU,GAAG,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iFAAiF,EAAE,CAAC,CAAC,EAAE;IAC1F,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,2BAA2B,CAAC,CAAC;IAC/E,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,qCAAqC,CAAC,CAAC;IACzF,MAAM,UAAU,GAAG,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kCAAkC,EAAE,CAAC,CAAC,EAAE;IAC3C,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,gCAAgC,CAAC,CAAC,CAAC;IAC/F,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0CAA0C,EAAE,CAAC,CAAC,EAAE;IACnD,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,wCAAwC,CAAC,CAAC,CAAC;IACvG,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8CAA8C,EAAE,CAAC,CAAC,EAAE;IACvD,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,4CAA4C,CAAC,CAAC,CAAC;IAC3G,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wCAAwC,EAAE,CAAC,CAAC,EAAE;IACjD,MAAM,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,mCAAmC,CAAC,CAAC;IACnF,CAAC,CAAC,QAAQ,CAAC,IAAA,yCAAsB,EAAC,MAAM,CAAC,CAAC,CAAC;AAC7C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6CAA6C,EAAE,CAAC,CAAC,EAAE;IACtD,MAAM,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,wCAAwC,CAAC,CAAC;IACxF,CAAC,CAAC,QAAQ,CAAC,IAAA,yCAAsB,EAAC,MAAM,CAAC,CAAC,CAAC;AAC7C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kCAAkC,EAAE,CAAC,CAAC,EAAE;IAC3C,MAAM,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,kCAAkC,CAAC,CAAC;IAClF,CAAC,CAAC,QAAQ,CAAC,IAAA,yCAAsB,EAAC,MAAM,CAAC,CAAC,CAAC;AAC7C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yBAAyB,EAAE,CAAC,CAAC,EAAE;IAClC,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,CAAC;IACjE,MAAM,UAAU,GAAG,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sDAAsD,EAAE,CAAC,CAAC,EAAE;IAC/D,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC;IACzD,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,qBAAqB,CAAC,CAAC;IACzE,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wDAAwD,EAAE,CAAC,CAAC,EAAE;IACjE,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC;IACzD,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,CAAC,qBAAqB,CAAC,CAAC;IACzE,MAAM,UAAU,GAAG,IAAA,iCAAuB,EAAC,EAAE,EAAE,EAAE,EAAE,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAC;IACrF,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export declare const ERC7201_FORMULA_PREFIX = "erc7201:";
|
|
2
|
+
/**
|
|
3
|
+
* Returns the ERC-7201 storage location hash for a given namespace id using formula:
|
|
4
|
+
* keccak256(abi.encode(uint256(keccak256(bytes(id))) - 1)) & ~bytes32(uint256(0xff))
|
|
5
|
+
*
|
|
6
|
+
* @param id The namespace id, not including the 'erc7201:' prefix
|
|
7
|
+
* @returns The ERC-7201 storage location hash as a hex string
|
|
8
|
+
*/
|
|
9
|
+
export declare function calculateERC7201StorageLocation(id: string): string;
|
|
10
|
+
//# sourceMappingURL=erc7201.d.ts.map
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ERC7201_FORMULA_PREFIX = void 0;
|
|
4
|
+
exports.calculateERC7201StorageLocation = calculateERC7201StorageLocation;
|
|
5
|
+
const ethereumjs_util_1 = require("ethereumjs-util");
|
|
6
|
+
exports.ERC7201_FORMULA_PREFIX = 'erc7201:';
|
|
7
|
+
/**
|
|
8
|
+
* Returns the ERC-7201 storage location hash for a given namespace id using formula:
|
|
9
|
+
* keccak256(abi.encode(uint256(keccak256(bytes(id))) - 1)) & ~bytes32(uint256(0xff))
|
|
10
|
+
*
|
|
11
|
+
* @param id The namespace id, not including the 'erc7201:' prefix
|
|
12
|
+
* @returns The ERC-7201 storage location hash as a hex string
|
|
13
|
+
*/
|
|
14
|
+
function calculateERC7201StorageLocation(id) {
|
|
15
|
+
const firstHash = (0, ethereumjs_util_1.keccak256)(Buffer.from(id));
|
|
16
|
+
const minusOne = BigInt(`0x${firstHash.toString('hex')}`) - 1n;
|
|
17
|
+
const minusOneBuffer = Buffer.from(minusOne.toString(16), 'hex');
|
|
18
|
+
const secondHash = (0, ethereumjs_util_1.keccak256)(minusOneBuffer);
|
|
19
|
+
const mask = BigInt('0xff');
|
|
20
|
+
const masked = BigInt(`0x${secondHash.toString('hex')}`) & ~mask;
|
|
21
|
+
const padded = masked.toString(16).padStart(64, '0');
|
|
22
|
+
return `0x${padded}`;
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=erc7201.js.map
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"erc7201.test.d.ts","sourceRoot":"","sources":["../../src/utils/erc7201.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const ava_1 = __importDefault(require("ava"));
|
|
7
|
+
const erc7201_1 = require("./erc7201");
|
|
8
|
+
(0, ava_1.default)('calculateERC7201StorageLocation', t => {
|
|
9
|
+
t.is((0, erc7201_1.calculateERC7201StorageLocation)('example.main'), '0x183a6125c38840424c4a85fa12bab2ab606c4b6d0e7cc73c0c06ba5300eab500');
|
|
10
|
+
});
|
|
11
|
+
//# sourceMappingURL=erc7201.test.js.map
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Converts a Solidity unsigned integer literal according to https://docs.soliditylang.org/en/latest/types.html#rational-literals
|
|
3
|
+
* to a 64-byte padded hex string.
|
|
4
|
+
*
|
|
5
|
+
* Accepts decimal, hexadecimal, and scientific notation formats.
|
|
6
|
+
*
|
|
7
|
+
* If the input is null or undefined, returns '0x0000000000000000000000000000000000000000000000000000000000000000'.
|
|
8
|
+
*
|
|
9
|
+
* Assumes the input is a valid uint256-compatible literal for Solidity, and only performs minimal validation.
|
|
10
|
+
*
|
|
11
|
+
* @param literal Integer literal to convert
|
|
12
|
+
* @returns Hex string with 0x prefix, padded to 64 bytes with leading zeroes
|
|
13
|
+
*/
|
|
14
|
+
export declare function normalizeUint256Literal(literal: string | null | undefined): string;
|
|
15
|
+
//# sourceMappingURL=integer-literals.d.ts.map
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.normalizeUint256Literal = normalizeUint256Literal;
|
|
7
|
+
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
|
+
/**
|
|
9
|
+
* Converts a Solidity unsigned integer literal according to https://docs.soliditylang.org/en/latest/types.html#rational-literals
|
|
10
|
+
* to a 64-byte padded hex string.
|
|
11
|
+
*
|
|
12
|
+
* Accepts decimal, hexadecimal, and scientific notation formats.
|
|
13
|
+
*
|
|
14
|
+
* If the input is null or undefined, returns '0x0000000000000000000000000000000000000000000000000000000000000000'.
|
|
15
|
+
*
|
|
16
|
+
* Assumes the input is a valid uint256-compatible literal for Solidity, and only performs minimal validation.
|
|
17
|
+
*
|
|
18
|
+
* @param literal Integer literal to convert
|
|
19
|
+
* @returns Hex string with 0x prefix, padded to 64 bytes with leading zeroes
|
|
20
|
+
*/
|
|
21
|
+
function normalizeUint256Literal(literal) {
|
|
22
|
+
if (!literal) {
|
|
23
|
+
return '0x0000000000000000000000000000000000000000000000000000000000000000';
|
|
24
|
+
}
|
|
25
|
+
const lowercaseNoUnderscores = literal.replace(/_/g, '').toLowerCase();
|
|
26
|
+
const parsed = new bignumber_js_1.default(lowercaseNoUnderscores);
|
|
27
|
+
if (!parsed.isInteger()) {
|
|
28
|
+
throw new Error(`Invalid integer literal: ${literal}`);
|
|
29
|
+
}
|
|
30
|
+
const calculatedValueAsHex = parsed.toString(16);
|
|
31
|
+
const padded = calculatedValueAsHex.padStart(64, '0');
|
|
32
|
+
return `0x${padded}`;
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=integer-literals.js.map
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"integer-literals.test.d.ts","sourceRoot":"","sources":["../../src/utils/integer-literals.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const ava_1 = __importDefault(require("ava"));
|
|
7
|
+
const integer_literals_1 = require("./integer-literals");
|
|
8
|
+
const ZEROES = '0x0000000000000000000000000000000000000000000000000000000000000000';
|
|
9
|
+
(0, ava_1.default)('falsy', t => {
|
|
10
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)(undefined), ZEROES);
|
|
11
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)(null), ZEROES);
|
|
12
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)(''), ZEROES);
|
|
13
|
+
});
|
|
14
|
+
(0, ava_1.default)('hex', t => {
|
|
15
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('0x12e3'), '0x00000000000000000000000000000000000000000000000000000000000012e3');
|
|
16
|
+
});
|
|
17
|
+
(0, ava_1.default)('hex - leading zeroes', t => {
|
|
18
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('0x0012e3'), '0x00000000000000000000000000000000000000000000000000000000000012e3');
|
|
19
|
+
});
|
|
20
|
+
(0, ava_1.default)('hex - capital', t => {
|
|
21
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('0x12E3'), '0x00000000000000000000000000000000000000000000000000000000000012e3');
|
|
22
|
+
});
|
|
23
|
+
(0, ava_1.default)('decimal', t => {
|
|
24
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('1234'), '0x00000000000000000000000000000000000000000000000000000000000004d2');
|
|
25
|
+
});
|
|
26
|
+
(0, ava_1.default)('zeroes', t => {
|
|
27
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('0'), ZEROES);
|
|
28
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('0x000'), ZEROES);
|
|
29
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)(ZEROES), ZEROES);
|
|
30
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('-0'), ZEROES);
|
|
31
|
+
});
|
|
32
|
+
(0, ava_1.default)('underscores', t => {
|
|
33
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('1_23_4'), '0x00000000000000000000000000000000000000000000000000000000000004d2');
|
|
34
|
+
});
|
|
35
|
+
(0, ava_1.default)('scientific notation', t => {
|
|
36
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('20e10'), '0x0000000000000000000000000000000000000000000000000000002e90edd000');
|
|
37
|
+
});
|
|
38
|
+
(0, ava_1.default)('scientific notation - capital', t => {
|
|
39
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('20E10'), '0x0000000000000000000000000000000000000000000000000000002e90edd000');
|
|
40
|
+
});
|
|
41
|
+
(0, ava_1.default)('scientific notation - fractional base', t => {
|
|
42
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('2.5e3'), '0x00000000000000000000000000000000000000000000000000000000000009c4');
|
|
43
|
+
});
|
|
44
|
+
(0, ava_1.default)('scientific notation - negative exponent', t => {
|
|
45
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('250000e-2'), '0x00000000000000000000000000000000000000000000000000000000000009c4');
|
|
46
|
+
});
|
|
47
|
+
(0, ava_1.default)('scientific notation - invalid integer literal', t => {
|
|
48
|
+
const error = t.throws(() => (0, integer_literals_1.normalizeUint256Literal)('2e-3'));
|
|
49
|
+
t.is(error?.message, 'Invalid integer literal: 2e-3');
|
|
50
|
+
});
|
|
51
|
+
(0, ava_1.default)('full hex', t => {
|
|
52
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'), '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff');
|
|
53
|
+
});
|
|
54
|
+
(0, ava_1.default)('full hex with leading and trailing zeroes', t => {
|
|
55
|
+
t.is((0, integer_literals_1.normalizeUint256Literal)('0x00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00'), '0x00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00');
|
|
56
|
+
});
|
|
57
|
+
//# sourceMappingURL=integer-literals.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"integer-literals.test.js","sourceRoot":"","sources":["../../src/utils/integer-literals.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-namespaced.d.ts","sourceRoot":"","sources":["../../src/utils/make-namespaced.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAYpD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"make-namespaced.d.ts","sourceRoot":"","sources":["../../src/utils/make-namespaced.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAYpD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAuI1G;AAED;;;;;;;;;GASG;AACH,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAOtG"}
|
|
@@ -55,6 +55,10 @@ function makeNamespacedInput(input, output, _solcVersion) {
|
|
|
55
55
|
if (contractDef.contractKind === 'contract' && !contractDef.abstract) {
|
|
56
56
|
modifications.push(makeInsertBefore(contractDef, 'abstract '));
|
|
57
57
|
}
|
|
58
|
+
// Remove custom layout annotation
|
|
59
|
+
if (contractDef.storageLayout !== undefined) {
|
|
60
|
+
modifications.push(makeDelete(contractDef.storageLayout, orig));
|
|
61
|
+
}
|
|
58
62
|
// Remove any calls to parent constructors from the inheritance list
|
|
59
63
|
const inherits = contractDef.baseContracts;
|
|
60
64
|
for (const inherit of inherits) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-namespaced.js","sourceRoot":"","sources":["../../src/utils/make-namespaced.ts"],"names":[],"mappings":";;AAuCA,
|
|
1
|
+
{"version":3,"file":"make-namespaced.js","sourceRoot":"","sources":["../../src/utils/make-namespaced.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,10 @@ const make_namespaced_1 = require("./make-namespaced");
|
|
|
20
20
|
const origBuildInfo = await hardhat_1.artifacts.getBuildInfo('contracts/test/NamespacedToModify07.sol:HasFunction');
|
|
21
21
|
await testMakeNamespaced(origBuildInfo, t, '0.7.6');
|
|
22
22
|
});
|
|
23
|
+
(0, ava_1.default)('make namespaced input - custom layout', async (t) => {
|
|
24
|
+
const origBuildInfo = await hardhat_1.artifacts.getBuildInfo('contracts/test/NamespacedToModifyCustomLayout.sol:ExampleCustomLayout');
|
|
25
|
+
await testMakeNamespaced(origBuildInfo, t, '0.8.29');
|
|
26
|
+
});
|
|
23
27
|
async function testMakeNamespaced(origBuildInfo, t, solcVersion, keepAllNatSpec = false) {
|
|
24
28
|
if (origBuildInfo === undefined) {
|
|
25
29
|
throw new Error('Build info not found');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-namespaced.test.js","sourceRoot":"","sources":["../../src/utils/make-namespaced.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"make-namespaced.test.js","sourceRoot":"","sources":["../../src/utils/make-namespaced.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stabilize-layout.d.ts","sourceRoot":"","sources":["../../src/utils/stabilize-layout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAI3C,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,aAAa
|
|
1
|
+
{"version":3,"file":"stabilize-layout.d.ts","sourceRoot":"","sources":["../../src/utils/stabilize-layout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAI3C,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkB3D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stabilize-layout.js","sourceRoot":"","sources":["../../src/utils/stabilize-layout.ts"],"names":[],"mappings":";;AAIA,
|
|
1
|
+
{"version":3,"file":"stabilize-layout.js","sourceRoot":"","sources":["../../src/utils/stabilize-layout.ts"],"names":[],"mappings":";;AAIA,wDAkBC;AArBD,8CAAkD;AAClD,uCAAoD;AAEpD,SAAgB,sBAAsB,CAAC,MAAqB;IAC1D,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,IAAA,iCAAuB,EAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnF,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;YACvD,MAAM,OAAO,GACX,IAAI,CAAC,OAAO;gBACZ,CAAC,IAAA,sBAAa,EAAC,IAAI,CAAC,OAAO,CAAC;oBAC1B,CAAC,CAAC,IAAI,CAAC,OAAO;oBACd,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,IAAA,iCAAuB,EAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAChF,OAAO,CAAC,IAAA,iCAAuB,EAAC,IAAI,CAAC,EAAE,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QAC/D,CAAC,CAAC;QACF,UAAU,EAAE,MAAM,CAAC,UAAU;YAC3B,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;gBACpD,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,IAAA,iCAAuB,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC1F,CAAC,CAAC;YACJ,CAAC,CAAC,SAAS;QACb,QAAQ,EAAE,MAAM,CAAC,QAAQ;KAC1B,CAAC;AACJ,CAAC"}
|
|
@@ -192,7 +192,7 @@ testAccepts('Recursive_Ok', 'transparent');
|
|
|
192
192
|
testAccepts('ERC20_Ok', 'uups');
|
|
193
193
|
testRejects('ERC20_Bad', 'uups', {
|
|
194
194
|
contains: [
|
|
195
|
-
'Missing initializer calls for one or more parent contracts: `ERC20Upgradeable,
|
|
195
|
+
'Missing initializer calls for one or more parent contracts: `ERC20Upgradeable, OwnableUpgradeable, ERC20PermitUpgradeable`',
|
|
196
196
|
],
|
|
197
197
|
count: 1,
|
|
198
198
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-initializers.test.js","sourceRoot":"","sources":["../src/validate-initializers.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"validate-initializers.test.js","sourceRoot":"","sources":["../src/validate-initializers.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openzeppelin/upgrades-core",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.44.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"repository": "https://github.com/OpenZeppelin/openzeppelin-upgrades/tree/master/packages/core",
|
|
6
6
|
"license": "MIT",
|
|
@@ -34,7 +34,9 @@
|
|
|
34
34
|
"compile:contracts": "hardhat compile",
|
|
35
35
|
"copyfiles": "node scripts/copy-build-info-v5.js && bash scripts/copy-legacy-artifacts.sh",
|
|
36
36
|
"prepare": "yarn clean && yarn compile && yarn copyfiles",
|
|
37
|
-
"
|
|
37
|
+
"pretest": "tsc -b && hardhat compile --force && yarn copyfiles",
|
|
38
|
+
"test": "ava",
|
|
39
|
+
"test:update-snapshots": "yarn test --update-snapshots",
|
|
38
40
|
"test:watch": "hardhat compile --force && yarn copyfiles && fgbg 'ava --watch' 'tsc -b --watch' --",
|
|
39
41
|
"version": "node ../../scripts/bump-changelog.js",
|
|
40
42
|
"cli": "node ./dist/cli/cli.js"
|
|
@@ -45,7 +47,7 @@
|
|
|
45
47
|
"devDependencies": {
|
|
46
48
|
"@ava/typescript": "^5.0.0",
|
|
47
49
|
"@nomicfoundation/hardhat-ethers": "^3.0.5",
|
|
48
|
-
"@openzeppelin/contracts": "5.0
|
|
50
|
+
"@openzeppelin/contracts": "5.3.0",
|
|
49
51
|
"@openzeppelin/upgrades-core-legacy": "npm:@openzeppelin/upgrades-core@1.31.3",
|
|
50
52
|
"@types/debug": "^4.1.5",
|
|
51
53
|
"@types/minimist": "^1.2.5",
|
|
@@ -65,11 +67,12 @@
|
|
|
65
67
|
"cbor": "^10.0.0",
|
|
66
68
|
"chalk": "^4.1.0",
|
|
67
69
|
"compare-versions": "^6.0.0",
|
|
70
|
+
"bignumber.js": "^9.1.2",
|
|
68
71
|
"debug": "^4.1.1",
|
|
69
72
|
"ethereumjs-util": "^7.0.3",
|
|
70
73
|
"minimist": "^1.2.7",
|
|
71
74
|
"proper-lockfile": "^4.1.1",
|
|
72
|
-
"solidity-ast": "^0.4.
|
|
75
|
+
"solidity-ast": "^0.4.60",
|
|
73
76
|
"minimatch": "^9.0.5"
|
|
74
77
|
}
|
|
75
78
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
"0.8.
|
|
1
|
+
"0.8.29"
|
package/src/storage/extract.ts
CHANGED
|
@@ -15,6 +15,7 @@ import { mapValues } from '../utils/map-values';
|
|
|
15
15
|
import { pick } from '../utils/pick';
|
|
16
16
|
import { execall } from '../utils/execall';
|
|
17
17
|
import { loadNamespaces } from './namespace';
|
|
18
|
+
import { UpgradesError } from '../error';
|
|
18
19
|
|
|
19
20
|
const currentLayoutVersion = '1.2';
|
|
20
21
|
|
|
@@ -37,6 +38,8 @@ export function extractStorageLayout(
|
|
|
37
38
|
): StorageLayout {
|
|
38
39
|
const layout: StorageLayout = { storage: [], types: {}, layoutVersion: currentLayoutVersion, flat: false };
|
|
39
40
|
|
|
41
|
+
loadBaseSlot(contractDef, decodeSrc, layout);
|
|
42
|
+
|
|
40
43
|
// The namespaced context will contain the types of namespaces that may not be included
|
|
41
44
|
// in the original storage layout.
|
|
42
45
|
// Some types will be present in both and they must be exactly equivalent.
|
|
@@ -101,6 +104,24 @@ export function extractStorageLayout(
|
|
|
101
104
|
return layout;
|
|
102
105
|
}
|
|
103
106
|
|
|
107
|
+
function loadBaseSlot(contractDef: ContractDefinition, decodeSrc: SrcDecoder, layout: StorageLayout) {
|
|
108
|
+
if (contractDef.storageLayout !== undefined) {
|
|
109
|
+
if (contractDef.storageLayout.baseSlotExpression.nodeType !== 'Literal') {
|
|
110
|
+
const src = decodeSrc(contractDef.storageLayout.baseSlotExpression);
|
|
111
|
+
|
|
112
|
+
// TODO when Slang supports Solidity 0.8.29, use it to parse the expression (of any node type) into a string, then just save it to `layout.baseSlot`.
|
|
113
|
+
// Then when comparing layouts in `storage/index.ts`, it will only be used when detailed storage layout is not available, and the comparison
|
|
114
|
+
// can be changed to a string comparison when `layout.baseSlot` not an integer literal.
|
|
115
|
+
throw new UpgradesError(
|
|
116
|
+
`${src}: Custom storage layout expression with node type ${contractDef.storageLayout.baseSlotExpression.nodeType} is not currently supported`,
|
|
117
|
+
() =>
|
|
118
|
+
'Please report this at https://zpl.in/upgrades/report and include the `layout at` expression from your contract.',
|
|
119
|
+
);
|
|
120
|
+
}
|
|
121
|
+
layout.baseSlot = contractDef.storageLayout.baseSlotExpression.value ?? undefined;
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
|
|
104
125
|
const findTypeNames = findAll([
|
|
105
126
|
'ArrayTypeName',
|
|
106
127
|
'ElementaryTypeName',
|
package/src/storage/index.ts
CHANGED
|
@@ -6,6 +6,7 @@ import { StorageOperation, StorageItem, StorageLayoutComparator } from './compar
|
|
|
6
6
|
import { LayoutCompatibilityReport } from './report';
|
|
7
7
|
import { ValidationOptions, withValidationDefaults } from '../validate/overrides';
|
|
8
8
|
import { logNote, logWarning } from '../utils/log';
|
|
9
|
+
import { normalizeUint256Literal } from '../utils/integer-literals';
|
|
9
10
|
|
|
10
11
|
export function assertStorageUpgradeSafe(
|
|
11
12
|
original: StorageLayout,
|
|
@@ -36,11 +37,39 @@ export function assertStorageUpgradeSafe(
|
|
|
36
37
|
}
|
|
37
38
|
}
|
|
38
39
|
|
|
40
|
+
function validateBaseSlotUnchanged(original: StorageLayout, updated: StorageLayout) {
|
|
41
|
+
const origNormalized = normalizeUint256Literal(original.baseSlot);
|
|
42
|
+
const updatedNormalized = normalizeUint256Literal(updated.baseSlot);
|
|
43
|
+
|
|
44
|
+
if (origNormalized !== updatedNormalized) {
|
|
45
|
+
throw new UpgradesError(
|
|
46
|
+
`Base slot for custom storage layout changed from ${origNormalized} to ${updatedNormalized}`,
|
|
47
|
+
() => `\
|
|
48
|
+
Do not change the base slot during upgrades when using custom storage layout.
|
|
49
|
+
|
|
50
|
+
If you need to change the base slot, ensure you also do the following:
|
|
51
|
+
1. Adjust all storage variables to continue using their original slots.
|
|
52
|
+
2. Configure your Solidity compiler options to include storage layouts according to https://docs.openzeppelin.com/upgrades-plugins/api-core#compile_contracts_with_storage_layouts
|
|
53
|
+
3. Recompile both the original and updated contracts.
|
|
54
|
+
4. Run the storage layout check again.`,
|
|
55
|
+
);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
|
|
39
59
|
export function getStorageUpgradeReport(
|
|
40
60
|
original: StorageLayout,
|
|
41
61
|
updated: StorageLayout,
|
|
42
62
|
opts: Required<ValidationOptions>,
|
|
43
63
|
): LayoutCompatibilityReport {
|
|
64
|
+
if (opts.unsafeSkipStorageCheck) {
|
|
65
|
+
return new LayoutCompatibilityReport([]);
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
if (original.storage.some(item => item.slot === undefined) || updated.storage.some(item => item.slot === undefined)) {
|
|
69
|
+
// Compiler was not configured to output detailed storage layout with slot information
|
|
70
|
+
validateBaseSlotUnchanged(original, updated);
|
|
71
|
+
}
|
|
72
|
+
|
|
44
73
|
const originalDetailed = getDetailedLayout(original);
|
|
45
74
|
const updatedDetailed = getDetailedLayout(updated);
|
|
46
75
|
const originalDetailedNamespaces = getDetailedNamespacedLayout(original);
|
package/src/storage/layout.ts
CHANGED