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

1662 Commits

Author SHA1 Message Date
vsmk98 045d936369 permission: Code and documentation clean up 2019-05-15 17:12:11 +08:00
amalraj.manigmail.com 32e5f8e581 params: customize max code size for quorum 2019-05-15 15:10:20 +08:00
amalraj.manigmail.com c5a9a01cad permission: fix unit test 2019-05-15 11:35:14 +08:00
vsmk98 b4756e56d3 permission: Reverted privateAbigen related changes as separate PR is there for this 2019-05-15 11:12:18 +08:00
vsmk98 cbad8d7b5d permissions: code clean up based on review comments 2019-05-13 15:29:47 +08:00
vsmk98 c9ab7e62df permissions: split assignAccountRole api into addAccountToOrg and changeAccountRole 2019-05-13 14:34:37 +08:00
vsmk98 3994997a73 permissions: big fixes and code clean up based on review comments 2019-05-13 14:15:09 +08:00
vsmk98 927f789c1e permissions: fixed update org status failing for invalid orgs 2019-05-10 21:56:28 +08:00
vsmk98 26279ea288 permissions: fix to correct account access when the org is suspended 2019-05-10 21:53:35 +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 aeb6720274 permission: remove unused code related to org key 2019-05-08 23:06:17 +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 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 be2331b226 permissions: documentation update and bug fixes 2019-05-08 18:01:30 +08:00
amalraj.manigmail.com 7e4b3ff310 permission: implement permission as standard service of the node 2019-05-08 14:07:23 +08:00
vsmk98 9d844b9dbf permissions: added checks to ensure that a role cannot be removed when active accounts are linked to it. 2019-05-08 11:30:06 +08:00
vsmk98 8e57f36013 permissions: added validation to ensure the updateOrgStatus is called only on the master org and not for sub orgs 2019-05-07 16:23:17 +08:00
vsmk98 e3bdff5f6f permissions: corrected the org id validation for adding a new org 2019-05-07 14:41:09 +08:00
vsmk98 37f3581192 permissions: validation to check account status for accounts linked to admin roles 2019-05-06 18:37:35 +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
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
vsmk98 2e9e2781f6 permissions: fixed the following 2 issues 
1. update of permissioned-nodes.json was happening when the new org was proposed. Changed it to update only when the node is approved
2. corrected error message in api.go
 2019-04-18 15:05:02 +08:00
vsmk98 e61d765aab permissions: removed unwanted code 2019-04-17 21:37:41 +08:00
vsmk98 650cd6eca5 permissions: changed isOrgAdmin check to validate for network admin as well 2019-04-17 21:35:26 +08:00
vsmk98 afc9e3a967 permissions: node level validation for transactions 2019-04-17 19:16:16 +08:00
vsmk98 d6f14dc123 permissions: nil condition check in getOrgDetails 2019-04-17 19:15:07 +08:00
vsmk98 9f1921df36 permissions: fixed issue with isOrgAdmin 2019-04-17 13:45:41 +08:00
vsmk98 47dd9d51c2 permissions: changed isOrgAdmin check to validate for network admin as well 2019-04-16 14:14:08 +08:00
vsmk98 505d8e1806 permissions: changed isOrgAdmin check to validate for network admin as well 2019-04-16 12:03:47 +08:00
vsmk98 485049f16e permissions: added validation to check the max breadth and depth when creating a sub org 2019-04-16 10:51:40 +08:00
vsmk98 355ddd9c5a permissions: api for account status change with necessary validations. Smart contract changes 2019-04-15 15:09:05 +08:00
vsmk98 3dc77f2b62 permissions: Added account status change function. changes to allow breadth and depth of suborg as a part config. 2019-04-15 12:33:34 +08:00
amalraj.manigmail.com 51cb1e3044 permission: fix bugs in validations and org manager event raised 2019-04-12 20:28:22 +08:00
amalraj.manigmail.com cc14183e06 Merge remote-tracking branch 'quoeng/feature/permissioning-1.8.18-suborgs' into feature/permissioning-1.8.18-suborgs 
# Conflicts:
#	core/types/permissions_cache.go
 2019-04-11 17:18:48 +08:00
amalraj.manigmail.com f6af52b66c permission: add json names and remove getOrgInfo from web3ext 2019-04-11 17:17:12 +08:00
vsmk98 115842dbea permissions: updated the getOrgDetails to return suborg list as well 2019-04-10 21:38:44 +08:00
vsmk98 e243b4eef3 permissions: replaced isOrgExists with validateOrg for better error checks 2019-04-10 20:04:40 +08:00
vsmk98 610bd49719 permissions: modified isOrgExists check for suborgs as well 2019-04-10 13:59:15 +08:00
vsmk98 fda4f6f873 permissions: Added validation to check that org id cannot have "." 2019-04-10 12:35:52 +08:00
vsmk98 b37af2f74a permissions: changes to enables roles defined at org level to be available at sub org level 2019-04-10 11:10:35 +08:00
amalraj.manigmail.com 60f6c9fb07 permission: update orgList to include subOrgList 
add new api for getOrgDetails by orgId
 2019-04-09 21:11:32 +08:00
vsmk98 1cf69208d7 permissions: changed permissions cache to handle all suborg level attributes 2019-04-09 17:52:06 +08:00
vsmk98 6f7c413a90 permissions: changes for enabling suborg 2019-04-09 14:58:30 +08:00
vsmk98 24d4e9390e permissions: changed api for addOrg. added account as one of the attributes 2019-04-08 16:57:36 +08:00
vsmk98 06e949effd permissions: bug fix, code clean up and error handling at api level 2019-04-05 17:16:08 +08:00
Jitendra Bhurat c429b00caa Reading default transaction size limit, if it is 0 2019-04-04 10:58:44 -04:00
vsmk98 0a48f6b01d permissions: api level changes for error handling and validation. 2019-04-04 18:15:53 +08:00
vsmk98 ee3d614705 permissions: code clean up. removed unnecessary loop from GetAccount 2019-04-03 14:17:32 +08:00
vsmk98 7ad1fb4ac9 permissions: code clean up. Removed unwanted code. 2019-04-03 12:21:30 +08:00
vsmk98 0af4d28825 permissions: Fixed contract issue for status update approval. Fixed api.go for passing right variables. 2019-04-03 10:13:05 +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 eb2fce1f53 permissions: combined all org related event monitoring to a single go-routine. Removed unnecessary error handling. Code clean up. 2019-04-01 17:48:37 +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
amalraj.manigmail.com fd295384f2 permission: handle node pending approval, org pending approval 
fix remove role and update node status
 2019-03-29 17:49:46 +08:00
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
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 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
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
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 32729b9f28 remove TODO related to review 2019-02-25 16:30:54 +08:00
vsmk98 7a0c016634 Removed unnecessary if condition 2019-02-15 14:41:53 +08:00
fixanoid 0f68921124 Renaming to TransactionSizeLimit for clarity 2019-02-14 09:01:22 -05: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
fixanoid cca2e84c18 Transaction size limit support via genesis 2019-02-12 17:23:59 -05:00
fixanoid 918aaa83a9 Merge branch 'txn-size-limit-cli' into txn-size-limit-genesis 2019-02-12 11:45:54 -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
vsmk98 f83b100052 refactored contract to remove all for loops 2019-02-12 16:22:15 +08:00
vsmk98 9b8906664c Removed for loops for master org and voter list update 2019-02-12 11:11:39 +08:00
vsmk98 13bccaa9c6 code changes to fix review comments 2019-02-12 09:54:13 +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
vsmk98 8673598d3b added check to allo only an account with full access rights can add voter at master org level 2019-02-08 16:29:27 +08:00
vsmk98 eaab3b004e Added check to ensure that at least one account with Full access will be there in the network 2019-02-08 14:25:35 +08:00
vsmk98 b6616a5ca4 added error messages for invalid ops 2019-02-07 15:19:25 +08:00
vsmk98 178d7629c4 added error message when a node not part of network is added is proposed for deactviation 2019-02-07 12:45:29 +08:00
vsmk98 c0d48d90d4 changed API names as per review and testing 2019-02-07 09:20:49 +08:00
vsmk98 f41e7ac83c additional fixes 2019-02-01 16:08:48 +08:00
vsmk98 13b8209d18 bug fixes based on internal testsing 2019-02-01 15:32:45 +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
vsmk98 925dd698e6 changes to reorder account access types 2019-01-29 14:23:30 +08:00
vsmk98 1cee5af40d merge with Zhiyao branch for cancel pending operation 2019-01-29 14:06:24 +08:00
vsmk98 70b66fb808 changes for solc compire change 0.5.3 version 2019-01-29 13:52:58 +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