params, trie: add verkle fork management + upgrade go-verkle #27464

gballet · 2023-06-13T16:10:18Z

In order to simplify the verkle code rebase and reduce the code diff, this PR:

Adds the verkle trie files
Upgrades go-verkle to the latest version
Declares the IsVerkle rule and function

holiman

Would it make sense to have a verkle package inside trie? So trie/verkle and, at some point, move old stuff into trie/mpt ?

gballet · 2023-06-20T13:23:52Z

Would it make sense to have a verkle package inside trie? So trie/verkle and, at some point, move old stuff into trie/mpt ?

In principle, yes, however the whole point of this PR is to make a horrible rebase easier. Doing this would have the opposite effect. Here's what I suggest: I'll remove the verkle files for now, and I'll do the move to its own subdir after the rebase.

trie/utils/verkle.go

rjl493456442 · 2023-06-26T04:08:39Z

trie/utils/verkle.go

+	return PointToHash(ret, subIndex)
+}
+
+func GetTreeKeyAccountLeaf(address []byte, leaf byte) []byte {


Please add function description.

rjl493456442 · 2023-06-26T04:09:55Z

trie/utils/verkle.go

+	return point
+}
+
+func (pc *PointCache) GetTreeKeyVersionCached(addr []byte) []byte {


It's duplicated with API *WithEvaluatedAddress. We can always cache evaluated address in point cache and combine it with *WithEvaluatedAddress APIs.

So we dont' need to define API like GetTreeKeyVersionCached

Not quite, as it saves on the allocation of a big.Int and is called quite often

forget that, that was nonsense, the big.Int is created no matter what

rjl493456442

nitpicks, otherwise lgtm

rjl493456442 · 2023-06-27T03:07:42Z

trie/utils/verkle.go

+// Basic account leaf suffixes, see:
+// https://notes.ethereum.org/@vbuterin/verkle_tree_eip#Tree-embedding
+const (
+	VersionLeafKey    = 0


Any particular reason to expose these constants?

rjl493456442 · 2023-06-27T03:07:58Z

trie/utils/verkle.go

+
+var (
+	zero                = uint256.NewInt(0)
+	HeaderStorageOffset = uint256.NewInt(64)


Any particular reason to expose these variables?

rjl493456442 · 2023-06-27T03:19:36Z

trie/utils/verkle.go

+	return GetTreeKey(address, zero, VersionLeafKey)
+}
+
+// Get does the,


Typo? This function description is duplicated.

rjl493456442 · 2023-06-27T03:25:37Z

trie/utils/verkle.go

+}
+
+func GetTreeKeyStorageSlot(address []byte, storageKey *uint256.Int) []byte {
+	pos := storageKey.Clone()


Perhaps pos := new(uint256.Int)? We either initialize the pos via pos.Add(HeaderStorageOffset, storageKey) or pos.Add(MainStorageOffset, storageKey). Make no sense to do clone first.

rjl493456442 · 2023-06-27T03:26:21Z

trie/utils/verkle.go

+}
+
+func pointToHash(evaluated *verkle.Point, suffix byte) []byte {
+	// The output of Byte() is big engian for banderwagon. This


rjl493456442 · 2023-06-27T03:40:10Z

trie/utils/verkle.go

+	verkle.FromLEBytes(&poly[1], address[:16])
+	verkle.FromLEBytes(&poly[2], address[16:])
+
+	// tree


rjl493456442 · 2023-06-27T03:41:53Z

trie/utils/verkle.go

+}
+
+func GetTreeKeyCodeChunk(address []byte, chunk *uint256.Int) []byte {
+	chunkOffset := new(uint256.Int).Add(CodeOffset, chunk)


I will prefer this style, but yeah, feel free to ignore

var ( subIndex byte chunkOffset = new(uint256.Int).Add(CodeOffset, chunk) treeIndex = new(uint256.Int).Div(chunkOffset, VerkleNodeWidth) subIndexMod = new(uint256.Int).Mod(chunkOffset, VerkleNodeWidth) )

rjl493456442 · 2023-06-27T03:42:42Z

trie/utils/verkle.go

+// GetTreeKeyCodeChunkWithEvaluatedAddress does the same thing as GetTreeKeyCodeChunk,
+// but uses the cached point corresponding to the address part of the polynomial.
+func GetTreeKeyCodeChunkWithEvaluatedAddress(addressPoint *verkle.Point, chunk *uint256.Int) []byte {
+	chunkOffset := new(uint256.Int).Add(CodeOffset, chunk)


I will prefer this style, feel free to ignore

var ( subIndex byte chunkOffset = new(uint256.Int).Add(CodeOffset, chunk) treeIndex = new(uint256.Int).Div(chunkOffset, VerkleNodeWidth) subIndexMod = new(uint256.Int).Mod(chunkOffset, VerkleNodeWidth)

rjl493456442 · 2023-06-27T03:45:42Z

trie/utils/verkle.go

+func pointToHash(evaluated *verkle.Point, suffix byte) []byte {
+	// The output of Byte() is big engian for banderwagon. This
+	// introduces an imbalance in the tree, because hashes are
+	// elements of a 253-bit field. This means more than half the


Something irrelevant, just want to confirm.

The Byte() return 353-bit hash, so the 3 zero bits are in the beginning of the bytes, or at the end?

I guess it's at the beginning, so you want to covert to little endian?

rjl493456442

I think it's fine to merge the PR, because all the stuffs are only used by verkle.

But I agree with Martin, it makes more sense to have trie/verkle and trie/mpt packages later on, to not mix everything in a single directory.

gballet · 2023-06-27T11:58:55Z

That makes sense, but what doesn't make sense, I just realized, is trying to integrate this last file if it's not used anywhere at the moment. I have taken notes of all the review comments and will add them to the next PR when these files are needed.

karalabe · 2023-06-27T12:56:09Z

PR SGTM, we've agreed to also add the --override.verkle flag as it might come in hangy to test different scenarios without screwing too much around with different genesis jsons and reinits.

…m#27464) * params, trie: add verkle fork management + upgrade go-verkle * remove the two verkle files * core, eth, params: add missing function * Gary's feedback * remove trie/utils/verkle.go * add verkle block override --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com>

…thereum#27464)" This reverts commit 59c73c0.

rjl493456442 self-assigned this Jun 14, 2023

gballet force-pushed the add-verkle-fork branch from 861c7ad to 2d4d93b Compare June 16, 2023 09:08

holiman reviewed Jun 20, 2023

View reviewed changes

gballet force-pushed the add-verkle-fork branch from 40517c4 to 7ecb2fa Compare June 20, 2023 13:30

gballet added 2 commits June 20, 2023 15:30

params, trie: add verkle fork management + upgrade go-verkle

90588a8

remove the two verkle files

7ecb2fa

gballet added the status:triage label Jun 23, 2023

core, eth, params: add missing function

8bbdaa5

rjl493456442 reviewed Jun 26, 2023

View reviewed changes

trie/utils/verkle.go Outdated Show resolved Hide resolved

rjl493456442 requested review from s1na and karalabe as code owners June 26, 2023 04:02

rjl493456442 reviewed Jun 26, 2023

View reviewed changes

rjl493456442 approved these changes Jun 26, 2023

View reviewed changes

Gary's feedback

7789cc0

rjl493456442 reviewed Jun 27, 2023

View reviewed changes

rjl493456442 approved these changes Jun 27, 2023

View reviewed changes

remove trie/utils/verkle.go

5571333

add verkle block override

dded957

gballet requested a review from zsfelfoldi as a code owner June 27, 2023 13:46

rjl493456442 approved these changes Jun 28, 2023

View reviewed changes

karalabe merged commit 85b8d1c into ethereum:master Jun 28, 2023
1 of 2 checks passed

karalabe added this to the 1.12.1 milestone Jun 28, 2023

devopsbo3 added a commit to HorizenOfficial/go-ethereum that referenced this pull request Nov 10, 2023

Revert "params, trie: add verkle fork management + upgrade go-verkle (e…

93d411d

…thereum#27464)" This reverts commit 59c73c0.

devopsbo3 added a commit to HorizenOfficial/go-ethereum that referenced this pull request Nov 10, 2023

Revert "params, trie: add verkle fork management + upgrade go-verkle (e…

b02e261

…thereum#27464)" This reverts commit 59c73c0.

devopsbo3 added a commit to HorizenOfficial/go-ethereum that referenced this pull request Nov 10, 2023

Revert "params, trie: add verkle fork management + upgrade go-verkle (e…

b5a11d6

…thereum#27464)" This reverts commit 59c73c0.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

params, trie: add verkle fork management + upgrade go-verkle #27464

params, trie: add verkle fork management + upgrade go-verkle #27464

gballet commented Jun 13, 2023

holiman left a comment

gballet commented Jun 20, 2023

rjl493456442 Jun 26, 2023

rjl493456442 Jun 26, 2023 •

edited

gballet Jun 26, 2023

gballet Jun 26, 2023

rjl493456442 left a comment

rjl493456442 Jun 27, 2023

rjl493456442 Jun 27, 2023

rjl493456442 Jun 27, 2023

rjl493456442 Jun 27, 2023

rjl493456442 Jun 27, 2023

rjl493456442 Jun 27, 2023

rjl493456442 Jun 27, 2023

rjl493456442 Jun 27, 2023

rjl493456442 Jun 27, 2023 •

edited

rjl493456442 left a comment

gballet commented Jun 27, 2023

karalabe commented Jun 27, 2023

params, trie: add verkle fork management + upgrade go-verkle #27464

params, trie: add verkle fork management + upgrade go-verkle #27464

Conversation

gballet commented Jun 13, 2023

holiman left a comment

Choose a reason for hiding this comment

gballet commented Jun 20, 2023

Choose a reason for hiding this comment

rjl493456442 Jun 26, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rjl493456442 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rjl493456442 Jun 27, 2023 • edited

Choose a reason for hiding this comment

rjl493456442 left a comment

Choose a reason for hiding this comment

gballet commented Jun 27, 2023

karalabe commented Jun 27, 2023

rjl493456442 Jun 26, 2023 •

edited

rjl493456442 Jun 27, 2023 •

edited