mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-06-12 01:41:36 +00:00
core, params: rename verkle to ubt
This commit is contained in:
parent
9f33f194b2
commit
d84d2a68e2
4 changed files with 9 additions and 9 deletions
|
|
@ -55,7 +55,7 @@ var (
|
||||||
TerminalTotalDifficulty: common.Big0,
|
TerminalTotalDifficulty: common.Big0,
|
||||||
EnableUBTAtGenesis: true,
|
EnableUBTAtGenesis: true,
|
||||||
BlobScheduleConfig: ¶ms.BlobScheduleConfig{
|
BlobScheduleConfig: ¶ms.BlobScheduleConfig{
|
||||||
Verkle: params.DefaultPragueBlobConfig,
|
UBT: params.DefaultPragueBlobConfig,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -294,7 +294,7 @@ func TestVerkleGenesisCommit(t *testing.T) {
|
||||||
Cancun: params.DefaultCancunBlobConfig,
|
Cancun: params.DefaultCancunBlobConfig,
|
||||||
Prague: params.DefaultPragueBlobConfig,
|
Prague: params.DefaultPragueBlobConfig,
|
||||||
Osaka: params.DefaultOsakaBlobConfig,
|
Osaka: params.DefaultOsakaBlobConfig,
|
||||||
Verkle: params.DefaultPragueBlobConfig,
|
UBT: params.DefaultPragueBlobConfig,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -153,7 +153,7 @@ type Trie interface {
|
||||||
// with the node that proves the absence of the key.
|
// with the node that proves the absence of the key.
|
||||||
Prove(key []byte, proofDb ethdb.KeyValueWriter) error
|
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
|
IsUBT() bool
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -476,13 +476,13 @@ type ChainConfig struct {
|
||||||
|
|
||||||
// EnableUBTAtGenesis is a flag that specifies whether the network uses
|
// EnableUBTAtGenesis is a flag that specifies whether the network uses
|
||||||
// the Verkle tree starting from the genesis block. If set to true, the
|
// the Verkle tree starting from the genesis block. If set to true, the
|
||||||
// genesis state will be committed using the Verkle tree, eliminating the
|
// genesis state will be committed using the Binary tree, eliminating the
|
||||||
// need for any Verkle transition later.
|
// 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.
|
// 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
|
// always occurs after the genesis block, making this flag irrelevant in
|
||||||
// those cases.
|
// those cases.
|
||||||
EnableUBTAtGenesis bool `json:"enableUBTAtGenesis,omitempty"`
|
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)
|
banner += fmt.Sprintf(" - Amsterdam: @%-10v blob: (%s)\n", *c.AmsterdamTime, c.BlobScheduleConfig.Amsterdam)
|
||||||
}
|
}
|
||||||
if c.UBTTime != nil {
|
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")
|
banner += fmt.Sprintf("\nAll fork specifications can be found at https://ethereum.github.io/execution-specs/src/ethereum/forks/\n")
|
||||||
return banner
|
return banner
|
||||||
|
|
@ -717,13 +717,13 @@ type BlobScheduleConfig struct {
|
||||||
Cancun *BlobConfig `json:"cancun,omitempty"`
|
Cancun *BlobConfig `json:"cancun,omitempty"`
|
||||||
Prague *BlobConfig `json:"prague,omitempty"`
|
Prague *BlobConfig `json:"prague,omitempty"`
|
||||||
Osaka *BlobConfig `json:"osaka,omitempty"`
|
Osaka *BlobConfig `json:"osaka,omitempty"`
|
||||||
Verkle *BlobConfig `json:"verkle,omitempty"`
|
|
||||||
BPO1 *BlobConfig `json:"bpo1,omitempty"`
|
BPO1 *BlobConfig `json:"bpo1,omitempty"`
|
||||||
BPO2 *BlobConfig `json:"bpo2,omitempty"`
|
BPO2 *BlobConfig `json:"bpo2,omitempty"`
|
||||||
BPO3 *BlobConfig `json:"bpo3,omitempty"`
|
BPO3 *BlobConfig `json:"bpo3,omitempty"`
|
||||||
BPO4 *BlobConfig `json:"bpo4,omitempty"`
|
BPO4 *BlobConfig `json:"bpo4,omitempty"`
|
||||||
BPO5 *BlobConfig `json:"bpo5,omitempty"`
|
BPO5 *BlobConfig `json:"bpo5,omitempty"`
|
||||||
Amsterdam *BlobConfig `json:"amsterdam,omitempty"`
|
Amsterdam *BlobConfig `json:"amsterdam,omitempty"`
|
||||||
|
UBT *BlobConfig `json:"ubt,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// IsHomestead returns whether num is either equal to the homestead block or greater.
|
// IsHomestead returns whether num is either equal to the homestead block or greater.
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue