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

237 Commits

Author SHA1 Message Date
vsmk98 4280bdadac permission: Enabled QIP714Block to allow staggered migration of network for enabling new permissions 2019-09-26 15:38:45 +08:00
vsmk98 afb61f089c permission: removed unused code 2019-09-24 17:09:22 +08:00
Trung Nguyen a5c8e7af32
permission: minor fixes and update with master 2019-09-04 14:39:53 -04:00
Trung Nguyen 2b70d2bfbf
permissions: add unit tests 2019-08-19 09:39:18 -04:00
Zhou Zhiyao 4b45dd2004 Minor fixes (#803) 2019-08-17 08:37:57 -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
jpmsam c894c2d70e v2.2.5 2019-08-08 15:24:12 -04:00
vsmk98 2e63f9c9e8 Merge remote-tracking branch 'remotes/upstream/master' into feature/permissioning-1.8.18-suborgs-docs 
# Conflicts:
#	cmd/geth/consolecmd_test.go
#	core/vm/evm.go
#	docs/Getting Started/Getting-Started-From-Scratch.md
#	docs/Permissioning/Framework/Quorum Network Security/Nodes/Permissioning/Network Permissioning.md
#	docs/Permissioning/Old Permissioning.md
#	docs/README.md
#	docs/Security/Security & Permissioning.md
#	mkdocs.yml
 2019-08-06 11:48:12 +08:00
Brajesh Awasthi baa7efcf3d max code size option in genesis config (#786) 2019-08-02 15:53:15 -04:00
jpmsam 30d4d72476 patch version update 2019-06-19 14:36:21 -04:00
vsmk98 0cd8c89018 permission: code clean up based on review comments 2019-05-17 16:12:53 +08:00
vsmk98 e5b14b0a71 permission: code clean up. removal of unnecessary code. 2019-05-15 15:59:46 +08:00
amalraj.manigmail.com 32e5f8e581 params: customize max code size for quorum 2019-05-15 15:10:20 +08:00
amalraj.manigmail.com 0ce58c23c3 Merge remote-tracking branch 'remotes/origin/master' into feature/permissioning-1.8.18-suborgs 
# Conflicts:
#	docs/README.md
 2019-05-08 18:13:51 +08:00
vsmk98 34565b5252 permissions: Changes for the following: 
1. Enabling allow a role to marked as admin role
2. managing error handling
 2019-04-26 16:35:51 +08:00
vsmk98 78dbedb254 permissions: Changes for the following: 
1. Enabling change of org admin
2. Enabling adding a new or existing account as network admin
3. related changes transaction permissions
 2019-04-24 14:40:28 +08:00
jpmsam 2d22fd0044 version update 2019-04-04 16:45:40 -04:00
jpmsam 17f558dae9 version update 2019-04-03 11:22:12 -04: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
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
fixanoid 0f68921124 Renaming to TransactionSizeLimit for clarity 2019-02-14 09:01:22 -05:00
vsmk98 564d35f94a changes to error handling and fixing code review comments 2019-02-14 10:24:32 +08:00
fixanoid cca2e84c18 Transaction size limit support via genesis 2019-02-12 17:23:59 -05:00
amalraj.manigmail.com c2b98220eb Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.18-latest 
# Conflicts:
#	.travis.yml
#	cmd/geth/consolecmd_test.go
#	vendor/github.com/rjeczalik/notify/watcher_readdcw.go
#	vendor/golang.org/x/sys/cpu/cpu.go
#	vendor/golang.org/x/sys/cpu/cpu_arm.go
#	vendor/golang.org/x/sys/cpu/cpu_arm64.go
#	vendor/golang.org/x/sys/cpu/cpu_mips64x.go
#	vendor/golang.org/x/sys/cpu/cpu_mipsx.go
#	vendor/golang.org/x/sys/cpu/cpu_ppc64x.go
#	vendor/golang.org/x/sys/cpu/cpu_s390x.go
#	vendor/vendor.json
 2019-02-10 20:31:51 +08: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
Samer Falah b5920e005c
Merge pull request #616 from jpmorganchase/quorum-node-info 
Adding Quorum version into node info
 2019-02-04 12:00:52 -05: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 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
fixanoid c6f0ae4e29 Quorum version bump 2019-01-16 17:28:01 +00:00
vsmk98 061c9b85ce merge with master 2019-01-14 13:53:05 +08:00
Felix Shnir 54f9a8ef13 Adding Quorum info into nodeInfo 2019-01-07 15:54:17 +00:00
jpmsam 8f678278aa quorum version update 2018-12-12 15:27:29 -05:00
Trung Nguyen 1b543eb0ba
separated consts for Quorum and those used in upstream Geth 2018-12-03 11:10:55 -05:00
Trung Nguyen a916458aff
tests/: minor refactoring to enable Ethereum tests 2018-11-30 17:24:50 -05:00
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 6b132548ec Merge remote-tracking branch 'vsmk/geth-upgrade-1.8.12' into 1812-permission-rpc-api 
merge with geth-upgrade-1812
 2018-11-23 17:29:26 +08:00
amalraj.manigmail.com 434c1f7f75 update gas limit as per quorum upstream 2018-11-21 17:27:28 +08:00
Péter Szilágyi 58632d4402
params, swarm: release Geth v1.8.18 and Swarm v0.3.6 2018-11-14 10:25:19 +02:00
Péter Szilágyi cef7ed53bd
params: update CHTs 2018-11-14 10:16:28 +02:00
amalraj.manigmail.com 46cf4ddfb6 add apis for org key management 2018-10-30 15:59:08 +08:00
amalraj.manigmail.com 8c339adc6c merge with upstream/master 2018-10-24 11:29:04 +08:00
amalraj.manigmail.com 0605e4db37 Merge remote-tracking branch 'remotes/origin/master' into 1812MergePerm 2018-10-17 11:50:32 +08:00
jpmsam 0d0c507a59 Quorum version update 2018-10-16 16:56:55 -04:00
vsmk98 d6352b30c3 Merge of 1812 with permissions changes and fix of conflicts 2018-10-12 04:24:36 +00:00
Péter Szilágyi ff5538ad4c
params, swarm: begin Geth v1.8.18, Swarm v0.3.6 cycle 2018-10-09 10:37:49 +03:00
Péter Szilágyi 8bbe72075e
params, swarm: release Geth v1.8.17 and Swar v0.3.5 2018-10-09 10:35:31 +03:00
Péter Szilágyi ff7fad18fb
params: add ropsten fork delay, update les checkpoints 2018-10-04 19:14:53 +03:00