From d84d2a68e2dc34f73257ea92afc096d8c9893690 Mon Sep 17 00:00:00 2001 From: Gary Rong Date: Tue, 14 Apr 2026 12:14:03 +0800 Subject: [PATCH] core, params: rename verkle to ubt --- core/bintrie_witness_test.go | 2 +- core/genesis_test.go | 2 +- core/state/database.go | 2 +- params/config.go | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/bintrie_witness_test.go b/core/bintrie_witness_test.go index bb8f9b91d7..e4cb34cb56 100644 --- a/core/bintrie_witness_test.go +++ b/core/bintrie_witness_test.go @@ -55,7 +55,7 @@ var ( TerminalTotalDifficulty: common.Big0, EnableUBTAtGenesis: true, BlobScheduleConfig: ¶ms.BlobScheduleConfig{ - Verkle: params.DefaultPragueBlobConfig, + UBT: params.DefaultPragueBlobConfig, }, } ) diff --git a/core/genesis_test.go b/core/genesis_test.go index 92d1ee1a27..28cc8c0713 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -294,7 +294,7 @@ func TestVerkleGenesisCommit(t *testing.T) { Cancun: params.DefaultCancunBlobConfig, Prague: params.DefaultPragueBlobConfig, Osaka: params.DefaultOsakaBlobConfig, - Verkle: params.DefaultPragueBlobConfig, + UBT: params.DefaultPragueBlobConfig, }, } diff --git a/core/state/database.go b/core/state/database.go index 43c3500773..6de58af63b 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -153,7 +153,7 @@ type Trie interface { // with the node that proves the absence of the key. Prove(key []byte, proofDb ethdb.KeyValueWriter) error - // IsUBT returns true if the trie is verkle-tree based + // IsUBT returns true if the trie is unified binary trie based. IsUBT() bool } diff --git a/params/config.go b/params/config.go index 5eac6c7f57..17508cbf27 100644 --- a/params/config.go +++ b/params/config.go @@ -476,13 +476,13 @@ type ChainConfig struct { // EnableUBTAtGenesis is a flag that specifies whether the network uses // the Verkle tree starting from the genesis block. If set to true, the - // genesis state will be committed using the Verkle tree, eliminating the - // need for any Verkle transition later. + // genesis state will be committed using the Binary tree, eliminating the + // need for any Binary transition later. // - // This is a temporary flag only for verkle devnet testing, where verkle is + // This is a temporary flag only for binary devnet testing, where binary is // activated at genesis, and the configured activation date has already passed. // - // In production networks (mainnet and public testnets), verkle activation + // In production networks (mainnet and public testnets), binary activation // always occurs after the genesis block, making this flag irrelevant in // those cases. EnableUBTAtGenesis bool `json:"enableUBTAtGenesis,omitempty"` @@ -691,7 +691,7 @@ func (c *ChainConfig) Description() string { banner += fmt.Sprintf(" - Amsterdam: @%-10v blob: (%s)\n", *c.AmsterdamTime, c.BlobScheduleConfig.Amsterdam) } if c.UBTTime != nil { - banner += fmt.Sprintf(" - Verkle: @%-10v blob: (%s)\n", *c.UBTTime, c.BlobScheduleConfig.Verkle) + banner += fmt.Sprintf(" - UBT: @%-10v blob: (%s)\n", *c.UBTTime, c.BlobScheduleConfig.UBT) } banner += fmt.Sprintf("\nAll fork specifications can be found at https://ethereum.github.io/execution-specs/src/ethereum/forks/\n") return banner @@ -717,13 +717,13 @@ type BlobScheduleConfig struct { Cancun *BlobConfig `json:"cancun,omitempty"` Prague *BlobConfig `json:"prague,omitempty"` Osaka *BlobConfig `json:"osaka,omitempty"` - Verkle *BlobConfig `json:"verkle,omitempty"` BPO1 *BlobConfig `json:"bpo1,omitempty"` BPO2 *BlobConfig `json:"bpo2,omitempty"` BPO3 *BlobConfig `json:"bpo3,omitempty"` BPO4 *BlobConfig `json:"bpo4,omitempty"` BPO5 *BlobConfig `json:"bpo5,omitempty"` Amsterdam *BlobConfig `json:"amsterdam,omitempty"` + UBT *BlobConfig `json:"ubt,omitempty"` } // IsHomestead returns whether num is either equal to the homestead block or greater.