hardhat 2.13.0 → 2.14.0

package/src/internal/hardhat-network/provider/output.ts

@@ -40,6 +40,8 @@ export interface RpcBlockOutput {
   transactionsRoot: string;
   uncles: string[];
   baseFeePerGas?: string;
+  withdrawals?: RpcWithdrawalItem[];
+  withdrawalsRoot?: string;
 }
 
 export type RpcTransactionOutput =
@@ -147,6 +149,13 @@ export interface RpcDebugTraceOutput {
   structLogs: RpcStructLog[];
 }
 
+export interface RpcWithdrawalItem {
+  index: string;
+  validatorIndex: string;
+  address: string;
+  amount: string;
+}
+
 /* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
 
 export function getRpcBlock(
@@ -191,6 +200,17 @@ export function getRpcBlock(
     output.baseFeePerGas = numberToRpcQuantity(block.header.baseFeePerGas);
   }
 
+  if (block.header.withdrawalsRoot !== undefined) {
+    output.withdrawals = block.withdrawals?.map((withdrawal) => ({
+      index: numberToRpcQuantity(withdrawal.index),
+      validatorIndex: numberToRpcQuantity(withdrawal.validatorIndex),
+      address: bufferToRpcData(withdrawal.address.toBuffer()),
+      amount: numberToRpcQuantity(withdrawal.amount),
+    }));
+
+    output.withdrawalsRoot = bufferToRpcData(block.header.withdrawalsRoot);
+  }
+
   return output;
 }
 

package/src/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.ts

@@ -134,7 +134,7 @@ export class FakeSenderAccessListEIP2930Transaction extends AccessListEIP2930Tra
         r: data.r ?? fakeSignature.r,
         s: data.s ?? fakeSignature.s,
       },
-      { ...opts, freeze: false }
+      { ...opts, freeze: false, disableMaxInitCodeSizeCheck: true }
     );
 
     this.common = this._getCommon(opts?.common);

package/src/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.ts

@@ -133,7 +133,7 @@ export class FakeSenderEIP1559Transaction extends FeeMarketEIP1559Transaction {
         r: data.r ?? fakeSignature.r,
         s: data.s ?? fakeSignature.s,
       },
-      { ...opts, freeze: false }
+      { ...opts, freeze: false, disableMaxInitCodeSizeCheck: true }
     );
 
     this._sender = sender;

package/src/internal/hardhat-network/provider/transactions/FakeSenderTransaction.ts

@@ -107,7 +107,7 @@ export class FakeSenderTransaction extends Transaction {
         r: data.r ?? fakeSignature.r,
         s: data.s ?? fakeSignature.s,
       },
-      { ...opts, freeze: false }
+      { ...opts, freeze: false, disableMaxInitCodeSizeCheck: true }
     );
 
     this.common = this._getCommon(opts?.common);

package/src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.ts

@@ -68,7 +68,11 @@ export class ReadOnlyValidEIP1559Transaction extends FeeMarketEIP1559Transaction
       }
     );
 
-    super(data, { freeze: false, common: fakeCommon });
+    super(data, {
+      freeze: false,
+      disableMaxInitCodeSizeCheck: true,
+      common: fakeCommon,
+    });
 
     this.common = fakeCommon;
     this._sender = sender;

package/src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.ts

@@ -67,7 +67,11 @@ export class ReadOnlyValidEIP2930Transaction extends AccessListEIP2930Transactio
       }
     );
 
-    super(data, { freeze: false, common: fakeCommon });
+    super(data, {
+      freeze: false,
+      disableMaxInitCodeSizeCheck: true,
+      common: fakeCommon,
+    });
 
     this.common = fakeCommon;
     this._sender = sender;

package/src/internal/hardhat-network/provider/transactions/ReadOnlyValidTransaction.ts

@@ -56,7 +56,7 @@ export class ReadOnlyValidTransaction extends Transaction {
   private readonly _sender: Address;
 
   constructor(sender: Address, data: TxData = {}) {
-    super(data, { freeze: false });
+    super(data, { freeze: false, disableMaxInitCodeSizeCheck: true });
 
     this.common = this._getCommon();
     this._sender = sender;

package/src/internal/hardhat-network/provider/transactions/ReadOnlyValidUnknownTypeTransaction.ts

@@ -47,7 +47,7 @@ export class ReadOnlyValidUnknownTypeTransaction extends Transaction {
   private readonly _actualType: number;
 
   constructor(sender: Address, type: number, data: TxData = {}) {
-    super(data, { freeze: false });
+    super(data, { freeze: false, disableMaxInitCodeSizeCheck: true });
 
     this.common = this._getCommon();
     this._sender = sender;

package/src/internal/solidity/resolver.ts

@@ -292,11 +292,30 @@ export class Resolver {
       nodeModulesPath = path.dirname(nodeModulesPath);
     }
 
-    await this._validateSourceNameExistenceAndCasing(
-      nodeModulesPath,
-      sourceName,
-      true
-    );
+    let absolutePath: string;
+    if (path.basename(nodeModulesPath) !== NODE_MODULES) {
+      // this can happen in monorepos that use PnP, in those
+      // cases we handle resolution differently
+      const packageRoot = path.dirname(packageJsonPath);
+      const pattern = new RegExp(`^${libraryName}/?`);
+      const fileName = sourceName.replace(pattern, "");
+
+      await this._validateSourceNameExistenceAndCasing(
+        packageRoot,
+        // TODO: this is _not_ a source name; we should handle this scenario in
+        // a better way
+        fileName,
+        true
+      );
+      absolutePath = path.join(packageRoot, fileName);
+    } else {
+      await this._validateSourceNameExistenceAndCasing(
+        nodeModulesPath,
+        sourceName,
+        true
+      );
+      absolutePath = path.join(nodeModulesPath, sourceName);
+    }
 
     const packageInfo: {
       name: string;
@@ -307,7 +326,7 @@ export class Resolver {
     return this._resolveFile(
       sourceName,
       // We resolve to the real path here, as we may be resolving a linked library
-      await getRealPath(path.join(nodeModulesPath, sourceName)),
+      await getRealPath(absolutePath),
       libraryName,
       libraryVersion
     );

package/src/internal/util/hardforks.ts

@@ -16,6 +16,7 @@ export enum HardforkName {
   ARROW_GLACIER = "arrowGlacier",
   GRAY_GLACIER = "grayGlacier",
   MERGE = "merge",
+  SHANGHAI = "shanghai",
 }
 
 const HARDFORKS_ORDER: HardforkName[] = [
@@ -34,6 +35,7 @@ const HARDFORKS_ORDER: HardforkName[] = [
   HardforkName.ARROW_GLACIER,
   HardforkName.GRAY_GLACIER,
   HardforkName.MERGE,
+  HardforkName.SHANGHAI,
 ];
 
 export function getHardforkName(name: string): HardforkName {