Commit Graph

11258 Commits

Author SHA1 Message Date
amalraj.manigmail.com e6c8e64c35 permission: modify account validation to refer the cache 2019-03-29 14:50:38 +08:00
amalraj.manigmail.com 293370cb94 permission: modify event handling 2019-03-29 12:28:32 +08:00
vsmk98 07f26bdb6c permissions: modified implementation contract for creating orgadmin role, added status to account access modified event 2019-03-29 12:27:13 +08:00
vsmk98 ca499fb30b permissions: updated events output in contracts 2019-03-29 10:51:16 +08:00
vsmk98 c455a8c7c9 permissions: updated events output in contracts 2019-03-29 10:51:16 +08:00
Jim Zhang a0c5a63e51 Added an Info log when skipping incorrectly signed txs; cleaned up debug logging 2019-03-28 12:17:16 -04:00
Jim Zhang ff94ad50a0 Check for Sender() return errors before using the resolved sender address, to account for sending EIP155 externally signed txs before the EIP155 block 2019-03-28 12:01:29 -04:00
amalraj.manigmail.com 00c96e2bab integrate permission contracts with geth - update cache from contract and events 2019-03-28 18:59:30 +08:00
amalraj.manigmail.com 2a974fcfbb integrate permission contracts with geth - update cache from contract and events 2019-03-28 18:06:24 +08:00
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
Samer Falah d715db38c4
Merge pull request #639 from QuorumEngineering/AJ-geth-upgrade-1.8.18
geth upgrade 1.8.18
2019-03-19 16:22:07 -04: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
amalraj.manigmail.com b286409b7a merge with quorum upstream
params: config.go and denomination.go merged with conflicts
2019-03-18 11:43:03 +08:00
amalraj.manigmail.com 849eca21da merge with quorum upstream
params: config.go and denomination.go merged with conflicts
2019-03-18 11:34:09 +08:00
Jitendra Bhurat 7eedfd2059 Adding a node only if it is not in the raft peer list 2019-03-15 11:36:41 -04: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
Samer Falah 2735367497
Merge pull request #644 from QuorumEngineering/estimategas-for-privatetransaction
EstimateGas to handle private transaction gas cost differences
2019-03-12 14:23:53 -04: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
Samer Falah af38cd133d
Merge pull request #636 from jpmorganchase/txn-size-limit-genesis
Adding support for transaction size limit via genesis
2019-03-07 11:28:37 -05: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