Merge branch 'main' into simulate-v1

Author: calbera

.github/workflows/berachain_release.asc

@@ -1,13 +1,13 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mDMEaDb6PxYJKwYBBAHaRw8BAQdA7NN0qrz+Cx5UriSUojsPYXyJepimw7xvUovE
-IixEb9S0IGFiZWFyIChyaykgPGFiZWFyQGJlcmFjaGFpbi5jb20+iJkEExYKAEEW
-IQQf3314kw4MJOZjm/rg+kk9+5MtfAUCaDb6PwIbAwUJAE8aAAULCQgHAgIiAgYV
-CgkICwIEFgIDAQIeBwIXgAAKCRDg+kk9+5MtfOkAAP9OCSa3BqCCfGO7mI/VT3lB
-0PhZyybfb0HUK9qEmxfODgEA62CbwYctgI/vkm/oUO0MhEQCLXYUYOiJRurOtLhY
-9QO4OARoNvo/EgorBgEEAZdVAQUBAQdAK0aEIOzG8JjfiDZ3vRjHfgDWKTh1OiGW
-dCB1lnAG+iUDAQgHiH4EGBYKACYWIQQf3314kw4MJOZjm/rg+kk9+5MtfAUCaDb6
-PwIbDAUJAE8aAAAKCRDg+kk9+5MtfEnwAQCymHAHWt9LWAQdIggPPP6pMBuGD7Dr
-pkXMsTK+HaG/dAD/U561NglvR7K2NcLUTqS5dSb2ibGgSEO5hbhXR5/W/Qg=
-=X5VL
+mDMEaIky1hYJKwYBBAHaRw8BAQdAnxP3mNWC+miF0OKvOg4+BzzswbrTWLbluSJU
++NBib3q0H2NhbGJlcmEgPGNhbGJlcmFAYmVyYWNoYWluLmNvbT6ImQQTFgoAQRYh
+BPzFjSePGuMIYGS4P/GUiPGD4kvxBQJoiTLWAhsDBQkAdqcABQsJCAcCAiICBhUK
+CQgLAgQWAgMBAh4HAheAAAoJEPGUiPGD4kvxA9oBANZQa+Q6UlhDPLOOhchdPSi7
+lmBE+za+5u5Q3bA7ZO8rAP46R+a1AxHqeLrShhkTvJwTG+qGvfS/LtHfNYLHqOQw
+Bbg4BGiJMtYSCisGAQQBl1UBBQEBB0A6onCspxjhXI7X13LHlUYQxYVyzUDamgVP
+hXYTLZ1QEAMBCAeIfgQYFgoAJhYhBPzFjSePGuMIYGS4P/GUiPGD4kvxBQJoiTLW
+AhsMBQkAdqcAAAoJEPGUiPGD4kvxWOAA/0IedfbPuCJU/IWo+gxCZMl9Fb7oVA4L
+v9lMBtnspGsxAQDRX3fFP/Bv96wHlUWQHg01TSaWNyTQa5dTpjEcLxnXCQ==
+=L8oL
 -----END PGP PUBLIC KEY BLOCK-----

CLAUDE.md

@@ -732,7 +732,6 @@ func ProvideBlockchainService(
 
 ### Build Tags
 - `bls12381` - BLS cryptography
-- `ckzg` - KZG blob commitments
 - `test` - Testing utilities
 - `e2e` - End-to-end tests
 - `simulated` - Simulation tests

cli/commands/initialize/initialize.go

@@ -215,7 +215,7 @@ func InitCmd(creator clitypes.ChainSpecCreator, mm interface {
 			appGenesis.InitialHeight = initHeight
 			appGenesis.Consensus = &types.ConsensusGenesis{
 				Validators: nil,
-				Params:     cometbft.DefaultConsensusParams(consensusKeyAlgo),
+				Params:     cometbft.DefaultConsensusParams(consensusKeyAlgo, chainSpec),
 			}
 
 			if err = genutil.ExportGenesisFile(appGenesis, genFile); err != nil {

config/spec/testnet.go

@@ -21,8 +21,6 @@
 package spec
 
 import (
-	"math"
-
 	"github.com/berachain/beacon-kit/chain"
 )
 
@@ -44,8 +42,12 @@ func TestnetChainSpecData() *chain.SpecData {
 	// Timestamp of the Electra fork on Bepolia.
 	specData.ElectraForkTime = 1746633600
 
+	// Enable stable block time before the Electra1 fork.
+	specData.Config.ConsensusUpdateHeight = 7_768_334
+	specData.Config.ConsensusEnableHeight = 7_768_335
+
 	// Timestamp of the Electra1 fork on Bepolia.
-	specData.Electra1ForkTime = math.MaxInt64
+	specData.Electra1ForkTime = 1754496000
 
 	return specData
 }

config/template/template.go

@@ -68,7 +68,7 @@ style = "{{.BeaconKit.Logger.Style}}"
 trusted-setup-path = "{{.BeaconKit.KZG.TrustedSetupPath}}"
 
 # KZG implementation to use.
-# Options are "crate-crypto/go-kzg-4844" or "ethereum/c-kzg-4844".
+# Options are "crate-crypto/go-kzg-4844".
 implementation = "{{.BeaconKit.KZG.Implementation}}"
 
 [beacon-kit.payload-builder]

consensus/cometbft/service/configs.go

@@ -26,6 +26,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/berachain/beacon-kit/chain"
 	"github.com/berachain/beacon-kit/log"
 	cmtcfg "github.com/cometbft/cometbft/config"
 	cmttypes "github.com/cometbft/cometbft/types"
@@ -107,7 +108,7 @@ func DefaultConfig() *cmtcfg.Config {
 // DefaultConsensusParams returns the default consensus parameters
 // shared by every node in the network. Consensus parameters are
 // inscripted in genesis.
-func DefaultConsensusParams(consensusKeyAlgo string) *cmttypes.ConsensusParams {
+func DefaultConsensusParams(consensusKeyAlgo string, cs chain.Spec) *cmttypes.ConsensusParams {
 	res := cmttypes.DefaultConsensusParams()
 	res.Validator.PubKeyTypes = []string{consensusKeyAlgo}
 
@@ -121,9 +122,7 @@ func DefaultConsensusParams(consensusKeyAlgo string) *cmttypes.ConsensusParams {
 	res.Feature.PbtsEnableHeight = 1
 	res.Synchrony.Precision = precision
 	res.Synchrony.MessageDelay = messageDelay
-
-	// Activate Stable Block Time (SBT) by default.
-	res.Feature.SBTEnableHeight = 1
+	res.Feature.SBTEnableHeight = cs.SbtConsensusEnableHeight()
 
 	if err := res.ValidateBasic(); err != nil {
 		panic(fmt.Errorf("invalid default consensus parameters: %w", err))

consensus/cometbft/service/configs_test.go

@@ -0,0 +1,88 @@
+// SPDX-License-Identifier: BUSL-1.1
+//
+// Copyright (C) 2025, Berachain Foundation. All rights reserved.
+// Use of this software is governed by the Business Source License included
+// in the LICENSE file of this repository and at www.mariadb.com/bsl11.
+//
+// ANY USE OF THE LICENSED WORK IN VIOLATION OF THIS LICENSE WILL AUTOMATICALLY
+// TERMINATE YOUR RIGHTS UNDER THIS LICENSE FOR THE CURRENT AND ALL OTHER
+// VERSIONS OF THE LICENSED WORK.
+//
+// THIS LICENSE DOES NOT GRANT YOU ANY RIGHT IN ANY TRADEMARK OR LOGO OF
+// LICENSOR OR ITS AFFILIATES (PROVIDED THAT YOU MAY USE A TRADEMARK OR LOGO OF
+// LICENSOR AS EXPRESSLY REQUIRED BY THIS LICENSE).
+//
+// TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
+// AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
+// EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
+// TITLE.
+//
+
+package cometbft_test
+
+import (
+	"testing"
+
+	"github.com/berachain/beacon-kit/chain"
+	"github.com/berachain/beacon-kit/config/spec"
+	cometbft "github.com/berachain/beacon-kit/consensus/cometbft/service"
+	"github.com/berachain/beacon-kit/primitives/crypto"
+	cmttypes "github.com/cometbft/cometbft/types"
+	"github.com/stretchr/testify/require"
+)
+
+func TestSBTEnableHeightAlignedWithChainSpecs(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		name          string
+		getChainSpecs func(t *testing.T) chain.Spec
+	}{
+		{
+			name: "mainnet",
+			getChainSpecs: func(t *testing.T) chain.Spec {
+				t.Helper()
+				cs, err := spec.MainnetChainSpec()
+				require.NoError(t, err)
+				return cs
+			},
+		},
+		{
+			name: "testnet",
+			getChainSpecs: func(t *testing.T) chain.Spec {
+				t.Helper()
+				cs, err := spec.TestnetChainSpec()
+				require.NoError(t, err)
+				return cs
+			},
+		},
+		{
+			name: "devnet",
+			getChainSpecs: func(t *testing.T) chain.Spec {
+				t.Helper()
+				cs, err := spec.DevnetChainSpec()
+				require.NoError(t, err)
+				return cs
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+
+			cs := tt.getChainSpecs(t)
+
+			var cp *cmttypes.ConsensusParams
+			require.NotPanics(t, func() {
+				cp = cometbft.DefaultConsensusParams(crypto.CometBLSType, cs)
+			})
+
+			// Make sure that the Enable Height in consensus parameters matches with
+			// chain spec one. This is relevant to make sure that consensus parameters
+			// are well set when chain spec is modified and genesis is regenerated.
+			require.Equal(t, cp.Feature.SBTEnableHeight, cs.SbtConsensusEnableHeight())
+		})
+	}
+}

consensus/cometbft/service/service.go

@@ -156,6 +156,14 @@ func NewService(
 		panic(fmt.Errorf("failed loading latest version: %w", err))
 	}
 
+	// Make sure that SBT consensus parameters are duly set when the node restart.
+	// Note that we can't rely on genesis.json having these parameters set right
+	// because we introduced stable block time post (mainnet) genesis.
+	lastBlockHeight := s.sm.GetCommitMultiStore().LastCommitID().Version
+	if lastBlockHeight >= s.delayCfg.SbtConsensusUpdateHeight() {
+		s.cmtConsensusParams.Feature.SBTEnableHeight = s.delayCfg.SbtConsensusEnableHeight()
+	}
+
 	// Load block delay.
 	//
 	// If not found, we will initialize it in FinalizeBlock once SBTEnableHeight

contracts/README.md

@@ -0,0 +1,30 @@
+# BeaconKit Contracts
+
+## Mock PoL Contracts
+
+Mock Proof-of-Liquidity contracts for testing execution client integration.
+
+### Usage
+
+Generate bytecode for genesis deployment:
+
+```bash
+# Build contracts
+forge build
+
+# Extract SimplePoLDistributor bytecode
+cat out/MockPoL.sol/SimplePoLDistributor.json | jq -r .deployedBytecode.object
+
+# Extract ValidatorRegistry bytecode
+cat out/MockValidatorRegistry.sol/ValidatorRegistry.json | jq -r .deployedBytecode.object
+```
+
+The same pattern can be used to extract bytecode for other contracts in the
+`brip0004/` directory.
+
+### Contracts
+
+- `MockPoL.sol` - Basic PoL distributor with multi-contract state changes
+- `MockPoLReverting.sol` - PoL distributor that reverts after 10 distributions
+- `MockPoLGasEnforcer.sol` - Gas-constrained PoL distributor for gas limit testing
+- `MockValidatorRegistry.sol` - Registry contract for testing cross-contract calls

contracts/src/brip0004/MockPoL.sol

@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.26;
+
+import "./MockValidatorRegistry.sol";
+
+/// @title SimplePoLDistributor
+/// @notice Mock PoL distributor for testing execution client integration
+/// @dev Interacts with ValidatorRegistry to test multi-contract state changes
+contract SimplePoLDistributor {
+    /// @notice System address that can call distributeFor (execution layer client)
+    address private constant SYSTEM_ADDRESS =
+        0xffffFFFfFFffffffffffffffFfFFFfffFFFfFFfE;
+
+    /// @notice The validator registry contract address (hardcoded for genesis deployment)
+    ValidatorRegistry private constant VALIDATOR_REGISTRY =
+        ValidatorRegistry(0x4200000000000000000000000000000000000043);
+
+    /// @notice Event emitted when distributeFor is called
+    event PoLDistributed(bytes pubkey);
+
+    /// @notice Counter for total distributions
+    uint256 public totalDistributions;
+
+    /// @notice Error thrown when caller is not the system address
+    error NotSystemAddress();
+
+    /// @dev Restricts access to system address (execution layer client only)
+    modifier onlySystemCall() {
+        if (msg.sender != SYSTEM_ADDRESS) {
+            revert NotSystemAddress();
+        }
+        _;
+    }
+
+    /// @notice Main function called by execution client
+    /// @param pubkey The validator public key
+    /// @dev Calls ValidatorRegistry to test multi-contract state changes
+    // slither-disable-next-line reentrancy-events
+    function distributeFor(bytes calldata pubkey) external onlySystemCall {
+        totalDistributions++;
+        VALIDATOR_REGISTRY.recordValidatorActivity(pubkey);
+
+        emit PoLDistributed(pubkey);
+    }
+}