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
65a0216609
permissions: changed the permissions config struct to have address instead of string. Updated error handling.
2019-04-01 14:33:44 +08:00
29aeb8432e
permissions: changed error handling conditions to ensure that geth will work without permission-config.json in the old style
2019-03-29 18:01:04 +08:00
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
9f72c2f5a4
integrate permission contracts with geth - update node approved event
2019-03-22 19:34:15 +08:00
1b93ecfd10
read permission-config from a json file for bootstrapping
2019-03-12 11:18:20 +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
5953106da3
Corrected error handling and log messages
2019-02-15 14:23:05 +08:00
564d35f94a
changes to error handling and fixing code review comments
2019-02-14 10:24:32 +08:00
4fe308c10a
changes to contract based on code review comments
2019-02-12 18:00:39 +08:00
7b2e2777ae
fix unit test
2019-02-10 20:54:25 +08:00
c2b98220eb
Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.18-latest
...
# Conflicts:
# .travis.yml
# cmd/geth/consolecmd_test.go
# vendor/github.com/rjeczalik/notify/watcher_readdcw.go
# vendor/golang.org/x/sys/cpu/cpu.go
# vendor/golang.org/x/sys/cpu/cpu_arm.go
# vendor/golang.org/x/sys/cpu/cpu_arm64.go
# vendor/golang.org/x/sys/cpu/cpu_mips64x.go
# vendor/golang.org/x/sys/cpu/cpu_mipsx.go
# vendor/golang.org/x/sys/cpu/cpu_ppc64x.go
# vendor/golang.org/x/sys/cpu/cpu_s390x.go
# vendor/vendor.json
2019-02-10 20:31:51 +08:00
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
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
4d6cf6da77
added checks to validate that the contract code is existing at the address
2019-01-21 16:18:59 +08:00
061c9b85ce
merge with master
2019-01-14 13:53:05 +08:00
45189d42c7
minor changes to avoid package name changes of abigen output
2019-01-08 14:40:57 +08:00
db34314a9a
Updating test
2019-01-07 17:05:56 +00:00
99e717bd1a
changed api signature from key managment to org management
2019-01-07 10:23:22 +08:00
bd558eff27
Cherrypicking go-ethereum#18211 pull
2018-12-13 16:32:48 +00:00
7903dac340
latest changes for cluster key management
2018-12-11 10:07:19 +05:30
13a9f26f9a
Merge remote-tracking branch 'quorum/master' into geth-upgrade-1.8.16
2018-11-29 17:56:02 +08:00
519337a9d0
Merge remote-tracking branch 'quorum/master' into geth-upgrade-1.8.16
2018-11-29 16:57:27 +08:00
4fdb4ec480
changes to account access logic
2018-11-16 11:07:10 +08:00
5ab90bfe92
quorum api seperation
2018-11-15 12:23:03 +08:00
9628cb5e2b
format code
2018-11-14 18:24:28 +08:00
405204cd23
remove p2p from api
2018-11-14 18:03:50 +08:00
7c94184803
changes for node list
2018-11-14 17:58:57 +08:00
eb8fa3cc89
cmd/swarm, swarm/api/http, swarm/bmt, swarm/fuse, swarm/network/stream, swarm/storage, swarm/storage/encryption, swarm/testutil: use pseudo-random instead of crypto-random for test files content generation ( #18083 )
...
- Replace "crypto/rand" to "math/rand" for files content generation
- Remove swarm/network_test.go.Shuffle and swarm/btm/btm_test.go.Shuffle - because go1.9 support dropped (see https://github.com/ethereum/go-ethereum/pull/17807 and comments to swarm/network_test.go.Shuffle)
2018-11-14 09:21:14 +01:00
3a3850af2c
additional changes
2018-11-13 16:15:28 +08:00
a0876f7433
Imply that SwarmApiFlag is the API endpoint to connect to, not to listen on ( #18071 )
2018-11-12 13:04:13 +01:00
b6f497c5ef
code improvements to quorum api
2018-11-12 16:16:56 +08:00
1ff152f3a4
rawdb: remove unused parameter for WritePreimages func ( #18059 )
...
* rawdb: remove unused parameter for WritePreimages func and modify a
spelling mistake
* rawdb: update the doc for function WritePreimages
2018-11-09 12:51:07 +02:00
cf3b187bde
swarm, cmd/swarm: address ineffectual assignments ( #18048 )
...
* swarm, cmd/swarm: address ineffectual assignments
* swarm/network: remove unused vars from testHandshake
* swarm/storage/feed: revert cursor changes
2018-11-07 20:39:08 +01:00
126dfde6c9
cmd/swarm: auto resolve default path according to env flag ( #17960 )
2018-11-04 07:59:58 +01:00
d0c3191d83
quorum/api: add SendTxArgs to accept txn args
2018-11-01 13:12:11 +08:00
033a128450
improvements to quorum api code
2018-10-31 20:46:54 +08:00
bb762580f5
derive private key from nodekey
2018-10-31 14:42:29 +08:00
64d8db5678
add api implementation for permission node - propose node
2018-10-30 10:41:01 +08:00
3e1cfbae93
cmd/swarm/swarm-smoke: fix issue that loop variable capture in func ( #17992 )
2018-10-29 10:00:00 +01:00
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
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
75060ef96e
cmd/bootnode: fix -writeaddress output ( #17932 )
2018-10-19 16:41:27 +03:00
6c313fff7b
cmd/geth: don't set GOMAXPROCS by default ( #17148 )
...
This is no longer needed because Go uses all CPUs
by default. The change allows setting GOMAXPROCS in environment if needed.
2018-10-16 02:02:53 +02:00
3e92c853fb
cmd/clef: fix typos in README ( #17908 )
2018-10-16 00:33:09 +02:00
862d6f2fbf
cmd/swarm: Smoke test for Swarm Feed ( #17892 )
2018-10-12 16:24:00 +02:00
4868964bb9
cmd/swarm: split flags and cli command declarations to the relevant files ( #17896 )
2018-10-12 14:51:38 +02:00
amalraj.manigmail.com
vsmk98
Felix Shnir
Alexey Sharov
Andrew Chiw
Corey Lin
Anton Evangelatov
Elad
Roc Yu
Johns Beharry
Martin Holst Swende
Felix Lange
Wenbiao Zheng
Grachev Mikhail
lash