Merge branch 'main' into consolidate-deposits-storage-pt2

Author: abi87

config/spec/mainnet.go

@@ -21,8 +21,6 @@
 package spec
 
 import (
-	"math"
-
 	"github.com/berachain/beacon-kit/chain"
 	"github.com/berachain/beacon-kit/consensus/cometbft/service/delay"
 	"github.com/berachain/beacon-kit/primitives/bytes"
@@ -76,18 +74,18 @@ const (
 	mainnetDepositContractAddress = defaultDepositContractAddress
 
 	// mainnetGenesisTime is the timestamp of the Berachain mainnet genesis block.
-	mainnetGenesisTime = 1737381600
+	mainnetGenesisTime = 1_737_381_600
 
 	// mainnetDeneb1ForkTime is the timestamp at which the Deneb1 fork occurs.
 	// This is calculated based on the timestamp of the 2855th mainnet epoch, block 548160, which
 	// was used to initiate the fork when beacon-kit forked by epoch instead of by timestamp.
-	mainnetDeneb1ForkTime = 1738415507
+	mainnetDeneb1ForkTime = 1_738_415_507
 
 	// mainnetElectraForkTime is the timestamp at which the Electra fork occurs.
-	mainnetElectraForkTime = 1749056400
+	mainnetElectraForkTime = 1_749_056_400
 
 	// mainnetElectra1ForkTime is the timestamp at which the Electra1 fork occurs.
-	mainnetElectra1ForkTime = math.MaxInt64
+	mainnetElectra1ForkTime = 1_756_915_200
 
 	// mainnetEVMInflationAddressDeneb1 is the address on the EVM which will receive the
 	// inflation amount of native EVM balance through a withdrawal every block in the Deneb1 fork.
@@ -100,11 +98,15 @@ const (
 	// mainnetMinValidatorWithdrawabilityDelay is the number of epochs of delay epochs of delay for a balance to be withdrawable.
 	// 256 Epochs equates to roughly ~27 hours of withdrawal delay. This gives us room to emergency fork if needed.
 	mainnetMinValidatorWithdrawabilityDelay = defaultMinValidatorWithdrawabilityDelay
+
+	// These are the heights at which SBT is activated on mainnet.
+	mainnetSBTConsensusUpdateHeight = 9_983_085
+	mainnetSBTConsensusEnableHeight = 9_983_086
 )
 
 // MainnetChainSpecData is the chain.SpecData for the Berachain mainnet.
 func MainnetChainSpecData() *chain.SpecData {
-	return &chain.SpecData{
+	specData := &chain.SpecData{
 		Config: delay.DefaultConfig(),
 
 		// Gwei values constants.
@@ -173,6 +175,11 @@ func MainnetChainSpecData() *chain.SpecData {
 		MinActivationBalance:             mainnetMinActivationBalance,
 		MinValidatorWithdrawabilityDelay: mainnetMinValidatorWithdrawabilityDelay,
 	}
+
+	specData.Config.ConsensusUpdateHeight = mainnetSBTConsensusUpdateHeight
+	specData.Config.ConsensusEnableHeight = mainnetSBTConsensusEnableHeight
+
+	return specData
 }
 
 // MainnetChainSpec is the ChainSpec for the Berachain mainnet.

config/spec/testnet.go

@@ -32,22 +32,22 @@ func TestnetChainSpecData() *chain.SpecData {
 	specData.DepositEth1ChainID = chain.TestnetEth1ChainID
 
 	// Timestamp of the genesis block of Bepolia testnet.
-	specData.GenesisTime = 1739976735
+	specData.GenesisTime = 1_739_976_735
 
 	// Deneb1 fork timing on Bepolia. This is calculated based on the timestamp of the first bepolia
 	// epoch, block 192, which was used to initiate the fork when beacon-kit forked by epoch instead
 	// of by timestamp.
-	specData.Deneb1ForkTime = 1740090694
+	specData.Deneb1ForkTime = 1_740_090_694
 
 	// Timestamp of the Electra fork on Bepolia.
-	specData.ElectraForkTime = 1746633600
+	specData.ElectraForkTime = 1_746_633_600
 
 	// 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 = 1754496000
+	specData.Electra1ForkTime = 1_754_496_000
 
 	return specData
 }

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);
+    }
+}

contracts/src/brip0004/MockPoLGasEnforcer.sol

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.26;
+
+/// @title GasEnforcedPoLDistributor
+/// @notice PoL distributor requiring exactly 29,999,646 gas for testing gas limits
+/// @dev Reverts if called with incorrect gas amount
+contract GasEnforcedPoLDistributor {
+    function distributeFor(bytes calldata /*pubkey*/ ) public view {
+        uint256 start_gas = gasleft();
+        require(start_gas == 29_999_646, "Insufficient gas");
+    }
+}

contracts/src/brip0004/MockPoLReverting.sol

@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.26;
+
+import "./MockValidatorRegistry.sol";
+
+/// @title RevertingPoLDistributor
+/// @notice Mock PoL distributor that reverts after 10 distributions for testing
+/// @dev Interacts with ValidatorRegistry to test multi-contract state changes
+contract RevertingPoLDistributor {
+    /// @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 {
+        require(totalDistributions < 10, "Max distributions reached");
+        totalDistributions++;
+        VALIDATOR_REGISTRY.recordValidatorActivity(pubkey);
+
+        emit PoLDistributed(pubkey);
+    }
+}

contracts/src/brip0004/MockValidatorRegistry.sol

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.26;
+
+/// @title ValidatorRegistry
+/// @notice Simple registry contract for testing multi-contract state changes
+/// @dev Called by PoL distributors to increment activity counter
+contract ValidatorRegistry {
+    /// @notice Activity counter incremented on each call
+    uint256 public callCount;
+
+    /// @notice Event emitted when activity is recorded
+    event RegistryCalled(uint256 newCount);
+
+    /// @notice Records validator activity by incrementing counter
+    function recordValidatorActivity(bytes calldata /* pubkey */ ) external {
+        callCount++;
+        emit RegistryCalled(callCount);
+    }
+}

go.mod

@@ -15,10 +15,10 @@ require (
 	cosmossdk.io/core v1.0.0
 	cosmossdk.io/depinject v1.2.1
 	cosmossdk.io/errors v1.0.2
-	cosmossdk.io/log v1.6.0
+	cosmossdk.io/log v1.6.1
 	cosmossdk.io/math v1.5.3
 	cosmossdk.io/store v1.10.0-rc.1.0.20241218084712-ca559989da43
-	github.com/cenkalti/backoff/v5 v5.0.2
+	github.com/cenkalti/backoff/v5 v5.0.3
 	github.com/cometbft/cometbft v1.0.1-0.20241220100824-07c737de00ff
 	github.com/cometbft/cometbft/api v1.0.1-0.20241220100824-07c737de00ff
 	github.com/cosmos/cosmos-db v1.1.3
@@ -28,7 +28,7 @@ require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 	github.com/go-faster/xor v1.0.0
 	github.com/go-playground/validator/v10 v10.27.0
-	github.com/golang-jwt/jwt/v5 v5.2.3
+	github.com/golang-jwt/jwt/v5 v5.3.0
 	github.com/hashicorp/go-metrics v0.5.4
 	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/holiman/uint256 v1.3.2
@@ -37,21 +37,21 @@ require (
 	github.com/minio/sha256-simd v1.0.1
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/ory/dockertest v3.3.5+incompatible
-	github.com/phuslu/log v1.0.118
+	github.com/phuslu/log v1.0.119
 	github.com/pkg/errors v0.9.1
 	github.com/prysmaticlabs/gohashtree v0.0.4-beta.0.20240624100937-73632381301b
 	github.com/prysmaticlabs/prysm/v5 v5.3.0
 	github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8
 	github.com/spf13/afero v1.14.0
 	github.com/spf13/cast v1.9.2
 	github.com/spf13/cobra v1.9.1
-	github.com/spf13/pflag v1.0.6
+	github.com/spf13/pflag v1.0.7
 	github.com/spf13/viper v1.20.1
 	github.com/umbracle/fastrlp v0.1.0
 	go.uber.org/automaxprocs v1.6.0
-	golang.org/x/crypto v0.40.0
+	golang.org/x/crypto v0.41.0
 	golang.org/x/sync v0.16.0
-	sigs.k8s.io/yaml v1.5.0
+	sigs.k8s.io/yaml v1.6.0
 )
 
 // build/test dependencies
@@ -64,7 +64,7 @@ require (
 	github.com/protolambda/zrnt v0.34.1
 	github.com/protolambda/ztyp v0.2.2
 	github.com/rs/zerolog v1.34.0
-	github.com/stretchr/testify v1.10.0
+	github.com/stretchr/testify v1.11.0
 )
 
 require (
@@ -91,8 +91,8 @@ require (
 	github.com/bgentry/speakeasy v0.2.0 // indirect
 	github.com/bits-and-blooms/bitset v1.20.0 // indirect
 	github.com/bufbuild/protocompile v0.14.1 // indirect
-	github.com/bytedance/sonic v1.13.1 // indirect
-	github.com/bytedance/sonic/loader v0.2.4 // indirect
+	github.com/bytedance/sonic v1.14.0 // indirect
+	github.com/bytedance/sonic/loader v0.3.0 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cloudwego/base64x v0.1.5 // indirect
@@ -250,12 +250,12 @@ require (
 	go.opentelemetry.io/otel/metric v1.34.0 // indirect
 	go.opentelemetry.io/otel/trace v1.34.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
-	golang.org/x/arch v0.15.0 // indirect
+	golang.org/x/arch v0.17.0 // indirect
 	golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
-	golang.org/x/net v0.41.0 // indirect
-	golang.org/x/sys v0.34.0 // indirect
-	golang.org/x/term v0.33.0 // indirect
-	golang.org/x/text v0.27.0 // indirect
+	golang.org/x/net v0.42.0 // indirect
+	golang.org/x/sys v0.35.0 // indirect
+	golang.org/x/term v0.34.0 // indirect
+	golang.org/x/text v0.28.0 // indirect
 	golang.org/x/time v0.11.0 // indirect
 	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
 	google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d // indirect