status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
status-go/vendor/github.com/ethereum/go-ethereum/_assets/patches
History
Andrea Franz fdcd20e14d
add missing patch file (#1319) 		2018-12-12 16:09:39 +01:00
..
0000-accounts-hd-keys.patch Use patched go-ethereum from our fork instead of patching it on-the-fly (#1184) 2018-09-27 21:16:15 +02:00
0014-whisperv6-notifications.patch Use patched go-ethereum from our fork instead of patching it on-the-fly (#1184) 2018-09-27 21:16:15 +02:00
0016-fix-leveldb-issue.patch Use patched go-ethereum from our fork instead of patching it on-the-fly (#1184) 2018-09-27 21:16:15 +02:00
0021-backends-simulated-chain-signer.patch Use patched go-ethereum from our fork instead of patching it on-the-fly (#1184) 2018-09-27 21:16:15 +02:00
0022-node-attach-public.patch Use patched go-ethereum from our fork instead of patching it on-the-fly (#1184) 2018-09-27 21:16:15 +02:00
0023-extract-personal-sign-api.patch Use patched go-ethereum from our fork instead of patching it on-the-fly (#1184) 2018-09-27 21:16:15 +02:00
0025-whisper-confirmations.patch Use patched go-ethereum from our fork instead of patching it on-the-fly (#1184) 2018-09-27 21:16:15 +02:00
0027-whisper-time-source.patch Use patched go-ethereum from our fork instead of patching it on-the-fly (#1184) 2018-09-27 21:16:15 +02:00
0028-p2p-watchdog.patch Upgrade geth 1.8.17 plus add metrics during compilation time (#1273) 2018-11-14 08:03:58 +01:00
0029-node-api-gauge-metric.patch Use patched go-ethereum from our fork instead of patching it on-the-fly (#1184) 2018-09-27 21:16:15 +02:00
0032-send-mailserver-request-completed-code.patch Upgrade geth 1.8.17 plus add metrics during compilation time (#1273) 2018-11-14 08:03:58 +01:00
0033-mailserver-response-contains-cursor.patch Upgrade geth 1.8.17 plus add metrics during compilation time (#1273) 2018-11-14 08:03:58 +01:00
0035-add_goroutines_metrics.patch Use patched go-ethereum from our fork instead of patching it on-the-fly (#1184) 2018-09-27 21:16:15 +02:00
0037-whisper-metrics.patch Use patched go-ethereum from our fork instead of patching it on-the-fly (#1184) 2018-09-27 21:16:15 +02:00
0038-ulc.patch Upgrade geth 1.8.17 plus add metrics during compilation time (#1273) 2018-11-14 08:03:58 +01:00
0039-enable-metrics-during-compilation.patch Upgrade geth 1.8.17 plus add metrics during compilation time (#1273) 2018-11-14 08:03:58 +01:00
0040-import-extended-key-by-purpose.patch add missing patch file (#1319) 2018-12-12 16:09:39 +01:00
README.md added ulc patch (#1239) 2018-10-16 14:27:11 +03:00
patcher Use patched go-ethereum from our fork instead of patching it on-the-fly (#1184) 2018-09-27 21:16:15 +02:00

README.md

Status Patches for geth (go-ethereum)

We keep changes in patches because it gives as a clear picture. In case of merge conflicts, thanks to patches we can easily figure out how the final code should look like.

Syncing with upstream

When a new geth version is released, we need to merge it to an appropriate branch and apply patches.

The format of branches looks like this: patched/1.8, patched/1.9, and so on.

In order to sync the upstream, follow this instruction:

  1. Revert existing patches: $ _assets/patches/patcher -r,
  2. Merge a new release: $ git merge upstream/v1.8.16 where v1.8.16 is a tag with a new release,
  3. Apply patches back: $ _assets/patches/patcher.

In the last step, some patches might be invalid. In such a case, they need to be fixed before proceeding.

Creating patches

Instructions for creating a patch from the command line:

  1. Do changes in vendor/github.com/ethereum/go-ethereum/,
  2. Go to the root status-go directory,
  3. Create a patch git diff --relative=vendor/github.com/ethereum/go-ethereum > _assets/patches/geth/0000-name-of-the-patch.patch
  4. Commit changes.

How to fix a patch?

TBD