3034c75403
fix linting issues ( #995 )
2020-05-11 16:15:27 -04:00
80564d5f26
added nil pointer check for args.Value to avoid a panic in estimate gas call ( #989 )
2020-05-08 23:10:14 -04:00
c215989c10
Quorum geth upgrade to 1.9.7 ( #960 )
...
Co-authored-by: amalraj.manigmail.com <amalraj.manigmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
Co-authored-by: Flash Sheridan <flash@pobox.com>
Co-authored-by: Martin Holst Swende <martin@swende.se>
Co-authored-by: Nguyen Kien Trung <trung.n.k@gmail.com>
Co-authored-by: Felix Lange <fjl@twurst.com>
Co-authored-by: Rob Mulholand <rmulholand@8thlight.com>
Co-authored-by: Felföldi Zsolt <zsfelfoldi@gmail.com>
Co-authored-by: soc1c <soc1c@users.noreply.github.com>
Co-authored-by: Rafael Matias <rafael@skyle.net>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Lucas Hendren <lhendre2@gmail.com>
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: ywzqwwt <39263032+ywzqwwt@users.noreply.github.com>
Co-authored-by: zcheng9 <zcheng9@hawk.iit.edu>
Co-authored-by: zzy96 <zhou0250@e.ntu.edu.sg>
Co-authored-by: kikilass <36239971+kikilass@users.noreply.github.com>
Co-authored-by: Darrel Herbst <dherbst@gmail.com>
Co-authored-by: Ross <9055337+Chadsr@users.noreply.github.com>
Co-authored-by: Jeffery Robert Walsh <rlxrlps@gmail.com>
Co-authored-by: Marius Kjærstad <sandakersmann@users.noreply.github.com>
Co-authored-by: Piotr Dyraga <piotr.dyraga@keep.network>
Co-authored-by: Guillaume Ballet <gballet@gmail.com>
Co-authored-by: Michael Forney <mforney@mforney.org>
Co-authored-by: Samuel Marks <807580+SamuelMarks@users.noreply.github.com>
2020-04-29 10:50:56 -04:00
4d27950f66
Fix params number for debug.dumpBlock in web3ext ( #944 )
...
Co-authored-by: Samer Falah <samer.falah@jpmchase.com>
2020-03-13 21:05:12 -04:00
07b0834245
Framework that allows adding additional Quorum features as plugins ( #923 )
2020-02-28 15:19:08 -05:00
3d91a6ca52
Add Quorum eth namespace RPC methods to console ( #922 )
2020-01-08 10:41:44 -05:00
dfd93ff218
Quorum raft upgrade v3.3.13 ( #887 )
...
* raft: upgrade etcd to version 3.3.13
* raft: added api for adding a learner node
2019-12-04 09:24:31 -05:00
66d91d0210
Add ability to see this nodes public address (that is used for signing) ( #856 )
...
Add block sealing information to IBFT API .
2019-10-29 00:27:46 -04:00
1dcee8518b
SignTransaction APIs: Set tx as private before signing ( #864 )
2019-10-23 13:55:34 -04:00
1db7d6a36b
Merge remote-tracking branch 'remotes/origin/master' into permissions-master-merge
...
# Conflicts:
# params/config.go
2019-10-04 11:20:58 +08:00
26bab38682
Quorum private transaction support for Abigen ( #819 )
...
Support private transaction for abigen and update private abigen docs
2019-10-01 12:49:26 -04:00
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
b74fc4d0c2
permissions: added functions for blacklisted node recovery.
2019-08-01 11:10:50 +08:00
97b59dfe21
internal/ethapi: ask transaction pool for pending nonce ( #784 )
...
internal/ethapi: ask transaction pool for pending nonce
2019-07-30 09:56:57 -04:00
e0564f7b41
Adding QuorumPrivateTxSigner for signing and recovering private txs. ( #767 )
...
Refactor private transaction signing and add a QuorumPrivateTxSigner for signing and recovering private txs.
2019-07-11 13:32:19 -04:00
321f7b27f8
Merge branch 'master' into feature/permissioning-1.8.18-suborgs-docs
2019-05-22 09:24:54 -04:00
c46d47a0ac
Merge branch 'master' into bugfix/personal_sendTransaction
2019-05-21 14:56:20 -04:00
c8d9ed1741
ignore swarm package when running tests for PR
2019-05-20 15:54:50 -04:00
bc204f148d
run goimports
2019-05-20 11:23:12 -04:00
e5b14b0a71
permission: code clean up. removal of unnecessary code.
2019-05-15 15:59:46 +08:00
b4756e56d3
permission: Reverted privateAbigen related changes as separate PR is there for this
2019-05-15 11:12:18 +08:00
c9ab7e62df
permissions: split assignAccountRole api into addAccountToOrg and changeAccountRole
2019-05-13 14:34:37 +08:00
3994997a73
permissions: big fixes and code clean up based on review comments
2019-05-13 14:15:09 +08:00
ad2abca93a
permissions: code comments update
2019-05-10 15:17:01 +08:00
6b66f7e27d
permissions: Code clean up.
2019-05-09 11:07:54 +08:00
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
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
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
355ddd9c5a
permissions: api for account status change with necessary validations. Smart contract changes
2019-04-15 15:09:05 +08:00
f6af52b66c
permission: add json names and remove getOrgInfo from web3ext
2019-04-11 17:17:12 +08:00
60f6c9fb07
permission: update orgList to include subOrgList
...
add new api for getOrgDetails by orgId
2019-04-09 21:11:32 +08:00
1cf69208d7
permissions: changed permissions cache to handle all suborg level attributes
2019-04-09 17:52:06 +08:00
6f7c413a90
permissions: changes for enabling suborg
2019-04-09 14:58:30 +08:00
24d4e9390e
permissions: changed api for addOrg. added account as one of the attributes
2019-04-08 16:57:36 +08:00
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
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
5836df7d8c
permission: add web3api calls
2019-04-01 18:22:41 +08:00
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
00c96e2bab
integrate permission contracts with geth - update cache from contract and events
2019-03-28 18:59:30 +08:00
b286409b7a
merge with quorum upstream
...
params: config.go and denomination.go merged with conflicts
2019-03-18 11:43:03 +08:00
849eca21da
merge with quorum upstream
...
params: config.go and denomination.go merged with conflicts
2019-03-18 11:34:09 +08:00
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
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
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
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
c0d48d90d4
changed API names as per review and testing
2019-02-07 09:20:49 +08:00
13b8209d18
bug fixes based on internal testsing
2019-02-01 15:32:45 +08:00
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
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
e854ebaabe
add cancelPendingOperation api in quorumNodeMgmt
2019-01-24 14:25:44 +08:00
Trung Nguyen
Sai V
Zhou Zhiyao
Peter Fox
chris-j-h
amalraj
libby kent
Samer Falah
Trung Nguyen
amalraj.manigmail.com
chris-j-h
Peter Fox