Skip to content

Vdb 1700 update geth in beta#151

Merged
elizabethengelman merged 3 commits intobetafrom
vdb-1700-update-geth-in-beta
Nov 16, 2020
Merged

Vdb 1700 update geth in beta#151
elizabethengelman merged 3 commits intobetafrom
vdb-1700-update-geth-in-beta

Conversation

@elizabethengelman
Copy link
Copy Markdown

@elizabethengelman elizabethengelman commented Nov 11, 2020

Update: here's the associated vdb-mcd-transformers PR: https://github.com/makerdao/vdb-mcd-transformers/pull/375/files


This branch brings over changes that we made in production to:

I still need to make a corresponding change in vdb-mcd-transformers to make sure that extractDiffs is run from that repo instead, and that the filterQuery is created and passed to the geth subscription. This may be tricky, because as we now know the way we were referencing versioned contract names in the config file don't parse properly using the toml parser, but I think we can probably find a workaround short of needing to update how contract names are referenced in the config file.

I think that other than the changes mentioned above in vdb-mcd-transformers that this may work, though I'd like to run it locally to verify.

  • since we're handling adding the hashed keys in the vdb keys_loader, and this PR removes it, there shouldn't be any changes necessary in vdb-mcd-transformers for hashed vs. unhashed keys.
  • the vdb-mcd-transformers in beta is still expecting hashed addresses, which we are taking care of here in libraries/shared/storage/types/diff.go - which hashes the addresses as it's formatting/decoding the diff it gets from the node.

Elizabeth and others added 2 commits November 11, 2020 16:33
* Remove hashing storage keys on storage diffs

* Remove adding hashed storage keys to keys lookup

* Remove keccaking storage key from storage backfill
Update geth statediff pkg references to filters pkg

Update AccountDiffs for new geth patch

Stream diffs from geth NewStateChanges subscription

Remove support for old geth patches

Remove dockerfile for extractDiffs command

Use config file for extract diffs watched addresses
@elizabethengelman elizabethengelman marked this pull request as ready for review November 12, 2020 20:39
rmulhol
rmulhol previously approved these changes Nov 12, 2020
Copy link
Copy Markdown

@rmulhol rmulhol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would like to take a longer look at this later but I'm fine with merging if it unblocks work in the transformers/actually building and testing the image

var addresses []string
for contractName := range contracts {
address := viper.GetStringMapString("contract." + contractName)["address"]
addresses = append(addresses, address)
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wonder if it's worth tossing a panic in here if address == ""

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call - just added the CreateFilterQuery method that we have in prod as part of fe275dc

Copy link
Copy Markdown

@rmulhol rmulhol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry meant to approve this earlier

@elizabethengelman elizabethengelman merged commit f212468 into beta Nov 16, 2020
@elizabethengelman elizabethengelman deleted the vdb-1700-update-geth-in-beta branch November 16, 2020 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants