Commit Graph

316 Commits

Author SHA1 Message Date
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
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
vsmk98 b28fa8b445 additional APIs 2018-11-07 13:58:51 +08:00
vsmk98 3c68a587ba Added additional APIs 2018-11-05 23:44:23 +08:00
vsmk98 753d4baa47 removed logging 2018-11-05 11:35:52 +08:00
amalraj.manigmail.com d0c3191d83 quorum/api: add SendTxArgs to accept txn args 2018-11-01 13:12:11 +08:00
amalraj.manigmail.com 033a128450 improvements to quorum api code 2018-10-31 20:46:54 +08:00
amalraj.manigmail.com 01233f583e read account from wallet 2018-10-31 15:15:34 +08:00
amalraj.manigmail.com 46cf4ddfb6 add apis for org key management 2018-10-30 15:59:08 +08:00
amalraj.manigmail.com 1f2504ff08 add all APIs related to node permission 2018-10-30 15:05:41 +08:00
amalraj.manigmail.com b24e51de1b add api stubs for permission node 2018-10-26 12:33:23 +08:00
Simon Jentzsch 97fb08342d EIP-1186 eth_getProof (#17737)
* first impl of eth_getProof

* fixed docu

* added comments and refactored based on comments from holiman

* created structs

* handle errors correctly

* change Value to *hexutil.Big in order to have the same output as parity

* use ProofList as return type
2018-10-18 21:41:22 +02:00
vsmk98 d6352b30c3 Merge of 1812 with permissions changes and fix of conflicts 2018-10-12 04:24:36 +00:00
Péter Szilágyi aff421e78c
internal/ethapi: warn on failed account accesses 2018-10-10 12:29:05 +03:00
amalraj.manigmail.com fcfc7b6d45 merge with quorum upstream master 2018-10-09 16:01:11 +08:00
Samer Falah 4d015bb488
Merge pull request #541
Update signing issue for eth_sendTransactionAsync RPC call
2018-10-08 16:29:51 -04:00
Martin Holst Swende 89a32451ae core/vm: faster create/create2 (#17806)
* core/vm/runtim: benchmark create/create2

* core/vm: do less hashing in CREATE2

* core/vm: avoid storing jumpdest analysis for initcode

* core/vm: avoid unneccesary lookups, remove unused fields

* core/vm: go formatting tests

* core/vm: save jumpdest analysis locally

* core/vm: use common.Hash instead of nil, fix review comments

* core/vm: removed type destinations

* core/vm: correct check for empty hash

* eth: more elegant api_tracer

* core/vm: address review concerns
2018-10-04 18:15:37 +03:00
amalraj.manigmail.com 2c4081d89f Merge remote-tracking branch 'remotes/goeth/release/1.8' into geth-upgrade-1.8.15_new
fix compilation issues on programs impcted by this merge
2018-10-04 16:21:20 +08:00
amalraj.manigmail.com 47571689ee Merge remote-tracking branch 'remotes/goeth/release/1.8' into geth-upgrade-1.8.15_new
# Conflicts:
#	.travis.yml
#	README.md
#	cmd/utils/flags.go
#	consensus/consensus.go
#	consensus/ethash/consensus.go
#	consensus/ethash/ethash.go
#	core/blockchain.go
#	core/genesis_test.go
#	core/state/state_object.go
#	core/state_processor.go
#	core/vm/errors.go
#	core/vm/evm.go
#	core/vm/gas_table.go
#	core/vm/instructions_test.go
#	core/vm/interface.go
#	eth/api_tracer.go
#	eth/backend.go
#	eth/config.go
#	eth/filters/filter.go
#	les/backend.go
#	les/helper_test.go
#	miner/worker.go
#	params/config.go
#	params/version.go
2018-10-04 16:19:02 +08:00
Nguyen Kien Trung 40f7d2b8b4 Value Transfer in Private Transactions (#538)
Fix #528
2018-10-01 14:37:05 -04:00
Peter Fox 2474f53efd Add API docs 2018-10-01 12:16:31 +01:00
Peter Fox c3f565db34 Updated import order 2018-10-01 10:09:14 +01:00
Peter Fox 5944ff2346 Added back the async throttling, fixing an issue where it could block
when the channel is full. Now it returns immediately with an error
indicating the channel is overloaded.
2018-10-01 10:07:50 +01:00
HackyMiner 107f556b2d internal/ethapi: add eth_chainId method (#17617)
This implements EIP-695.
2018-09-29 22:07:02 +02:00
HackyMiner 44eb69561a internal/debug: support color terminal for cygwin/msys2 (#17740)
- update go-colorable, go-isatty, go-runewidth packages
- use go-isatty instead of log/term and remove log/term package
2018-09-29 16:15:39 +02:00
vsmk98 8e21004b6b removed import of sync 2018-09-28 08:19:57 +00:00
amalraj.manigmail.com d35f6e2c5e Merge remote-tracking branch 'remotes/peter/bugfix/sendTransactionAsync-updates' into geth-upgrade-1.8.12
# Conflicts:
#	internal/ethapi/api.go
2018-09-28 15:51:27 +08:00
vsmk98 7dcd66a543 Cluster key related changes 2018-09-27 11:24:38 +00:00
amalraj.manigmail.com 72270b10c7 Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.12
# Conflicts:
#	.travis.yml
#	README.md
#	cmd/geth/genesis_test.go
#	core/genesis.go
#	core/genesis_test.go
#	core/state_processor.go
#	eth/config.go
#	eth/downloader/downloader_test.go
#	eth/protocol_test.go
#	params/config.go
2018-09-27 18:55:55 +08:00
Liang ZOU 6663e5da10 all: fix various comment typos (#17748) 2018-09-25 12:26:35 +02:00