poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
10,936 Commits 22 Branches 24 Tags 156 MiB
Commit Graph

10936 Commits

Author SHA1 Message Date
amalraj.manigmail.com 14961b714a Merge remote-tracking branch 'quoeng/feature/permissioning-1.8.18' into feature/permissioning-1.8.18 
# Conflicts:
#	controls/permission/NodeManager.sol
 2019-03-28 18:01:16 +08:00
amalraj.manigmail.com 1d8a054207 integrate permission contracts with geth - update cache from contract and events 2019-03-28 18:00:17 +08:00
vsmk98 203984d18c Merge branch 'feature/permissioning-1.8.18' of https://github.com/QuorumEngineering/quorum into feature/permissioning-1.8.18 
merge with qend branch
 2019-03-28 17:54:27 +08:00
vsmk98 0ca8694321 permissions: fine tuning of implementation code, added node status update call 2019-03-28 17:53:11 +08:00
amalraj.manigmail.com eeda3e7044 integrate permission contracts with geth - update cache from contract and events 2019-03-28 12:44:47 +08:00
amalraj.manigmail.com a98971370c integrate permission contracts with geth - handle mux locks for cache 2019-03-28 11:01:33 +08:00
amalraj.manigmail.com 86ecfa4864 integrate permission contracts with geth - load data from contracts when geth is started 2019-03-27 19:07:01 +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
vsmk98 a5f534ed6a permissions: generated go binding for all contracts 2019-03-19 17:58:13 +08:00
vsmk98 2c71edbea1 permissions: update of contracts to support the proxy-implementation-storage policy 2019-03-19 17:17:37 +08:00
amalraj.manigmail.com addb836244 update bootstrapping of permission 2019-03-19 15:29:53 +08:00
vsmk98 ce1c848f0b implementation of upgradable 2019-03-15 17:26:57 +08:00
vsmk98 50a55a2c09 Permissions new contracts as per latest spec 2019-03-15 14:41:04 +08:00
amalraj.manigmail.com d650d5522d update comment 2019-03-15 14:13:42 +08:00
amalraj.manigmail.com 5c8aecc15c code improvements 2019-03-14 14:26:17 +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
amalraj.manigmail.com 57be5ca94e remove comment 2019-03-07 15:15:20 +08:00
amalraj.manigmail.com aaf67bfd75 solc upgrade 2019-03-07 15:03:54 +08:00
amalraj.manigmail.com 2fd6876827 Merge remote-tracking branch 'remotes/origin/master' into AJ-geth-upgrade-1.8.18 2019-03-07 15:02:05 +08:00
Samer Falah 0a57640e95
Merge pull request #648 from trung/solc-specific-version 
Use solc 0.5.4 when running acceptance tests against pull requests
 2019-03-06 22:49:59 -05:00
Trung Nguyen f6e5aa67f4
grant executable to solc 2019-03-06 15:55:21 -05:00
Trung Nguyen e9f2596e19
use solc 0.5.4 2019-03-06 15:50:24 -05:00
Samer Falah d4ff7f1fdd
Merge pull request #647 from QuorumEngineering/raft-doc-update 
Update Raft doc and log messages
 2019-03-06 15:30:44 -05:00
amalraj.manigmail.com 45fc047ae7 Merge remote-tracking branch 'remotes/origin/master' into AJ-geth-upgrade-1.8.18 2019-03-06 12:49:40 +08:00
amalraj.manigmail.com 9d544810f8 update CONTRIBUTING.md with quorum wiki 2019-02-27 14:03:53 +08:00
amalraj.manigmail.com 0af013dd13 merge CONTRIBUTING.md with upstream 2019-02-26 17:43:10 +08:00
amalraj.manigmail.com eb06642fc2 update comments 2019-02-26 16:33:29 +08:00
fixanoid dadd8b0f30
Update BUILDING, adding Windows info 2019-02-25 12:39:46 -05:00
amalraj.manigmail.com 32729b9f28 remove TODO related to review 2019-02-25 16:30:54 +08:00
amalraj.manigmail.com 6bdd01fc0b raft: change RAFTPORT to RaftPort 2019-02-25 15:01:53 +08:00
amalraj.manigmail.com e034cb1680 Merge remote-tracking branch 'remotes/origin/master' into AJ-geth-upgrade-1.8.18 2019-02-25 14:46:49 +08:00
amalraj 9a3184ba19 travis: run quorum-acceptance-tests for pull requests (#637) 
* update travis to enable running acceptance test for raft, istanbul and clique consensus when a PR is raised
 2019-02-22 16:24:15 -05:00
vsmk98 e37d066d72 Account access update for access type other than full access was not happening. Corrected the same. 2019-02-19 10:48:03 +08:00
chris-j-h bfa7dcfbc3 Raft doc and log message updates 2019-02-15 16:36:11 +00:00
vsmk98 7a0c016634 Removed unnecessary if condition 2019-02-15 14:41:53 +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 7aedef0937 corrected log.error messages 2019-02-13 17:42:59 +08: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
vsmk98 b0cd2b5ef2 updated code comments 2019-02-13 12:31:11 +08:00
vsmk98 0b6e64f250 changes to ensure that unlock is called only after lock 2019-02-13 09:57:11 +08:00
vsmk98 05b17e3ab4 removed debug log statements 2019-02-13 09:51:22 +08:00
Samer Falah 212b25c566
Merge pull request #539 from jbhurat/impossible-reorg-fix-v1 
consensus/istanbul: Race condition causing "Impossible reorg" error
 2019-02-12 18:51:25 -05:00
Jitendra Bhurat 1ddf595c34 Using NewBlockMsg constant instead of hardcoded 0x07 2019-02-12 15:36:05 -05:00
Samer Falah 07c76cc137
Merge pull request #595 from SatpalSandhu61/fix-for-bad-block-on-gas-limit 
Fix for BAD BLOCK caused by "gas limit reached" for private contracts
 2019-02-12 10:40:35 -05:00
amalraj.manigmail.com a8f7b2ca33 update newly added methods 2019-02-12 22:08:42 +08:00
vsmk98 6ef3b82a2b changes to contract based on review comments 2019-02-12 20:24:31 +08:00