vsmk98
df4bec88db
removed logging
2018-11-05 11:28:33 +08:00
Elad
126dfde6c9
cmd/swarm: auto resolve default path according to env flag ( #17960 )
2018-11-04 07:59:58 +01:00
vsmk98
fd598b49b8
merge with Amals changes
2018-11-02 22:59:20 +08:00
vsmk98
e949a737ab
additional changes for permissions
2018-11-02 18:42:14 +08:00
SatpalSandhu61
c9ce586203
Merge branch 'master' of https://github.com/jpmorganchase/quorum
2018-11-01 14:53:37 +00:00
amalraj
f02d8d642d
Merge pull request #7 from SatpalSandhu61/geth-upgrade-1.8.12-fix-for-large-gas-estimate
...
Geth upgrade 1.8.12 fix for large gas estimate
2018-11-01 16:46:16 +08:00
amalraj.manigmail.com
fac700181b
add comments to quorum api
2018-11-01 13:45:16 +08:00
amalraj.manigmail.com
51ad453f74
merge changes to permission bin run-time
2018-11-01 13:17:36 +08:00
amalraj.manigmail.com
d0c3191d83
quorum/api: add SendTxArgs to accept txn args
2018-11-01 13:12:11 +08:00
vsmk98
5cd1b2c561
formatting changes
2018-11-01 11:02:13 +08:00
vsmk98
78c79e59a2
Merge branch '1812-permission-rpc-api' of https://github.com/vsmk98/quorum into 1812-permission-rpc-api
...
Merging with Amal's API changes
2018-11-01 10:56:06 +08:00
vsmk98
37d76a1d3b
debugging init population issue
2018-11-01 10:55:40 +08:00
Elad
f08f596a37
all: updated code owners file ( #17987 )
2018-10-31 23:36:33 +01:00
amalraj.manigmail.com
033a128450
improvements to quorum api code
2018-10-31 20:46:54 +08:00
vsmk98
2363ef5769
merge with node key changes
2018-10-31 16:20:36 +08:00
amalraj.manigmail.com
01233f583e
read account from wallet
2018-10-31 15:15:34 +08:00
vsmk98
bb762580f5
derive private key from nodekey
2018-10-31 14:42:29 +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
64d8db5678
add api implementation for permission node - propose node
2018-10-30 10:41:01 +08:00
Roc Yu
3e1cfbae93
cmd/swarm/swarm-smoke: fix issue that loop variable capture in func ( #17992 )
2018-10-29 10:00:00 +01:00
amalraj.manigmail.com
299c17598a
add api stubs for permission node
2018-10-29 12:23:53 +08:00
Ferenc Szabo
54f650a3be
swarm: clean up unused private types and functions ( #17989 )
...
* swarm: clean up unused private types and functions
Those that were identified by code inspection tool.
* swarm/storage: move/add Proximity GoDoc from deleted private function
The mentioned proximity() private function was deleted in:
1ca8fc1e6fa0ab4ab1aaca06d6fb32e173cd5f2f
2018-10-27 16:18:42 +02:00
Martin Holst Swende
1b6fd032e3
core/vm: check empty in extcodehash
2018-10-26 08:56:37 +02:00
amalraj.manigmail.com
63a38ae054
Merge remote-tracking branch 'remotes/saiv/1812MergePerm' into 1812-permission-rpc-api
2018-10-26 13:39:46 +08:00
vsmk98
10c926ab75
Removed dependency on permissioned-nodes.json.
2018-10-26 05:38:56 +00:00
amalraj.manigmail.com
20b137bfb1
Merge remote-tracking branch 'remotes/saiv/1812MergePerm' into 1812-permission-rpc-api
2018-10-26 12:34:51 +08:00
amalraj.manigmail.com
b24e51de1b
add api stubs for permission node
2018-10-26 12:33:23 +08:00
holisticode
8ed4739176
p2p accounting ( #17951 )
...
* p2p/protocols: introduced protocol accounting
* p2p/protocols: added TestExchange simulation
* p2p/protocols: add accounting simulation
* p2p/protocols: remove unnecessary tests
* p2p/protocols: comments for accounting simulation
* p2p/protocols: addressed PR comments
* p2p/protocols: finalized accounting implementation
* p2p/protocols: removed unused code
* p2p/protocols: addressed @nonsense PR comments
2018-10-26 00:26:31 +02:00
Johns Beharry
80d3907767
cmd/clef: replace password arg with prompt ( #17897 )
...
* cmd/clef: replace password arg with prompt (#17829 )
Entering passwords on the command line is not secure as it is easy to recover from bash_history or the process table.
1. The clef command addpw was renamed to setpw to better describe the functionality
2. The <password> argument was removed and replaced with an interactive prompt
* cmd/clef: remove undeclared variable
2018-10-25 21:45:56 +02:00
vsmk98
c37530e7d1
Merge branch 'privateAbigen' of https://github.com/vsmk98/quorum into 1812MergePerm
2018-10-25 02:22:42 +00:00
Sai V
c60ba9cb21
Merge pull request #6 from zzy96/privateAbigen
...
private abigen merged
2018-10-25 10:19:52 +08:00
Jitendra Bhurat
ea0c1ffd45
Adding private log blooms to DB in addition to public log bloom
2018-10-24 14:44:11 -04:00
SatpalSandhu61
97dfe51a56
Remove logging used for investigation.
2018-10-24 11:59:40 +01:00
vsmk98
5187dd9430
Code changes for populating the initial node list from static-nodes.json
2018-10-24 10:21:21 +00:00
zzy96
d11276fbc1
private abigen merged
2018-10-24 16:44:59 +08:00
amalraj.manigmail.com
8c339adc6c
merge with upstream/master
2018-10-24 11:29:04 +08:00
amalraj.manigmail.com
70c78cc304
Revert "Fix vendor package error in Mojave"
...
This reverts commit e679587e1f
.
2018-10-24 11:22:22 +08:00
Wenbiao Zheng
6810933640
eth/downloader: SetBlocksIdle is not used ( #17962 )
...
__
<(o )___
( ._> /
`---'
2018-10-24 01:27:49 +02:00
Felix Lange
7f22b59f87
core/state: simplify proof methods ( #17965 )
...
This fixes the import cycle build error in core/vm tests.
There is no need to refer to core/vm for a type definition.
2018-10-23 21:51:41 +02:00
vsmk98
4dc1f3376b
Corrected enode format for Raft
2018-10-23 15:00:57 +00:00
vsmk98
6ee681156a
Merge branch '1812MergePerm' of https://github.com/vsmk98/quorum into 1812MergePerm local branch behind
2018-10-23 14:59:09 +00:00
vsmk98
10ad4a5364
Corrected enode format for Raft
2018-10-23 14:58:39 +00:00
Martin Holst Swende
4c0883e20d
core/vm: adds refund as part of the json standard trace ( #17910 )
...
This adds the global accumulated refund counter to the standard
json output as a numeric json value. Previously this was not very
interesting since it was not used much, but with the new sstore
gas changes the value is a lot more interesting from a consensus
investigation perspective.
2018-10-23 16:28:18 +02:00
Wenbiao Zheng
3088c122d8
eth/downloader: fix comment typos ( #17956 )
2018-10-23 13:21:16 +02:00
SatpalSandhu61
e6dd33d71b
Adding fix for eth_estimateGas - ensure private state is initialised before creating EVM.
2018-10-23 09:03:34 +01:00
vsmk98
f935a0ce8f
Merge branch '1812MergePerm' of https://github.com/vsmk98/quorum into 1812MergePerm
...
Merge of local branch with remote
2018-10-23 10:41:53 +08:00
vsmk98
501f798b6f
cherry pick ff2d4d2cedc09db23cc46d3eeb8b402bca6d819d for package rjeczalik
2018-10-23 10:40:34 +08:00
vsmk98
519348e621
Cherry pick pvt abigen. Make errors exist
2018-10-23 10:21:57 +08:00
Nguyen Kien Trung
347f6fc356
Docker: Add git commit hash ( #554 )
2018-10-22 15:00:03 -04:00