nit

Author: pgherveou

contracts/Pretrace.sol

@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+/// @title PretraceFixture
+/// @notice A simple contract to exercise storage, balance, and nonce changes
+contract PretraceFixture {
+    uint256 public value;
+    mapping(address => uint256) public balances;
+
+    constructor() payable {
+        balances[msg.sender] = msg.value;
+        value = 42;
+    }
+
+    function writeStorage(uint256 _value) external {
+        value = _value;
+    }
+
+    function readStorage() external view returns (uint256) {
+        return value;
+    }
+
+    function deposit() external payable {
+        balances[msg.sender] += msg.value;
+    }
+
+    function withdraw(uint256 amount) external {
+        require(balances[msg.sender] >= amount, 'Insufficient balance');
+        balances[msg.sender] -= amount;
+        (bool sent, ) = msg.sender.call{value: amount}('');
+        require(sent, 'Transfer failed');
+    }
+
+    function getContractBalance() external view returns (uint256) {
+        return address(this).balance;
+    }
+
+    function getExternalBalance(
+        address account
+    ) external view returns (uint256) {
+        return account.balance;
+    }
+
+    function createChild() external returns (address) {
+        PretraceFixtureChild c = new PretraceFixtureChild();
+        return address(c);
+    }
+
+    function callContract(address childAddr) external {
+        PretraceFixtureChild(childAddr).increment();
+    }
+
+    function delegatecallContract(address childAddr) external {
+        (bool success, ) = childAddr.delegatecall(
+            abi.encodeWithSelector(PretraceFixtureChild.increment.selector)
+        );
+        require(success, "Delegatecall failed");
+    }}
+
+/// @title Child
+/// @notice A disposable child contract used to test contract deployment and calls
+contract PretraceFixtureChild {
+    uint256 public value = 1;
+
+    function increment() external {
+        value += 1;
+    }
+
+}

contracts/Storage.sol

@@ -16,6 +16,10 @@ contract Storage {
         n2 = 100;
     }
 
+    function gethash() public view returns (bytes32) {
+        return blockhash(block.number);
+    }
+
     /**
      * @dev Store value in variable
      * @param num value to store

src/cli/dao-hack-traces.ts

@@ -12,14 +12,17 @@ import {
 } from 'viem'
 import { Dao, DaoAttacker } from '../codegen/addresses.ts'
 
-const result = await env.debugClient.traceCall({
-    to: DaoAttacker,
-    data: encodeFunctionData({
-        abi: abis.DaoAttacker,
-        functionName: 'attack',
-        args: [],
-    }),
-})
+const result = await env.debugClient.traceCall(
+    {
+        to: DaoAttacker,
+        data: encodeFunctionData({
+            abi: abis.DaoAttacker,
+            functionName: 'attack',
+            args: [],
+        }),
+    },
+    'callTracer'
+)
 console.log(JSON.stringify(visit(result, visitor), null, 2))
 
 function visitor(key: string, value: any) {

src/cli/dao-playground.ts

@@ -1,6 +1,6 @@
 // Run with
 // deno task build --filter dao
-// deno --env-file --allow-all ./cli/dao-playground.ts
+// deno --env-file --allow-all ./src/cli/dao-playground.ts
 import { env } from '../tools/lib/index.ts'
 import { abis } from '../codegen/abis.ts'
 import { Dao, DaoAttacker } from '../codegen/addresses.ts'

src/cli/playground.ts

@@ -0,0 +1,14 @@
+// deno --env-file --allow-all src/cli/playground.ts
+import { env } from '../tools/lib/index.ts'
+import { abis } from '../codegen/abis.ts'
+import { Storage } from '../codegen/addresses.ts'
+
+{
+    const result = await env.wallet.readContract({
+        address: Storage,
+        abi: abis.Storage,
+        functionName: 'gethash',
+        args: [],
+    })
+    console.log(result)
+}

src/cli/pretrace-playground.ts

@@ -0,0 +1,57 @@
+// Run with
+// deno task build --filter storage
+// deno --env-file --allow-all src/cli/pretrace-playground.ts
+import { env } from '../tools/lib/index.ts'
+import { abis } from '../codegen/abis.ts'
+import { PretraceFixture } from '../codegen/addresses.ts'
+import { encodeFunctionData } from 'viem'
+
+{
+    // const res = await env.debugClient.traceCall(
+    //     {
+    //         to: PretraceFixture,
+    //         data: encodeFunctionData({
+    //             abi: abis.Storage,
+    //             functionName: 'write_n1_read_n2',
+    //             args: [BigInt(2n)],
+    //         }),
+    //     },
+    //     'prestateTracer',
+    //     { diffMode: false, disableCode: true }
+    // )
+    //
+    //
+
+    const res = await env.debugClient.traceCall(
+        {
+            data: '0x68874f1f0000000000000000000000003ed62137c5db927cb137c26455969116bf0c23cb',
+            from:"0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac",
+            to:"0xc01ee7f10ea4af4673cfff62710e1d7792aba8f3"
+        },
+        "0xe969d81cd5a97ce04a512fb73cb78b9a630eba6bb49a9141aa850ca5201f700c",
+
+        'prestateTracer',
+        {"tracer":"prestateTracer","tracerConfig":{"diffMode":false}}
+
+    )
+}
+//
+// const { request } = await env.wallet.simulateContract({
+//     address: PretraceFixture,
+//     abi: abis.PretraceFixture,
+//     functionName: 'writeStorage',
+//     args: [BigInt(4n)],
+// })
+// const hash = await env.wallet.writeContract(request)
+// let receipt = await env.wallet.waitForTransactionReceipt({
+//     hash,
+// })
+//
+// console.log(receipt)
+//
+// const res = await env.debugClient.traceBlock(
+//     receipt.blockNumber,
+//     'prestateTracer',
+//     { diffMode: false, disableCode: true }
+// )
+// console.log(res)

src/tools/deploy.ts

@@ -17,4 +17,23 @@ import { deploy } from './lib/index.ts'
 // await deploy({ name: 'ATracing', args: [bAddress] })
 // await deploy({ name: 'Storage', args: [] })
 
-await deploy({ name: 'MyToken', args: ['MTK'] })
+await deploy({
+    name: 'Storage',
+    args: [],
+})
+
+// // await deploy({
+// //     name: 'DaoAttacker',
+// //     args: [address, 1n],
+// //     value: parseEther('1'),
+// // })
+//
+// await deploy({
+//     name: 'PretraceFixtureChild',
+//     args: [],
+// })
+//
+// await deploy({
+//     name: 'PretraceFixture',
+//     args: [],
+// })