From 988cd73217732c27e9534fcaf50fb194c6984390 Mon Sep 17 00:00:00 2001 From: Dmitry Shulyak Date: Thu, 1 Mar 2018 15:23:41 +0200 Subject: [PATCH] Use newer CHT defined in go-ethereum (#711) --- _assets/patches/geth/0006-latest-cht.patch | 26 ------------------- _assets/patches/geth/README.md | 1 - .../ethereum/go-ethereum/light/postprocess.go | 10 +------ 3 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 _assets/patches/geth/0006-latest-cht.patch diff --git a/_assets/patches/geth/0006-latest-cht.patch b/_assets/patches/geth/0006-latest-cht.patch deleted file mode 100644 index 17c041a42..000000000 --- a/_assets/patches/geth/0006-latest-cht.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/light/postprocess.go b/light/postprocess.go -index e7e513880..dc6562be8 100644 ---- a/light/postprocess.go -+++ b/light/postprocess.go -@@ -66,12 +66,20 @@ var ( - chtRoot: common.HexToHash("71d60207af74e5a22a3e1cfbfc89f9944f91b49aa980c86fba94d568369eaf44"), - bloomTrieRoot: common.HexToHash("70aca4b3b6d08dde8704c95cedb1420394453c1aec390947751e69ff8c436360"), - } -+ -+ statusRopstenCheckpoint = trustedCheckpoint{ -+ name: "Ropsten testnet", -+ sectionIdx: 67, -+ sectionHead: common.HexToHash("9832cf2ce760d4e3a7922fbfedeaa5dce67f1772e0f729f67c806bfafdedc370"), -+ chtRoot: common.HexToHash("60d43984a1d55e93f4296f4b48bf5af350476fe48679a73263bd57d8a324c9d4"), -+ bloomTrieRoot: common.HexToHash("fd81543dc619f6d1148e766b942c90296343c2cd0fd464946678f27f35feb59b"), -+ } - ) - - // trustedCheckpoints associates each known checkpoint with the genesis hash of the chain it belongs to - var trustedCheckpoints = map[common.Hash]trustedCheckpoint{ - params.MainnetGenesisHash: mainnetCheckpoint, -- params.TestnetGenesisHash: ropstenCheckpoint, -+ params.TestnetGenesisHash: statusRopstenCheckpoint, - } - - var ( diff --git a/_assets/patches/geth/README.md b/_assets/patches/geth/README.md index 6e84d8385..9600cc8c6 100644 --- a/_assets/patches/geth/README.md +++ b/_assets/patches/geth/README.md @@ -31,7 +31,6 @@ Instructions for creating a patch from the command line: - [`0000-accounts-hd-keys.patch`](./0000-accounts-hd-keys.patch) — adds support for HD extended keys (links/docs?) - [`0004-whisper-notifications.patch`](./0004-whisper-notifications.patch) — adds Whisper notifications (need to be reviewed and documented) -- [`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. - [`0009-whisper-envelopes-tracing.patch`](./0009-whisper-envelopes-tracing.patch) — adds Whisper envelope tracing (need to be reviewed and documented) - [`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. - [`0014-whisperv6-notifications.patch`](./0014-whisperv6-notifications.patch) — adds Whisper v6 notifications (need to be reviewed and documented) diff --git a/vendor/github.com/ethereum/go-ethereum/light/postprocess.go b/vendor/github.com/ethereum/go-ethereum/light/postprocess.go index e51388598..84149fdaa 100644 --- a/vendor/github.com/ethereum/go-ethereum/light/postprocess.go +++ b/vendor/github.com/ethereum/go-ethereum/light/postprocess.go @@ -71,20 +71,12 @@ var ( chtRoot: common.HexToHash("71d60207af74e5a22a3e1cfbfc89f9944f91b49aa980c86fba94d568369eaf44"), bloomTrieRoot: common.HexToHash("70aca4b3b6d08dde8704c95cedb1420394453c1aec390947751e69ff8c436360"), } - - statusRopstenCheckpoint = trustedCheckpoint{ - name: "Ropsten testnet", - sectionIdx: 67, - sectionHead: common.HexToHash("9832cf2ce760d4e3a7922fbfedeaa5dce67f1772e0f729f67c806bfafdedc370"), - chtRoot: common.HexToHash("60d43984a1d55e93f4296f4b48bf5af350476fe48679a73263bd57d8a324c9d4"), - bloomTrieRoot: common.HexToHash("fd81543dc619f6d1148e766b942c90296343c2cd0fd464946678f27f35feb59b"), - } ) // trustedCheckpoints associates each known checkpoint with the genesis hash of the chain it belongs to var trustedCheckpoints = map[common.Hash]trustedCheckpoint{ params.MainnetGenesisHash: mainnetCheckpoint, - params.TestnetGenesisHash: statusRopstenCheckpoint, + params.TestnetGenesisHash: ropstenCheckpoint, } var (