6cdea4ef97
* Update project to use Whisper v6. Part of #638 * Revert "Add patch to downgrade usage of Whisper v6 to v5 in some geth 1.8.1 vendor files. Part of #665" - this reverts commit 6aefb4c8fd02dbcfffac6b69e8bb22b13ef86b6b. * Enable light mode on Whisper v6 for non-mail servers. Part of #638 * Fix race condition in whisperv6/peer.go. Part of #665 (PR already accepted upstream for 1.8.2) * Update bootnode addresses in staticnodes.json. Part of #638 * Add `shh.lightclient` flag and tests for bloom filter setting logic. Part of #638 * Move MakeTestNodeConfig to utils. Part of #638 * Reduce PoW in `whisper_jail_test.go` to fix flaky test. Part of #638 |
||
|---|---|---|
| .. | ||
| 0000-accounts-hd-keys.patch | ||
| 0004-whisper-notifications.patch | ||
| 0009-whisper-envelopes-tracing.patch | ||
| 0010-geth-17-fix-npe-in-filter-system.patch | ||
| 0012-disable-filter-timeout.patch | ||
| 0014-whisperv6-notifications.patch | ||
| 0015-whisperv6-envelopes-tracing.patch | ||
| 0016-fix-leveldb-issue.patch | ||
| 0018-geth-181-whisperv6-peer-race-cond-fix.patch | ||
| README.md | ||
README.md
Status Patches for geth (go-ethereum)
Status-go uses go-ethereum (upstream) as its dependency. As any other Go dependency go-ethereum code is vendored and stored in vendor/ folder.
However, there are a few changes has been made to the upstream, that are specific to Status and should not be merged to the upstream. We keep those changes as a set of patches, that can be applied upon each next release of go-ethereum. Patched version of go-ethereum is available in vendor folder.
We try to minimize number and amount of changes in those patches as much as possible, and whereas possible, to contribute changes into the upstream.
Creating patches
Instructions for creating a patch from the command line:
- Enter the command line at the go-ethereum dependency root in vendor folder.
- Create the patch:
- If you already have a commit that represents the change, find its SHA1 (e.g.
$COMMIT_SHA1) and dogit diff $COMMIT_SHA1 > file.patch - If the files are staged, do
git diff --cached > file.patch
- If you already have a commit that represents the change, find its SHA1 (e.g.
Updating patches
- Tweak the patch file.
- Run
make dep-ensureto re-apply patches.
Removing patches
- Remove the patch file
- Remove the link from [this README] (./README.md)
- Run
make dep-ensureto re-apply patches.
Patches
0000-accounts-hd-keys.patch— adds support for HD extended keys (links/docs?)0004-whisper-notifications.patch— adds Whisper notifications (need to be reviewed and documented)0009-whisper-envelopes-tracing.patch— adds Whisper envelope tracing (need to be reviewed and documented)0010-geth-17-fix-npe-in-filter-system.patch- Temp patch for 1.7.x to fix a NPE in the filter system.0014-whisperv6-notifications.patch— adds Whisper v6 notifications (need to be reviewed and documented)0015-whisperv6-envelopes-tracing.patch— adds Whisper v6 envelope tracing (need to be reviewed and documented)0018-geth-181-whisperv6-peer-race-cond-fix.patch— Fixes race condition in Whisper v6. This has been merged upstream and this patch will need to be removed for 1.8.2.
Updating
When a new stable release of go-ethereum comes out, we need to upgrade our vendored copy. We use dep for vendoring, so for upgrading:
- Change target branch for
go-ethereuminGopkg.toml. dep ensure -update github.com/ethereum/go-ethereummake dep-ensure
This will ensure that dependency is upgraded and fully patched. Upon success, you can do make vendor-check after committing all the changes, in order to ensure that all changes are valid.