Commit Graph

133 Commits

Author SHA1 Message Date
Trung Nguyen 3034c75403
fix linting issues (#995) 2020-05-11 16:15:27 -04:00
Sai V c215989c10
Quorum geth upgrade to 1.9.7 (#960)
Co-authored-by: amalraj.manigmail.com <amalraj.manigmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
Co-authored-by: Flash Sheridan <flash@pobox.com>
Co-authored-by: Martin Holst Swende <martin@swende.se>
Co-authored-by: Nguyen Kien Trung <trung.n.k@gmail.com>
Co-authored-by: Felix Lange <fjl@twurst.com>
Co-authored-by: Rob Mulholand <rmulholand@8thlight.com>
Co-authored-by: Felföldi Zsolt <zsfelfoldi@gmail.com>
Co-authored-by: soc1c <soc1c@users.noreply.github.com>
Co-authored-by: Rafael Matias <rafael@skyle.net>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Lucas Hendren <lhendre2@gmail.com>
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: ywzqwwt <39263032+ywzqwwt@users.noreply.github.com>
Co-authored-by: zcheng9 <zcheng9@hawk.iit.edu>
Co-authored-by: zzy96 <zhou0250@e.ntu.edu.sg>
Co-authored-by: kikilass <36239971+kikilass@users.noreply.github.com>
Co-authored-by: Darrel Herbst <dherbst@gmail.com>
Co-authored-by: Ross <9055337+Chadsr@users.noreply.github.com>
Co-authored-by: Jeffery Robert Walsh <rlxrlps@gmail.com>
Co-authored-by: Marius Kjærstad <sandakersmann@users.noreply.github.com>
Co-authored-by: Piotr Dyraga <piotr.dyraga@keep.network>
Co-authored-by: Guillaume Ballet <gballet@gmail.com>
Co-authored-by: Michael Forney <mforney@mforney.org>
Co-authored-by: Samuel Marks <807580+SamuelMarks@users.noreply.github.com>
2020-04-29 10:50:56 -04:00
Satpal 4c9740bfaa
Add configurable threshold for 'future block' check for Istanbul & Clique (#800) 2020-04-08 09:34:02 -04:00
Peter Fox 66d91d0210 Add ability to see this nodes public address (that is used for signing) (#856)
Add block sealing information to IBFT API .
2019-10-29 00:27:46 -04:00
Jitendra Bhurat a3840c280e Check if message payload is signed by the message sender (#853)
* Checking if message is signed by the message sender
2019-10-16 11:57:33 -04:00
vsmk98 1db7d6a36b Merge remote-tracking branch 'remotes/origin/master' into permissions-master-merge
# Conflicts:
#	params/config.go
2019-10-04 11:20:58 +08:00
Peter Fox 2dd2a28f92
Make sealing synchronous
Fix private tx receipt setting on tasks
Remove now unnecessary locking when writing state
Move delay creation outside of goroutine to mimic Clique sealing
Handle errors appropriately
2019-10-03 10:01:14 +01:00
Amit Panghal e1278520d0 Chain stalls while scaling out from 1 to 4 nodes, changing quorum size fixes things (#796)
* Adding Ceil2Nby3Block genesis config option to specify the number of blocks required to transition from 2f+1 to Ceil(2n/3) in IBFT

* Add support for using ceil(2N/3) in IBFT
2019-09-30 15:26:13 -04:00
Satpal d140c2a00b Change "block in the future" message to Info instead of Warn (#821) 2019-09-20 12:48:30 -04:00
Trung Nguyen a5c8e7af32
permission: minor fixes and update with master 2019-09-04 14:39:53 -04:00
Zhou Zhiyao 4b45dd2004 Minor fixes (#803) 2019-08-17 08:37:57 -04:00
Samer Falah 321f7b27f8
Merge branch 'master' into feature/permissioning-1.8.18-suborgs-docs 2019-05-22 09:24:54 -04:00
Trung Nguyen bc204f148d
run goimports 2019-05-20 11:23:12 -04:00
Jitendra Bhurat 6d8c7ed226 Checking if c.current is nil, as it can be when istanbul engine is stopped due to block download event 2019-04-23 17:13:30 -04:00
amalraj.manigmail.com 6fb33c0e32 Merge remote-tracking branch 'remotes/origin/master' into AJ-geth-upgrade-1.8.18 2019-02-13 17:26:38 +08:00
Jitendra Bhurat 1ddf595c34 Using NewBlockMsg constant instead of hardcoded 0x07 2019-02-12 15:36:05 -05:00
amalraj.manigmail.com 73667e7942 merge 1.8.18 with quorum/master
refactor raft & istanbul based on upstream changes
fix unit test cases
2019-02-08 17:29:01 +08:00
amalraj.manigmail.com 4dbd95947d Merge branch 'goeth-1.8.18' into geth-upgrade-1.8.18
# Conflicts:
#	.github/CONTRIBUTING.md
#	.travis.yml
#	core/blockchain.go
#	core/vm/evm.go
#	core/vm/logger_test.go
#	eth/handler_test.go
#	eth/tracers/tracer_test.go
#	internal/ethapi/api.go
#	internal/web3ext/web3ext.go
#	p2p/discover/node.go
#	p2p/server.go
#	swarm/network/simulations/discovery/discovery_test.go
2019-01-29 19:08:50 +08:00
amalraj.manigmail.com bc529a509d Merge branch 'goeth-1.8.18' into geth-upgrade-1.8.18
# Conflicts:
#	.github/CONTRIBUTING.md
#	.travis.yml
#	core/blockchain.go
#	core/vm/evm.go
#	core/vm/logger_test.go
#	eth/handler_test.go
#	eth/tracers/tracer_test.go
#	internal/ethapi/api.go
#	internal/web3ext/web3ext.go
#	p2p/discover/node.go
#	p2p/server.go
#	swarm/network/simulations/discovery/discovery_test.go
2019-01-29 19:08:14 +08:00
amalraj.manigmail.com 8e30fc202a Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.18
# Conflicts:
#	consensus/ethash/consensus.go
#	eth/bloombits.go
#	params/protocol_params.go
2019-01-25 22:29:22 +08:00
amalraj.manigmail.com 2914b3c99d Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.18
# Conflicts:
#	consensus/ethash/consensus.go
#	eth/bloombits.go
#	params/protocol_params.go
2019-01-25 22:24:03 +08:00
Trung Nguyen 1007ea93e2
fixed unit test 2018-12-11 11:28:26 -05:00
Trung Nguyen 85d3c4d031
merged from upstream/master 2018-12-11 10:43:48 -05:00
Trung Nguyen 1b543eb0ba
separated consts for Quorum and those used in upstream Geth 2018-12-03 11:10:55 -05:00
gary rong 144c1c6c52 consensus: extend getWork API with block number (#18038) 2018-11-08 17:08:57 +02:00
Trung Nguyen f09bd2c465
fixed the logic to verify if block is currently proposed 2018-10-15 12:31:17 -04:00
Trung Nguyen b921df8b86
restored p2p message payload after processing 2018-10-12 11:09:43 -04:00
Trung Nguyen b0bd4302eb
cloned p2p Message to be used for checking 2018-10-11 15:55:56 -04:00
Trung Nguyen cbba21e9fc
added test cases 2018-10-11 15:05:37 -04:00
Trung Nguyen b9ee7c9719
refined NewBlockMsg handling in Istanbul 2018-10-11 14:57:58 -04:00
Trung Nguyen 784491e502
refined NewBlockMsg handling in Istanbul 2018-10-11 14:41:51 -04:00
Trung Nguyen 30f506208c
only process messages for istanbul 2018-10-11 14:02:32 -04:00
amalraj.manigmail.com 8f51fb3e00 remove failing ethash test case as its not supported by quorum 2018-10-10 11:27:51 +08:00
Trung Nguyen 478139017d
fix racing condition when proposer receives same block from peer 2018-10-05 16:09:10 -04:00
amalraj.manigmail.com 2ba4fe0ec0 istanbul/backend: handle nil on result returned from commitCh 2018-10-05 20:18:26 +08:00
amalraj.manigmail.com dc116850b4 miner, istanbul/backend : make seal async 2018-10-05 15:28:50 +08:00
amalraj.manigmail.com 2c4081d89f Merge remote-tracking branch 'remotes/goeth/release/1.8' into geth-upgrade-1.8.15_new
fix compilation issues on programs impcted by this merge
2018-10-04 16:21:20 +08:00
amalraj.manigmail.com 47571689ee Merge remote-tracking branch 'remotes/goeth/release/1.8' into geth-upgrade-1.8.15_new
# Conflicts:
#	.travis.yml
#	README.md
#	cmd/utils/flags.go
#	consensus/consensus.go
#	consensus/ethash/consensus.go
#	consensus/ethash/ethash.go
#	core/blockchain.go
#	core/genesis_test.go
#	core/state/state_object.go
#	core/state_processor.go
#	core/vm/errors.go
#	core/vm/evm.go
#	core/vm/gas_table.go
#	core/vm/instructions_test.go
#	core/vm/interface.go
#	eth/api_tracer.go
#	eth/backend.go
#	eth/config.go
#	eth/filters/filter.go
#	les/backend.go
#	les/helper_test.go
#	miner/worker.go
#	params/config.go
#	params/version.go
2018-10-04 16:19:02 +08:00
amalraj.manigmail.com 72270b10c7 Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.12
# Conflicts:
#	.travis.yml
#	README.md
#	cmd/geth/genesis_test.go
#	core/genesis.go
#	core/genesis_test.go
#	core/state_processor.go
#	eth/config.go
#	eth/downloader/downloader_test.go
#	eth/protocol_test.go
#	params/config.go
2018-09-27 18:55:55 +08:00
gary rong d6254f827b all: protect self-mined block during reorg (#17656) 2018-09-20 15:09:30 +03:00
gary rong 0b477712a1 consensus/clique: hide no transaction error (#17614) 2018-09-19 12:06:55 +03:00
gary rong 5d1d1a808d consensus, ethdb, metrics: implement forced-meter (#17667) 2018-09-17 15:32:34 +03:00
Péter Szilágyi 41ac8dd803
Merge pull request #17675 from holiman/eip1234
Eip1234
2018-09-17 15:18:17 +03:00
Martin Holst Swende 7efb12d29b
ethash: documentation + cleanup 2018-09-17 11:53:36 +02:00
Martin Holst Swende 3df7df0386
ethash: less copy-paste for EIP 1234 2018-09-15 23:54:16 +02:00
EOS Classic 0732617b65
consensus: implement Constantinople EIP 1234 2018-09-12 20:02:34 +09:00
Péter Szilágyi 4bb25042eb
consensus/clique, core: chain maker clique + error tests 2018-09-11 16:40:00 +03:00
Péter Szilágyi bcfb7f58b9
consensus/clique: only trust snapshot for genesis or les checkpoint 2018-09-10 15:00:54 +03:00
Trung Nguyen 7af7d8cfef
avoid growing backlogs when valSet changes 2018-09-05 17:22:42 -04:00
Anton Evangelatov cc2b39bbd1 consensus/ethash: increase timeout in test (#17526)
This is an attempt to fix the flaky consensus/ethash tests under macOS.
2018-09-03 16:59:23 +02:00