zelig
45afbe5d9c
Merge remote-tracking branch 'upstream/poc-9' into blockpool3
2015-03-05 16:55:11 +07:00
obscuren
c47866d251
Miner fixes and updates (including miner)
2015-03-05 09:14:58 +01:00
zelig
7315962880
use ethash.Verify in blockpool
2015-03-05 11:22:36 +07:00
obscuren
15f491e500
Clean up REPL
2015-03-04 12:18:26 +01:00
obscuren
5817dab89e
Merge branch 'develop' into poc-9
2015-03-04 10:51:44 +01:00
obscuren
a56243075a
removed double flag. Closes #421
2015-03-04 10:51:17 +01:00
obscuren
84a4f761f3
uncle validation
2015-03-04 10:49:56 +01:00
obscuren
d4d505c868
Fixed genesis
2015-03-03 21:48:05 +01:00
obscuren
08fd0715f9
updated genesis
2015-03-03 21:09:29 +01:00
obscuren
26de12d9bf
Changed nonce to a uint64
2015-03-03 21:04:31 +01:00
Jeffrey Wilcke
2b3c55f20d
Merge pull request #413 from chfast/pr/jit_build_fixes
...
JIT build fixes
2015-03-03 20:39:51 +01:00
obscuren
e9f1e868e2
Merge branch 'develop' into poc-9
2015-03-03 20:38:46 +01:00
obscuren
827ea43478
removed all old filters
2015-03-03 20:38:28 +01:00
obscuren
bb152612e0
Merge branch 'develop' into poc-9
...
Conflicts:
cmd/utils/cmd.go
2015-03-03 20:34:48 +01:00
obscuren
cfe3af099c
Merge branch 'ethersphere-jsonlogs' into poc-9
2015-03-03 20:31:12 +01:00
obscuren
f0b2ea64fc
Merge branch 'jsonlogs' of https://github.com/ethersphere/go-ethereum into ethersphere-jsonlogs
...
Conflicts:
eth/block_pool.go
eth/block_pool_test.go
eth/protocol_test.go
miner/worker.go
2015-03-03 20:30:05 +01:00
obscuren
2707891966
Merge branch 'ethersphere-blockpool2' into poc-9
2015-03-03 20:27:15 +01:00
obscuren
d8a68dc0f1
Merge branch 'blockpool2' of https://github.com/ethersphere/go-ethereum into ethersphere-blockpool2
2015-03-03 20:26:59 +01:00
Jeffrey Wilcke
253eb778d1
Merge pull request #411 from ethersphere/readme
...
[WIP] Update Readme
2015-03-03 20:17:51 +01:00
Jeffrey Wilcke
988391fc37
Merge pull request #409 from tgerring/jsonlogs
...
Updated JSON log events
2015-03-03 20:16:55 +01:00
Jeffrey Wilcke
b1603f166e
Merge pull request #408 from tgerring/removews
...
Remove Websockets RPC transport
2015-03-03 20:16:16 +01:00
obscuren
8e995b97cc
Fixes and debug added
2015-03-03 20:13:11 +01:00
zelig
2c616bd279
partial fix to idle best peer issue
...
- best peer cannot be idle for more than idleBestPeerTimeout
- introduce ErrIdleTooLong fatal error
- modify default values
2015-03-04 02:06:15 +07:00
obscuren
40ff3cac39
merge
2015-03-03 17:56:36 +01:00
obscuren
53b5a45856
Merge branch 'xcthulhu-publictests' into poc-9
2015-03-03 17:55:29 +01:00
obscuren
313fe3861b
fixed pow stuff
2015-03-03 17:55:23 +01:00
obscuren
22b132e28f
Merge branch 'publictests' of https://github.com/xcthulhu/go-ethereum into xcthulhu-publictests
2015-03-03 17:20:34 +01:00
obscuren
b0aaa77f02
changed message
2015-03-03 17:20:10 +01:00
obscuren
ee0a1bec6c
GasLimit check updated
2015-03-03 17:05:51 +01:00
obscuren
c74c07eed1
Fixed error for invalid transaction
2015-03-03 16:20:38 +01:00
obscuren
6518da7c01
Merge commit 'a6e04ab05150d1b5aa4adb297f3e5146b1559b02' into poc-9
2015-03-03 15:39:34 +01:00
obscuren
a6e04ab051
Squashed 'tests/files/' changes from 13be3e3..9e3fe72
...
9e3fe72 update state root hash
git-subtree-dir: tests/files
git-subtree-split: 9e3fe720e3d46f046e06a91e45c881e79557f721
2015-03-03 15:39:33 +01:00
obscuren
651b2158ba
Merge commit '42a210b571b9358df16da148d9724c2ef9abbca5' into poc-9
2015-03-03 15:16:52 +01:00
obscuren
42a210b571
Squashed 'tests/files/' changes from 402e748..13be3e3
...
13be3e3 update
git-subtree-dir: tests/files
git-subtree-split: 13be3e33afa8d708786f82b63bf874138f05bb02
2015-03-03 15:16:52 +01:00
obscuren
9f359dfffa
Merge commit 'd9d40888ce9498b25925ccbf1447b1f62597aa2f' into poc-9
2015-03-03 13:56:59 +01:00
obscuren
d9d40888ce
Squashed 'tests/files/' changes from 2bfb7db..402e748
...
402e748 Merge branch 'PoC9' of github.com:/ethereum/tests into PoC9
13b6a99 State test refill.
git-subtree-dir: tests/files
git-subtree-split: 402e7482f9283e08869b3412329e24ef6287d8c7
2015-03-03 13:56:59 +01:00
obscuren
2a50931684
Merge commit '0867e4fae96c0b0d234f1710119a129f8b0d96f7' into poc-9
2015-03-03 13:29:59 +01:00
obscuren
0867e4fae9
Squashed 'tests/files/' changes from 6f75ca3..2bfb7db
...
2bfb7db update memory test
88f32fa Merge remote-tracking branch 'origin/PoC9' into PoC9
a1f73f9 update gas costs
e16b5d3 Move over to key value rather than array of arrays since they're unordered and no duplicates.
ac11bbc Merge branch 'PoC9' of github.com:/ethereum/tests into PoC9
93ae304 Move to non-repeated.
fd9e406 Added test 2
git-subtree-dir: tests/files
git-subtree-split: 2bfb7dbe09c62319b28a2c2873caf7e7e99bf32a
2015-03-03 13:29:59 +01:00
obscuren
fa831206c6
Updated gast costs
2015-03-03 13:29:52 +01:00
Paweł Bylica
e72173dc43
Fix JitVm build
2015-03-03 12:31:26 +01:00
obscuren
4659b51b50
Squashed 'tests/files/' changes from 998e275..6f75ca3
...
6f75ca3 Merge remote-tracking branch 'origin/PoC9' into PoC9
8d22687 update state root - DEBUG
git-subtree-dir: tests/files
git-subtree-split: 6f75ca354f239fa30f4e07754ede575aed24bbc2
2015-03-03 12:31:09 +01:00
obscuren
ffa6b99ab6
Merge commit '4659b51b50394c596f0548eb53390c80ba96e392' into poc-9
2015-03-03 12:31:09 +01:00
obscuren
524bf9e858
wup
2015-03-03 12:30:57 +01:00
obscuren
b7ec9fbb0e
Squashed 'tests/files/' changes from a3d44ca..998e275
...
998e275 renamed
089e346 Added hex encoded securetrie test
cdefad8 Update VM tests.
ec0a309 update state root
b3d223e update state root hash
171a945 update memory teste
git-subtree-dir: tests/files
git-subtree-split: 998e2756b5491c760f6624c62ebc09e86197c31f
2015-03-03 12:26:24 +01:00
obscuren
e73d7725df
Merge commit 'b7ec9fbb0e49e345a8a2566226a76d50b48266a7' into poc-9
2015-03-03 12:26:24 +01:00
obscuren
b909a5ec18
Trie => SecureTrie
2015-03-03 12:25:44 +01:00
obscuren
1650b59cd9
Delet => Delete
2015-03-03 12:21:27 +01:00
obscuren
bf5365b317
Delet => Delete
2015-03-03 12:15:58 +01:00
obscuren
ba0a758d8c
Quad mem & log changes
2015-03-03 11:56:43 +01:00
obscuren
49da6a8d80
Fixed test helper
2015-03-03 11:56:28 +01:00
