hardhat 3.0.0-next.7 → 3.0.0-next.8

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/CHANGELOG.md CHANGED
@@ -1,5 +1,12 @@
1
1
  # hardhat
2
2
 
3
+ ## 3.0.0-next.8
4
+
5
+ ### Patch Changes
6
+
7
+ - 6c27bd3: Fix to the template project scripts to match the new signature of `network.connect(...)` ([#6691](https://github.com/NomicFoundation/hardhat/issues/6691))
8
+ - 11e4652: Dedupe and sort merged solc outputSelection ([#6678](https://github.com/NomicFoundation/hardhat/pull/6678))
9
+
3
10
  ## 3.0.0-next.7
4
11
 
5
12
  ### Patch Changes
@@ -262,6 +262,10 @@ async function getProviderConfig(networkConfig, chainDescriptors) {
262
262
  },
263
263
  },
264
264
  networkId: BigInt(networkConfig.networkId),
265
+ observability: {
266
+ // TODO: add configuration of code coverage
267
+ codeCoverage: undefined,
268
+ },
265
269
  ownedAccounts: await hardhatAccountsToEdrOwnedAccounts(networkConfig.accounts),
266
270
  };
267
271
  }
@@ -1 +1 @@
1
- {"version":3,"file":"edr-provider.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/network-manager/edr/edr-provider.ts"],"names":[],"mappings":"AAyBA,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,cAAc,EACd,oBAAoB,GACrB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,sBAAsB,EACtB,YAAY,GACb,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAChE,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,iCAAiC,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EACL,qBAAqB,EACrB,aAAa,EACb,YAAY,GACb,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,iCAAiC,EAAE,MAAM,+CAA+C,CAAC;AAClG,OAAO,EACL,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EACL,yBAAyB,EACzB,wCAAwC,EACxC,oCAAoC,EACpC,0BAA0B,EAC1B,iCAAiC,EACjC,kCAAkC,EAClC,mCAAmC,EACnC,8BAA8B,GAC/B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAE/D,MAAM,GAAG,GAAG,KAAK,CAAC,uCAAuC,CAAC,CAAC;AAE3D,MAAM,CAAC,MAAM,4BAA4B,GACvC,4CAA4C,CAAC;AAQ/C,MAAM,CAAC,MAAM,oBAAoB,GAC/B,6DAA6D,CAAC;AAChE,MAAM,CAAC,MAAM,2BAA2B,GAAG,wBAAwB,CAAC;AACpE,MAAM,CAAC,MAAM,6CAA6C,GACxD;IACE,GAAG,iCAAiC;IACpC,QAAQ,EAAE,oBAAoB;IAC9B,eAAe,EAAE,2BAA2B;CAC7C,CAAC;AAEJ,MAAM,CAAC,KAAK,UAAU,mCAAmC,CACvD,QAAoC;IAEpC,OAAO,SAAS,CACd;QACE,GAAG,QAAQ;QACX,QAAQ,EAAE,MAAM,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE;QACvC,UAAU,EAAE,MAAM,QAAQ,CAAC,UAAU,CAAC,GAAG,EAAE;KAC5C,EACD,6CAA6C,CAC9C,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,gCAAgC,GAAa;IACxD,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;CACrE,CAAC;AAUF,MAAM,OAAO,WAAY,SAAQ,YAAY;IAClC,sBAAsB,CAAiC;IAEhE,SAAS,CAAuB;IAChC,cAAc,GAAG,CAAC,CAAC;IAEnB;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EACzB,gBAAgB,EAChB,aAAa,EACb,YAAY,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,EACjC,aAAa,GAAG,EAAE,EAClB,qBAAqB,GACH;QAClB,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,IAAI,SAAS,CAAC;QAC1D,MAAM,iBAAiB,GAAG,YAAY,CAAC,iBAAiB,IAAI,eAAe,CAAC;QAE5E,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAC5C,aAAa,EACb,gBAAgB,CACjB,CAAC;QAEF,IAAI,WAAwB,CAAC;QAE7B,iFAAiF;QACjF,0EAA0E;QAC1E,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,mBAAmB,EAAE,CAAC;YAC5C,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,cAAc,CAC3C,8BAA8B,CAAC,aAAa,CAAC,SAAS,CAAC,EACvD,cAAc,EACd;gBACE,MAAM,EAAE,YAAY,CAAC,OAAO;gBAC5B,8BAA8B,EAAE,aAAa,CAAC,cAAc;gBAC5D,iBAAiB,EAAE,CAAC,OAAe,EAAE,OAAgB,EAAE,EAAE;oBACvD,IAAI,OAAO,EAAE,CAAC;wBACZ,iBAAiB,CAAC,OAAO,CAAC,CAAC;oBAC7B,CAAC;yBAAM,CAAC;wBACN,WAAW,CAAC,OAAO,CAAC,CAAC;oBACvB,CAAC;gBACH,CAAC;aACF,EACD;gBACE,oBAAoB,EAAE,CAAC,KAAwB,EAAE,EAAE;oBACjD,WAAW,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;gBACzC,CAAC;aACF,EACD,aAAa,CACd,CAAC;YAEF,WAAW,GAAG,IAAI,WAAW,CAAC,QAAQ,EAAE,qBAAqB,CAAC,CAAC;QACjE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,CAAC,KAAK,CAAC,CAAC;YAEnB,+EAA+E;YAC/E,MAAM,IAAI,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED;;;;;;OAMG;IACH,YACE,QAAkB,EAClB,qBAAqD;QAErD,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,sBAAsB,GAAG,qBAAqB,CAAC;IACtD,CAAC;IAEM,KAAK,CAAC,OAAO,CAClB,gBAAkC;QAElC,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACjC,MAAM,IAAI,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAAC;QAE5C,MAAM,cAAc,GAAG,iBAAiB,CACtC,IAAI,CAAC,cAAc,EAAE,EACrB,MAAM,EACN,MAAM,CACP,CAAC;QAEF,IAAI,eAAgC,CAAC;QAErC,IAAI,IAAI,CAAC,sBAAsB,KAAK,SAAS,EAAE,CAAC;YAC9C,eAAe,GAAG,MAAM,IAAI,CAAC,sBAAsB,CACjD,cAAc,EACd,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAC/B,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAC9D,CAAC;QAED,6DAA6D;QAC7D,0DAA0D;QAC1D,IAAI,uBAAuB,CAAC,eAAe,CAAC,EAAE,CAAC;YAC7C,MAAM,KAAK,GAAG,IAAI,aAAa,CAC7B,eAAe,CAAC,KAAK,CAAC,OAAO,EAC7B,eAAe,CAAC,KAAK,CAAC,IAAI,CAC3B,CAAC;YACF,KAAK,CAAC,IAAI,GAAG,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC;YAExC,gFAAgF;YAChF,MAAM,KAAK,CAAC;QACd,CAAC;QAED,IAAI,cAAc,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;YAC3C,IAAI,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAC/C,CAAC;QAED,4EAA4E;QAC5E,+DAA+D;QAC/D,IAAI,cAAc,CAAC,MAAM,KAAK,oBAAoB,EAAE,CAAC;YACnD,sBAAsB,CACpB,OAAO,eAAe,CAAC,MAAM,KAAK,QAAQ,EAC1C,iCAAiC,CAClC,CAAC;YACF,OAAO,aAAa,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAC/C,CAAC;aAAM,IACL,cAAc,CAAC,MAAM,KAAK,wBAAwB;YAClD,cAAc,CAAC,MAAM,KAAK,iBAAiB,EAC3C,CAAC;YACD,sBAAsB,CACpB,kBAAkB,CAAC,eAAe,CAAC,MAAM,CAAC,EAC1C,8BAA8B,CAC/B,CAAC;YACF,OAAO,yBAAyB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,OAAO,eAAe,CAAC,MAAM,CAAC;QAChC,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,+DAA+D;QAC/D,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,WAAqB;QAErB,IAAI,eAAgC,CAAC;QAErC,IAAI,OAAO,WAAW,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACzC,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,eAAe,GAAG,WAAW,CAAC,IAAI,CAAC;QACrC,CAAC;QAED,IAAI,uBAAuB,CAAC,eAAe,CAAC,EAAE,CAAC;YAC7C,MAAM,aAAa,GAAG,eAAe,CAAC,KAAK,CAAC;YAC5C,IAAI,KAAK,CAAC;YAEV,IAAI,UAAU,GAA8B,IAAI,CAAC;YACjD,IAAI,CAAC;gBACH,UAAU,GAAG,WAAW,CAAC,UAAU,EAAE,CAAC;YACxC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,GAAG,CAAC,+BAA+B,EAAE,CAAC,CAAC,CAAC;YAC1C,CAAC;YAED,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;gBACxB,oEAAoE;gBACpE,wDAAwD;gBACxD,sBAAsB,CACpB,sBAAsB,CAAC,aAAa,CAAC,IAAI,CAAC,EAC1C,oBAAoB,CACrB,CAAC;gBAEF,KAAK,GAAG,iCAAiC,CACvC,aAAa,CAAC,OAAO,EACrB,UAAU,EACV,aAAa,CAAC,IAAI,CAAC,IAAI,EACvB,aAAa,CAAC,IAAI,CAAC,eAAe,CACnC,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,KAAK;oBACH,aAAa,CAAC,IAAI,KAAK,qBAAqB,CAAC,IAAI;wBAC/C,CAAC,CAAC,IAAI,qBAAqB,CAAC,aAAa,CAAC,OAAO,CAAC;wBAClD,CAAC,CAAC,IAAI,aAAa,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;gBACnE,KAAK,CAAC,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC;YAClC,CAAC;YAED;+DACmD;YACnD,MAAM,KAAK,CAAC;QACd,CAAC;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;IAEM,mBAAmB,CAAC,KAAwB;QACjD,MAAM,YAAY,GAAG,iBAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5E,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,4BAA4B,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YACxD,IAAI,CAAC,6BAA6B,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;IAED,4BAA4B,CAAC,YAAoB,EAAE,MAAe;QAChE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACxB,YAAY;YACZ,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED,6BAA6B,CAAC,YAAoB,EAAE,MAAe;QACjE,MAAM,OAAO,GAAoB;YAC/B,IAAI,EAAE,kBAAkB;YACxB,IAAI,EAAE;gBACJ,YAAY;gBACZ,MAAM;aACP;SACF,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAuB;QAC1C,sBAAsB,CACpB,IAAI,CAAC,SAAS,KAAK,SAAS,EAC5B,6BAA6B,CAC9B,CAAC;QAEF,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAEhD,IAAI,WAAqB,CAAC;QAE1B,iFAAiF;QACjF,0EAA0E;QAC1E,IAAI,CAAC;YACH,WAAW,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QACpE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,CAAC,KAAK,CAAC,CAAC;YAEnB,+EAA+E;YAC/E,MAAM,IAAI,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAC9C,CAAC;CACF;AAED,KAAK,UAAU,iBAAiB,CAC9B,aAA0D,EAC1D,gBAAwC;IAExC,MAAM,MAAM,GAAG,0BAA0B,CACvC,aAAa,CAAC,QAAQ,EACtB,aAAa,CAAC,SAAS,CACxB,CAAC;IAEF,MAAM,YAAY,GAChB,aAAa,CAAC,OAAO,KAAK,SAAS;QACjC,CAAC,CAAC,EAAE,CAAC,sFAAsF;QAC3F,CAAC,CAAC,aAAa,CAAC,SAAS,KAAK,UAAU;YACtC,CAAC,CAAC,cAAc,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;YAC9C,CAAC,CAAC,cAAc,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC;IAErD,OAAO;QACL,4BAA4B,EAAE,aAAa,CAAC,4BAA4B;QACxE,0BAA0B,EAAE,aAAa,CAAC,0BAA0B;QACpE,iBAAiB,EAAE,aAAa,CAAC,mBAAmB;QACpD,wBAAwB,EAAE,aAAa,CAAC,0BAA0B;QAClE,aAAa,EAAE,aAAa,CAAC,aAAa;QAC1C,QAAQ,EAAE,aAAa,CAAC,OAAO,EAAE,QAAQ;QACzC,OAAO,EAAE,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC;QACtC,MAAM,EAAE,kCAAkC,CACxC,gBAAgB,EAChB,aAAa,CAAC,SAAS,CACxB;QACD,6EAA6E;QAC7E,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;QAC7C,aAAa,EAAE,aAAa,CAAC,aAAa;QAC1C,IAAI,EAAE,MAAM,mCAAmC,CAAC,aAAa,CAAC,OAAO,CAAC;QACtE,YAAY;QACZ,QAAQ,EAAE,MAAM;QAChB,oBAAoB,EAAE,aAAa,CAAC,oBAAoB;QACxD,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QACzD,WAAW,EAAE,aAAa,CAAC,WAAW;QACtC,MAAM,EAAE;YACN,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI;YACnC,QAAQ,EAAE,wCAAwC,CAChD,aAAa,CAAC,MAAM,CAAC,QAAQ,CAC9B;YACD,OAAO,EAAE;gBACP,KAAK,EAAE,oCAAoC,CACzC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CACnC;aACF;SACF;QACD,SAAS,EAAE,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC;QAC1C,aAAa,EAAE,MAAM,iCAAiC,CACpD,aAAa,CAAC,QAAQ,CACvB;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"edr-provider.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/network-manager/edr/edr-provider.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"compilation-job.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/compilation-job.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AAStF,qBAAa,4BAA6B,YAAW,cAAc;;IACjE,SAAgB,eAAe,EAAE,eAAe,CAAC;IACjD,SAAgB,UAAU,EAAE,UAAU,CAAC;IACvC,SAAgB,eAAe,EAAE,MAAM,CAAC;gBAUtC,eAAe,EAAE,6BAA6B,EAC9C,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,SAAS,EAAE;IAQZ,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC;IAQtC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;CAuH3C"}
1
+ {"version":3,"file":"compilation-job.d.ts","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/compilation-job.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AAStF,qBAAa,4BAA6B,YAAW,cAAc;;IACjE,SAAgB,eAAe,EAAE,eAAe,CAAC;IACjD,SAAgB,UAAU,EAAE,UAAU,CAAC;IACvC,SAAgB,eAAe,EAAE,MAAM,CAAC;gBAUtC,eAAe,EAAE,6BAA6B,EAC9C,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,SAAS,EAAE;IAQZ,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC;IAQtC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;CA6I3C"}
@@ -77,11 +77,23 @@ export class CompilationJobImplementation {
77
77
  ...settings,
78
78
  evmVersion: settings.evmVersion ??
79
79
  getEvmVersionFromSolcVersion(this.solcConfig.version),
80
- outputSelection,
80
+ outputSelection: this.#dedupeAndSortOutputSelection(outputSelection),
81
81
  remappings: this.#remappings.map(formatRemapping),
82
82
  },
83
83
  };
84
84
  }
85
+ #dedupeAndSortOutputSelection(outputSelection) {
86
+ const dedupedOutputSelection = {};
87
+ for (const sourceName of Object.keys(outputSelection).sort()) {
88
+ dedupedOutputSelection[sourceName] = {};
89
+ const contracts = outputSelection[sourceName];
90
+ for (const contractName of Object.keys(contracts).sort()) {
91
+ const selectors = contracts[contractName];
92
+ dedupedOutputSelection[sourceName][contractName] = Array.from(new Set(selectors)).sort();
93
+ }
94
+ }
95
+ return dedupedOutputSelection;
96
+ }
85
97
  async #computeBuildId() {
86
98
  // NOTE: We type it this way so that this stop compiling if we ever change
87
99
  // the format of the BuildInfo type.
@@ -1 +1 @@
1
- {"version":3,"file":"compilation-job.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/compilation-job.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"compilation-job.js","sourceRoot":"","sources":["../../../../../../src/internal/builtin-plugins/solidity/build-system/compilation-job.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAEhE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAE9D,MAAM,OAAO,4BAA4B;IACvB,eAAe,CAAkB;IACjC,UAAU,CAAa;IACvB,eAAe,CAAS;IAE/B,WAAW,CAAc;IAElC,QAAQ,CAAqB;IAC7B,UAAU,CAA4B;IACtC,wBAAwB,CAA6C;IACrE,cAAc,CAA6B;IAE3C,YACE,eAA8C,EAC9C,UAAsB,EACtB,eAAuB,EACvB,UAAuB;QAEvB,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAChC,CAAC;IAEM,KAAK,CAAC,YAAY;QACvB,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAClC,IAAI,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QACjD,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC/C,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,2BAA2B;QAC/B,IAAI,IAAI,CAAC,wBAAwB,KAAK,SAAS,EAAE,CAAC;YAChD,IAAI,CAAC,wBAAwB;gBAC3B,MAAM,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAC/C,CAAC;QAED,OAAO,IAAI,CAAC,wBAAwB,CAAC;IACvC,CAAC;IAED,iBAAiB;QACf,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YACtC,qEAAqE;YACrE,IAAI,CAAC,cAAc,GAAG,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,CAAC,IAAI,CAChE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,CACnD,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,MAAM,uBAAuB,GAAG,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAEzE,MAAM,OAAO,GAAkD,EAAE,CAAC;QAElE,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAE/C,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG;gBACzB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;aAC3B,CAAC;QACJ,CAAC;QAED,OAAO;YACL,GAAG,uBAAuB;YAC1B,OAAO;SACR,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,6BAA6B;QAGjC,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAE1C,wEAAwE;QACxE,8CAA8C;QAC9C,2EAA2E;QAC3E,yEAAyE;QACzE,oEAAoE;QACpE,YAAY;QACZ,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;QACxE,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QAC5B,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QAChC,eAAe,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QAEjC,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrC,eAAe,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAC5B,KAAK,EACL,cAAc,EACd,sBAAsB,EACtB,uBAAuB,EACvB,UAAU,CACX,CAAC;QAEF,OAAO;YACL,QAAQ,EAAE,UAAU;YACpB,QAAQ,EAAE;gBACR,GAAG,QAAQ;gBACX,UAAU,EACR,QAAQ,CAAC,UAAU;oBACnB,4BAA4B,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;gBACvD,eAAe,EAAE,IAAI,CAAC,6BAA6B,CAAC,eAAe,CAAC;gBACpE,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,eAAe,CAAC;aAClD;SACF,CAAC;IACJ,CAAC;IAED,6BAA6B,CAC3B,eAA6D;QAE7D,MAAM,sBAAsB,GAC1B,EAAE,CAAC;QAEL,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7D,sBAAsB,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;YACxC,MAAM,SAAS,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;YAE9C,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;gBACzD,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;gBAE1C,sBAAsB,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC,IAAI,CAC3D,IAAI,GAAG,CAAC,SAAS,CAAC,CACnB,CAAC,IAAI,EAAE,CAAC;YACX,CAAC;QACH,CAAC;QAED,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,0EAA0E;QAC1E,oCAAoC;QACpC,MAAM,MAAM,GAAyB,sBAAsB,CAAC;QAE5D,MAAM,OAAO,GAA+C,EAAE,CAAC;QAC/D,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAE/C,MAAM,OAAO,CAAC,GAAG,CACf,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YAC/B,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG;gBACzB,IAAI,EAAE,MAAM,IAAI,CAAC,cAAc,EAAE;aAClC,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;QAEF,qEAAqE;QACrE,0DAA0D;QAC1D,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CACtC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACjE,CAAC;QAEF,kEAAkE;QAClE,yEAAyE;QACzE,4CAA4C;QAC5C,MAAM,QAAQ,GACZ,MAAM;YACN,IAAI,CAAC,eAAe;YACpB,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAC;YACxD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC;YAC7B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAElC,OAAO,4BAA4B,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC;CACF"}
@@ -15,10 +15,10 @@ const configureTelemetry = async ({ enable, disable }) => {
15
15
  }
16
16
  const consent = await isTelemetryAllowed();
17
17
  if (consent) {
18
- console.log("Telemetry is now enabled, to disable it run `npx hardhat telemetry --disable`");
18
+ console.log("Telemetry is enabled, to disable it run `npx hardhat telemetry --disable`");
19
19
  }
20
20
  else {
21
- console.log("Telemetry is now disabled, to enable it run `npx hardhat telemetry --enable`");
21
+ console.log("Telemetry is disabled, to enable it run `npx hardhat telemetry --enable`");
22
22
  }
23
23
  };
24
24
  export default configureTelemetry;
@@ -1 +1 @@
1
- {"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/telemetry/task-action.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,8CAA8C,CAAC;AAOtD,MAAM,kBAAkB,GAEpB,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;IAChC,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;QACtB,OAAO,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;QACtE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,OAAO;IACT,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QACrC,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;QACtC,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,kBAAkB,EAAE,CAAC;IAE3C,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,GAAG,CACT,+EAA+E,CAChF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CACT,8EAA8E,CAC/E,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
1
+ {"version":3,"file":"task-action.js","sourceRoot":"","sources":["../../../../../src/internal/builtin-plugins/telemetry/task-action.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,8CAA8C,CAAC;AAOtD,MAAM,kBAAkB,GAEpB,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;IAChC,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;QACtB,OAAO,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;QACtE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,OAAO;IACT,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QACrC,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;QACtC,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,kBAAkB,EAAE,CAAC;IAE3C,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,GAAG,CACT,2EAA2E,CAC5E,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CACT,0EAA0E,CAC3E,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hardhat",
3
- "version": "3.0.0-next.7",
3
+ "version": "3.0.0-next.8",
4
4
  "description": "Hardhat is an extensible developer tool that helps smart contract developers increase productivity by reliably bringing together the tools they want.",
5
5
  "homepage": "https://github.com/nomicfoundation/hardhat/tree/v-next/v-next/hardhat",
6
6
  "repository": {
@@ -51,7 +51,7 @@
51
51
  "README.md"
52
52
  ],
53
53
  "devDependencies": {
54
- "@nomicfoundation/hardhat-node-test-reporter": "^3.0.0-next.7",
54
+ "@nomicfoundation/hardhat-node-test-reporter": "^3.0.0-next.8",
55
55
  "@types/adm-zip": "^0.5.5",
56
56
  "@types/debug": "^4.1.7",
57
57
  "@types/node": "^20.14.9",
@@ -63,14 +63,14 @@
63
63
  "prettier": "3.2.5",
64
64
  "rimraf": "^5.0.5",
65
65
  "typescript": "~5.5.0",
66
- "@nomicfoundation/hardhat-test-utils": "^3.0.0-next.7"
66
+ "@nomicfoundation/hardhat-test-utils": "^3.0.0-next.8"
67
67
  },
68
68
  "dependencies": {
69
69
  "@ignored/edr": "0.10.0-alpha.3",
70
- "@ignored/edr-optimism": "0.13.0-alpha.0",
71
- "@nomicfoundation/hardhat-errors": "^3.0.0-next.7",
72
- "@nomicfoundation/hardhat-utils": "^3.0.0-next.7",
73
- "@nomicfoundation/hardhat-zod-utils": "^3.0.0-next.7",
70
+ "@ignored/edr-optimism": "0.13.0-alpha.1",
71
+ "@nomicfoundation/hardhat-errors": "^3.0.0-next.8",
72
+ "@nomicfoundation/hardhat-utils": "^3.0.0-next.8",
73
+ "@nomicfoundation/hardhat-zod-utils": "^3.0.0-next.8",
74
74
  "@nomicfoundation/solidity-analyzer": "^0.1.1",
75
75
  "@sentry/core": "^9.4.0",
76
76
  "@sentry/node": "^9.4.0",
@@ -437,6 +437,10 @@ async function getProviderConfig(
437
437
  },
438
438
  },
439
439
  networkId: BigInt(networkConfig.networkId),
440
+ observability: {
441
+ // TODO: add configuration of code coverage
442
+ codeCoverage: undefined,
443
+ },
440
444
  ownedAccounts: await hardhatAccountsToEdrOwnedAccounts(
441
445
  networkConfig.accounts,
442
446
  ),
@@ -124,12 +124,34 @@ export class CompilationJobImplementation implements CompilationJob {
124
124
  evmVersion:
125
125
  settings.evmVersion ??
126
126
  getEvmVersionFromSolcVersion(this.solcConfig.version),
127
- outputSelection,
127
+ outputSelection: this.#dedupeAndSortOutputSelection(outputSelection),
128
128
  remappings: this.#remappings.map(formatRemapping),
129
129
  },
130
130
  };
131
131
  }
132
132
 
133
+ #dedupeAndSortOutputSelection(
134
+ outputSelection: CompilerInput["settings"]["outputSelection"],
135
+ ): CompilerInput["settings"]["outputSelection"] {
136
+ const dedupedOutputSelection: CompilerInput["settings"]["outputSelection"] =
137
+ {};
138
+
139
+ for (const sourceName of Object.keys(outputSelection).sort()) {
140
+ dedupedOutputSelection[sourceName] = {};
141
+ const contracts = outputSelection[sourceName];
142
+
143
+ for (const contractName of Object.keys(contracts).sort()) {
144
+ const selectors = contracts[contractName];
145
+
146
+ dedupedOutputSelection[sourceName][contractName] = Array.from(
147
+ new Set(selectors),
148
+ ).sort();
149
+ }
150
+ }
151
+
152
+ return dedupedOutputSelection;
153
+ }
154
+
133
155
  async #computeBuildId(): Promise<string> {
134
156
  // NOTE: We type it this way so that this stop compiling if we ever change
135
157
  // the format of the BuildInfo type.
@@ -33,11 +33,11 @@ const configureTelemetry: NewTaskActionFunction<
33
33
 
34
34
  if (consent) {
35
35
  console.log(
36
- "Telemetry is now enabled, to disable it run `npx hardhat telemetry --disable`",
36
+ "Telemetry is enabled, to disable it run `npx hardhat telemetry --disable`",
37
37
  );
38
38
  } else {
39
39
  console.log(
40
- "Telemetry is now disabled, to enable it run `npx hardhat telemetry --enable`",
40
+ "Telemetry is disabled, to enable it run `npx hardhat telemetry --enable`",
41
41
  );
42
42
  }
43
43
  };
@@ -5,8 +5,9 @@
5
5
  "description": "A TypeScript Hardhat project using Node Test Runner and Viem",
6
6
  "type": "module",
7
7
  "devDependencies": {
8
- "hardhat": "workspace:^3.0.0-next.7",
9
- "@nomicfoundation/hardhat-toolbox-viem": "workspace:^4.0.0-next.7",
8
+ "hardhat": "workspace:^3.0.0-next.8",
9
+ "@nomicfoundation/hardhat-toolbox-viem": "workspace:^4.0.0-next.8",
10
+ "@nomicfoundation/hardhat-ignition": "workspace:^3.0.0-next.8",
10
11
  "@types/node": "^22.8.5",
11
12
  "forge-std": "foundry-rs/forge-std#v1.9.4",
12
13
  "typescript": "~5.5.0",
@@ -4,7 +4,10 @@ import { network } from "hardhat";
4
4
  const OP_GAS_PRICE_ORACLE = "0x420000000000000000000000000000000000000F";
5
5
 
6
6
  async function mainnetExample() {
7
- const { viem } = await network.connect("hardhatMainnet", "l1");
7
+ const { viem } = await network.connect({
8
+ network: "hardhatMainnet",
9
+ chainType: "l1",
10
+ });
8
11
 
9
12
  const publicClient = await viem.getPublicClient();
10
13
  const gasPriceOracleCode = await publicClient.getCode({
@@ -18,7 +21,10 @@ async function mainnetExample() {
18
21
  }
19
22
 
20
23
  async function opExample() {
21
- const { viem } = await network.connect("hardhatOp", "optimism");
24
+ const { viem } = await network.connect({
25
+ network: "hardhatOp",
26
+ chainType: "optimism",
27
+ });
22
28
 
23
29
  const publicClient = await viem.getPublicClient();
24
30
  const gasPriceOracleCode = await publicClient.getCode({
@@ -1,8 +1,9 @@
1
1
  import { network } from "hardhat";
2
2
 
3
- const chainType = "optimism";
4
-
5
- const { viem } = await network.connect("hardhatOp", chainType);
3
+ const { viem } = await network.connect({
4
+ network: "hardhatOp",
5
+ chainType: "optimism",
6
+ });
6
7
 
7
8
  console.log("Sending transaction using the OP chain type");
8
9
 
@@ -39,12 +39,13 @@ describe("Counter", async function () {
39
39
  *
40
40
  * Examples:
41
41
  *
42
- * - `await network.connect("sepolia", "l1")`: Connects to the
43
- * `sepolia` network config, treating it as an "l1" network with the
42
+ * - `await network.connect({network: "sepolia", chainType: "l1"})`: Connects
43
+ * to the `sepolia` network config, treating it as an "l1" network with the
44
44
  * appropriate viem extensions.
45
45
  *
46
- * - `await network.connect("hardhatOp", "optimism")`: Creates a new EDR
47
- * instance in Optimism mode, using the `hardhatOp` network config.
46
+ * - `await network.connect({network: "hardhatOp", chainType: "optimism"})`:
47
+ * Creates a new EDR instance in Optimism mode, using the `hardhatOp`
48
+ * network config.
48
49
  *
49
50
  * - `await network.connect()`: Creates a new EDR instance with the default
50
51
  * network config (i.e. `hardhat`), the `generic` chain type, and no
@@ -5,8 +5,10 @@
5
5
  "description": "A TypeScript Hardhat project using Mocha and Ethers.js",
6
6
  "type": "module",
7
7
  "devDependencies": {
8
- "hardhat": "workspace:^3.0.0-next.7",
9
- "@nomicfoundation/hardhat-toolbox-mocha-ethers": "workspace:^3.0.0-next.7",
8
+ "hardhat": "workspace:^3.0.0-next.8",
9
+ "@nomicfoundation/hardhat-toolbox-mocha-ethers": "workspace:^3.0.0-next.8",
10
+ "@nomicfoundation/hardhat-ignition": "workspace:^3.0.0-next.8",
11
+ "@nomicfoundation/hardhat-ethers": "workspace:^4.0.0-next.8",
10
12
  "@types/chai": "^4.2.0",
11
13
  "@types/chai-as-promised": "^8.0.1",
12
14
  "@types/mocha": ">=10.0.10",
@@ -4,7 +4,10 @@ import { network } from "hardhat";
4
4
  const OP_GAS_PRICE_ORACLE = "0x420000000000000000000000000000000000000F";
5
5
 
6
6
  async function mainnetExample() {
7
- const { ethers } = await network.connect("hardhatMainnet", "l1");
7
+ const { ethers } = await network.connect({
8
+ network: "hardhatMainnet",
9
+ chainType: "l1",
10
+ });
8
11
 
9
12
  const gasPriceOracleCode = await ethers.provider.getCode(OP_GAS_PRICE_ORACLE);
10
13
 
@@ -15,7 +18,10 @@ async function mainnetExample() {
15
18
  }
16
19
 
17
20
  async function opExample() {
18
- const { ethers } = await network.connect("hardhatOp", "optimism");
21
+ const { ethers } = await network.connect({
22
+ network: "hardhatOp",
23
+ chainType: "optimism",
24
+ });
19
25
 
20
26
  const gasPriceOracleCode = await ethers.provider.getCode(OP_GAS_PRICE_ORACLE);
21
27
 
@@ -1,6 +1,9 @@
1
1
  import { network } from "hardhat";
2
2
 
3
- const { ethers } = await network.connect("hardhatOp", "optimism");
3
+ const { ethers } = await network.connect({
4
+ network: "hardhatOp",
5
+ chainType: "optimism",
6
+ });
4
7
 
5
8
  console.log("Sending transaction using the OP chain type");
6
9
 
@@ -1,7 +1,8 @@
1
1
  import { network } from "hardhat";
2
- import { HardhatEthers } from "@nomicfoundation/hardhat-ethers/types";
3
2
  import { expect } from "chai";
4
3
 
4
+ const { ethers } = await network.connect();
5
+
5
6
  describe("Counter", function () {
6
7
  /*
7
8
  * In Hardhat 3, there isn't a single global connection to a network. Instead,
@@ -30,11 +31,12 @@ describe("Counter", function () {
30
31
  *
31
32
  * Examples:
32
33
  *
33
- * - `await network.connect("sepolia", "l1")`: Connects to the
34
- * `sepolia` network config, treating it as an "l1" network.
34
+ * - `await network.connect({network: "sepolia", chainType: "l1"})`: Connects
35
+ * to the `sepolia` network config, treating it as an "l1" network.
35
36
  *
36
- * - `await network.connect("hardhatOp", "optimism")`: Creates a new EDR
37
- * instance in Optimism mode, using the `hardhatOp` network config.
37
+ * - `await network.connect(network: "hardhatOp", chainType: "optimism"})`:
38
+ * Creates a new EDR instance in Optimism mode, using the `hardhatOp`
39
+ * network config.
38
40
  *
39
41
  * - `await network.connect()`: Creates a new EDR instance with the default
40
42
  * network config (i.e. `hardhat`) and the `generic` chain type.
@@ -42,11 +44,6 @@ describe("Counter", function () {
42
44
  * Each network connection object has a `provider` property and other
43
45
  * network-related fields added by plugins, like `ethers` and `networkHelpers`.
44
46
  */
45
- let ethers: HardhatEthers;
46
- beforeEach(async function () {
47
- const connection = await network.connect();
48
- ethers = connection.ethers;
49
- });
50
47
 
51
48
  it("The sum of the Increment events should match the current value", async function () {
52
49
  const counter = await ethers.deployContract("Counter");