bing bong

berachain · Nov 22, 2023 · 313d3d8 · 313d3d8
1 parent ee59d43
commit 313d3d8
Show file tree

Hide file tree

Showing 24 changed files with 513 additions and 25 deletions.
diff --git a/cosmos/config/mocks/app_options.go b/cosmos/config/mocks/app_options.go
diff --git a/cosmos/runtime/miner/abci.go b/cosmos/runtime/miner/abci.go
@@ -27,13 +27,8 @@ import (
 	abci "github.com/cometbft/cometbft/abci/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-
-	"github.com/ethereum/go-ethereum/common"
 )
 
-// emptyHash is a common.Hash initialized to all zeros.
-var emptyHash = common.Hash{}
-
 // PrepareProposal implements baseapp.PrepareProposal.
 func (m *Miner) PrepareProposal(
 	ctx sdk.Context, req *abci.RequestPrepareProposal,

diff --git a/cosmos/runtime/miner/miner.go b/cosmos/runtime/miner/miner.go
@@ -94,12 +94,13 @@ func (m *Miner) submitPayloadForBuilding(ctx context.Context) error {
 
 // constructPayloadArgs builds a payload to submit to the miner.
 func (m *Miner) constructPayloadArgs(ctx sdk.Context) *miner.BuildPayloadArgs {
+	parentBeaconHash := (common.BytesToHash(ctx.BlockHeader().LastBlockId.Hash))
 	return &miner.BuildPayloadArgs{
 		Timestamp:    uint64(ctx.BlockTime().Unix()),
 		FeeRecipient: m.Etherbase(),
 		Random:       common.Hash{}, /* todo: generated random */
 		Withdrawals:  make(types.Withdrawals, 0),
-		BeaconRoot:   &emptyHash,
+		BeaconRoot:   &parentBeaconHash,
 	}
 }
 

diff --git a/cosmos/runtime/txpool/mocks/geth_tx_pool.go b/cosmos/runtime/txpool/mocks/geth_tx_pool.go
diff --git a/cosmos/runtime/txpool/mocks/lifecycle.go b/cosmos/runtime/txpool/mocks/lifecycle.go
diff --git a/cosmos/runtime/txpool/mocks/sdk_tx.go b/cosmos/runtime/txpool/mocks/sdk_tx.go
diff --git a/cosmos/runtime/txpool/mocks/subscription.go b/cosmos/runtime/txpool/mocks/subscription.go
diff --git a/cosmos/runtime/txpool/mocks/tx_broadcaster.go b/cosmos/runtime/txpool/mocks/tx_broadcaster.go
diff --git a/cosmos/runtime/txpool/mocks/tx_serializer.go b/cosmos/runtime/txpool/mocks/tx_serializer.go
diff --git a/cosmos/runtime/txpool/mocks/tx_sub_provider.go b/cosmos/runtime/txpool/mocks/tx_sub_provider.go
diff --git a/cosmos/x/evm/plugins/state/plugin.go b/cosmos/x/evm/plugins/state/plugin.go
@@ -198,6 +198,10 @@ func (p *plugin) Finalize() {
 	p.Controller.Finalize()
 }
 
+func (p *plugin) StateRoot() common.Hash {
+	return common.BytesToHash(p.ctx.BlockHeader().AppHash)
+}
+
 // ===========================================================================
 // Accounts
 // ===========================================================================

diff --git a/eth/core/mock/state_plugin.mock.go b/eth/core/mock/state_plugin.mock.go
diff --git a/eth/core/state/interfaces.go b/eth/core/state/interfaces.go
@@ -87,4 +87,7 @@ type Plugin interface {
 	// ForEachStorage iterates over the storage of an account and calls the given callback
 	// function.
 	ForEachStorage(common.Address, func(common.Hash, common.Hash) bool) error
+
+	// StateRoot retrieves the latest state root of the host chain.
+	StateRoot() common.Hash
 }
diff --git a/eth/core/state/journal/mocks/accesslist.go b/eth/core/state/journal/mocks/accesslist.go