Update READMEs to document dep-based workflow.
#606
Conversation
geth-patches/README.md
Outdated
|
|
||
| ### From very scratch | ||
| Use this method if you're up to nuke forked repo for some reason and apply patches from scratch: | ||
| #### I. In `go-ethereum fork`. |
There was a problem hiding this comment.
Would write
I. In our fork at /status-im/go-ethereum
geth-patches/README.md
Outdated
|
|
||
| ## Manually | ||
| This method should be used only while `dep` tool workflow is not set up. | ||
| #### II. In `status-go` repository |
There was a problem hiding this comment.
Also here status-go is a name, no code. So simply
II. In status-go repository
| - [`0006-latest-cht.patch`](./0006-latest-cht.patch) – updates CHT root hashes, should be updated regularly to keep sync fast, until proper Trusted Checkpoint sync is not implemented as part of LES/2 protocol. | ||
| - [`0007-README.patch`](./0007-README.patch) — update upstream README.md. | ||
| - [`0008-tx-pool-nonce.patch`](./0008-tx-pool-nonce.patch) - On GetTransactionCount request with PendingBlockNumber get the nonce from transaction pool | ||
| - [`0010-geth-17-fix-npe-in-filter-system.patch`](./0010-geth-17-fix-npe-in-filter-system.patch) - Temp patch for 1.7.x to fix a NPE in the filter system |
There was a problem hiding this comment.
Not yet sure if "17" is a good abbreviation for version 1.7.x. But that's more a topic about naming schemes to manage different versions.
There was a problem hiding this comment.
yeah, I agree.
hope this patch will go away soon anyway :)
geth-patches/README.md
Outdated
| ``` | ||
| # merge upstream release branch into local master | ||
| git pull git@github.com:ethereum/go-ethereum.git release/1.7:master | ||
| git pull git@github.com:ethereum/go-ethereum.git release/1.7:develop |
There was a problem hiding this comment.
We should put a comment saying that upstream release branch depends on the current stable geth version we use. Currently, it's 1.7.x.
geth-patches/README.md
Outdated
|
|
||
| 1. Update vendored `go-ethereum` (note that we use upstream's address there, the link to our fork is in `Gopkg.toml`) |
There was a problem hiding this comment.
[...] the link to our fork is in [...] maybe [...] we override the download link to our fork address in [...]
mandrigin
force-pushed
the
igorm/578-update-readme
branch
from
f02a961
to
fc4224c
Compare
|
Merging before CI passes because there are no code changes. |
Updated workflow for upstream rebasing with
dep.Closes #578