Skip to content
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

Receipt logs #27

Merged
merged 11 commits into from
Aug 11, 2021
Merged

Receipt logs #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0636a3d
extension node will never contain TrieNode directly
i-norden Aug 2, 2021
83eab12
updates to gen.go for merkelizing logs in IPLD representation of Receipt
i-norden Aug 3, 2021
5ccd005
log IPLD marshaller and unmarshaller
i-norden Aug 3, 2021
5c34ca4
log trie codec
i-norden Aug 3, 2021
ede2453
need to keep the list of logs materialized in the receipt IPLD object…
i-norden Aug 3, 2021
c7d7c0c
proposed multicodec types
i-norden Aug 4, 2021
9dd2daf
log marshaller and unmarshaller unit tests
Aug 10, 2021
798eed1
log trie marshaller and unmarshaller unit tests
Aug 10, 2021
d5054b0
update code gen output
Aug 10, 2021
3f6b398
adjustments after new code gen
Aug 10, 2021
988aee3
adjustments to codegen and manual fixes to Union types
Aug 10, 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
42 changes: 25 additions & 17 deletions gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ func accumulateChainTypes(ts *schema.TypeSystem) {
ParentCID &Header
UnclesCID &Uncles
Coinbase Address
StateRootCID &StateTrieNode
TxRootCID &TxTrieNode
RctRootCID &RctTrieNode
StateRootCID &TrieNode
TxRootCID &TrieNode
RctRootCID &TrieNode
Bloom Bloom
Difficulty BigInt
Number BigInt
Expand Down Expand Up @@ -176,29 +176,32 @@ func accumulateChainTypes(ts *schema.TypeSystem) {
}

type Logs [Log]
*/
ts.Accumulate(schema.SpawnList("Topics", "Hash", false))
ts.Accumulate(schema.SpawnStruct("Log",
[]schema.StructField{
schema.SpawnStructField("Address", "Address", false, false),
schema.SpawnStructField("Topics", "Topics", false, false),
schema.SpawnStructField("Data", "Bytes", false, false),
},
schema.SpawnStructRepresentationMap(nil),
))
ts.Accumulate(schema.SpawnList("Logs", "Log", false))

/*
type Receipt struct {
TxType TxType
// We could make Status an enum
Status Uint // nullable
PostState Hash // nullable
CumulativeGasUsed Uint
Bloom Bloom
Logs Logs
Logs Logs
LogRootCID &TrieNode
}

type Receipts [Receipt]
*/
ts.Accumulate(schema.SpawnList("Topics", "Hash", false))
ts.Accumulate(schema.SpawnStruct("Log",
[]schema.StructField{
schema.SpawnStructField("Address", "Address", false, false),
schema.SpawnStructField("Topics", "Topics", false, false),
schema.SpawnStructField("Data", "Bytes", false, false),
},
schema.SpawnStructRepresentationMap(nil),
))
ts.Accumulate(schema.SpawnList("Logs", "Log", false))
ts.Accumulate(schema.SpawnStruct("Receipt",
[]schema.StructField{
schema.SpawnStructField("TxType", "TxType", false, false),
Expand All @@ -207,6 +210,7 @@ func accumulateChainTypes(ts *schema.TypeSystem) {
schema.SpawnStructField("CumulativeGasUsed", "Uint", false, false),
schema.SpawnStructField("Bloom", "Bloom", false, false),
schema.SpawnStructField("Logs", "Logs", false, false),
schema.SpawnStructField("LogRootCID", "Link", false, false),
},
schema.SpawnStructRepresentationMap(nil),
))
Expand Down Expand Up @@ -251,6 +255,7 @@ func accumulateStateDataStructures(ts *schema.TypeSystem) {
| Receipt "rct"
| Account "state"
| Bytes "storage"
| Log "log"
} representation keyed

# Child union type used to handle the case where the node is stored directly in the parent node because it is smaller
Expand All @@ -262,7 +267,7 @@ func accumulateStateDataStructures(ts *schema.TypeSystem) {

type TrieExtensionNode struct {
PartialPath Bytes
Child Child
Child &TrieNode
}

type TrieLeafNode struct {
Expand All @@ -276,12 +281,14 @@ func accumulateStateDataStructures(ts *schema.TypeSystem) {
"Receipt",
"Account",
"Bytes",
"Log",
},
schema.SpawnUnionRepresentationKeyed(map[string]schema.TypeName{
"tx": "Transaction",
"rct": "Receipt",
"state": "Account",
"storage": "Bytes",
"log": "Log",
}),
))
ts.Accumulate(schema.SpawnUnion("Child",
Expand Down Expand Up @@ -319,10 +326,11 @@ func accumulateStateDataStructures(ts *schema.TypeSystem) {
ts.Accumulate(schema.SpawnStruct("TrieExtensionNode",
[]schema.StructField{
schema.SpawnStructField("PartialPath", "Bytes", false, false),
schema.SpawnStructField("Child", "Child", false, false),
schema.SpawnStructField("Child", "Link", false, false),
},
schema.SpawnStructRepresentationMap(nil),
))

ts.Accumulate(schema.SpawnStruct("TrieLeafNode",
[]schema.StructField{
schema.SpawnStructField("PartialPath", "Bytes", false, false),
Expand All @@ -348,7 +356,7 @@ func accumulateStateDataStructures(ts *schema.TypeSystem) {
type Account struct {
Nonce Uint
Balance Balance
StorageRootCID &StorageTrieNode
StorageRootCID &TrieNode
CodeCID &ByteCode
}
*/
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ go 1.15
require (
github.com/ethereum/go-ethereum v1.10.4
github.com/ipfs/go-cid v0.0.7
github.com/ipfs/go-ipfs-blockstore v1.0.4
github.com/ipfs/go-ipfs-ds-help v1.0.0
github.com/ipld/go-ipld-prime v0.10.0
github.com/multiformats/go-multihash v0.0.15
golang.org/dl v0.0.0-20210805175753-70f86bf65abd // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
)

replace github.com/ethereum/go-ethereum v1.10.4 => github.com/vulcanize/go-ethereum v1.10.4-ir-0.0.1
56 changes: 2 additions & 54 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

Loading