Christopher Franko
00bf780118
Merge remote-tracking branch 'refs/remotes/ethereum/master'
...
Conflicts:
cmd/gexp/main.go
2015-10-25 19:30:12 -04:00
Jeffrey Wilcke
e55594ca0e
Merge branch 'master' of github.com-obscure:ethereum/go-ethereum
2015-10-21 15:56:19 +02:00
Jeffrey Wilcke
6962eda19d
VERSION, cmd/geth: version 1.2.3
2015-10-21 15:53:54 +02:00
Jeffrey Wilcke
619b37ca37
core, tests: get_hash fix
...
Make sure that we're fetching the hash from the current chain and not
the canonical chain.
Conflicts:
core/vm/environment.go
2015-10-21 15:52:48 +02:00
Christopher Franko
7df403e655
Merge pull request #6 from expanse-project/rebase-1.2.1
...
Rebase 1.2.2
2015-10-13 17:51:36 -04:00
Christopher Franko
dfcf6fe985
bump version
2015-10-13 14:33:02 -04:00
Christopher Franko
789e52afdf
fix web3.js
2015-10-13 14:20:07 -04:00
Christopher Franko
1299522681
update from expanse-project to org
2015-10-13 12:59:29 -04:00
Christopher Franko
85fab62294
Merge branch 'rebase-1.2.1' of https://github.com/expanse-project/go-expanse into rebase-1.2.1
2015-10-13 12:47:02 -04:00
Christopher Franko
135b401a06
update rpc mapping
...
🎱
moving stuff around
fixed import
one more replace
one more
wasnt he last but close
last one
2015-10-13 12:44:36 -04:00
Christopher Franko
7456be5f84
last one
2015-10-13 12:43:13 -04:00
Christopher Franko
9b6b54f07a
wasnt he last but close
2015-10-13 12:34:48 -04:00
Christopher Franko
49d4cf6f1e
one more
2015-10-13 12:31:41 -04:00
Christopher Franko
a724a1bb42
one more replace
2015-10-13 12:29:39 -04:00
Christopher Franko
4977d41e95
fixed import
2015-10-13 12:25:29 -04:00
Christopher Franko
72f70f662c
moving stuff around
2015-10-13 12:16:20 -04:00
Christopher Franko
f3d24e4eb6
update rpc mapping
...
🎱
2015-10-13 12:05:30 -04:00
Christopher Franko
6a6cd10299
rebase 1.2.2
2015-10-13 11:56:11 -04:00
Christopher Franko
1487a50fd9
ignore all those test files
2015-10-13 11:09:02 -04:00
Jeffrey Wilcke
2800c33280
Fake commit
2015-10-02 21:31:53 +02:00
Jeffrey Wilcke
465e810c66
VERSION, cmd/geth: bumped version 1.2.2
2015-10-02 12:55:57 +02:00
Péter Szilágyi
274f86cd86
eth/downloader: match capabilities when querying idle peers
2015-10-02 12:50:26 +02:00
Jeffrey Wilcke
b527c9c718
core: deadlock in chainmanager after posting RemovedTransactionEvent
...
This PR solves an issue with the chain manager posting a
`RemovedTransactionEvent`, the tx pool will try to
acquire the chainmanager lock which has previously been locked prior to
posting `RemovedTransactionEvent`. This results in a deadlock in the
core.
2015-10-02 12:41:10 +02:00
Jeffrey Wilcke
9666db2a44
VERSION, cmd/geth: bumped version 1.2.1
2015-10-01 10:38:43 +02:00
Jeffrey Wilcke
e3ac56d502
Merge pull request #1859 from fjl/fix-discover-refresh-race
...
p2p/discover: fix race involving the seed node iterator
2015-09-30 08:21:40 -07:00
Felix Lange
32dda97602
p2p/discover: ignore packet version numbers
...
The strict matching can get in the way of protocol upgrades.
2015-09-30 16:23:03 +02:00
Felix Lange
631bf36102
p2p/discover: remove unused lastLookup field
2015-09-30 16:23:03 +02:00
Felix Lange
b4374436f3
p2p/discover: fix race involving the seed node iterator
...
nodeDB.querySeeds was not safe for concurrent use but could be called
concurrenty on multiple goroutines in the following case:
- the table was empty
- a timed refresh started
- a lookup was started and initiated refresh
These conditions are unlikely to coincide during normal use, but are
much more likely to occur all at once when the user's machine just woke
from sleep. The root cause of the issue is that querySeeds reused the
same leveldb iterator until it was exhausted.
This commit moves the refresh scheduling logic into its own goroutine
(so only one refresh is ever active) and changes querySeeds to not use
a persistent iterator. The seed node selection is now more random and
ignores nodes that have not been contacted in the last 5 days.
2015-09-30 16:23:03 +02:00
Jeffrey Wilcke
46ad5a5f5b
Merge pull request #1852 from obscuren/filter-nil-fix
...
xeth: fixed nil pointer of filter retrieval
2015-09-30 03:06:36 -07:00
Jeffrey Wilcke
9b94076717
Merge pull request #1854 from karalabe/badhasherror-formatting-loop
...
core: fix a formatting loop in BadHashError
2015-09-29 02:26:01 -07:00
Péter Szilágyi
b8b996be74
core: fix a formatting loop in BadHashError
2015-09-29 09:11:38 +03:00
Jeffrey Wilcke
b9359981f4
xeth: fixed nil pointer of filter retrieval
...
This fix addresses an issue with filters that were (possibly) not yet
added to the filter queues but were expected. I've added additional nil
checks making sure it doesn't crash and swapped the installation of the
filter around so it's installed before use.
Closes #1665
2015-09-25 13:56:53 +02:00
Jeffrey Wilcke
7977e87ce1
Merge pull request #1843 from karalabe/cleanup-downloader-channel
...
eth/downloader: always send termination wakes, clean leftover
2015-09-25 04:34:59 -07:00
Franko
aba7b81e64
remove builds
2015-09-24 16:42:07 -04:00
Franko
06d0afc4b2
bump version
2015-09-24 16:40:22 -04:00
Franko
98b173e362
update binaries
2015-09-24 16:28:29 -04:00
Christopher Franko
ca1d6c0411
Merge pull request #5 from expanse-project/test-difficulty-adjustment
...
merge difficulty adjustment branch
2015-09-24 15:47:00 -04:00
Franko
a090568ae6
Merge branch 'test-difficulty-adjustment' of https://github.com/expanse-project/go-expanse into test-difficulty-adjustment
2015-09-24 15:39:09 -04:00
Christopher Franko
8997f08ecc
make the diff adjustments better
2015-09-24 15:38:26 -04:00
Christopher Franko
bfc916c6e3
qf2
2015-09-24 15:34:44 -04:00
Christopher Franko
3cb6e7745c
quickfix
2015-09-24 15:33:08 -04:00
Christopher Franko
78c48ad903
added fork block number
2015-09-24 15:28:37 -04:00
Christopher Franko
6767c95887
make the diff adjustments better
2015-09-24 10:59:49 -04:00
Jeffrey Wilcke
69d86442a5
Merge pull request #1803 from Gustav-Simonsson/badhashes
...
core: Add BadHashErr and test for BadHashes handling
2015-09-23 11:10:25 -07:00
Jeffrey Wilcke
36f46a61a7
Merge pull request #1844 from obscuren/version-file
...
VERSION: added version
2015-09-23 05:48:00 -07:00
Jeffrey Wilcke
6e1dc321f4
VERSION: added version
2015-09-23 14:47:20 +02:00
Felix Lange
7a2a918067
Merge pull request #1842 from fjl/rpc-fix-unknown-block
...
rpc/api: don't crash for unknown blocks
2015-09-23 12:57:33 +02:00
Péter Szilágyi
f459a3f0ae
eth/downloader: always send termination wakes, clean leftover
2015-09-23 12:39:17 +03:00
Jeffrey Wilcke
e456f27795
Merge pull request #1827 from Gustav-Simonsson/common_tests
...
tests: add test for StateTests/stCallCodes.json
2015-09-23 02:12:59 -07:00
Felix Lange
90cd8ae9f2
rpc/api: don't crash for unknown blocks
...
Most eth RPC calls that work with blocks crashed when the block was not
found because they called Hash on a nil block. This is a regression
introduced in cdc2662c40 (#1779 ).
While here, remove the insane conversions in get*CountBy*. There is no
need to construct a complete BlockRes and converting
int->int64->*big.Int->[]byte->hexnum->string to format the length of a
slice as hex.
2015-09-22 23:59:26 +02:00