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
zzy96
e854ebaabe
add cancelPendingOperation api in quorumNodeMgmt
2019-01-24 14:25:44 +08:00
vsmk98
94aa2382ce
Added validation to check if anything is pending approval for node approve, deactivation approve, activation approve and blacklisting approval
2019-01-18 14:20:40 +08:00
vsmk98
061c9b85ce
merge with master
2019-01-14 13:53:05 +08:00
vsmk98
c31fa5cfa5
changes to set readOnlyDepth only once during the entire opCode execution
2019-01-14 11:53:33 +08:00
SatpalSandhu61
895947de48
Currently, we can't tell the reason for evm failure, so change log message for EVM failure reason from Debug to Info. This is helpful to users and makes analysis of issues much easier.
2019-01-10 13:54:38 +08:00
amalraj.manigmail.com
741fe1b33f
quorun: add json camelCase name for api's output structs
2019-01-09 13:39:32 +08:00
vsmk98
b40b7ab148
added api for listing the voters for a master org
2019-01-08 17:27:13 +08:00
vsmk98
45189d42c7
minor changes to avoid package name changes of abigen output
2019-01-08 14:40:57 +08:00
Samer Falah
d77cb778ca
Merge pull request #563 from Puneetha17/private_rawtx
...
Do not reset V value if the tx is already set to private
2019-01-07 09:22:20 -05:00
vsmk98
99e717bd1a
changed api signature from key managment to org management
2019-01-07 10:23:22 +08: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
Trung Nguyen
67c9b4332f
staticcall does not modify states so no need to push to stack
2018-12-11 16:54:18 -05:00
vsmk98
7903dac340
latest changes for cluster key management
2018-12-11 10:07:19 +05:30
SatpalSandhu61
50da8eaf0d
Fix for issue 576 where private transactions can cause block gas limit to be exceeded, leading to BAD BLOCK.
2018-12-10 15:30:28 +00:00
SatpalSandhu61
5af110984a
Fix for issue 576 where private transactions can cause block gas limit to be exceeded, leading to BAD BLOCK.
2018-12-10 09:58:16 +00:00
Michael Gu
8ca92333f3
Merge branch 'master' into photic-tx-size-limit
2018-12-05 22:53:18 +02:00
Trung Nguyen
089841e036
added dual state implementation to StaticCall
2018-12-05 13:47:01 -05:00
Samer Falah
d4db92f69e
Merge pull request #570 from jbhurat/missing-logs-events
...
Adding private log blooms to DB in addition to public log bloom
2018-12-02 20:08:30 -05: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
Trung Nguyen
c2a580217f
fixed method signature
2018-11-28 16:17:05 -05:00
vsmk98
36000ec2a1
changes to set readOnlyDepth only once during the entire opCode execution
2018-11-28 15:01:52 +08:00
amalraj.manigmail.com
7e1aa97d65
core/vm: revert to joel's change to getdualstate. This is a mandatory change for quorum
...
dual state & read only EVM
This commit implements a dual state approach. The dual state approach
separates public and private state by making the core vm environment
context aware.
Although not currently implemented it will need to prohibit value
transfers and it must initialise all transactions from accounts on the
public state. This means that sending transactions increments the
account nonce on the public state and contract addresses are derived
from the public state when initialised by a transaction. For obvious
reasons, contract created by private contracts are still derived from
public state.
This is required in order to have consensus over the public state at all
times as non-private participants would still process the transaction on
the public state even though private payload can not be decrypted. This
means that participants of a private group must do the same in order to
have public consensus. However the creation of the contract and
interaction still occurs on the private state.
It implements support for the following calling model:
S: sender, (X): private, X: public, ->: direction, [ ]: read only mode
1. S -> A -> B
2. S -> (A) -> (B)
3. S -> (A) -> [ B -> C ]
It does not support
1. (S) -> A
2. (S) -> (A)
3. S -> (A) -> B
Implemented "read only" mode for the EVM. Read only mode is checked
during any opcode that could potentially modify the state. If such an
opcode is encountered during "read only", it throws an exception.
The EVM is flagged "read only" when a private contract calls in to
public state.
2018-11-27 11:36:59 +08:00
amalraj.manigmail.com
66d46778e6
Merge remote-tracking branch 'quorum/master' into geth-upgrade-1.8.12
...
# Conflicts:
# core/tx_pool_test.go
# miner/worker.go
2018-11-26 15:17:57 +08:00
Trung Nguyen
99dcc0fd3f
fix unit test for PR 510
2018-11-23 11:20:31 -05:00
Samer Falah
40cf04732e
Merge pull request #510 from nathanawmk/master
...
Update max transaction size limit.
2018-11-23 10:16:54 -05: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
1783419ce5
core/vm : remove get dual state calls in some op codes as its unnecessary. evm push is setting stateDB to public / private correctly.
2018-11-23 14:51:03 +08:00
amalraj.manigmail.com
33724be5a7
revert to getDualState instead of evm.StateDB as per quorum
2018-11-22 17:08:45 +08:00
amalraj.manigmail.com
8438d79754
update gas limit as per quorum upstream
2018-11-22 15:41:04 +08:00
Michael Gu
927284b420
Add --txsizelimit flag to geth CLI that allows expansion of transaction size limit used by tx_pool.go => validateTx()
2018-11-21 12:56:55 -05:00
vsmk98
5b34cb7eee
handling null pointer error for voter list when network brought in non permissioned mode
2018-11-20 22:51:49 +08:00
vsmk98
939142786e
handled null pointer error for permissioned node and account list when network is brought in non-permissioned mode
2018-11-20 22:36:24 +08:00
vsmk98
cdf0e0dd5e
validation to check voter account access before adding as voter
2018-11-20 21:29:03 +08:00
vsmk98
844fb584d2
changed to update permissioned-nodes.json, added additional check in api.go
2018-11-20 15:43:56 +08:00
vsmk98
bac8c0b048
addiitional checks in api, reduction of voter length upon delete
2018-11-19 14:59:10 +08:00
vsmk98
3da089da31
changes to check the details of node for approval
2018-11-19 11:58:34 +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
vsmk98
4fdb4ec480
changes to account access logic
2018-11-16 11:07:10 +08:00