poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,624 Commits 22 Branches 24 Tags 156 MiB
Commit Graph

7624 Commits

Author SHA1 Message Date
Péter Szilágyi e859f36967 Merge pull request #3035 from Gustav-Simonsson/zero_value_transfer_noop 
core/state: short-circuit balance change if zero value
 2016-09-26 08:47:20 +03:00
Gustav Simonsson 25ed5fedda core/state: short-circuit balance change if zero value 2016-09-26 01:26:54 -04:00
Felix Lange 3778f1bf77 Merge pull request #3009 from Gustav-Simonsson/fix_oom_in_light 
light: fix memory expansion bug (same as fix for core/state)
 2016-09-22 13:11:59 +02:00
Felix Lange f85f46461f Merge pull request #3021 from bas-vk/ethclient-logs 
ethclient: bugfix retrieving logs
 2016-09-21 15:08:14 +02:00
Bas van Kervel 5bb517355e ethclient: bugfix retrieving logs 2016-09-21 14:10:11 +02:00
Gustav Simonsson 22eea17b06 light: fix memory expansion bug (same as fix for core/state) 2016-09-19 15:26:55 -04:00
Felix Lange c8d6efd602 Merge pull request #3010 from Gustav-Simonsson/remove_unused_initcode_field 
core/state, light: remove unused StateObject.initCode
 2016-09-19 09:58:14 +02:00
Gustav Simonsson b6b17e5648 core/state, light: remove unused StateObject.initCode 2016-09-19 02:16:58 -04:00
Péter Szilágyi 88b012ad3b Merge pull request #3006 from Arachnid/patch 
core/state: Fix memory expansion bug by not copying clean objects
 2016-09-19 04:20:14 +03:00
Nick Johnson 581b320b9d core/state: Fix memory expansion bug by not copying clean objects 2016-09-19 08:57:08 +08:00
Péter Szilágyi 7c12e8ea44 Merge pull request #2999 from karalabe/bury-blockchain-version 
cmd, eth: drop the blockchain version from cli/eth configs
 2016-09-15 14:41:10 +03:00
Péter Szilágyi 30860491ba cmd, eth: drop the blockchain version from cli/eth configs 2016-09-15 14:09:47 +03:00
Felix Lange 0f6f83a709 Merge pull request #2983 from bas-vk/txindex 
miner: set tx index logs
 2016-09-14 21:05:17 +02:00
Bas van Kervel e3fe634f99 miner: set tx index logs 2016-09-12 11:33:25 +02:00
Péter Szilágyi dc3e969e14 Merge pull request #2973 from bas-vk/filterid 
rpc: format filter ID according to spec for quantities
 2016-09-12 11:55:15 +03:00
bas-vk b7f6404168 Merge pull request #2984 from karalabe/fix-head-sub 
core/types, ethclient: fix broken subscriptions
 2016-09-09 16:20:52 +02:00
Péter Szilágyi b6b5ec8f75 core/types: add core type marshal methods too 2016-09-08 18:16:53 +03:00
Péter Szilágyi ca37730c9d ethclient: fix new block->header subscription endpoint 2016-09-08 17:17:55 +03:00
Péter Szilágyi 6fb8ae2bd6 Merge pull request #2979 from karalabe/ethclient-sync-api 
ethereum, ethclient: add SyncProgress API endpoint
 2016-09-06 13:59:41 +03:00
Péter Szilágyi 2924fdfcf7 ethereum, ethclient: add SyncProgress API endpoint 2016-09-06 13:41:43 +03:00
Felix Lange eac390f289 Merge pull request #2976 from fjl/utils-version 
cmd/evm, cmd/geth, cmd/utils: move version handling to cmd/utils
 2016-09-05 14:09:45 +02:00
Felix Lange de54273f51 cmd/geth: fix port clash in genesis test 2016-09-05 13:24:11 +02:00
Felix Lange 6b727c0440 cmd/evm, cmd/geth, cmd/utils: move version handling to cmd/utils 2016-09-05 13:24:11 +02:00
Péter Szilágyi 2c6be49d20 Merge pull request #2949 from elliots/fix/#2948 
miner: Prevent attempts to close nil quit channel in agent (fixes #2948)
 2016-09-02 14:45:15 +03:00
Jeffrey Wilcke a42b7355f4 Merge pull request #2742 from karalabe/tx-spam-protection 
Transaction pool optimizations
 2016-09-02 13:44:23 +02:00
Péter Szilágyi b4a5251391 core: abstract out a sorted transaction hash map 2016-09-02 14:15:40 +03:00
Péter Szilágyi a183ea29f9 core: add upper bound on the queued transctions 2016-09-02 14:15:40 +03:00
Péter Szilágyi affffb39b3 core/types, miner: switch over to the grouped tx sets 2016-09-02 14:12:03 +03:00
Péter Szilágyi 0ef327bbee core, eth, internal, miner: optimize txpool for quick ops 2016-09-02 14:12:03 +03:00
Péter Szilágyi 795b70423e core, eth, miner: only retain 1 tx/nonce, remove bad ones 2016-09-02 14:12:03 +03:00
Felix Lange 49227f65ff Merge pull request #2972 from Arachnid/ens 
contracts/ens: Replace setOwner with setSubnodeOwner per EIP137
 2016-09-01 15:27:45 +02:00
Nick Johnson a386b4c983 contracts/ens: Replace setOwner with setSubnodeOwner in accordance with EIP137 2016-09-01 12:40:15 +01:00
Felix Lange 5cb3fa2f89 Merge pull request #2965 from fjl/swarm-merge 
swarm: plan bee for content storage and distribution on web3
 2016-09-01 12:10:24 +02:00
Bas van Kervel 43d716280e rpc: format filter ID according to spec for quantities 2016-09-01 11:50:13 +02:00
Felix Lange cc6170d7fc Merge pull request #2918 from hypergig/patch-2 
Small docker run example for main README
 2016-08-31 22:51:09 +02:00
ΞTHΞЯSPHΞЯΞ 4d300e4dec swarm: plan bee for content storage and distribution on web3 
This change imports the Swarm protocol codebase. Compared to the 'swarm'
branch, a few mostly cosmetic changes had to be made:

* The various redundant log message prefixes are gone.
* All files now have LGPLv3 license headers.
* Minor code changes were needed to please go vet and make the tests
  pass on Windows.
* Further changes were required to adapt to the go-ethereum develop
  branch and its new Go APIs.

Some code has not (yet) been brought over:

* swarm/cmd/bzzhash: will reappear as cmd/bzzhash later
* swarm/cmd/bzzup.sh: will be reimplemented in cmd/bzzup
* swarm/cmd/makegenesis: will reappear somehow
* swarm/examples/album: will move to a separate repository
* swarm/examples/filemanager: ditto
* swarm/examples/files: will not be merged
* swarm/test/*: will not be merged
* swarm/services/swear: will reappear as contracts/swear when needed
 2016-08-31 16:19:40 +02:00
Felix Lange 1f58b2d084 Merge pull request #2962 from fjl/release-move 
contracts/release: move package release to contracts/
 2016-08-31 15:32:13 +02:00
Felix Lange 6903fa2d47 Merge pull request #2963 from fjl/ens-solc-0.3.6 
contracts/ens: regenerate binding with solc v0.3.6
 2016-08-31 09:28:18 +02:00
Felix Lange 319ae90184 Merge pull request #2964 from nagydani/develop 
contracts/chequebook: fix possible reentrancy bug in chequebook contract
 2016-08-31 01:29:01 +02:00
Daniel A. Nagy 7b884e0075 contracts/chequebook/contract: fix possible reentrancy bug in chequebook.sol 2016-08-30 18:16:49 +02:00
Felix Lange 3e7b4ae0c3 Merge pull request #2967 from fjl/godeps-update 
Godeps: update golang.org/x/...
 2016-08-30 12:43:10 +02:00
Felix Lange 3b75d0ce23 Godeps: update golang.org/x/... 2016-08-30 12:20:34 +02:00
Felix Lange 48807de305 contracts/ens: regenerate binding with solc v0.3.6 2016-08-29 19:34:44 +02:00
Felix Lange 1d7d1a3499 contracts/release: move package release to contracts/ 
This change also deletes generator.go, moving the only interesting line
in it into release.go. The binding has been regenerated with abigen from
develop and solc v0.3.6.
 2016-08-29 19:25:05 +02:00
Felix Lange 969008dbb0 Merge pull request #2952 from Arachnid/ens 
contracts/ens: Add ENS contract binding
 2016-08-29 19:09:35 +02:00
Nick Johnson 6976e602f6 contracts/ens: Add ENS contract binding 2016-08-29 17:30:17 +01:00
Felix Lange 3b087e03ea Merge pull request #2956 from fjl/chequebook 
contracts/chequebook: add chequebook contract wrapper
 2016-08-29 14:06:12 +02:00
Viktor Trón 6c8b023298 contracts/chequebook: add chequebook contract wrapper 
The wrapper code is adapted from the swarm/services/chequebook package
with the following mostly cosmetic changes:

* The code now uses the new Go API interfaces to query balances. Some
  minor functional changes were required to make this work.
* The package no longer depends on swarm/services/swap/swap. References
  to swap.Promise are replaced by interface{}, the base type of Promise.
  This is temporary.
* The contract wrapper has been regenerated with latest abigen
  and solc v0.3.6.
* There is a new generator that creates the 'deployed code' variable.
* Documentation comments now follow the recommended godoc style.
* [CHEQUEBOOK] log prefixes are gone.
* LGPL license headers have been added to all files.
 2016-08-29 13:39:25 +02:00
gregg dourgarian 8dbf59fec5 common,internal: typo/misspelling fixes (#2953) 2016-08-27 15:05:09 +03:00
☃ Elliot Shepherd ac0f8b81ae miner: Move CpuAgent channel creation from Start() to initialization (fixes #2948) 
Also remove the now un-needed mutex locking in Start() and Stop()
 2016-08-26 00:12:17 +10:00