VDB-1368: Add Dockerfile for extract diffs cmd#259
Merged
elizabethengelman merged 5 commits intostagingfrom Aug 11, 2020
Merged
VDB-1368: Add Dockerfile for extract diffs cmd#259elizabethengelman merged 5 commits intostagingfrom
elizabethengelman merged 5 commits intostagingfrom
Conversation
d1e72e7 to
ae5fcdb
Compare
|
|
||
| # Run extractDiffs | ||
| echo "Running extractDiffs..." | ||
| ./vulcanizedb extractDiffs --watchedAddresses=0x78f2c2af65126834c51822f56be0d7469d7a523e \ |
Contributor
Author
There was a problem hiding this comment.
Unfortunately, I don't think that we can add a comment for each address telling which contract it belongs to. Not sure if that's ideal, so I may play around with just using a .toml config file like we're doing with execute.
yaoandrew
approved these changes
Aug 4, 2020
Contributor
yaoandrew
left a comment
There was a problem hiding this comment.
LGTM - I was able to build the container locally. Of course I didn't read your note at first so I got an error when I tried to run it without --build-arg set🤣
980cee3 to
7223a43
Compare
Contributor
Author
|
I've added extract diffs to the travis deploy script since the last review and would love another set of eyes! |
rmulhol
approved these changes
Aug 10, 2020
Contributor
rmulhol
left a comment
There was a problem hiding this comment.
A couple questions, but LGTM 👍
environments/extractDiffs.toml
Outdated
| address = "0x956ecD6a9A9A0d84e8eB4e6BaaC09329E202E55e" | ||
| abi = '[{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"val","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"age","type":"uint256"}],"name":"LogMedianPrice","type":"event"},{"anonymous":true,"inputs":[{"indexed":true,"internalType":"bytes4","name":"sig","type":"bytes4"},{"indexed":true,"internalType":"address","name":"usr","type":"address"},{"indexed":true,"internalType":"bytes32","name":"arg1","type":"bytes32"},{"indexed":true,"internalType":"bytes32","name":"arg2","type":"bytes32"},{"indexed":false,"internalType":"bytes","name":"data","type":"bytes"}],"name":"LogNote","type":"event"},{"constant":true,"inputs":[],"name":"age","outputs":[{"internalType":"uint32","name":"","type":"uint32"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"bar","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"bud","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"usr","type":"address"}],"name":"deny","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address[]","name":"a","type":"address[]"}],"name":"diss","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"a","type":"address"}],"name":"diss","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address[]","name":"a","type":"address[]"}],"name":"drop","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address[]","name":"a","type":"address[]"}],"name":"kiss","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"a","type":"address"}],"name":"kiss","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address[]","name":"a","type":"address[]"}],"name":"lift","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"orcl","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"peek","outputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"uint256[]","name":"val_","type":"uint256[]"},{"internalType":"uint256[]","name":"age_","type":"uint256[]"},{"internalType":"uint8[]","name":"v","type":"uint8[]"},{"internalType":"bytes32[]","name":"r","type":"bytes32[]"},{"internalType":"bytes32[]","name":"s","type":"bytes32[]"}],"name":"poke","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"read","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"usr","type":"address"}],"name":"rely","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"uint256","name":"bar_","type":"uint256"}],"name":"setBar","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"internalType":"uint8","name":"","type":"uint8"}],"name":"slot","outputs":[{"internalType":"address","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"wards","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"wat","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"payable":false,"stateMutability":"view","type":"function"}]' | ||
| deployed = 10322821 | ||
| [contract.OASIS_MATCHING_MARKET_ONE] |
Contributor
There was a problem hiding this comment.
Might be able to remove the Oasis + OSM contracts?
| HEALTHCHECK CMD test -f /tmp/connection | ||
|
|
||
| # need to execute with a shell to access env variables | ||
| CMD ["./startup_script.sh"] No newline at end of file |
Contributor
There was a problem hiding this comment.
One thing that bit me recently was forgetting to update permissions on the startup_script.sh file - if you haven't run this locally, maybe worth verifying that won't be an issue here
Contributor
Author
There was a problem hiding this comment.
I think this should be okay - I've changed the script's permissions, and can run the docker container on my machine.
| docker build -f dockerfiles/execute/Dockerfile . -t makerdao/vdb-execute:$TAG | ||
|
|
||
| message BUILDING EXTRACT-DIFFS DOCKER IMAGE | ||
| docker build -f dockerfiles/extract_diffs/Dockerfile . -t makerdao/vdb-extract-diffs:$TAG |
Contributor
There was a problem hiding this comment.
Since this is moving over here, do we want a corresponding PR to remove it from vdb?
Contributor
Author
There was a problem hiding this comment.
👍 I think that sky-ecosystem/vulcanizedb#119 should take care of this.
c0947f8 to
8f3e735
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR needs to work with this VDB PR. Before the VDB PR is merged in, pass
VDB_VERSION=VDB-1368-add-new-geth-patch-as-diff-sourceas a build arg while building this container, eg: