Add more changes

miner/builder.go

@@ -85,9 +85,13 @@ type SBundle struct {
 }
 
 func (b *Builder) AddTransaction(txn *types.Transaction) (*types.SimulateTransactionResult, error) {
+	// If the context is not set, the logs will not be recorded
+	b.env.state.SetTxContext(txn.Hash(), b.env.tcount)
+
 	logs, err := b.wrk.commitTransaction(b.env, txn)
 	if err != nil {
 		return &types.SimulateTransactionResult{
+			Error:   err.Error(),
 			Success: false,
 		}, nil
 	}

miner/builder_test.go

@@ -1,8 +1,16 @@
 package miner
 
 import (
+	"encoding/json"
+	"fmt"
+	"math/big"
+	"os"
+	"path/filepath"
+	"runtime"
 	"testing"
 
+	"github.com/ethereum/go-ethereum/accounts/abi"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/consensus/clique"
 	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -73,6 +81,29 @@ func TestBuilder_BuildBlock(t *testing.T) {
 	require.Len(t, block.Transactions(), 1)
 }
 
+func TestBuilder_ContractWithLogs(t *testing.T) {
+	// test that we can simulate a txn with a contract that emits events
+	t.Parallel()
+
+	config, backend := newMockBuilderConfig(t)
+
+	input, err := suaveExample1Artifact.Abi.Pack("get", big.NewInt(1))
+	require.NoError(t, err)
+
+	tx := backend.newCall(suaveExample1Addr, input)
+
+	builder, err := NewBuilder(config, &BuilderArgs{})
+	require.NoError(t, err)
+
+	simResult, err := builder.AddTransaction(tx)
+	require.NoError(t, err)
+	require.True(t, simResult.Success)
+	require.Len(t, simResult.Logs, 1)
+
+	require.Equal(t, simResult.Logs[0].Addr, suaveExample1Addr)
+	require.Equal(t, simResult.Logs[0].Topics[0], suaveExample1Artifact.Abi.Events["SomeEvent"].ID)
+}
+
 func newMockBuilderConfig(t *testing.T) (*BuilderConfig, *testWorkerBackend) {
 	var (
 		db     = rawdb.NewMemoryDatabase()
@@ -93,3 +124,43 @@ func newMockBuilderConfig(t *testing.T) (*BuilderConfig, *testWorkerBackend) {
 	}
 	return bConfig, backend
 }
+
+func (b *testWorkerBackend) newCall(to common.Address, data []byte) *types.Transaction {
+	gasPrice := big.NewInt(10 * params.InitialBaseFee)
+	tx, _ := types.SignTx(types.NewTransaction(b.txPool.Nonce(testBankAddress), to, big.NewInt(0), 1000000, gasPrice, data), types.HomesteadSigner{}, testBankKey)
+	return tx
+}
+
+var (
+	suaveExample1Addr     = common.Address{0x1}
+	suaveExample1Artifact = readContractArtifact("Example.sol/Example.json")
+)
+
+type artifactObj struct {
+	Abi              *abi.ABI `json:"abi"`
+	DeployedBytecode struct {
+		Object string
+	} `json:"deployedBytecode"`
+}
+
+func readContractArtifact(name string) *artifactObj {
+	// Get the caller's file path.
+	_, filename, _, _ := runtime.Caller(1)
+
+	// Resolve the directory of the caller's file.
+	callerDir := filepath.Dir(filename)
+
+	// Construct the absolute path to the target file.
+	targetFilePath := filepath.Join(callerDir, "./contracts/out/", name)
+
+	data, err := os.ReadFile(targetFilePath)
+	if err != nil {
+		panic(fmt.Sprintf("failed to read artifact %s: %v. Maybe you forgot to generate the artifacts? `cd suave && forge build`", name, err))
+	}
+
+	var obj artifactObj
+	if err := json.Unmarshal(data, &obj); err != nil {
+		panic(fmt.Sprintf("failed to unmarshal artifact %s: %v", name, err))
+	}
+	return &obj
+}

miner/contracts/Example.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.13;
+
+contract Example {
+    event SomeEvent(uint256 value);
+
+    function get(uint256 value) public {
+        emit SomeEvent(value);
+    }
+}

miner/worker_test.go

@@ -118,6 +118,10 @@ func newTestWorkerBackend(t *testing.T, chainConfig *params.ChainConfig, engine
 		Config: chainConfig,
 		Alloc:  core.GenesisAlloc{testBankAddress: {Balance: testBankFunds}},
 	}
+	// == SUAVE SPECIFIC ==
+	// Add custom contracts for the genesis
+	gspec.Alloc[suaveExample1Addr] = core.GenesisAccount{Balance: big.NewInt(0), Code: common.FromHex(suaveExample1Artifact.DeployedBytecode.Object)}
+	// == END OF SUAVE SPECIFIC ==
 	switch e := engine.(type) {
 	case *clique.Clique:
 		gspec.ExtraData = make([]byte, 32+common.AddressLength+crypto.SignatureLength)