Skip to content

Ignore PUSH data bytes, detect and ignore metadata #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hugo-dc wants to merge 5 commits into
base: cm/chunk-size
Choose a base branch
from
Open

Ignore PUSH data bytes, detect and ignore metadata #3

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11e2ebd
Ignore PUSH data bytes, detect and ignore metadata corresponding to t…
hugo-dc Apr 20, 2021
7896c66
fix, reset swarmMatch to 0
hugo-dc Apr 21, 2021
903dd76
Validate swarm metadata starting with 0xa2
hugo-dc Apr 21, 2021
d3c7b7e
Ingnore the rest of the metadata
hugo-dc Apr 22, 2021
f1fcb25
Different bzzr versions
hugo-dc Apr 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions codetrie/codetrie.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ var (
versionValue = []byte{0x00}
codeLengthKey = []byte{0xff, 0xfe}
codeHashKey = []byte{0xff, 0xff}
swarmIdent = []byte{0xa1, 0x65, 0x62, 0x7a, 0x7a, 0x72} // a165 bzzr
)

type Trie interface {
Expand Down Expand Up @@ -217,19 +218,41 @@ func setFIO(chunks []*Chunk) {
}

chunkSize := len(chunks[0].code)
swarmMatch := 0

for i, chunk := range chunks {
if i == len(chunks)-1 {
break
}

pushDataLeft := 0
for j, op := range chunk.code {

if swarmMatch == len(swarmIdent) {
continue // skip bytes corresponding to swarm metadata
}

if op == swarmIdent[swarmMatch] || (swarmMatch == 0 && op == 0xa2) {
swarmMatch += 1
} else {
swarmMatch = 0
}

if uint8(j) < chunk.fio { // FIO already set in previous chunk analysis
continue
}
if pushDataLeft > 0 { // current byte corresponds to PUSH data
pushDataLeft -= 1
continue
}

opcode := OpCode(op)
// Push is the only opcode with immediate
if !opcode.IsPush() {
continue
}
size := getPushSize(opcode)
pushDataLeft = size
// Fits within chunk
if j+size < chunkSize {
continue
Expand Down