Commit Graph

11258 Commits

Author SHA1 Message Date
Jitendra Bhurat 9dbafd38c5 Adding a lock around WriteBlockWithState while processing sealing result 2019-04-16 15:23:42 -04:00
amalraj.manigmail.com 62c00b637c permission: set default gas ceil and floor to 700M which is the default minGasLimit 2019-04-16 18:05:29 +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
amalraj.manigmail.com c1ae36f27b permission: merge with code improvements to contract and api 2019-04-08 22:26:13 +08:00
amalraj.manigmail.com cf97fde8d9 permission: merge with code improvements to contract and api 2019-04-08 19:49:51 +08:00
vsmk98 24d4e9390e permissions: changed api for addOrg. added account as one of the attributes 2019-04-08 16:57:36 +08:00
chris-j-h 6a4c751a13 Add encrypted tx payload hash from TM to Quorum tx's data field
The TM response was being stored in an isolated scope variable,
therefore the tx data was not being updated correctly for private txs.
This meant the private tx payload could not be retrieved from the TM
when needed.
2019-04-05 10:52:48 +01:00
vsmk98 06e949effd permissions: bug fix, code clean up and error handling at api level 2019-04-05 17:16:08 +08:00
amalraj.manigmail.com efd39f1b6a raft: pass gas floor and gas ceil to calcGasLimit when minting block 2019-04-05 17:13:10 +08:00
jpmsam 2d22fd0044 version update 2019-04-04 16:45:40 -04:00
Samer Falah 697791f6fa
Merge pull request #675 from jbhurat/defaulting_tx_size_limit
Reading default transaction size limit, if it is 0
2019-04-04 14:43:32 -04:00
Jitendra Bhurat c429b00caa Reading default transaction size limit, if it is 0 2019-04-04 10:58:44 -04:00
amalraj.manigmail.com 5f5c222246 permission: allow sub orgs to be added to orgs 2019-04-04 18:25:43 +08:00
vsmk98 0a48f6b01d permissions: api level changes for error handling and validation. 2019-04-04 18:15:53 +08:00
jpmsam 17f558dae9 version update 2019-04-03 11:22:12 -04:00
Samer Falah a5021ac812
Merge pull request #667 from kaleido-io/raft-fix-master
Check recovered sender address before including txs in the TransactionsByPriceAndNonce list
2019-04-03 10:54:19 -04:00
amalraj.manigmail.com 2bd92a2622 permission: allow sub orgs to be added to orgs 2019-04-03 22:25:01 +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 9fb8cdd61a permissions: removed reference to older permissions contract from the repo 2019-04-03 10:20:13 +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
vsmk98 0c1bbef22a permissions: remove event emit from nodemanager at the time of network boot up. 2019-04-02 15:30:51 +08:00
vsmk98 40fd7001cd permissions: Reduced number of go routines being called for various events. Code clean up. 2019-04-02 14:13:23 +08:00
vsmk98 5a97fc4b99 permissions: Org admin role from config was not read properly. Corrected the same. 2019-04-02 11:37:09 +08:00
vsmk98 2fd649bb36 Merge remote-tracking branch 'qeng/feature/permissioning-1.8.18' into feature/permissioning-1.8.18 2019-04-01 18:30:51 +08:00
vsmk98 9f9145f8d0 permissions: code revamp 2019-04-01 18:30:42 +08:00
amalraj.manigmail.com ec650d97a4 permission: update permission config parsing 2019-04-01 18:25:37 +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
Samer Falah e9ce8d4668
Merge pull request #656 from jbhurat/raft-panic-adding-peer
Adding a node only if it is not in the raft peer list
2019-03-29 14:19:39 -04: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 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 69f544a415 permission: update contracts 2019-03-29 16:47:14 +08:00