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

344 Commits

Author SHA1 Message Date
Samer Falah 321f7b27f8
Merge branch 'master' into feature/permissioning-1.8.18-suborgs-docs 2019-05-22 09:24:54 -04:00
Samer Falah c46d47a0ac
Merge branch 'master' into bugfix/personal_sendTransaction 2019-05-21 14:56:20 -04:00
Trung Nguyen c8d9ed1741
ignore swarm package when running tests for PR 2019-05-20 15:54:50 -04:00
Trung Nguyen bc204f148d
run goimports 2019-05-20 11:23:12 -04:00
vsmk98 e5b14b0a71 permission: code clean up. removal of unnecessary code. 2019-05-15 15:59:46 +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 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 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 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
vsmk98 355ddd9c5a permissions: api for account status change with necessary validations. Smart contract changes 2019-04-15 15:09:05 +08:00
amalraj.manigmail.com f6af52b66c permission: add json names and remove getOrgInfo from web3ext 2019-04-11 17:17:12 +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
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
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
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 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
Peter Fox e1e5fa0e8f Require the addition of the extra intrinsic gas cost to remain under the 
user input gas limit.
 2019-02-21 17:00:28 +00:00
Peter Fox a872dd10c2 Compare intrinsic gas of public transaction versus the private version 
that contains the PTM hash instead. If there is a difference, add it on
to the execution cost.
 2019-02-21 15:56:35 +00:00
vsmk98 c0d48d90d4 changed API names as per review and testing 2019-02-07 09:20:49 +08:00
vsmk98 13b8209d18 bug fixes based on internal testsing 2019-02-01 15:32:45 +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
zzy96 e854ebaabe add cancelPendingOperation api in quorumNodeMgmt 2019-01-24 14:25:44 +08:00
vsmk98 061c9b85ce merge with master 2019-01-14 13:53:05 +08:00
vsmk98 b40b7ab148 added api for listing the voters for a master org 2019-01-08 17:27:13 +08:00
vsmk98 99e717bd1a changed api signature from key managment to org management 2019-01-07 10:23:22 +08:00
namtruong e92052b3a4 return error when sendRawPrivateTransaction is called to submit public transaction (privateFor list empty) 2019-01-03 15:26:42 +00:00
vsmk98 23e0cecdc5 contract change to add api for org listing 2018-12-13 20:58:36 +05:30
vsmk98 f5981f0c7e latest changes for cluster key management 2018-12-12 13:07:13 +05:30
vsmk98 7903dac340 latest changes for cluster key management 2018-12-11 10:07:19 +05:30
namtruong c49a833eb9 add support for private sendRawTransaction - merge with latest quorum 2018-12-05 14:30:42 +00:00
amalraj.manigmail.com 13a9f26f9a Merge remote-tracking branch 'quorum/master' into geth-upgrade-1.8.16 2018-11-29 17:56:02 +08: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
amalraj.manigmail.com 4543d5fde4 add voter list api 2018-11-16 13:40:36 +08:00
amalraj.manigmail.com e667a03b09 add permission account list api 2018-11-16 12:21:50 +08:00
amalraj.manigmail.com 5ab90bfe92 quorum api seperation 2018-11-15 12:23:03 +08:00
amalraj.manigmail.com b6f497c5ef code improvements to quorum api 2018-11-12 16:16:56 +08:00
Ryan Schneider bd519ab8ae internal/web3ext: add eth.getProof (#18052) 2018-11-08 13:18:38 +01:00