mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2024-12-31 16:21:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WIP: issue/issue-250-use_compressed_keys (#285)

Browse Source 
* issue/issue-250-use_compressed_keys

* Step into the twilight zone

* fix zero byte

* Add zerolen check

* Remove branhc data check

* Check lengths
This commit is contained in:
primal_concrete_sledge 2022-01-28 22:30:32 +03:00 committed by GitHub
parent c8397a0433
commit 24098d94d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
aggregator/aggregator.go
View File

@ -515,9 +515,6 @@ func (c *Changes) aggregate(blockFrom, blockTo uint64, prefixLen int, tx kv.RwTx
return true return true
} }
dbPrefix := item.k dbPrefix := item.k
if len(dbPrefix) == 0 {
dbPrefix = []byte{16}
}
prevV, err := tx.GetOne(table, dbPrefix) prevV, err := tx.GetOne(table, dbPrefix)
if err != nil { if err != nil {
e = err e = err
@ -1288,9 +1285,6 @@ func (i *CommitmentItem) Less(than btree.Item) bool {
func (w *Writer) branchFn(prefix []byte) ([]byte, error) { func (w *Writer) branchFn(prefix []byte) ([]byte, error) {
// Look in the summary table first // Look in the summary table first
dbPrefix := prefix dbPrefix := prefix
if len(dbPrefix) == 0 {
dbPrefix = []byte{16}
}
v, err := w.tx.GetOne(kv.StateCommitment, dbPrefix) v, err := w.tx.GetOne(kv.StateCommitment, dbPrefix)
if err != nil { if err != nil {
return nil, err return nil, err
@ -1549,9 +1543,6 @@ func (w *Writer) computeCommitment(trace bool) ([]byte, error) {
for prefixStr, branchNodeUpdate := range branchNodeUpdates { for prefixStr, branchNodeUpdate := range branchNodeUpdates {
prefix := []byte(prefixStr) prefix := []byte(prefixStr)
dbPrefix := prefix dbPrefix := prefix
if len(dbPrefix) == 0 {
dbPrefix = []byte{16}
}
prevV, err := w.tx.GetOne(kv.StateCommitment, dbPrefix) prevV, err := w.tx.GetOne(kv.StateCommitment, dbPrefix)
if err != nil { if err != nil {
return nil, err return nil, err

47
commitment/hex_patricia_hashed.go
View File

@ -27,7 +27,6 @@ import (
"strings" "strings"
"github.com/holiman/uint256" "github.com/holiman/uint256"
"github.com/ledgerwatch/erigon-lib/common"
"github.com/ledgerwatch/erigon-lib/common/length" "github.com/ledgerwatch/erigon-lib/common/length"
"github.com/ledgerwatch/erigon-lib/rlp" "github.com/ledgerwatch/erigon-lib/rlp"
"golang.org/x/crypto/sha3" "golang.org/x/crypto/sha3"
@ -918,7 +917,7 @@ func (hph *HexPatriciaHashed) unfold(hashedKey []byte, unfolding int) error {
hph.delBitmap[row] = 0 hph.delBitmap[row] = 0
if upCell.downHashedLen == 0 { if upCell.downHashedLen == 0 {
depth = upDepth + 1 depth = upDepth + 1
branchData, err := hph.branchFn(hph.currentKey[:hph.currentKeyLen]) branchData, err := hph.branchFn(hexToCompact(hph.currentKey[:hph.currentKeyLen]))
if err != nil { if err != nil {
return err return err
} }
@ -1092,7 +1091,7 @@ func (hph *HexPatriciaHashed) needFolding(hashedKey []byte) bool {
// until that current key becomes a prefix of hashedKey that we will proccess next // until that current key becomes a prefix of hashedKey that we will proccess next
// (in other words until the needFolding function returns 0) // (in other words until the needFolding function returns 0)
func (hph *HexPatriciaHashed) fold() ([]byte, []byte, error) { func (hph *HexPatriciaHashed) fold() ([]byte, []byte, error) {
updateKey := common.Copy(hph.currentKey[:hph.currentKeyLen]) updateKey := hexToCompact(hph.currentKey[:hph.currentKeyLen])
if hph.activeRows == 0 { if hph.activeRows == 0 {
return nil, nil, fmt.Errorf("cannot fold - no active rows") return nil, nil, fmt.Errorf("cannot fold - no active rows")
} }
@ -1686,3 +1685,45 @@ func (hph *HexPatriciaHashed) ProcessUpdates(plainKeys, hashedKeys [][]byte, upd
} }
return branchNodeUpdates, nil return branchNodeUpdates, nil
} }
func hexToCompact(key []byte) []byte {
zeroByte, keyPos, keyLen := makeCompactZeroByte(key)
bufLen := keyLen/2 + 1 // always > 0
buf := make([]byte, bufLen)
buf[0] = zeroByte
return decodeKey(key[keyPos:], buf)
}
func makeCompactZeroByte(key []byte) (compactZeroByte byte, keyPos, keyLen int) {
keyLen = len(key)
if hasTerm(key) {
keyLen--
compactZeroByte = 0x20
}
var firstNibble byte
if len(key) > 0 {
firstNibble = key[0]
}
if keyLen&1 == 1 {
compactZeroByte |= 0x10 | firstNibble // Odd: (1<<4) + first nibble
keyPos++
}
return
}
func decodeKey(key, buf []byte) []byte {
keyLen := len(key)
if hasTerm(key) {
keyLen--
}
for keyIndex, bufIndex := 0, 1; keyIndex < keyLen; keyIndex, bufIndex = keyIndex+2, bufIndex+1 {
if keyIndex == keyLen-1 {
buf[bufIndex] = buf[bufIndex] & 0x0f
} else {
buf[bufIndex] = key[keyIndex+1]
}
buf[bufIndex] |= key[keyIndex] << 4
}
return buf
}