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
4d6cf6da77
added checks to validate that the contract code is existing at the address
2019-01-21 16:18:59 +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
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
3a3850af2c
additional changes
2018-11-13 16:15:28 +08:00
b6f497c5ef
code improvements to quorum api
2018-11-12 16:16:56 +08: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
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
d6352b30c3
Merge of 1812 with permissions changes and fix of conflicts
2018-10-12 04:24:36 +00:00
fcfc7b6d45
merge with quorum upstream master
2018-10-09 16:01:11 +08:00
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
2ad2e0b4bf
Added a validateConsensus() which exits geth if no consensus is speci… ( #540 )
...
Validate for a Quorum supported consensus and exit if no consensus is specified.
2018-10-01 16:39:01 -04:00
a574bc4026
code refactor for managing cluster key
2018-09-28 08:15:59 +00:00
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
da29332c5f
core/vm: add switches to select evm+ewasm interpreters ( #17687 )
...
Interpreter initialization is left to the PRs implementing them.
Options for external interpreters are passed after a colon in the
`--vm.ewasm` and `--vm.evm` switches.
2018-09-20 10:44:35 +03:00
bd9d79adba
cmd/geth: typo export -> import ( #17703 )
2018-09-19 13:29:40 +03:00
8711e2b636
whisper: add light mode check to handshake ( #16725 )
2018-09-05 10:57:45 +02:00
e8f229b82e
cmd, core, eth, miner, params: configurable gas floor and ceil
2018-08-29 12:40:12 +03:00
c1c003e4ff
consensus, miner: stale block mining support ( #17506 )
...
* consensus, miner: stale block supporting
* consensus, miner: refactor seal signature
* cmd, consensus, eth: add miner noverify flag
* cmd, consensus, miner: polish
2018-08-28 16:59:05 +03:00
8a25cada96
EIP 155 Activation ( #502 )
...
Add ChainId validation, add a default networkId and reject network ID 1 for Quorum.
2018-08-23 14:51:13 -04:00
92381ee009
cmd, eth: clean up miner startup API, drop noop config field
2018-08-23 14:09:45 +03:00
e0d0e64ce2
cmd, core, miner: add --txpool.locals and priority mining
2018-08-22 09:43:57 +03:00
b2c644ffb5
cmd, eth, miner: make recommit configurable ( #17444 )
...
* cmd, eth, miner: make recommit configurable
* cmd, eth, les, miner: polish a bit
* miner: filter duplicate sealing work
* cmd: remove uncessary conversion
* miner: avoid microptimization in favor of cleaner code
2018-08-21 22:56:54 +03:00
amalraj.manigmail.com
vsmk98
Felix Shnir
Wenbiao Zheng
Jitendra Bhurat
Guillaume Ballet
b00ris
Péter Szilágyi
gary rong