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

package/internal/hardhat-network/provider/vm/rethnet.d.ts

@@ -1,34 +1,27 @@
 /// <reference types="node" />
-import type { Message } from "@nomicfoundation/ethereumjs-evm";
-import type { RunTxResult } from "@nomicfoundation/ethereumjs-vm";
-import { BlockchainInterface } from "@nomicfoundation/ethereumjs-blockchain";
 import { Block } from "@nomicfoundation/ethereumjs-block";
 import { Common } from "@nomicfoundation/ethereumjs-common";
-import { StateManager } from "@nomicfoundation/ethereumjs-statemanager";
 import { Account, Address } from "@nomicfoundation/ethereumjs-util";
 import { TypedTransaction } from "@nomicfoundation/ethereumjs-tx";
-import { Rethnet } from "rethnet-evm";
+import { Blockchain, Rethnet } from "rethnet-evm";
 import { NodeConfig } from "../node-types";
 import { RpcDebugTraceOutput } from "../output";
+import { RethnetStateManager } from "../RethnetState";
 import { RpcDebugTracingConfig } from "../../../core/jsonrpc/types/input/debugTraceTransaction";
-import { VMAdapter } from "./vm-adapter";
+import { MessageTrace } from "../../stack-traces/message-trace";
+import { RunTxResult, Trace, VMAdapter } from "./vm-adapter";
 export declare class RethnetAdapter implements VMAdapter {
+    private _blockchain;
+    private _state;
     private _rethnet;
     private readonly _selectHardfork;
-    constructor(_rethnet: Rethnet, _selectHardfork: (blockNumber: bigint) => string);
-    static create(stateManager: StateManager, blockchain: BlockchainInterface, config: NodeConfig, selectHardfork: (blockNumber: bigint) => string): Promise<RethnetAdapter>;
+    private _vmTracer;
+    constructor(_blockchain: Blockchain, _state: RethnetStateManager, _rethnet: Rethnet, _selectHardfork: (blockNumber: bigint) => string, common: Common);
+    static create(config: NodeConfig, selectHardfork: (blockNumber: bigint) => string, getBlockHash: (blockNumber: bigint) => Promise<Buffer>, common: Common): Promise<RethnetAdapter>;
     /**
      * Run `tx` with the given `blockContext`, without modifying the state.
      */
-    dryRun(tx: TypedTransaction, blockContext: Block, forceBaseFeeZero?: boolean): Promise<RunTxResult>;
-    /**
-     * Temporary method, will be removed.
-     */
-    getCommon(): Common;
-    /**
-     * Temporary method, will be removed.
-     */
-    isEip1559Active(): boolean;
+    dryRun(tx: TypedTransaction, blockContext: Block, forceBaseFeeZero?: boolean): Promise<[RunTxResult, Trace]>;
     /**
      * Get the account info for the given address.
      */
@@ -75,7 +68,7 @@ export declare class RethnetAdapter implements VMAdapter {
     /**
      * Must be called after `startBlock`, and before `addBlockRewards`.
      */
-    runTxInBlock(tx: TypedTransaction, block: Block): Promise<RunTxResult>;
+    runTxInBlock(tx: TypedTransaction, block: Block): Promise<[RunTxResult, Trace]>;
     /**
      * Must be called after `startBlock` and all `runTxInBlock` calls.
      */
@@ -94,18 +87,13 @@ export declare class RethnetAdapter implements VMAdapter {
      * given hash, and trace the execution of that transaction.
      */
     traceTransaction(hash: Buffer, block: Block, config: RpcDebugTracingConfig): Promise<RpcDebugTraceOutput>;
-    /**
-     * Start tracing the VM execution with the given callbacks.
-     */
-    enableTracing(callbacks: {
-        beforeMessage: (message: Message, next: any) => Promise<void>;
-        step: () => Promise<void>;
-        afterMessage: () => Promise<void>;
-    }): void;
-    /**
-     * Stop tracing the execution.
-     */
-    disableTracing(): void;
+    makeSnapshot(): Promise<Buffer>;
+    getLastTrace(): {
+        trace: MessageTrace | undefined;
+        error: Error | undefined;
+    };
+    clearLastError(): void;
     private _getBlockEnvDifficulty;
+    private _getBlockPrevRandao;
 }
 //# sourceMappingURL=rethnet.d.ts.map

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

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

package/internal/hardhat-network/provider/vm/rethnet.js

@@ -2,103 +2,162 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RethnetAdapter = void 0;
 const ethereumjs_util_1 = require("@nomicfoundation/ethereumjs-util");
+const rethnet_evm_1 = require("rethnet-evm");
+const node_types_1 = require("../node-types");
 const convertToRethnet_1 = require("../utils/convertToRethnet");
 const hardforks_1 = require("../../../util/hardforks");
+const keccak_1 = require("../../../util/keccak");
+const RethnetState_1 = require("../RethnetState");
+const vm_tracer_1 = require("../../stack-traces/vm-tracer");
 /* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 class RethnetAdapter {
-    constructor(_rethnet, _selectHardfork) {
+    constructor(_blockchain, _state, _rethnet, _selectHardfork, common) {
+        this._blockchain = _blockchain;
+        this._state = _state;
         this._rethnet = _rethnet;
         this._selectHardfork = _selectHardfork;
+        this._vmTracer = new vm_tracer_1.VMTracer(common, false);
     }
-    static async create(stateManager, blockchain, config, selectHardfork) {
-        const hardhatDB = new convertToRethnet_1.HardhatDB(stateManager, blockchain);
+    static async create(config, selectHardfork, getBlockHash, common) {
+        if ((0, node_types_1.isForkedNodeConfig)(config)) {
+            // eslint-disable-next-line @nomiclabs/hardhat-internal-rules/only-hardhat-error
+            throw new Error("Forking is not supported for Rethnet yet");
+        }
+        const blockchain = new rethnet_evm_1.Blockchain(getBlockHash);
         const limitContractCodeSize = config.allowUnlimitedContractSize === true ? 2n ** 64n - 1n : undefined;
-        const rethnet = (0, convertToRethnet_1.createRethnetFromHardhatDB)({
+        const state = RethnetState_1.RethnetStateManager.withGenesisAccounts(config.genesisAccounts);
+        const rethnet = new rethnet_evm_1.Rethnet(blockchain, state.asInner(), {
             chainId: BigInt(config.chainId),
+            specId: (0, convertToRethnet_1.ethereumsjsHardforkToRethnet)(config.hardfork),
             limitContractCodeSize,
             disableBlockGasLimit: true,
             disableEip3607: true,
-        }, hardhatDB);
-        return new RethnetAdapter(rethnet, selectHardfork);
+        });
+        return new RethnetAdapter(blockchain, state, rethnet, selectHardfork, common);
     }
     /**
      * Run `tx` with the given `blockContext`, without modifying the state.
      */
     async dryRun(tx, blockContext, forceBaseFeeZero) {
         const rethnetTx = (0, convertToRethnet_1.ethereumjsTransactionToRethnet)(tx);
-        const difficulty = this._getBlockEnvDifficulty(blockContext.header.number, blockContext.header.difficulty, (0, ethereumjs_util_1.bufferToBigInt)(blockContext.header.mixHash));
-        await this._rethnet.guaranteeTransaction(rethnetTx);
-        const rethnetResult = await this._rethnet.dryRun(rethnetTx, {
+        const difficulty = this._getBlockEnvDifficulty(blockContext.header.difficulty);
+        const prevRandao = this._getBlockPrevRandao(blockContext.header.number, blockContext.header.mixHash);
+        const rethnetResult = await this._rethnet.guaranteedDryRun(rethnetTx, {
             number: blockContext.header.number,
             coinbase: blockContext.header.coinbase.buf,
             timestamp: blockContext.header.timestamp,
             basefee: forceBaseFeeZero === true ? 0n : blockContext.header.baseFeePerGas,
             gasLimit: blockContext.header.gasLimit,
             difficulty,
+            prevrandao: prevRandao,
         });
-        return (0, convertToRethnet_1.rethnetResultToRunTxResult)(rethnetResult.execResult);
-    }
-    /**
-     * Temporary method, will be removed.
-     */
-    getCommon() {
-        throw new Error("not implemented");
-    }
-    /**
-     * Temporary method, will be removed.
-     */
-    isEip1559Active() {
-        throw new Error("not implemented");
+        for (const traceItem of rethnetResult.execResult.trace) {
+            if ("pc" in traceItem) {
+                // step
+                await this._vmTracer.addStep(traceItem);
+            }
+            else if ("executionResult" in traceItem) {
+                // after message
+                await this._vmTracer.addAfterMessage(traceItem);
+            }
+            else {
+                // before message
+                await this._vmTracer.addBeforeMessage(traceItem);
+            }
+        }
+        try {
+            const result = (0, convertToRethnet_1.rethnetResultToRunTxResult)(rethnetResult.execResult, blockContext.header.gasUsed);
+            return [result, rethnetResult.execResult.trace];
+        }
+        catch (e) {
+            // console.log("Rethnet trace");
+            // console.log(rethnetResult.execResult.trace);
+            throw e;
+        }
     }
     /**
      * Get the account info for the given address.
      */
     async getAccount(address) {
-        throw new Error("not implemented");
+        const account = await this._state.getAccount(address);
+        const storageRoot = await this._state.getAccountStorageRoot(address);
+        return new ethereumjs_util_1.Account(account?.nonce, account?.balance, storageRoot ?? undefined, account?.code?.hash);
     }
     /**
      * Get the storage value at the given address and slot.
      */
     async getContractStorage(address, key) {
-        throw new Error("not implemented");
+        return this._state.getContractStorage(address, key);
     }
     /**
      * Get the contract code at the given address.
      */
     async getContractCode(address) {
-        throw new Error("not implemented");
+        return this._state.getContractCode(address);
     }
     /**
      * Update the account info for the given address.
      */
     async putAccount(address, account) {
-        throw new Error("not implemented");
+        const contractCode = account.codeHash === ethereumjs_util_1.KECCAK256_NULL
+            ? undefined
+            : await this._state.getContractCode(address);
+        return this._state.modifyAccount(address, async function (balance, nonce, code) {
+            const newCode = account.codeHash === ethereumjs_util_1.KECCAK256_NULL
+                ? undefined
+                : account.codeHash === code?.hash
+                    ? code
+                    : {
+                        hash: account.codeHash,
+                        code: contractCode,
+                    };
+            return {
+                balance: account.balance,
+                nonce: account.nonce,
+                code: newCode,
+            };
+        });
     }
     /**
      * Update the contract code for the given address.
      */
     async putContractCode(address, value) {
-        throw new Error("not implemented");
+        const codeHash = (0, keccak_1.keccak256)(value);
+        return this._state.modifyAccount(address, async function (balance, nonce, code) {
+            const newCode = codeHash === ethereumjs_util_1.KECCAK256_NULL
+                ? undefined
+                : codeHash === code?.hash
+                    ? code
+                    : {
+                        hash: codeHash,
+                        code: value,
+                    };
+            return {
+                balance,
+                nonce,
+                code: newCode,
+            };
+        });
     }
     /**
      * Update the value of the given storage slot.
      */
     async putContractStorage(address, key, value) {
-        throw new Error("not implemented");
+        await this._state.putContractStorage(address, key, value);
     }
     /**
      * Get the root of the current state trie.
      */
     async getStateRoot() {
-        throw new Error("not implemented");
+        return this._state.getStateRoot();
     }
     /**
      * Reset the state trie to the point after `block` was mined. If
      * `irregularStateOrUndefined` is passed, use it as the state root.
      */
     async setBlockContext(block, irregularStateOrUndefined) {
-        throw new Error("not implemented");
+        return this._state.setStateRoot(irregularStateOrUndefined ?? block.header.stateRoot);
     }
     /**
      * Reset the state trie to the point where it had the given state root.
@@ -106,65 +165,119 @@ class RethnetAdapter {
      * Throw if it can't.
      */
     async restoreContext(stateRoot) {
-        throw new Error("not implemented");
+        return this._state.setStateRoot(stateRoot);
     }
     /**
      * Start a new block and accept transactions sent with `runTxInBlock`.
      */
     async startBlock() {
-        throw new Error("not implemented");
+        await this._state.checkpoint();
     }
     /**
      * Must be called after `startBlock`, and before `addBlockRewards`.
      */
     async runTxInBlock(tx, block) {
-        throw new Error("not implemented");
+        const rethnetTx = (0, convertToRethnet_1.ethereumjsTransactionToRethnet)(tx);
+        const difficulty = this._getBlockEnvDifficulty(block.header.difficulty);
+        const prevRandao = this._getBlockPrevRandao(block.header.number, block.header.mixHash);
+        const rethnetResult = await this._rethnet.run(rethnetTx, (0, convertToRethnet_1.ethereumjsHeaderDataToRethnet)(block.header, difficulty, prevRandao));
+        for (const traceItem of rethnetResult.trace) {
+            if ("pc" in traceItem) {
+                // step
+                await this._vmTracer.addStep(traceItem);
+            }
+            else if ("executionResult" in traceItem) {
+                // after message
+                await this._vmTracer.addAfterMessage(traceItem);
+            }
+            else {
+                // before message
+                await this._vmTracer.addBeforeMessage(traceItem);
+            }
+        }
+        try {
+            const result = (0, convertToRethnet_1.rethnetResultToRunTxResult)(rethnetResult, block.header.gasUsed);
+            return [result, rethnetResult.trace];
+        }
+        catch (e) {
+            // console.log("Rethnet trace");
+            // console.log(rethnetResult.trace);
+            throw e;
+        }
     }
     /**
      * Must be called after `startBlock` and all `runTxInBlock` calls.
      */
     async addBlockRewards(rewards) {
-        throw new Error("not implemented");
+        const blockBuilder = rethnet_evm_1.BlockBuilder.new(this._blockchain, this._state.asInner(), {}, {
+            // Dummy values
+            parentHash: Buffer.alloc(32, 0),
+            ommersHash: Buffer.alloc(32, 0),
+            beneficiary: Buffer.alloc(20, 0),
+            stateRoot: Buffer.alloc(32, 0),
+            transactionsRoot: Buffer.alloc(32, 0),
+            receiptsRoot: Buffer.alloc(32, 0),
+            logsBloom: Buffer.alloc(256, 0),
+            difficulty: 0n,
+            number: 0n,
+            gasLimit: 0n,
+            gasUsed: 0n,
+            timestamp: 0n,
+            extraData: Buffer.allocUnsafe(0),
+            mixHash: Buffer.alloc(32, 0),
+            nonce: 0n,
+        }, {});
+        await blockBuilder.finalize(rewards.map(([address, reward]) => {
+            return [address.buf, reward];
+        }));
     }
     /**
      * Finish the block successfully. Must be called after `addBlockRewards`.
      */
-    async sealBlock() {
-        throw new Error("not implemented");
-    }
+    async sealBlock() { }
     /**
      * Revert the block and discard the changes to the state. Can be called
      * at any point after `startBlock`.
      */
     async revertBlock() {
-        throw new Error("not implemented");
+        await this._state.revert();
     }
     /**
      * Re-execute the transactions in the block up until the transaction with the
      * given hash, and trace the execution of that transaction.
      */
     async traceTransaction(hash, block, config) {
-        throw new Error("not implemented");
+        throw new Error("traceTransaction not implemented for Rethnet");
     }
-    /**
-     * Start tracing the VM execution with the given callbacks.
-     */
-    enableTracing(callbacks) {
-        throw new Error("not implemented");
+    async makeSnapshot() {
+        return this._state.makeSnapshot();
     }
-    /**
-     * Stop tracing the execution.
-     */
-    disableTracing() {
-        throw new Error("not implemented");
+    getLastTrace() {
+        const trace = this._vmTracer.getLastTopLevelMessageTrace();
+        const error = this._vmTracer.getLastError();
+        return { trace, error };
+    }
+    clearLastError() {
+        this._vmTracer.clearLastError();
+    }
+    _getBlockEnvDifficulty(difficulty) {
+        const MAX_DIFFICULTY = 2n ** 32n - 1n;
+        if (difficulty !== undefined && difficulty > MAX_DIFFICULTY) {
+            console.debug("Difficulty is larger than U256::max:", difficulty.toString(16));
+            return MAX_DIFFICULTY;
+        }
+        return difficulty;
     }
-    _getBlockEnvDifficulty(blockNumber, difficulty, mixHash) {
+    _getBlockPrevRandao(blockNumber, mixHash) {
         const hardfork = this._selectHardfork(blockNumber);
         const isPostMergeHardfork = (0, hardforks_1.hardforkGte)(hardfork, hardforks_1.HardforkName.MERGE);
         if (isPostMergeHardfork) {
+            if (mixHash === undefined) {
+                throw new Error("mixHash must be set for post-merge hardfork");
+            }
             return mixHash;
         }
-        return difficulty;
+        return undefined;
     }
 }
 exports.RethnetAdapter = RethnetAdapter;

package/internal/hardhat-network/provider/vm/rethnet.js.map

@@ -1 +1 @@
-{"version":3,"file":"rethnet.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/vm/rethnet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rethnet.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/vm/rethnet.ts"],"names":[],"mappings":";;;AAEA,sEAI0C;AAE1C,6CAMqB;AAErB,8CAA+D;AAC/D,gEAKmC;AACnC,uDAAoE;AACpE,iDAAiD;AAEjD,kDAAsD;AAGtD,4DAAwD;AAIxD,yEAAyE;AACzE,sDAAsD;AAEtD,MAAa,cAAc;IAGzB,YACU,WAAuB,EACvB,MAA2B,EAC3B,QAAiB,EACR,eAAgD,EACjE,MAAc;QAJN,gBAAW,GAAX,WAAW,CAAY;QACvB,WAAM,GAAN,MAAM,CAAqB;QAC3B,aAAQ,GAAR,QAAQ,CAAS;QACR,oBAAe,GAAf,eAAe,CAAiC;QAGjE,IAAI,CAAC,SAAS,GAAG,IAAI,oBAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,MAAM,CACxB,MAAkB,EAClB,cAA+C,EAC/C,YAAsD,EACtD,MAAc;QAEd,IAAI,IAAA,+BAAkB,EAAC,MAAM,CAAC,EAAE;YAC9B,gFAAgF;YAChF,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;SAC7D;QAED,MAAM,UAAU,GAAG,IAAI,wBAAU,CAAC,YAAY,CAAC,CAAC;QAEhD,MAAM,qBAAqB,GACzB,MAAM,CAAC,0BAA0B,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAE1E,MAAM,KAAK,GAAG,kCAAmB,CAAC,mBAAmB,CACnD,MAAM,CAAC,eAAe,CACvB,CAAC;QAEF,MAAM,OAAO,GAAG,IAAI,qBAAO,CAAC,UAAU,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE;YACvD,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;YAC/B,MAAM,EAAE,IAAA,+CAA4B,EAAC,MAAM,CAAC,QAAwB,CAAC;YACrE,qBAAqB;YACrB,oBAAoB,EAAE,IAAI;YAC1B,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;QAEH,OAAO,IAAI,cAAc,CACvB,UAAU,EACV,KAAK,EACL,OAAO,EACP,cAAc,EACd,MAAM,CACP,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,MAAM,CACjB,EAAoB,EACpB,YAAmB,EACnB,gBAA0B;QAE1B,MAAM,SAAS,GAAG,IAAA,iDAA8B,EAAC,EAAE,CAAC,CAAC;QAErD,MAAM,UAAU,GAAG,IAAI,CAAC,sBAAsB,CAC5C,YAAY,CAAC,MAAM,CAAC,UAAU,CAC/B,CAAC;QAEF,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CACzC,YAAY,CAAC,MAAM,CAAC,MAAM,EAC1B,YAAY,CAAC,MAAM,CAAC,OAAO,CAC5B,CAAC;QAEF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE;YACpE,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,MAAM;YAClC,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG;YAC1C,SAAS,EAAE,YAAY,CAAC,MAAM,CAAC,SAAS;YACxC,OAAO,EACL,gBAAgB,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,aAAa;YACpE,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC,QAAQ;YACtC,UAAU;YACV,UAAU,EAAE,UAAU;SACvB,CAAC,CAAC;QAEH,KAAK,MAAM,SAAS,IAAI,aAAa,CAAC,UAAU,CAAC,KAAK,EAAE;YACtD,IAAI,IAAI,IAAI,SAAS,EAAE;gBACrB,OAAO;gBACP,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aACzC;iBAAM,IAAI,iBAAiB,IAAI,SAAS,EAAE;gBACzC,gBAAgB;gBAChB,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;aACjD;iBAAM;gBACL,iBAAiB;gBACjB,MAAM,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;aAClD;SACF;QAED,IAAI;YACF,MAAM,MAAM,GAAG,IAAA,6CAA0B,EACvC,aAAa,CAAC,UAAU,EACxB,YAAY,CAAC,MAAM,CAAC,OAAO,CAC5B,CAAC;YACF,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SACjD;QAAC,OAAO,CAAC,EAAE;YACV,gCAAgC;YAChC,+CAA+C;YAC/C,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,UAAU,CAAC,OAAgB;QACtC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACtD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;QACrE,OAAO,IAAI,yBAAO,CAChB,OAAO,EAAE,KAAK,EACd,OAAO,EAAE,OAAO,EAChB,WAAW,IAAI,SAAS,EACxB,OAAO,EAAE,IAAI,EAAE,IAAI,CACpB,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,kBAAkB,CAC7B,OAAgB,EAChB,GAAW;QAEX,OAAO,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACtD,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,eAAe,CAAC,OAAgB;QAC3C,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,UAAU,CAAC,OAAgB,EAAE,OAAgB;QACxD,MAAM,YAAY,GAChB,OAAO,CAAC,QAAQ,KAAK,gCAAc;YACjC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAEjD,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAC9B,OAAO,EACP,KAAK,WACH,OAAe,EACf,KAAa,EACb,IAA0B;YAE1B,MAAM,OAAO,GACX,OAAO,CAAC,QAAQ,KAAK,gCAAc;gBACjC,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,OAAO,CAAC,QAAQ,KAAK,IAAI,EAAE,IAAI;oBACjC,CAAC,CAAC,IAAI;oBACN,CAAC,CAAC;wBACE,IAAI,EAAE,OAAO,CAAC,QAAQ;wBACtB,IAAI,EAAE,YAAa;qBACpB,CAAC;YAER,OAAO;gBACL,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,IAAI,EAAE,OAAO;aACd,CAAC;QACJ,CAAC,CACF,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,eAAe,CAAC,OAAgB,EAAE,KAAa;QAC1D,MAAM,QAAQ,GAAG,IAAA,kBAAS,EAAC,KAAK,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAC9B,OAAO,EACP,KAAK,WACH,OAAe,EACf,KAAa,EACb,IAA0B;YAE1B,MAAM,OAAO,GACX,QAAQ,KAAK,gCAAc;gBACzB,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,QAAQ,KAAK,IAAI,EAAE,IAAI;oBACzB,CAAC,CAAC,IAAI;oBACN,CAAC,CAAC;wBACE,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,KAAK;qBACZ,CAAC;YAER,OAAO;gBACL,OAAO;gBACP,KAAK;gBACL,IAAI,EAAE,OAAO;aACd,CAAC;QACJ,CAAC,CACF,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,kBAAkB,CAC7B,OAAgB,EAChB,GAAW,EACX,KAAa;QAEb,MAAM,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAC5D,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,YAAY;QACvB,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;IACpC,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,eAAe,CAC1B,KAAY,EACZ,yBAA6C;QAE7C,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAC7B,yBAAyB,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CACpD,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,cAAc,CAAC,SAAiB;QAC3C,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAC7C,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,UAAU;QACrB,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IACjC,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,YAAY,CACvB,EAAoB,EACpB,KAAY;QAEZ,MAAM,SAAS,GAAG,IAAA,iDAA8B,EAAC,EAAE,CAAC,CAAC;QAErD,MAAM,UAAU,GAAG,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAExE,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CACzC,KAAK,CAAC,MAAM,CAAC,MAAM,EACnB,KAAK,CAAC,MAAM,CAAC,OAAO,CACrB,CAAC;QAEF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAC3C,SAAS,EACT,IAAA,gDAA6B,EAAC,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CACpE,CAAC;QAEF,KAAK,MAAM,SAAS,IAAI,aAAa,CAAC,KAAK,EAAE;YAC3C,IAAI,IAAI,IAAI,SAAS,EAAE;gBACrB,OAAO;gBACP,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aACzC;iBAAM,IAAI,iBAAiB,IAAI,SAAS,EAAE;gBACzC,gBAAgB;gBAChB,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;aACjD;iBAAM;gBACL,iBAAiB;gBACjB,MAAM,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;aAClD;SACF;QAED,IAAI;YACF,MAAM,MAAM,GAAG,IAAA,6CAA0B,EACvC,aAAa,EACb,KAAK,CAAC,MAAM,CAAC,OAAO,CACrB,CAAC;YACF,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;SACtC;QAAC,OAAO,CAAC,EAAE;YACV,gCAAgC;YAChC,oCAAoC;YACpC,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,eAAe,CAC1B,OAAiC;QAEjC,MAAM,YAAY,GAAG,0BAAY,CAAC,GAAG,CACnC,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EACrB,EAAE,EACF;YACE,eAAe;YACf,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/B,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/B,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YAChC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9B,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YACrC,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YACjC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;YAC/B,UAAU,EAAE,EAAE;YACd,MAAM,EAAE,EAAE;YACV,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE,EAAE;YACX,SAAS,EAAE,EAAE;YACb,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;YAChC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5B,KAAK,EAAE,EAAE;SACV,EACD,EAAE,CACH,CAAC;QAEF,MAAM,YAAY,CAAC,QAAQ,CACzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE;YAChC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC/B,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,SAAS,KAAmB,CAAC;IAE1C;;;OAGG;IACI,KAAK,CAAC,WAAW;QACtB,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAC7B,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,gBAAgB,CAC3B,IAAY,EACZ,KAAY,EACZ,MAA6B;QAE7B,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAEM,KAAK,CAAC,YAAY;QACvB,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;IACpC,CAAC;IAEM,YAAY;QAIjB,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,2BAA2B,EAAE,CAAC;QAC3D,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;QAE5C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAC1B,CAAC;IAEM,cAAc;QACnB,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;IAClC,CAAC;IAEO,sBAAsB,CAC5B,UAA8B;QAE9B,MAAM,cAAc,GAAG,EAAE,IAAI,GAAG,GAAG,EAAE,CAAC;QACtC,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,GAAG,cAAc,EAAE;YAC3D,OAAO,CAAC,KAAK,CACX,sCAAsC,EACtC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CACxB,CAAC;YACF,OAAO,cAAc,CAAC;SACvB;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,mBAAmB,CACzB,WAAmB,EACnB,OAA2B;QAE3B,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QACnD,MAAM,mBAAmB,GAAG,IAAA,uBAAW,EACrC,QAAwB,EACxB,wBAAY,CAAC,KAAK,CACnB,CAAC;QAEF,IAAI,mBAAmB,EAAE;YACvB,IAAI,OAAO,KAAK,SAAS,EAAE;gBACzB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;aAChE;YAED,OAAO,OAAO,CAAC;SAChB;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AA7ZD,wCA6ZC"}

package/internal/hardhat-network/provider/vm/vm-adapter.d.ts

@@ -1,16 +1,32 @@
 /// <reference types="node" />
-import type { EVMResult, InterpreterStep, Message } from "@nomicfoundation/ethereumjs-evm";
-import type { RunTxResult } from "@nomicfoundation/ethereumjs-vm";
 import type { Block } from "@nomicfoundation/ethereumjs-block";
-import type { Common } from "@nomicfoundation/ethereumjs-common";
 import type { TypedTransaction } from "@nomicfoundation/ethereumjs-tx";
 import type { Account, Address } from "@nomicfoundation/ethereumjs-util";
+import type { TxReceipt } from "@nomicfoundation/ethereumjs-vm";
 import type { RpcDebugTracingConfig } from "../../../core/jsonrpc/types/input/debugTraceTransaction";
 import type { RpcDebugTraceOutput } from "../output";
+import { MessageTrace } from "../../stack-traces/message-trace";
+import { Bloom } from "../utils/bloom";
+import { Exit } from "./exit";
+export declare type Trace = any;
+export interface RunTxResult {
+    bloom: Bloom;
+    createdAddress?: Address;
+    gasUsed: bigint;
+    returnValue: Buffer;
+    exit: Exit;
+    receipt: TxReceipt;
+}
+export interface RunBlockResult {
+    results: RunTxResult[];
+    receipts: TxReceipt[];
+    stateRoot: Buffer;
+    logsBloom: Buffer;
+    receiptsRoot: Buffer;
+    gasUsed: bigint;
+}
 export interface VMAdapter {
-    dryRun(tx: TypedTransaction, blockContext: Block, forceBaseFeeZero?: boolean): Promise<RunTxResult>;
-    getCommon(): Common;
-    isEip1559Active(blockNumberOrPending?: bigint | "pending"): boolean;
+    dryRun(tx: TypedTransaction, blockContext: Block, forceBaseFeeZero?: boolean): Promise<[RunTxResult, Trace]>;
     getAccount(address: Address): Promise<Account>;
     getContractStorage(address: Address, key: Buffer): Promise<Buffer>;
     getContractCode(address: Address): Promise<Buffer>;
@@ -21,16 +37,16 @@ export interface VMAdapter {
     setBlockContext(block: Block, irregularStateOrUndefined: Buffer | undefined): Promise<void>;
     restoreContext(stateRoot: Buffer): Promise<void>;
     startBlock(): Promise<void>;
-    runTxInBlock(tx: TypedTransaction, block: Block): Promise<RunTxResult>;
+    runTxInBlock(tx: TypedTransaction, block: Block): Promise<[RunTxResult, Trace]>;
     addBlockRewards(rewards: Array<[Address, bigint]>): Promise<void>;
     sealBlock(): Promise<void>;
     revertBlock(): Promise<void>;
+    getLastTrace(): {
+        trace: MessageTrace | undefined;
+        error: Error | undefined;
+    };
+    clearLastError(): void;
     traceTransaction(hash: Buffer, block: Block, config: RpcDebugTracingConfig): Promise<RpcDebugTraceOutput>;
-    enableTracing(callbacks: {
-        beforeMessage: (message: Message, next: any) => Promise<void>;
-        step: (step: InterpreterStep, next: any) => Promise<void>;
-        afterMessage: (result: EVMResult, next: any) => Promise<void>;
-    }): void;
-    disableTracing(): void;
+    makeSnapshot(): Promise<Buffer>;
 }
 //# sourceMappingURL=vm-adapter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"vm-adapter.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/vm/vm-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vm-adapter.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/vm/vm-adapter.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yDAAyD,CAAC;AACrG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,oBAAY,KAAK,GAAG,GAAG,CAAC;AAExB,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,KAAK,CAAC;IACb,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,IAAI,CAAC;IACX,OAAO,EAAE,SAAS,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,QAAQ,EAAE,SAAS,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,CACJ,EAAE,EAAE,gBAAgB,EACpB,YAAY,EAAE,KAAK,EACnB,gBAAgB,CAAC,EAAE,OAAO,GACzB,OAAO,CAAC,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;IAGjC,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACnE,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAGnD,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,kBAAkB,CAChB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAAC;IAGjB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,eAAe,CACb,KAAK,EAAE,KAAK,EACZ,yBAAyB,EAAE,MAAM,GAAG,SAAS,GAC5C,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAGjD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,YAAY,CACV,EAAE,EAAE,gBAAgB,EACpB,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;IACjC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClE,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAG7B,YAAY,IAAI;QACd,KAAK,EAAE,YAAY,GAAG,SAAS,CAAC;QAChC,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;KAC1B,CAAC;IACF,cAAc,IAAI,IAAI,CAAC;IACvB,gBAAgB,CACd,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAGhC,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CACjC"}

package/internal/hardhat-network/stack-traces/compiler-to-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compiler-to-model.d.ts","sourceRoot":"","sources":["../../../src/internal/hardhat-network/stack-traces/compiler-to-model.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EACb,cAAc,EAEf,MAAM,gBAAgB,CAAC;AAMxB,OAAO,EACL,QAAQ,EAST,MAAM,SAAS,CAAC;AAKjB,wBAAgB,8BAA8B,CAC5C,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,cAAc,GAC7B,QAAQ,EAAE,CAqBZ"}
+{"version":3,"file":"compiler-to-model.d.ts","sourceRoot":"","sources":["../../../src/internal/hardhat-network/stack-traces/compiler-to-model.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,cAAc,EAEf,MAAM,gBAAgB,CAAC;AAMxB,OAAO,EACL,QAAQ,EAST,MAAM,SAAS,CAAC;AAgBjB,wBAAgB,8BAA8B,CAC5C,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,cAAc,GAC7B,QAAQ,EAAE,CAqBZ"}