Commit Graph

387 Commits

Author SHA1 Message Date
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
Trung Nguyen 07b0834245
Framework that allows adding additional Quorum features as plugins (#923) 2020-02-28 15:19:08 -05:00
Peter Fox e3089e30be DNS support for static nodes (#885)
* Update raft to accept a hostname instead of only an IP address
* Add a switch to enable DNS changes in raft to ensure default behavior is backwards-compatible with older versions.
* Allow P2P layer to use the FQDN
2019-11-29 09:42:02 -05:00
Peter Fox bdbeacdf47 Add check at startup to ensure transaction manager mode is specified. (#868)
Update error message and name to be generic for all PTMs.
2019-11-07 12:31:02 -05:00
Trung Nguyen 8a088def7a
permission: [WIP] start permission service 2019-08-20 09:33:54 -04:00
vsmk98 91d85aa15c permission: updated comments 2019-08-15 11:34:47 +08:00
Trung Nguyen b4d7b1e282
capture error in CLI layer 2019-08-14 12:01:29 -04:00
Trung Nguyen d3c2c59b94
permission: simplify permission checking logic
- add unit tests
- minor enhancements on handling JSON unmarshalling
2019-08-14 11:55:42 -04:00
vsmk98 b53841d1d7 permission: changed the signature of IsNodePermissioned to avoid passing ctx. Removed hardcoding of permission-config.json. 2019-08-14 10:54:13 +08:00
vsmk98 53d580fb6c permissions: converted permissions to a service registered in line with other services at node level 2019-07-24 14:00:49 +08:00
amalraj.manigmail.com d84c73e39d remove debug message 2019-07-09 11:47:42 +08:00
amalraj.manigmail.com 6d8f451f45 Merge remote-tracking branch 'remotes/quoeng/feature/permissioning-1.8.18-suborgs-docs' into permissioning-suborgs-review
# Conflicts:
#	cmd/geth/main.go
#	controls/bind/permission/permission_impl.go
#	controls/bind/permission/permission_interface.go
#	controls/bind/permission/permission_upgr.go
#	core/types/permissions_cache.go
#	docs/README.md
#	docs/permissions.md
#	eth/backend.go
#	internal/ethapi/api.go
#	permission/api.go
#	permission/bind/implementation.go
#	permission/bind/interface.go
#	permission/bind/permission_impl.go
#	permission/bind/permission_interface.go
#	permission/bind/permission_upgr.go
#	permission/bind/upgradable.go
#	permission/contract/OrgManager.sol
#	permission/contract/PermissionsInterface.sol
#	permission/contract/PermissionsUpgradable.sol
#	permission/contract/abi/OrgManager.abi
#	permission/contract/abi/PermissionsImplementation.abi
#	permission/contract/abi/PermissionsInterface.abi
#	permission/permission.go
2019-07-08 18:57:26 +08:00
vsmk98 8c33f25f1b permission: moved startQuorumService from main.go to permission.go 2019-06-07 14:51:21 +08:00
vsmk98 b6f4529629 permission: Code changes as per review comments 2019-05-31 14:25:56 +08:00
vsmk98 febbe84521 permission: changes as per code review comments 2019-05-23 09:35:22 +08:00
Trung Nguyen bc204f148d
run goimports 2019-05-20 11:23:12 -04:00
vsmk98 045d936369 permission: Code and documentation clean up 2019-05-15 17:12:11 +08:00
vsmk98 e5b14b0a71 permission: code clean up. removal of unnecessary code. 2019-05-15 15:59:46 +08:00
vsmk98 cbad8d7b5d permissions: code clean up based on review comments 2019-05-13 15:29:47 +08:00
vsmk98 ad2abca93a permissions: code comments update 2019-05-10 15:17:01 +08:00
vsmk98 6b66f7e27d permissions: Code clean up. 2019-05-09 11:07:54 +08:00
amalraj.manigmail.com 6e7f3959e3 permission: update start and initialize service methods
code clean up - remove unused code related to org key
2019-05-08 22:55:03 +08:00
amalraj.manigmail.com 468478be78 permission: refactor dir structure for contract 2019-05-08 18:08:08 +08:00
amalraj.manigmail.com 7e4b3ff310 permission: implement permission as standard service of the node 2019-05-08 14:07:23 +08:00
vsmk98 385a2334d8 permissions: Changes for the following:
1. added hack to check block syncing before starting permissions api
2. reduced the default gas limit
2019-04-30 18:28:09 +08:00
amalraj.manigmail.com bc61ff23f5 Merge remote-tracking branch 'quoeng/feature/permissioning-1.8.18' into feature/permissioning-1.8.18
# Conflicts:
#	controls/permission/permission.go
2019-04-01 18:23:52 +08:00
amalraj.manigmail.com 5836df7d8c permission: add web3api calls 2019-04-01 18:22:41 +08:00
vsmk98 65a0216609 permissions: changed the permissions config struct to have address instead of string. Updated error handling. 2019-04-01 14:33:44 +08:00
vsmk98 29aeb8432e permissions: changed error handling conditions to ensure that geth will work without permission-config.json in the old style 2019-03-29 18:01:04 +08:00
amalraj.manigmail.com 3371aa0ac9 integrate permission contracts with geth - network boot from permission config.json and handle update node approved event, account added event 2019-03-26 23:20:06 +08:00
amalraj.manigmail.com 9f72c2f5a4 integrate permission contracts with geth - update node approved event 2019-03-22 19:34:15 +08:00
amalraj.manigmail.com 1b93ecfd10 read permission-config from a json file for bootstrapping 2019-03-12 11:18:20 +08:00
amalraj.manigmail.com a8c050df22 Merge remote-tracking branch 'remotes/quoeng/feature/permissioning-1.8.12' into feature/permissioning-1.8.18
# Conflicts:
#	cmd/bootnode/main.go
#	internal/web3ext/web3ext.go
#	p2p/discover/udp.go
#	p2p/discover/udp_test.go
#	p2p/permissions.go
#	p2p/server.go

poc to pass permission contract via command line
2019-03-08 17:09:24 +08:00
amalraj.manigmail.com d5e4ae7b87 Merge remote-tracking branch 'remotes/quoeng/feature/permissioning-1.8.12' into feature/permissioning-1.8.18
# Conflicts:
#	cmd/bootnode/main.go
#	internal/web3ext/web3ext.go
#	p2p/discover/udp.go
#	p2p/discover/udp_test.go
#	p2p/permissions.go
#	p2p/server.go
2019-03-08 12:53:46 +08:00
vsmk98 5953106da3 Corrected error handling and log messages 2019-02-15 14:23:05 +08:00
vsmk98 564d35f94a changes to error handling and fixing code review comments 2019-02-14 10:24:32 +08:00
vsmk98 4fe308c10a changes to contract based on code review comments 2019-02-12 18:00:39 +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
vsmk98 4d6cf6da77 added checks to validate that the contract code is existing at the address 2019-01-21 16:18:59 +08:00
vsmk98 45189d42c7 minor changes to avoid package name changes of abigen output 2019-01-08 14:40:57 +08:00
vsmk98 99e717bd1a changed api signature from key managment to org management 2019-01-07 10:23:22 +08:00
vsmk98 7903dac340 latest changes for cluster key management 2018-12-11 10:07:19 +05:30
amalraj.manigmail.com 519337a9d0 Merge remote-tracking branch 'quorum/master' into geth-upgrade-1.8.16 2018-11-29 16:57:27 +08:00
vsmk98 4fdb4ec480 changes to account access logic 2018-11-16 11:07:10 +08:00
amalraj.manigmail.com 5ab90bfe92 quorum api seperation 2018-11-15 12:23:03 +08:00
amalraj.manigmail.com 9628cb5e2b format code 2018-11-14 18:24:28 +08:00
vsmk98 405204cd23 remove p2p from api 2018-11-14 18:03:50 +08:00
vsmk98 7c94184803 changes for node list 2018-11-14 17:58:57 +08:00
vsmk98 3a3850af2c additional changes 2018-11-13 16:15:28 +08:00