hardhat 2.13.0-dev.1 → 2.13.0-dev.3

package/internal/hardhat-network/provider/utils/convertToRethnet.js

@@ -1,87 +1,89 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rethnetResultToRunTxResult = exports.createRethnetFromHardhatDB = exports.ethereumjsTransactionToRethnet = exports.HardhatDB = void 0;
-const ethereumjs_evm_1 = require("@nomicfoundation/ethereumjs-evm");
-const exceptions_1 = require("@nomicfoundation/ethereumjs-evm/dist/exceptions");
-const ethereumjs_statemanager_1 = require("@nomicfoundation/ethereumjs-statemanager");
+exports.rethnetResultToRunTxResult = exports.ethereumjsTransactionToRethnet = exports.ethereumjsHeaderDataToRethnet = exports.ethereumsjsHardforkToRethnet = exports.ethereumjsBlockHeaderToRethnet = void 0;
 const ethereumjs_tx_1 = require("@nomicfoundation/ethereumjs-tx");
 const ethereumjs_util_1 = require("@nomicfoundation/ethereumjs-util");
-const rethnet_evm_1 = require("rethnet-evm");
-const errors_1 = require("../../../core/errors");
-const errors_list_1 = require("../../../core/errors-list");
-class HardhatDB {
-    constructor(stateManager, blockchain) {
-        this._stateManager = stateManager;
-        this._blockchain = blockchain;
-    }
-    async commit() {
-        return this._stateManager.commit();
-    }
-    async checkpoint() {
-        return this._stateManager.checkpoint();
-    }
-    async revert() {
-        return this._stateManager.revert();
-    }
-    async getAccountByAddress(address) {
-        return this._stateManager.getAccount(new ethereumjs_util_1.Address(address));
-    }
-    async getAccountStorageSlot(address, index) {
-        const key = (0, ethereumjs_util_1.setLengthLeft)((0, ethereumjs_util_1.bigIntToBuffer)(index), 32);
-        let data = await this._stateManager.getContractStorage(new ethereumjs_util_1.Address(address), key);
-        const EXPECTED_DATA_SIZE = 32;
-        if (data.length < EXPECTED_DATA_SIZE) {
-            data = Buffer.concat([Buffer.alloc(EXPECTED_DATA_SIZE - data.length, 0), data], EXPECTED_DATA_SIZE);
-        }
-        return (0, ethereumjs_util_1.bufferToBigInt)(data);
-    }
-    async getBlockHash(blockNumber) {
-        const block = await this._blockchain?.getBlock(blockNumber);
-        if (block === undefined || block === null) {
-            throw new errors_1.HardhatError(errors_list_1.ERRORS.GENERAL.UNSUPPORTED_OPERATION, {
-                error: "Block not found",
-            });
-        }
-        return block.header.hash();
-    }
-    async getCodeByHash(codeHash) {
-        if (this._stateManager instanceof ethereumjs_statemanager_1.DefaultStateManager) {
-            // eslint-disable-next-line @typescript-eslint/dot-notation
-            const db = this._stateManager._trie["_db"];
-            const code = await db.get(Buffer.concat([Buffer.from("c"), codeHash]));
-            if (code === null) {
-                // eslint-disable-next-line @nomiclabs/hardhat-internal-rules/only-hardhat-error
-                throw new Error("returning null in getCodeByHash is not supported");
-            }
-            return code;
-        }
-        // eslint-disable-next-line @nomiclabs/hardhat-internal-rules/only-hardhat-error
-        throw new Error("getCodeByHash not implemented for ForkStateManager");
-    }
-    async getStorageRoot() {
-        return this._stateManager.getStateRoot();
-    }
-    async insertAccount(address, account) {
-        return this._stateManager.putAccount(new ethereumjs_util_1.Address(address), new ethereumjs_util_1.Account(account.nonce, account.balance, undefined, account.codeHash));
-    }
-    async setAccountBalance(address, balance) {
-        return this._stateManager.modifyAccountFields(new ethereumjs_util_1.Address(address), {
-            balance,
-        });
-    }
-    async setAccountCode(address, code) {
-        return this._stateManager.putContractCode(new ethereumjs_util_1.Address(address), code);
-    }
-    async setAccountNonce(address, nonce) {
-        return this._stateManager.modifyAccountFields(new ethereumjs_util_1.Address(address), {
-            nonce,
-        });
-    }
-    async setAccountStorageSlot(address, index, value) {
-        return this._stateManager.putContractStorage(new ethereumjs_util_1.Address(address), (0, ethereumjs_util_1.setLengthLeft)((0, ethereumjs_util_1.bigIntToBuffer)(index), 32), (0, ethereumjs_util_1.setLengthLeft)((0, ethereumjs_util_1.bigIntToBuffer)(value), 32));
+const bigint_1 = require("../../../util/bigint");
+const hardforks_1 = require("../../../util/hardforks");
+const message_trace_1 = require("../../stack-traces/message-trace");
+const exit_1 = require("../vm/exit");
+const bloom_1 = require("./bloom");
+/* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
+function ethereumjsBlockHeaderToRethnet(blockHeader) {
+    return {
+        parentHash: blockHeader.parentHash,
+        ommersHash: blockHeader.uncleHash,
+        beneficiary: blockHeader.coinbase.buf,
+        stateRoot: blockHeader.stateRoot,
+        transactionsRoot: blockHeader.transactionsTrie,
+        receiptsRoot: blockHeader.receiptTrie,
+        logsBloom: blockHeader.logsBloom,
+        difficulty: blockHeader.difficulty,
+        number: blockHeader.number,
+        gasLimit: blockHeader.gasLimit,
+        gasUsed: blockHeader.gasUsed,
+        timestamp: blockHeader.timestamp,
+        extraData: blockHeader.extraData,
+        mixHash: blockHeader.mixHash,
+        nonce: BigInt(`0x${blockHeader.nonce.toString("hex")}`),
+        baseFeePerGas: blockHeader.baseFeePerGas,
+    };
+}
+exports.ethereumjsBlockHeaderToRethnet = ethereumjsBlockHeaderToRethnet;
+function ethereumsjsHardforkToRethnet(hardfork) {
+    switch (hardfork) {
+        case hardforks_1.HardforkName.FRONTIER:
+            return 0 /* Frontier */;
+        case hardforks_1.HardforkName.HOMESTEAD:
+            return 2 /* Homestead */;
+        case hardforks_1.HardforkName.DAO:
+            return 3 /* DaoFork */;
+        case hardforks_1.HardforkName.TANGERINE_WHISTLE:
+            return 4 /* Tangerine */;
+        case hardforks_1.HardforkName.SPURIOUS_DRAGON:
+            return 5 /* SpuriousDragon */;
+        case hardforks_1.HardforkName.BYZANTIUM:
+            return 6 /* Byzantium */;
+        case hardforks_1.HardforkName.CONSTANTINOPLE:
+            return 7 /* Constantinople */;
+        case hardforks_1.HardforkName.PETERSBURG:
+            return 8 /* Petersburg */;
+        case hardforks_1.HardforkName.ISTANBUL:
+            return 9 /* Istanbul */;
+        case hardforks_1.HardforkName.MUIR_GLACIER:
+            return 10 /* MuirGlacier */;
+        case hardforks_1.HardforkName.BERLIN:
+            return 11 /* Berlin */;
+        case hardforks_1.HardforkName.LONDON:
+            return 12 /* London */;
+        case hardforks_1.HardforkName.ARROW_GLACIER:
+            return 13 /* ArrowGlacier */;
+        case hardforks_1.HardforkName.GRAY_GLACIER:
+            return 14 /* GrayGlacier */;
+        case hardforks_1.HardforkName.MERGE:
+            return 15 /* Merge */;
+        default:
+            const _exhaustiveCheck = hardfork;
+            throw new Error(`Unknown hardfork name '${hardfork}', this shouldn't happen`);
     }
 }
-exports.HardhatDB = HardhatDB;
+exports.ethereumsjsHardforkToRethnet = ethereumsjsHardforkToRethnet;
+function ethereumjsHeaderDataToRethnet(headerData, difficulty, prevRandao) {
+    const coinbase = headerData?.coinbase === undefined
+        ? undefined
+        : (0, ethereumjs_util_1.toBuffer)(headerData.coinbase);
+    return {
+        number: (0, bigint_1.fromBigIntLike)(headerData?.number),
+        coinbase,
+        timestamp: (0, bigint_1.fromBigIntLike)(headerData?.timestamp),
+        difficulty,
+        prevrandao: prevRandao,
+        basefee: (0, bigint_1.fromBigIntLike)(headerData?.baseFeePerGas),
+        gasLimit: (0, bigint_1.fromBigIntLike)(headerData?.gasLimit),
+        parentHash: headerData?.parentHash,
+    };
+}
+exports.ethereumjsHeaderDataToRethnet = ethereumjsHeaderDataToRethnet;
 function ethereumjsTransactionToRethnet(tx) {
     const chainId = (_tx) => {
         if (_tx instanceof ethereumjs_tx_1.AccessListEIP2930Transaction) {
@@ -109,106 +111,52 @@ function ethereumjsTransactionToRethnet(tx) {
     return rethnetTx;
 }
 exports.ethereumjsTransactionToRethnet = ethereumjsTransactionToRethnet;
-function createRethnetFromHardhatDB(cfg, hardhatDB) {
-    return rethnet_evm_1.Rethnet.withCallbacks(cfg, {
-        getAccountByAddressFn: HardhatDB.prototype.getAccountByAddress.bind(hardhatDB),
-        getAccountStorageSlotFn: HardhatDB.prototype.getAccountStorageSlot.bind(hardhatDB),
-        getBlockHashFn: HardhatDB.prototype.getBlockHash.bind(hardhatDB),
-        getCodeByHashFn: HardhatDB.prototype.getCodeByHash.bind(hardhatDB),
-    }, null, {
-        checkpointFn: HardhatDB.prototype.checkpoint.bind(hardhatDB),
-        revertFn: HardhatDB.prototype.revert.bind(hardhatDB),
-        getStorageRootFn: HardhatDB.prototype.getStorageRoot.bind(hardhatDB),
-        insertAccountFn: HardhatDB.prototype.insertAccount.bind(hardhatDB),
-        setAccountBalanceFn: HardhatDB.prototype.setAccountBalance.bind(hardhatDB),
-        setAccountCodeFn: HardhatDB.prototype.setAccountCode.bind(hardhatDB),
-        setAccountNonceFn: HardhatDB.prototype.setAccountNonce.bind(hardhatDB),
-        setAccountStorageSlotFn: HardhatDB.prototype.setAccountStorageSlot.bind(hardhatDB),
-    });
+function rethnetLogsToBloom(logs) {
+    const bloom = new bloom_1.Bloom();
+    for (const log of logs) {
+        bloom.add(log.address);
+        for (const topic of log.topics) {
+            bloom.add(topic);
+        }
+    }
+    return bloom;
 }
-exports.createRethnetFromHardhatDB = createRethnetFromHardhatDB;
-function rethnetResultToRunTxResult(rethnetResult) {
-    // We return an object with only the properties that are used by Hardhat.
-    // To be extra sure that the other properties are not used, we add getters
-    // that exit the process if accessed.
+function rethnetResultToRunTxResult(rethnetResult, blockGasUsed) {
+    const createdAddress = (0, message_trace_1.isSuccessResult)(rethnetResult.result) &&
+        (0, message_trace_1.isCreateOutput)(rethnetResult.result.output)
+        ? rethnetResult.result.output.address
+        : undefined;
+    const exit = (0, message_trace_1.isSuccessResult)(rethnetResult.result)
+        ? exit_1.Exit.fromRethnetSuccessReason(rethnetResult.result.reason)
+        : (0, message_trace_1.isHaltResult)(rethnetResult.result)
+            ? exit_1.Exit.fromRethnetExceptionalHalt(rethnetResult.result.reason)
+            : new exit_1.Exit(exit_1.ExitCode.REVERT);
+    const returnValue = (0, message_trace_1.isRevertResult)(rethnetResult.result)
+        ? rethnetResult.result.output
+        : (0, message_trace_1.isSuccessResult)(rethnetResult.result)
+            ? rethnetResult.result.output.returnValue
+            : Buffer.from([]);
+    const bloom = (0, message_trace_1.isSuccessResult)(rethnetResult.result)
+        ? rethnetLogsToBloom(rethnetResult.result.logs)
+        : new bloom_1.Bloom(undefined);
     return {
-        totalGasSpent: rethnetResult.gasUsed,
-        gasRefund: rethnetResult.gasRefunded,
-        createdAddress: rethnetResult.output.address !== undefined
-            ? new ethereumjs_util_1.Address(rethnetResult.output.address)
-            : undefined,
-        execResult: {
-            exceptionError: mapRethnetExitCodeToEthereumJsExceptionError(rethnetResult.exitCode),
-            returnValue: rethnetResult.output.output ?? Buffer.from([]),
-            get runState() {
-                console.trace("execResult.runState not implemented");
-                return process.exit(1);
-            },
-            get gas() {
-                console.trace("execResult.gas not implemented");
-                return process.exit(1);
-            },
-            get executionGasUsed() {
-                console.trace("execResult.executionGasUsed not implemented");
-                return process.exit(1);
-            },
-            get logs() {
-                console.trace("execResult.logs not implemented");
-                return process.exit(1);
-            },
-            get selfdestruct() {
-                console.trace("execResult.selfdestruct not implemented");
-                return process.exit(1);
-            },
-            get gasRefund() {
-                console.trace("execResult.gasRefund not implemented");
-                return process.exit(1);
-            },
-        },
-        get bloom() {
-            console.trace("bloom not implemented");
-            return process.exit(1);
-        },
-        get amountSpent() {
-            console.trace("amountSpent not implemented");
-            return process.exit(1);
-        },
-        get receipt() {
-            console.trace("receipt not implemented");
-            return process.exit(1);
-        },
-        get accessList() {
-            console.trace("accessList not implemented");
-            return process.exit(1);
+        gasUsed: rethnetResult.result.gasUsed,
+        createdAddress: createdAddress !== undefined ? new ethereumjs_util_1.Address(createdAddress) : undefined,
+        exit,
+        returnValue,
+        bloom,
+        receipt: {
+            // Receipts have a 0 as status on error
+            status: exit.isError() ? 0 : 1,
+            cumulativeBlockGasUsed: blockGasUsed + rethnetResult.result.gasUsed,
+            bitvector: bloom.bitvector,
+            logs: (0, message_trace_1.isSuccessResult)(rethnetResult.result)
+                ? rethnetResult.result.logs.map((log) => {
+                    return [log.address, log.topics, log.data];
+                })
+                : [],
         },
     };
 }
 exports.rethnetResultToRunTxResult = rethnetResultToRunTxResult;
-const rethnetExitCodeToEthereumJsError = new Map([
-    [0x50, exceptions_1.ERROR.OUT_OF_GAS],
-    [0x57, exceptions_1.ERROR.STACK_UNDERFLOW],
-    [0x58, exceptions_1.ERROR.STACK_OVERFLOW],
-    [0x54, exceptions_1.ERROR.INVALID_JUMP],
-    [0x51, exceptions_1.ERROR.INVALID_OPCODE],
-    [0x53, exceptions_1.ERROR.INVALID_OPCODE],
-    [0x59, exceptions_1.ERROR.OUT_OF_RANGE],
-    [0x20, exceptions_1.ERROR.REVERT],
-    [0x52, exceptions_1.ERROR.STATIC_STATE_CHANGE],
-    [0x60, exceptions_1.ERROR.CREATE_COLLISION],
-    [0x01, exceptions_1.ERROR.STOP],
-    [0x53, exceptions_1.ERROR.INVALID_BYTECODE_RESULT],
-    [0x64, exceptions_1.ERROR.INITCODE_SIZE_VIOLATION],
-]);
-function mapRethnetExitCodeToEthereumJsExceptionError(rethnetExitCode) {
-    if (rethnetExitCode <= 0x03) {
-        return;
-    }
-    const ethereumJsError = rethnetExitCodeToEthereumJsError.get(rethnetExitCode);
-    if (ethereumJsError === undefined) {
-        console.trace(`Couldn't map exit code ${rethnetExitCode}`);
-        // eslint-disable-next-line @nomiclabs/hardhat-internal-rules/only-hardhat-error
-        throw new Error(`Couldn't map exit code ${rethnetExitCode}`);
-    }
-    return new ethereumjs_evm_1.EvmError(ethereumJsError);
-}
 //# sourceMappingURL=convertToRethnet.js.map

package/internal/hardhat-network/provider/utils/convertToRethnet.js.map

@@ -1 +1 @@
-{"version":3,"file":"convertToRethnet.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/utils/convertToRethnet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"convertToRethnet.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/utils/convertToRethnet.ts"],"names":[],"mappings":"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"}

package/internal/hardhat-network/provider/utils/makeFakeSignature.d.ts

@@ -0,0 +1,7 @@
+import { AccessListEIP2930Transaction, FeeMarketEIP1559Transaction, TxData } from "@nomicfoundation/ethereumjs-tx";
+import { Address } from "@nomicfoundation/ethereumjs-util";
+export declare function makeFakeSignature(tx: TxData | AccessListEIP2930Transaction | FeeMarketEIP1559Transaction, sender: Address): {
+    r: number;
+    s: number;
+};
+//# sourceMappingURL=makeFakeSignature.d.ts.map

package/internal/hardhat-network/provider/utils/makeFakeSignature.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"makeFakeSignature.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/utils/makeFakeSignature.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,2BAA2B,EAC3B,MAAM,EACP,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAK3D,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,MAAM,GAAG,4BAA4B,GAAG,2BAA2B,EACvE,MAAM,EAAE,OAAO,GACd;IACD,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CA6BA"}

package/internal/hardhat-network/provider/utils/makeFakeSignature.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeFakeSignature = void 0;
+const hash_1 = require("../../../util/hash");
+// Produces a signature with r and s values taken from a hash of the inputs.
+function makeFakeSignature(tx, sender) {
+    const hashInputString = [
+        sender,
+        tx.nonce,
+        tx.gasLimit,
+        tx.value,
+        tx.to,
+        tx.data,
+        "gasPrice" in tx ? tx.gasPrice : "",
+        "chainId" in tx ? tx.chainId : "",
+        "maxPriorityFeePerGas" in tx ? tx.maxPriorityFeePerGas : "",
+        "maxFeePerGas" in tx ? tx.maxFeePerGas : "",
+        "accessList" in tx
+            ? tx.accessList?.map(([buf, bufs]) => [buf, ...bufs].map((b) => b.toString("hex")).join(";"))
+            : "",
+    ]
+        .map((a) => a?.toString() ?? "")
+        .join(",");
+    const hashDigest = (0, hash_1.createNonCryptographicHashBasedIdentifier)(Buffer.from(hashInputString));
+    return {
+        r: hashDigest.readUInt32LE(),
+        s: hashDigest.readUInt32LE(4),
+    };
+}
+exports.makeFakeSignature = makeFakeSignature;
+//# sourceMappingURL=makeFakeSignature.js.map

package/internal/hardhat-network/provider/utils/makeFakeSignature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"makeFakeSignature.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/utils/makeFakeSignature.ts"],"names":[],"mappings":";;;AAOA,6CAA+E;AAE/E,4EAA4E;AAC5E,SAAgB,iBAAiB,CAC/B,EAAuE,EACvE,MAAe;IAKf,MAAM,eAAe,GAAG;QACtB,MAAM;QACN,EAAE,CAAC,KAAK;QACR,EAAE,CAAC,QAAQ;QACX,EAAE,CAAC,KAAK;QACR,EAAE,CAAC,EAAE;QACL,EAAE,CAAC,IAAI;QACP,UAAU,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;QACnC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACjC,sBAAsB,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE;QAC3D,cAAc,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE;QAC3C,YAAY,IAAI,EAAE;YAChB,CAAC,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CACjC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CACvD;YACH,CAAC,CAAC,EAAE;KACP;SACE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;SAC/B,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,MAAM,UAAU,GAAG,IAAA,gDAAyC,EAC1D,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAC7B,CAAC;IAEF,OAAO;QACL,CAAC,EAAE,UAAU,CAAC,YAAY,EAAE;QAC5B,CAAC,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC;KAC9B,CAAC;AACJ,CAAC;AAnCD,8CAmCC"}

package/internal/hardhat-network/provider/utils/makeForkClient.d.ts

@@ -4,5 +4,6 @@ export declare function makeForkClient(forkConfig: ForkConfig, forkCachePath?: s
     forkClient: JsonRpcClient;
     forkBlockNumber: bigint;
     forkBlockTimestamp: number;
+    forkBlockHash: string;
 }>;
 //# sourceMappingURL=makeForkClient.d.ts.map

package/internal/hardhat-network/provider/utils/makeForkClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeForkClient.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/utils/makeForkClient.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAe3C,wBAAsB,cAAc,CAClC,UAAU,EAAE,UAAU,EACtB,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC;IACT,UAAU,EAAE,aAAa,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;CAC5B,CAAC,CA4DD"}
+{"version":3,"file":"makeForkClient.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/utils/makeForkClient.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAe3C,wBAAsB,cAAc,CAClC,UAAU,EAAE,UAAU,EACtB,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC;IACT,UAAU,EAAE,aAAa,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC,CAmED"}

package/internal/hardhat-network/provider/utils/makeForkClient.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeForkClient = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const constants_1 = require("../../../constants");
+const errors_1 = require("../../../core/errors");
 const base_types_1 = require("../../../core/jsonrpc/types/base-types");
 const http_1 = require("../../../core/providers/http");
 const client_1 = require("../../jsonrpc/client");
@@ -44,7 +45,9 @@ Please use block number ${lastSafeBlock} or wait for the block to get ${required
     const forkBlockTimestamp = (0, base_types_1.rpcQuantityToNumber)(block.timestamp) * 1000;
     const cacheToDiskEnabled = forkConfig.blockNumber !== undefined && forkCachePath !== undefined;
     const forkClient = new client_1.JsonRpcClient(provider, networkId, latestBlock, maxReorg, cacheToDiskEnabled ? forkCachePath : undefined);
-    return { forkClient, forkBlockNumber, forkBlockTimestamp };
+    const forkBlockHash = block.hash;
+    (0, errors_1.assertHardhatInvariant)(forkBlockHash !== null, "Forked block should have a hash");
+    return { forkClient, forkBlockNumber, forkBlockTimestamp, forkBlockHash };
 }
 exports.makeForkClient = makeForkClient;
 async function getBlockByNumber(provider, blockNumber) {

package/internal/hardhat-network/provider/utils/makeForkClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"makeForkClient.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/utils/makeForkClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"makeForkClient.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/utils/makeForkClient.ts"],"names":[],"mappings":"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"}

package/internal/hardhat-network/provider/utils/putGenesisBlock.d.ts

@@ -4,5 +4,5 @@ import { Trie } from "@nomicfoundation/ethereumjs-trie";
 import { HardforkName } from "../../../util/hardforks";
 import { HardhatBlockchain } from "../HardhatBlockchain";
 import { LocalNodeConfig } from "../node-types";
-export declare function putGenesisBlock(blockchain: HardhatBlockchain, common: Common, { initialDate, blockGasLimit }: LocalNodeConfig, stateTrie: Trie, hardfork: HardforkName, initialMixHash: Buffer, initialBaseFee?: bigint): Promise<void>;
+export declare function putGenesisBlock(blockchain: HardhatBlockchain, common: Common, { initialDate, blockGasLimit: initialBlockGasLimit }: LocalNodeConfig, stateTrie: Trie, hardfork: HardforkName, initialMixHash: Buffer, initialBaseFee?: bigint): Promise<void>;
 //# sourceMappingURL=putGenesisBlock.d.ts.map

package/internal/hardhat-network/provider/utils/putGenesisBlock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"putGenesisBlock.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/utils/putGenesisBlock.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAIxD,OAAO,EAAe,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGhD,wBAAsB,eAAe,CACnC,UAAU,EAAE,iBAAiB,EAC7B,MAAM,EAAE,MAAM,EACd,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,eAAe,EAC/C,SAAS,EAAE,IAAI,EACf,QAAQ,EAAE,YAAY,EACtB,cAAc,EAAE,MAAM,EACtB,cAAc,CAAC,EAAE,MAAM,iBAqCxB"}
+{"version":3,"file":"putGenesisBlock.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/utils/putGenesisBlock.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAIxD,OAAO,EAAe,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGhD,wBAAsB,eAAe,CACnC,UAAU,EAAE,iBAAiB,EAC7B,MAAM,EAAE,MAAM,EACd,EAAE,WAAW,EAAE,aAAa,EAAE,oBAAoB,EAAE,EAAE,eAAe,EACrE,SAAS,EAAE,IAAI,EACf,QAAQ,EAAE,YAAY,EACtB,cAAc,EAAE,MAAM,EACtB,cAAc,CAAC,EAAE,MAAM,iBAqCxB"}

package/internal/hardhat-network/provider/utils/putGenesisBlock.js

@@ -6,14 +6,14 @@ const ethereumjs_util_1 = require("@nomicfoundation/ethereumjs-util");
 const date_1 = require("../../../util/date");
 const hardforks_1 = require("../../../util/hardforks");
 const getCurrentTimestamp_1 = require("./getCurrentTimestamp");
-async function putGenesisBlock(blockchain, common, { initialDate, blockGasLimit }, stateTrie, hardfork, initialMixHash, initialBaseFee) {
+async function putGenesisBlock(blockchain, common, { initialDate, blockGasLimit: initialBlockGasLimit }, stateTrie, hardfork, initialMixHash, initialBaseFee) {
     const initialBlockTimestamp = initialDate !== undefined
         ? (0, date_1.dateToTimestampSeconds)(initialDate)
         : (0, getCurrentTimestamp_1.getCurrentTimestamp)();
     const isPostMerge = (0, hardforks_1.hardforkGte)(hardfork, hardforks_1.HardforkName.MERGE);
     const header = {
         timestamp: `0x${initialBlockTimestamp.toString(16)}`,
-        gasLimit: blockGasLimit,
+        gasLimit: initialBlockGasLimit,
         difficulty: isPostMerge ? 0 : 1,
         nonce: isPostMerge ? "0x0000000000000000" : "0x0000000000000042",
         extraData: "0x1234",

package/internal/hardhat-network/provider/utils/putGenesisBlock.js.map

@@ -1 +1 @@
-{"version":3,"file":"putGenesisBlock.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/utils/putGenesisBlock.ts"],"names":[],"mappings":";;;AAAA,wEAAsE;AAGtE,sEAA+D;AAE/D,6CAA4D;AAC5D,uDAAoE;AAGpE,+DAA4D;AAErD,KAAK,UAAU,eAAe,CACnC,UAA6B,EAC7B,MAAc,EACd,EAAE,WAAW,EAAE,aAAa,EAAmB,EAC/C,SAAe,EACf,QAAsB,EACtB,cAAsB,EACtB,cAAuB;IAEvB,MAAM,qBAAqB,GACzB,WAAW,KAAK,SAAS;QACvB,CAAC,CAAC,IAAA,6BAAsB,EAAC,WAAW,CAAC;QACrC,CAAC,CAAC,IAAA,yCAAmB,GAAE,CAAC;IAE5B,MAAM,WAAW,GAAG,IAAA,uBAAW,EAAC,QAAQ,EAAE,wBAAY,CAAC,KAAK,CAAC,CAAC;IAE9D,MAAM,MAAM,GAAe;QACzB,SAAS,EAAE,KAAK,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;QACpD,QAAQ,EAAE,aAAa;QACvB,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/B,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,oBAAoB;QAChE,SAAS,EAAE,QAAQ;QACnB,SAAS,EAAE,IAAA,6BAAW,EAAC,SAAS,CAAC,IAAI,EAAE,CAAC;KACzC,CAAC;IAEF,IAAI,WAAW,EAAE;QACf,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC;KACjC;IAED,IAAI,cAAc,KAAK,SAAS,EAAE;QAChC,MAAM,CAAC,aAAa,GAAG,cAAc,CAAC;KACvC;IAED,MAAM,YAAY,GAAG,wBAAK,CAAC,aAAa,CACtC;QACE,MAAM;KACP,EACD;QACE,MAAM;QACN,6BAA6B,EAAE,IAAI;KACpC,CACF,CAAC;IAEF,MAAM,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;AAC1C,CAAC;AA5CD,0CA4CC"}
+{"version":3,"file":"putGenesisBlock.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/utils/putGenesisBlock.ts"],"names":[],"mappings":";;;AAAA,wEAAsE;AAGtE,sEAA+D;AAE/D,6CAA4D;AAC5D,uDAAoE;AAGpE,+DAA4D;AAErD,KAAK,UAAU,eAAe,CACnC,UAA6B,EAC7B,MAAc,EACd,EAAE,WAAW,EAAE,aAAa,EAAE,oBAAoB,EAAmB,EACrE,SAAe,EACf,QAAsB,EACtB,cAAsB,EACtB,cAAuB;IAEvB,MAAM,qBAAqB,GACzB,WAAW,KAAK,SAAS;QACvB,CAAC,CAAC,IAAA,6BAAsB,EAAC,WAAW,CAAC;QACrC,CAAC,CAAC,IAAA,yCAAmB,GAAE,CAAC;IAE5B,MAAM,WAAW,GAAG,IAAA,uBAAW,EAAC,QAAQ,EAAE,wBAAY,CAAC,KAAK,CAAC,CAAC;IAE9D,MAAM,MAAM,GAAe;QACzB,SAAS,EAAE,KAAK,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;QACpD,QAAQ,EAAE,oBAAoB;QAC9B,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/B,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,oBAAoB;QAChE,SAAS,EAAE,QAAQ;QACnB,SAAS,EAAE,IAAA,6BAAW,EAAC,SAAS,CAAC,IAAI,EAAE,CAAC;KACzC,CAAC;IAEF,IAAI,WAAW,EAAE;QACf,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC;KACjC;IAED,IAAI,cAAc,KAAK,SAAS,EAAE;QAChC,MAAM,CAAC,aAAa,GAAG,cAAc,CAAC;KACvC;IAED,MAAM,YAAY,GAAG,wBAAK,CAAC,aAAa,CACtC;QACE,MAAM;KACP,EACD;QACE,MAAM;QACN,6BAA6B,EAAE,IAAI;KACpC,CACF,CAAC;IAEF,MAAM,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;AAC1C,CAAC;AA5CD,0CA4CC"}

package/internal/hardhat-network/provider/vm/block-builder.d.ts

@@ -1,8 +1,8 @@
+import type { Common } from "@nomicfoundation/ethereumjs-common";
 import { Block, HeaderData } from "@nomicfoundation/ethereumjs-block";
 import { TypedTransaction } from "@nomicfoundation/ethereumjs-tx";
 import { Address } from "@nomicfoundation/ethereumjs-util";
-import { RunTxResult } from "@nomicfoundation/ethereumjs-vm";
-import { VMAdapter } from "./vm-adapter";
+import { RunTxResult, VMAdapter } from "./vm-adapter";
 declare type Reward = [address: Address, reward: bigint];
 export interface BuildBlockOpts {
     parentBlock: Block;
@@ -10,12 +10,13 @@ export interface BuildBlockOpts {
 }
 export declare class BlockBuilder {
     private _vm;
+    private _common;
     private _opts;
     private _state;
     private _gasUsed;
     private _transactions;
     private _transactionResults;
-    constructor(_vm: VMAdapter, _opts: BuildBlockOpts);
+    constructor(_vm: VMAdapter, _common: Common, _opts: BuildBlockOpts);
     startBlock(): Promise<void>;
     getGasUsed(): bigint;
     addTransaction(tx: TypedTransaction): Promise<RunTxResult>;

package/internal/hardhat-network/provider/vm/block-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block-builder.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/vm/block-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAGtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EACL,OAAO,EAIR,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAGL,WAAW,EAEZ,MAAM,gCAAgC,CAAC;AAIxC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC,aAAK,MAAM,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAEjD,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,KAAK,CAAC;IACnB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAcD,qBAAa,YAAY;IAMX,OAAO,CAAC,GAAG;IAAa,OAAO,CAAC,KAAK;IALjD,OAAO,CAAC,MAAM,CAA8B;IAC5C,OAAO,CAAC,QAAQ,CAAM;IACtB,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,mBAAmB,CAAqB;gBAE5B,GAAG,EAAE,SAAS,EAAU,KAAK,EAAE,cAAc;IAEpD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC,UAAU,IAAI,MAAM;IAId,cAAc,CAAC,EAAE,EAAE,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC;IAqC1D,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5C,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAoDtB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;YAWtB,oBAAoB;YAQpB,gBAAgB;IAU9B,OAAO,CAAC,aAAa;CAQtB"}
+{"version":3,"file":"block-builder.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/vm/block-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAGtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EACL,OAAO,EAIR,MAAM,kCAAkC,CAAC;AAS1C,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAItD,aAAK,MAAM,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAEjD,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,KAAK,CAAC;IACnB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAcD,qBAAa,YAAY;IAOrB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,KAAK;IARf,OAAO,CAAC,MAAM,CAA8B;IAC5C,OAAO,CAAC,QAAQ,CAAM;IACtB,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,mBAAmB,CAAqB;gBAGtC,GAAG,EAAE,SAAS,EACd,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,cAAc;IAGlB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC,UAAU,IAAI,MAAM;IAId,cAAc,CAAC,EAAE,EAAE,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC;IAyC1D,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5C,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAoDtB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;YAWtB,oBAAoB;YAQpB,gBAAgB;IAU9B,OAAO,CAAC,aAAa;CAQtB"}

package/internal/hardhat-network/provider/vm/block-builder.js

@@ -8,8 +8,9 @@ const ethereumjs_util_1 = require("@nomicfoundation/ethereumjs-util");
 const bigint_1 = require("../../../util/bigint");
 const bloom_1 = require("../utils/bloom");
 class BlockBuilder {
-    constructor(_vm, _opts) {
+    constructor(_vm, _common, _opts) {
         this._vm = _vm;
+        this._common = _common;
         this._opts = _opts;
         this._state = "ready";
         this._gasUsed = 0n;
@@ -36,16 +37,19 @@ class BlockBuilder {
             ...this._opts.headerData,
             gasUsed: this._gasUsed,
         };
+        if (header.number === undefined) {
+            header.number = this._opts.parentBlock.header.number + 1n;
+        }
         const blockData = { header, transactions: this._transactions };
         const block = ethereumjs_block_1.Block.fromBlockData(blockData, {
-            common: this._vm.getCommon(),
+            common: this._common,
             skipConsensusFormatValidation: true,
             calcDifficultyFromHeader: this._opts.parentBlock.header,
         });
-        const result = await this._vm.runTxInBlock(tx, block);
+        const [result] = await this._vm.runTxInBlock(tx, block);
         this._transactions.push(tx);
         this._transactionResults.push(result);
-        this._gasUsed += result.totalGasSpent;
+        this._gasUsed += result.gasUsed;
         return result;
     }
     async addRewards(rewards) {
@@ -86,7 +90,7 @@ class BlockBuilder {
             transactions: this._transactions,
         };
         const block = ethereumjs_block_1.Block.fromBlockData(blockData, {
-            common: this._vm.getCommon(),
+            common: this._common,
             skipConsensusFormatValidation: true,
             calcDifficultyFromHeader: this._opts.parentBlock.header,
         });