@openzeppelin/upgrades-core 1.29.0 → 1.30.1

package/dist/storage/report.js

@@ -116,6 +116,10 @@ function explainStorageOperation(op, ctx) {
                     hints.push('Keep the variable even if unused');
                     break;
                 }
+                case 'delete-namespace': {
+                    hints.push(`Keep the struct with annotation '@custom:storage-location ${op.namespace}' even if unused`);
+                    break;
+                }
             }
             return printWithHints({ title, hints });
         }
@@ -234,6 +238,8 @@ function explainBasicOperation(op, getName) {
             return `Inserted \`${getName(op.updated)}\``;
         case 'append':
             return `Added \`${getName(op.updated)}\``;
+        case 'delete-namespace':
+            return `Deleted namespace \`${op.namespace}\``;
     }
 }
 function describeTransition(original, updated) {

package/dist/storage/report.js.map

@@ -1 +1 @@
-{"version":3,"file":"report.js","sourceRoot":"","sources":["../../src/storage/report.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA2B;AAI3B,uCASmB;AACnB,8CAAwD;AACxD,4CAAyC;AACzC,4CAAyC;AACzC,+BAA8B;AAE9B,MAAa,yBAAyB;IACpC,YAAqB,GAAoC;QAApC,QAAG,GAAH,GAAG,CAAiC;IAAG,CAAC;IAE7D,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,CAAC,KAAK,GAAG,IAAI;QAClB,MAAM,KAAK,GAAG,IAAI,eAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,KAAK,IAAI,eAAM,CAAC,aAAa,CAAC,CAAC,CAAC,eAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC7G,MAAM,GAAG,GAAG,EAAE,CAAC;QAEf,KAAK,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE;YACxC,MAAM,GAAG,GAAG,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACpE,0GAA0G;YAC1G,IAAI,EAAE,CAAC,IAAI,KAAK,cAAc,IAAI,CAAC,KAAK,CAAC,EAAE;gBACzC,SAAS;aACV;YACD,GAAG,CAAC,IAAI,CACN,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,IAAA,eAAM,EAAC,uBAAuB,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CACzG,CAAC;SACH;QAED,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;CACF;AA5BD,8DA4BC;AAYD,SAAS,kBAAkB,CAAC,QAAsB,EAAE,OAAqB;IACvE,MAAM,OAAO,GAAG,IAAA,yBAAe,EAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,IAAA,2BAAiB,EAAC,OAAO,CAAC,CAAC;IAChD,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC;IACtD,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;IAEpC,IAAI,OAAO,KAAK,SAAS,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE;QAC/G,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;IAC3E,MAAM,iBAAiB,GAAG,OAAO,GAAG,YAAY,CAAC;IAEjD,OAAO,iBAAiB,GAAG,YAAY,CAAC;AAC1C,CAAC;AAED,SAAS,cAAc,CAAC,QAAsB,EAAE,OAAqB;IACnE,MAAM,YAAY,GAAG,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC3D,IAAI,YAAY,KAAK,SAAS,EAAE;QAC9B,OAAO,OAAO,OAAO,CAAC,KAAK,kBAAkB,YAAY,EAAE,CAAC;KAC7D;AACH,CAAC;AAED,SAAS,uBAAuB,CAAC,EAAkC,EAAE,GAA4B;IAC/F,QAAQ,EAAE,CAAC,IAAI,EAAE;QACf,KAAK,WAAW,CAAC;QACjB,KAAK,YAAY,CAAC,CAAC;YACjB,MAAM,KAAK,GAAG,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;YACpE,MAAM,OAAO,GACX,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,kCAAkC;gBACtD,CAAC,CAAC,IAAI,GAAG,CACL,iBAAiB,CAAC,EAAE,CAAC,MAAM,CAAC;qBACzB,GAAG,CAAC,wBAAwB,CAAC;qBAC7B,MAAM,CAAC,CAAC,CAAU,EAAe,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CACxD;gBACH,CAAC,CAAC,EAAE,CAAC;YACT,MAAM,KAAK,GAAG,EAAE,CAAC;YACjB,IAAI,IAAA,WAAK,EAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,cAAc,EAAE;gBAC3D,MAAM,UAAU,GAAG,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;gBAC3D,IAAI,UAAU,EAAE;oBACd,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;iBACxB;aACF;YACD,OAAO,cAAc,CAAC;gBACpB,KAAK,EAAE,YAAY,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,4BAA4B,GAAG,IAAA,iBAAO,EAAC,KAAK,EAAE,GAAG,OAAO,CAAC;gBAC7F,KAAK;aACN,CAAC,CAAC;SACJ;QAED,KAAK,WAAW;YACd,OAAO,gCAAgC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;QAEtF,KAAK,QAAQ;YACX,OAAO,WAAW,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;QAEjE,KAAK,SAAS;YACZ,OAAO,YAAY,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,uBAAuB,CAAC;QAEzF,KAAK,cAAc,CAAC,CAAC;YACnB,MAAM,KAAK,GACT,UAAU,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,QAAQ,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG;gBAC5F,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK;gBACrE,wBAAwB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;YACtC,MAAM,KAAK,GAAG,EAAE,CAAC;YAEjB,IAAI,IAAA,WAAK,EAAC,EAAE,CAAC,QAAQ,CAAC,EAAE;gBACtB,MAAM,UAAU,GAAG,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;gBAC3D,IAAI,UAAU,EAAE;oBACd,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;iBACxB;aACF;YAED,OAAO,cAAc,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;SACzC;QAED,OAAO,CAAC,CAAC;YACP,MAAM,KAAK,GAAG,qBAAqB,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACtD,MAAM,KAAK,GAAG,EAAE,CAAC;YAEjB,QAAQ,EAAE,CAAC,IAAI,EAAE;gBACf,KAAK,QAAQ,CAAC,CAAC;oBACb,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE;wBACzB,IAAI,GAAG,CAAC,WAAW,EAAE;4BACnB,KAAK,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;yBACvE;6BAAM;4BACL,KAAK,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;yBAC5E;qBACF;yBAAM;wBACL,KAAK,CAAC,IAAI,CAAC,uEAAuE,CAAC,CAAC;qBACrF;oBACD,MAAM;iBACP;gBAED,KAAK,QAAQ,CAAC,CAAC;oBACb,KAAK,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;oBAC/C,MAAM;iBACP;aACF;YAED,OAAO,cAAc,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;SACzC;KACF;AACH,CAAC;AAED,SAAS,cAAc,CAAC,MAAiB;IACvC,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,GAAG,IAAA,qBAAW,EAAC,GAAG,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;AAC7E,CAAC;AAED,SAAS,iBAAiB,CAAC,EAAc,EAAE,QAAsB,EAAE,OAAqB;IACtF,QAAQ,EAAE,CAAC,IAAI,EAAE;QACf,KAAK,mBAAmB;YACtB,OAAO,eAAe,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,wBAAwB,CAAC;QAE5F,KAAK,kBAAkB,CAAC;QACxB,KAAK,gBAAgB,CAAC;QACtB,KAAK,cAAc;YACjB,OAAO,eAAe,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;QAEtE,KAAK,aAAa;YAChB,OAAO,eAAe,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,kCAAkC,CAAC;QAEtG,KAAK,aAAa;YAChB,OAAO,aAAa,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,GAAG,IAAA,iBAAO,EAAC,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;QAE1G,KAAK,eAAe,CAAC;QACrB,KAAK,aAAa;YAChB,OAAO,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,GAAG,IAAA,iBAAO,EAAC,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;QAEnG,KAAK,cAAc,CAAC;QACpB,KAAK,YAAY,CAAC,CAAC;YACjB,IAAA,eAAM,EAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC5C,MAAM,YAAY,GAAG,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACpD,MAAM,WAAW,GAAG,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAElD,IAAI,IAAA,WAAK,EAAC,QAAQ,CAAC,EAAE;gBACnB,MAAM,IAAI,GACR,EAAE,CAAC,IAAI,KAAK,cAAc;oBACxB,CAAC,CAAC,8DAA8D;oBAChE,CAAC,CAAC,sBAAsB,CAAC;gBAC7B,OAAO,+BAA+B,YAAY,OAAO,WAAW,KAAK,IAAI,EAAE,CAAC;aACjF;iBAAM;gBACL,MAAM,IAAI,GAAG,EAAE,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,2BAA2B,CAAC;gBAC/F,OAAO,yBAAyB,YAAY,OAAO,WAAW,KAAK,IAAI,EAAE,CAAC;aAC3E;SACF;QAED,KAAK,eAAe,CAAC,CAAC;YACpB,IAAA,eAAM,EAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC5C,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAC7G,OAAO,oBAAoB,YAAY,OAAO,WAAW,aAAa,CAAC;SACxE;QAED,KAAK,iBAAiB,CAAC,CAAC;YACtB,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,mCAAmC;YACpF,OAAO,gCAAgC,IAAI,oFAAoF,CAAC;SACjI;QAED,KAAK,SAAS;YACZ,OAAO,gBAAgB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;KAClD;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAgB;IACzC,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;IAEpB,KAAK,MAAM,EAAE,IAAI,IAAI,EAAE;QACrB,QAAQ,EAAE,CAAC,IAAI,EAAE;YACf,KAAK,eAAe,CAAC;YACrB,KAAK,aAAa;gBAChB,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;gBACpB,MAAM;YAER,KAAK,gBAAgB,CAAC,CAAC;gBACrB,KAAK,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE;oBACvB,IAAI,EAAE,CAAC,IAAI,KAAK,YAAY,EAAE;wBAC5B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;qBACtB;iBACF;gBACD,MAAM;aACP;YAED,uEAAuE;YACvE,KAAK,kBAAkB,CAAC;YACxB,KAAK,cAAc,CAAC;YACpB,KAAK,aAAa,CAAC;YACnB,KAAK,aAAa,CAAC;YACnB,KAAK,cAAc,CAAC;YACpB,KAAK,YAAY,CAAC;YAClB,KAAK,eAAe,CAAC;YACrB,KAAK,iBAAiB,CAAC;YACvB,KAAK,SAAS;gBACZ,MAAM;SACT;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,wBAAwB,CAAC,EAAc;IAC9C,QAAQ,EAAE,CAAC,IAAI,EAAE;QACf,KAAK,gBAAgB,CAAC,CAAC;YACrB,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC;YAC3B,OAAO,CACL,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI;gBAC/B,IAAA,iBAAO,EACL,GAAG,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE;oBAC1B,IAAI,EAAE,CAAC,IAAI,KAAK,cAAc,IAAI,CAAC,KAAK,CAAC,EAAE;wBACzC,0GAA0G;wBAC1G,OAAO,EAAE,CAAC;qBACX;yBAAM;wBACL,OAAO,CAAC,uBAAuB,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;qBACvE;gBACH,CAAC,CAAC,CACH,CACF,CAAC;SACH;QAED,KAAK,cAAc;YACjB,OAAO,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC;KACzF;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,EAAiB;IAC7C,QAAQ,EAAE,CAAC,IAAI,EAAE;QACf,KAAK,SAAS;YACZ,OAAO,cAAc,EAAE,CAAC,QAAQ,aAAa,EAAE,CAAC,OAAO,IAAI,CAAC;QAE9D;YACE,OAAO,qBAAqB,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAC5C;AACH,CAAC;AAED,SAAS,qBAAqB,CAAI,EAAqB,EAAE,OAAyB;IAChF,QAAQ,EAAE,CAAC,IAAI,EAAE;QACf,KAAK,QAAQ;YACX,OAAO,aAAa,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;QAE/C,KAAK,QAAQ;YACX,OAAO,cAAc,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;QAE/C,KAAK,QAAQ;YACX,OAAO,WAAW,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;KAC7C;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,QAA4B,EAAE,OAA2B;IACnF,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;IAC1C,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;IAExC,IAAI,aAAa,KAAK,YAAY,EAAE;QAClC,OAAO,MAAM,YAAY,EAAE,CAAC;KAC7B;SAAM;QACL,OAAO,QAAQ,aAAa,OAAO,YAAY,EAAE,CAAC;KACnD;AACH,CAAC;AAED,SAAS,wBAAwB,CAAC,MAAoB;IACpD,MAAM,GAAG,GAAG,EAAE,CAAC;IACf,KAAK,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAU,EAAE;QACpD,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,EAAE,EAAE;YACN,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;YAC1F,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,iBAAiB,EAAE,CAAC,IAAI,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;SAC1D;KACF;IACD,OAAO,IAAA,iBAAO,EAAC,GAAG,GAAG,CAAC,CAAC;AACzB,CAAC;AAED,SAAS,KAAK,CAAC,QAA2B;IACxC,OAAO,GAAG,GAAG,QAAQ,CAAC,KAAK,GAAG,GAAG,CAAC;AACpC,CAAC"}
+{"version":3,"file":"report.js","sourceRoot":"","sources":["../../src/storage/report.ts"],"names":[],"mappings":"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"}

package/dist/storage-namespaced-conflicts-layout.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=storage-namespaced-conflicts-layout.test.d.ts.map

package/dist/storage-namespaced-conflicts-layout.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage-namespaced-conflicts-layout.test.d.ts","sourceRoot":"","sources":["../src/storage-namespaced-conflicts-layout.test.ts"],"names":[],"mappings":""}

package/dist/storage-namespaced-conflicts-layout.test.js

@@ -0,0 +1,69 @@
+"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 extract_1 = require("./storage/extract");
+const src_decoder_1 = require("./src-decoder");
+const test = ava_1.default;
+test.before(async (t) => {
+    const origBuildInfo = await hardhat_1.artifacts.getBuildInfo('contracts/test/NamespacedConflicts.sol:DuplicateNamespace');
+    const namespacedBuildInfo = await hardhat_1.artifacts.getBuildInfo('contracts/test/NamespacedConflictsLayout.sol:DuplicateNamespace');
+    if (origBuildInfo === undefined || namespacedBuildInfo === undefined) {
+        throw new Error('Build info not found');
+    }
+    const origSolcOutput = origBuildInfo.output;
+    const origContracts = {};
+    const origStorageLayouts = {};
+    const namespacedSolcOutput = namespacedBuildInfo.output;
+    const namespacedContracts = {};
+    const namespacedStorageLayouts = {};
+    const origContractDefs = [];
+    for (const def of (0, utils_1.findAll)('ContractDefinition', origSolcOutput.sources['contracts/test/NamespacedConflicts.sol'].ast)) {
+        origContractDefs.push(def);
+    }
+    const namespacedContractDefs = [];
+    for (const def of (0, utils_1.findAll)('ContractDefinition', namespacedSolcOutput.sources['contracts/test/NamespacedConflictsLayout.sol'].ast)) {
+        namespacedContractDefs.push(def);
+    }
+    for (let i = 0; i < origContractDefs.length; i++) {
+        const origContractDef = origContractDefs[i];
+        const namespacedContractDef = namespacedContractDefs[i];
+        origContracts[origContractDef.name] = origContractDef;
+        namespacedContracts[namespacedContractDef.name] = namespacedContractDef;
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        origStorageLayouts[origContractDef.name] =
+            origSolcOutput.contracts['contracts/test/NamespacedConflicts.sol'][origContractDef.name].storageLayout;
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        namespacedStorageLayouts[namespacedContractDef.name] =
+            namespacedSolcOutput.contracts['contracts/test/NamespacedConflictsLayout.sol'][namespacedContractDef.name].storageLayout;
+    }
+    const origDeref = (0, utils_1.astDereferencer)(origSolcOutput);
+    const namespacedDeref = (0, utils_1.astDereferencer)(namespacedSolcOutput);
+    const decodeSrc = (0, src_decoder_1.solcInputOutputDecoder)(origBuildInfo.input, origSolcOutput);
+    t.context.extractStorageLayout = name => (0, extract_1.extractStorageLayout)(origContracts[name], decodeSrc, origDeref, origStorageLayouts[name], {
+        deref: namespacedDeref,
+        contractDef: namespacedContracts[name],
+        storageLayout: namespacedStorageLayouts[name],
+    });
+});
+test('duplicate namespace', t => {
+    const error = t.throws(() => t.context.extractStorageLayout('DuplicateNamespace'));
+    t.snapshot(error?.message);
+});
+test('inherits duplicate', t => {
+    const error = t.throws(() => t.context.extractStorageLayout('InheritsDuplicate'));
+    t.snapshot(error?.message);
+});
+test('conflicts with parent', t => {
+    const error = t.throws(() => t.context.extractStorageLayout('ConflictsWithParent'));
+    t.snapshot(error?.message);
+});
+test('conflicts in both parents', t => {
+    const error = t.throws(() => t.context.extractStorageLayout('ConflictsInBothParents'));
+    t.snapshot(error?.message);
+});
+//# sourceMappingURL=storage-namespaced-conflicts-layout.test.js.map

package/dist/storage-namespaced-conflicts-layout.test.js.map

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

package/dist/storage-namespaced-conflicts.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=storage-namespaced-conflicts.test.d.ts.map

package/dist/storage-namespaced-conflicts.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage-namespaced-conflicts.test.d.ts","sourceRoot":"","sources":["../src/storage-namespaced-conflicts.test.ts"],"names":[],"mappings":""}

package/dist/storage-namespaced-conflicts.test.js

@@ -0,0 +1,45 @@
+"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 extract_1 = require("./storage/extract");
+const src_decoder_1 = require("./src-decoder");
+const test = ava_1.default;
+test.before(async (t) => {
+    const buildInfo = await hardhat_1.artifacts.getBuildInfo('contracts/test/NamespacedConflicts.sol:DuplicateNamespace');
+    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['contracts/test/NamespacedConflicts.sol'].ast)) {
+        contracts[def.name] = def;
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        storageLayouts[def.name] = solcOutput.contracts['contracts/test/NamespacedConflicts.sol'][def.name].storageLayout;
+    }
+    const deref = (0, utils_1.astDereferencer)(solcOutput);
+    const decodeSrc = (0, src_decoder_1.solcInputOutputDecoder)(buildInfo.input, solcOutput);
+    t.context.extractStorageLayout = name => (0, extract_1.extractStorageLayout)(contracts[name], decodeSrc, deref, storageLayouts[name]);
+});
+test('duplicate namespace', t => {
+    const error = t.throws(() => t.context.extractStorageLayout('DuplicateNamespace'));
+    t.snapshot(error?.message);
+});
+test('inherits duplicate', t => {
+    const error = t.throws(() => t.context.extractStorageLayout('InheritsDuplicate'));
+    t.snapshot(error?.message);
+});
+test('conflicts with parent', t => {
+    const error = t.throws(() => t.context.extractStorageLayout('ConflictsWithParent'));
+    t.snapshot(error?.message);
+});
+test('conflicts in both parents', t => {
+    const error = t.throws(() => t.context.extractStorageLayout('ConflictsInBothParents'));
+    t.snapshot(error?.message);
+});
+//# sourceMappingURL=storage-namespaced-conflicts.test.js.map

package/dist/storage-namespaced-conflicts.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage-namespaced-conflicts.test.js","sourceRoot":"","sources":["../src/storage-namespaced-conflicts.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAoC;AAEpC,8CAA8D;AAC9D,qCAAoC;AAIpC,+CAAyD;AACzD,+CAAuD;AAMvD,MAAM,IAAI,GAAG,aAAwB,CAAC;AAEtC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE;IACpB,MAAM,SAAS,GAAG,MAAM,mBAAS,CAAC,YAAY,CAAC,2DAA2D,CAAC,CAAC;IAC5G,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACzC;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,wCAAwC,CAAC,CAAC,GAAG,CAAC,EAAE;QACjH,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;QAC1B,oEAAoE;QACpE,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,aAAc,CAAC;KACpH;IACD,MAAM,KAAK,GAAG,IAAA,uBAAe,EAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,IAAA,oCAAsB,EAAC,SAAS,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IACtE,CAAC,CAAC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,EAAE,CACtC,IAAA,8BAAoB,EAAC,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;AAClF,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC,EAAE;IAC9B,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAC,CAAC;IACnF,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC,EAAE;IAC7B,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAClF,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC,EAAE;IAChC,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,CAAC,CAAC;IACpF,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE;IACpC,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,CAAC,CAAC;IACvF,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC"}

package/dist/storage-namespaced-layout.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=storage-namespaced-layout.test.d.ts.map

package/dist/storage-namespaced-layout.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage-namespaced-layout.test.d.ts","sourceRoot":"","sources":["../src/storage-namespaced-layout.test.ts"],"names":[],"mappings":""}

package/dist/storage-namespaced-layout.test.js

@@ -0,0 +1,59 @@
+"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 extract_1 = require("./storage/extract");
+const stabilize_layout_1 = require("./utils/stabilize-layout");
+const src_decoder_1 = require("./src-decoder");
+const test = ava_1.default;
+test.before(async (t) => {
+    // Tests extracting the storage layout (to include slot and offset) using Namespaced.sol's Example as the original contract,
+    // and NamespacedLayout.sol's Example as the modified contract with the storage layout.
+    const origBuildInfo = await hardhat_1.artifacts.getBuildInfo('contracts/test/Namespaced.sol:Example');
+    const namespacedBuildInfo = await hardhat_1.artifacts.getBuildInfo('contracts/test/NamespacedLayout.sol:Example');
+    if (origBuildInfo === undefined || namespacedBuildInfo === undefined) {
+        throw new Error('Build info not found');
+    }
+    const origSolcOutput = origBuildInfo.output;
+    const origContracts = {};
+    const origStorageLayouts = {};
+    const namespacedSolcOutput = namespacedBuildInfo.output;
+    const namespacedContracts = {};
+    const namespacedStorageLayouts = {};
+    const origContractDefs = [];
+    for (const def of (0, utils_1.findAll)('ContractDefinition', origSolcOutput.sources['contracts/test/Namespaced.sol'].ast)) {
+        origContractDefs.push(def);
+    }
+    const namespacedContractDefs = [];
+    for (const def of (0, utils_1.findAll)('ContractDefinition', namespacedSolcOutput.sources['contracts/test/NamespacedLayout.sol'].ast)) {
+        namespacedContractDefs.push(def);
+    }
+    // Expects the first contract in Namespaced.sol and NamespacedLayout.sol to be 'Example'
+    const origContractDef = origContractDefs[0];
+    const namespacedContractDef = namespacedContractDefs[0];
+    origContracts[origContractDef.name] = origContractDef;
+    namespacedContracts[namespacedContractDef.name] = namespacedContractDef;
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    origStorageLayouts[origContractDef.name] =
+        origSolcOutput.contracts['contracts/test/Namespaced.sol'][origContractDef.name].storageLayout;
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    namespacedStorageLayouts[namespacedContractDef.name] =
+        namespacedSolcOutput.contracts['contracts/test/NamespacedLayout.sol'][namespacedContractDef.name].storageLayout;
+    const origDeref = (0, utils_1.astDereferencer)(origSolcOutput);
+    const namespacedDeref = (0, utils_1.astDereferencer)(namespacedSolcOutput);
+    const decodeSrc = (0, src_decoder_1.solcInputOutputDecoder)(origBuildInfo.input, origSolcOutput);
+    t.context.extractStorageLayout = name => (0, extract_1.extractStorageLayout)(origContracts[name], decodeSrc, origDeref, origStorageLayouts[name], {
+        deref: namespacedDeref,
+        contractDef: namespacedContracts[name],
+        storageLayout: namespacedStorageLayouts[name],
+    });
+});
+test('layout', t => {
+    const layout = t.context.extractStorageLayout('Example');
+    t.snapshot((0, stabilize_layout_1.stabilizeStorageLayout)(layout));
+});
+//# sourceMappingURL=storage-namespaced-layout.test.js.map

package/dist/storage-namespaced-layout.test.js.map

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

package/dist/storage-namespaced-outside-contract.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=storage-namespaced-outside-contract.test.d.ts.map

package/dist/storage-namespaced-outside-contract.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage-namespaced-outside-contract.test.d.ts","sourceRoot":"","sources":["../src/storage-namespaced-outside-contract.test.ts"],"names":[],"mappings":""}

package/dist/storage-namespaced-outside-contract.test.js

@@ -0,0 +1,22 @@
+"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 hardhat_1 = require("hardhat");
+const validate_1 = require("./validate");
+const src_decoder_1 = require("./src-decoder");
+(0, ava_1.default)('namespace outside contract', async (t) => {
+    const contract = 'contracts/test/NamespacedOutsideContract.sol:Example';
+    const buildInfo = await hardhat_1.artifacts.getBuildInfo(contract);
+    if (buildInfo === undefined) {
+        throw new Error(`Build info not found for contract ${contract}`);
+    }
+    const solcOutput = buildInfo.output;
+    const solcInput = buildInfo.input;
+    const decodeSrc = (0, src_decoder_1.solcInputOutputDecoder)(solcInput, solcOutput);
+    const error = t.throws(() => (0, validate_1.validate)(solcOutput, decodeSrc));
+    t.assert(error?.message.includes('contracts/test/NamespacedOutsideContract.sol:7: Namespace struct MainStorage is defined outside of a contract'), error?.message);
+});
+//# sourceMappingURL=storage-namespaced-outside-contract.test.js.map

package/dist/storage-namespaced-outside-contract.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage-namespaced-outside-contract.test.js","sourceRoot":"","sources":["../src/storage-namespaced-outside-contract.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AACvB,qCAAoC;AAEpC,yCAAsC;AACtC,+CAAuD;AAEvD,IAAA,aAAI,EAAC,4BAA4B,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IAC3C,MAAM,QAAQ,GAAG,sDAAsD,CAAC;IAExE,MAAM,SAAS,GAAG,MAAM,mBAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IACzD,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,qCAAqC,QAAQ,EAAE,CAAC,CAAC;KAClE;IACD,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC;IACpC,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC;IAClC,MAAM,SAAS,GAAG,IAAA,oCAAsB,EAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAChE,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,mBAAQ,EAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC,MAAM,CACN,KAAK,EAAE,OAAO,CAAC,QAAQ,CACrB,+GAA+G,CAChH,EACD,KAAK,EAAE,OAAO,CACf,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/dist/storage-namespaced-solc-versions.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=storage-namespaced-solc-versions.test.d.ts.map

package/dist/storage-namespaced-solc-versions.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage-namespaced-solc-versions.test.d.ts","sourceRoot":"","sources":["../src/storage-namespaced-solc-versions.test.ts"],"names":[],"mappings":""}

package/dist/storage-namespaced-solc-versions.test.js

@@ -0,0 +1,42 @@
+"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 hardhat_1 = require("hardhat");
+const validate_1 = require("./validate");
+const src_decoder_1 = require("./src-decoder");
+const test = ava_1.default;
+test.before(async (t) => {
+    const contract = 'contracts/test/Namespaced.sol:Example';
+    const buildInfo = await hardhat_1.artifacts.getBuildInfo(contract);
+    if (buildInfo === undefined) {
+        throw new Error(`Build info not found for contract ${contract}`);
+    }
+    const solcOutput = buildInfo.output;
+    const solcInput = buildInfo.input;
+    const decodeSrc = (0, src_decoder_1.solcInputOutputDecoder)(solcInput, solcOutput);
+    t.context.validate = solcVersion => (0, validate_1.validate)(solcOutput, decodeSrc, solcVersion, solcInput);
+});
+test('namespace with older solc version', async (t) => {
+    const { validate } = t.context;
+    const error = t.throws(() => validate('0.8.19'));
+    t.assert(error?.message.includes(`contracts/test/Namespaced.sol: Namespace annotations require Solidity version >= 0.8.20, but 0.8.19 was used`), error?.message);
+});
+test('namespace with correct solc version', async (t) => {
+    const { validate } = t.context;
+    validate('0.8.20');
+    t.pass();
+});
+test('namespace with newer solc version', async (t) => {
+    const { validate } = t.context;
+    validate('0.8.21');
+    t.pass();
+});
+test('namespace with no solc version', async (t) => {
+    const { validate } = t.context;
+    const error = t.throws(() => validate(undefined));
+    t.assert(error?.message.includes(`contracts/test/Namespaced.sol: Namespace annotations require Solidity version >= 0.8.20, but no solcVersion parameter was provided`), error?.message);
+});
+//# sourceMappingURL=storage-namespaced-solc-versions.test.js.map

package/dist/storage-namespaced-solc-versions.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage-namespaced-solc-versions.test.js","sourceRoot":"","sources":["../src/storage-namespaced-solc-versions.test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAoC;AACpC,qCAAoC;AAEpC,yCAAsC;AACtC,+CAAuD;AAMvD,MAAM,IAAI,GAAG,aAAwB,CAAC;AAEtC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE;IACpB,MAAM,QAAQ,GAAG,uCAAuC,CAAC;IAEzD,MAAM,SAAS,GAAG,MAAM,mBAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IACzD,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,qCAAqC,QAAQ,EAAE,CAAC,CAAC;KAClE;IACD,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC;IACpC,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC;IAClC,MAAM,SAAS,GAAG,IAAA,oCAAsB,EAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAEhE,CAAC,CAAC,OAAO,CAAC,QAAQ,GAAG,WAAW,CAAC,EAAE,CAAC,IAAA,mBAAQ,EAAC,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;AAC9F,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mCAAmC,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC;IAC/B,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjD,CAAC,CAAC,MAAM,CACN,KAAK,EAAE,OAAO,CAAC,QAAQ,CACrB,8GAA8G,CAC/G,EACD,KAAK,EAAE,OAAO,CACf,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qCAAqC,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IACpD,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC;IAC/B,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACnB,CAAC,CAAC,IAAI,EAAE,CAAC;AACX,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mCAAmC,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC;IAC/B,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACnB,CAAC,CAAC,IAAI,EAAE,CAAC;AACX,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gCAAgC,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IAC/C,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC;IAC/B,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC,MAAM,CACN,KAAK,EAAE,OAAO,CAAC,QAAQ,CACrB,oIAAoI,CACrI,EACD,KAAK,EAAE,OAAO,CACf,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/dist/storage-namespaced-udvt.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=storage-namespaced-udvt.test.d.ts.map

package/dist/storage-namespaced-udvt.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage-namespaced-udvt.test.d.ts","sourceRoot":"","sources":["../src/storage-namespaced-udvt.test.ts"],"names":[],"mappings":""}

package/dist/storage-namespaced-udvt.test.js

@@ -0,0 +1,130 @@
+"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 src_decoder_1 = require("./src-decoder");
+const test = ava_1.default;
+test.before(async (t) => {
+    const origBuildInfo = await hardhat_1.artifacts.getBuildInfo('contracts/test/NamespacedUDVT.sol:NamespacedUDVT');
+    const namespacedBuildInfo = await hardhat_1.artifacts.getBuildInfo('contracts/test/NamespacedUDVTLayout.sol:NamespacedUDVT');
+    if (origBuildInfo === undefined || namespacedBuildInfo === undefined) {
+        throw new Error('Build info not found');
+    }
+    const origSolcOutput = origBuildInfo.output;
+    const origContracts = {};
+    const origStorageLayouts = {};
+    const namespacedSolcOutput = namespacedBuildInfo.output;
+    const namespacedContracts = {};
+    const namespacedStorageLayouts = {};
+    const origContractDefs = [];
+    for (const def of (0, utils_1.findAll)('ContractDefinition', origSolcOutput.sources['contracts/test/NamespacedUDVT.sol'].ast)) {
+        origContractDefs.push(def);
+    }
+    const namespacedContractDefs = [];
+    for (const def of (0, utils_1.findAll)('ContractDefinition', namespacedSolcOutput.sources['contracts/test/NamespacedUDVTLayout.sol'].ast)) {
+        namespacedContractDefs.push(def);
+    }
+    for (let i = 0; i < origContractDefs.length; i++) {
+        const origContractDef = origContractDefs[i];
+        const namespacedContractDef = namespacedContractDefs[i];
+        origContracts[origContractDef.name] = origContractDef;
+        namespacedContracts[namespacedContractDef.name] = namespacedContractDef;
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        origStorageLayouts[origContractDef.name] =
+            origSolcOutput.contracts['contracts/test/NamespacedUDVT.sol'][origContractDef.name].storageLayout;
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        namespacedStorageLayouts[namespacedContractDef.name] =
+            namespacedSolcOutput.contracts['contracts/test/NamespacedUDVTLayout.sol'][namespacedContractDef.name].storageLayout;
+    }
+    const origDeref = (0, utils_1.astDereferencer)(origSolcOutput);
+    const namespacedDeref = (0, utils_1.astDereferencer)(namespacedSolcOutput);
+    const decodeSrc = (0, src_decoder_1.solcInputOutputDecoder)(origBuildInfo.input, origSolcOutput);
+    t.context.extractStorageLayout = (name, layoutInfo) => (0, extract_1.extractStorageLayout)(origContracts[name], decodeSrc, origDeref, origStorageLayouts[name], layoutInfo
+        ? {
+            deref: namespacedDeref,
+            contractDef: namespacedContracts[name],
+            storageLayout: namespacedStorageLayouts[name],
+        }
+        : undefined);
+});
+test('user defined value types - layout info', async (t) => {
+    const v1 = t.context.extractStorageLayout('NamespacedUDVT', true);
+    const v2 = t.context.extractStorageLayout('NamespacedUDVT_V2_Ok', true);
+    const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
+    t.deepEqual(comparison, []);
+});
+test('user defined value types - no layout info', async (t) => {
+    const v1 = t.context.extractStorageLayout('NamespacedUDVT', false);
+    const v2 = t.context.extractStorageLayout('NamespacedUDVT_V2_Ok', false);
+    const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
+    t.deepEqual(comparison, []);
+});
+test('user defined value types - layout info - bad underlying type', async (t) => {
+    const v1 = t.context.extractStorageLayout('NamespacedUDVT', true);
+    const v2 = t.context.extractStorageLayout('NamespacedUDVT_V2_Resize', true);
+    const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
+    t.like(comparison, {
+        length: 1,
+        0: {
+            kind: 'typechange',
+            change: {
+                kind: 'type resize',
+            },
+            original: { label: 'my_user_value' },
+            updated: { label: 'my_user_value' },
+        },
+    });
+});
+test('user defined value types - no layout info - bad underlying type', async (t) => {
+    const v1 = t.context.extractStorageLayout('NamespacedUDVT', false);
+    const v2 = t.context.extractStorageLayout('NamespacedUDVT_V2_Resize', false);
+    const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
+    t.like(comparison, {
+        length: 1,
+        0: {
+            kind: 'typechange',
+            change: {
+                kind: 'unknown',
+            },
+            original: { label: 'my_user_value' },
+            updated: { label: 'my_user_value' },
+        },
+    });
+});
+test('mapping with user defined value type key - ok', t => {
+    const v1 = t.context.extractStorageLayout('NamespacedUDVT_MappingKey_V1', true);
+    const v2 = t.context.extractStorageLayout('NamespacedUDVT_MappingKey_V2_Ok', true);
+    const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
+    t.deepEqual(comparison, []);
+});
+test('mapping with user defined value type key - bad', t => {
+    const v1 = t.context.extractStorageLayout('NamespacedUDVT_MappingKey_V1', true);
+    const v2 = t.context.extractStorageLayout('NamespacedUDVT_MappingKey_V2_Bad', true);
+    const comparison = (0, storage_1.getStorageUpgradeErrors)(v1, v2);
+    t.like(comparison, {
+        length: 2,
+        0: {
+            kind: 'typechange',
+            change: {
+                kind: 'mapping key',
+            },
+            original: { label: 'm1' },
+            updated: { label: 'm1' },
+        },
+        1: {
+            kind: 'typechange',
+            change: {
+                kind: 'mapping key',
+            },
+            original: { label: 'm2' },
+            updated: { label: 'm2' },
+        },
+    });
+});
+//# sourceMappingURL=storage-namespaced-udvt.test.js.map

package/dist/storage-namespaced-udvt.test.js.map

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

package/dist/storage-namespaced.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=storage-namespaced.test.d.ts.map

package/dist/storage-namespaced.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage-namespaced.test.d.ts","sourceRoot":"","sources":["../src/storage-namespaced.test.ts"],"names":[],"mappings":""}