forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-11 06:23:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
6807 commits 80 branches 276 tags 1.1 GiB
Commit graph

6807 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christopher Franko
43b929d242 update docker 2015-09-03 12:42:15 -04:00
Felix Lange
e2d7c1a523 Merge pull request #1752 from karalabe/fix-eth61-test 
eth/downloader: fix race causing occasional test failure
 2015-09-03 15:52:18 +02:00
Christopher Franko
cbf7147409 update testnet block 2015-09-03 09:40:25 -04:00
Christopher Franko
a53996d005 Merge branch 'master' into develop 2015-09-03 09:39:51 -04:00
Péter Szilágyi
ebbe25ee71 Merge pull request #1764 from kobigurk/honor_ipc_datadir 
honors datadir when attaching
 2015-09-03 10:48:23 +03:00
Kobi Gurkan
1a86adc5a2 cmd/geth: honor datadir when attaching 2015-09-03 10:28:30 +03:00
expanse-project
2959acc2d3 Merge pull request #2 from expanse-project/develop 
rebased with latest eth changes and bug fixes
 2015-09-02 22:44:57 -04:00
Christopher Franko
b59f825c93 bye 2015-09-02 22:38:59 -04:00
Christopher Franko
8b50fbc849 Merge remote-tracking branch 'ethereum/master' into develop 
Conflicts:
	cmd/gexp/main.go
 2015-09-02 22:37:46 -04:00
Christopher Franko
161bcec8c3 remove idea again 2015-09-02 22:36:37 -04:00
Christopher Franko
c93acd8030 update 2015-09-02 22:35:53 -04:00
Jeffrey Wilcke
587669215b cmd/geth: bump 1.1.2 2015-09-03 00:52:42 +02:00
Christoph Jentzsch
fc3941d1fd fix block time issue 
currently, under normal circumstances, you always set the timestamp to previous.Time() + 1.
credits to https://www.reddit.com/r/ethereum/comments/3jcs5r/code_avg_block_time_vs_difficulty_adjustment/cuoi4op

style
 2015-09-03 00:16:59 +02:00
Jeffrey Wilcke
e98854588b Merge pull request #1761 from CJentzsch/patch-3 
fix block time issue
 2015-09-02 15:13:14 -07:00
Christoph Jentzsch
0fda4c4e15 fix block time issue 
currently, under normal circumstances, you always set the timestamp to previous.Time() + 1.
credits to https://www.reddit.com/r/ethereum/comments/3jcs5r/code_avg_block_time_vs_difficulty_adjustment/cuoi4op

style
 2015-09-03 00:05:05 +02:00
Felix Lange
b2c17a5a63 Merge pull request #1726 from Gustav-Simonsson/update_tests 
Add TestBcForkUncle tests & update JSON files
 2015-09-02 22:02:44 +02:00
Christopher Franko
82b3b59993 update main.go deps 2015-09-01 20:54:41 -04:00
Christopher Franko
197961ba66 another dep 2015-09-01 20:51:47 -04:00
Christopher Franko
0f1fe4847b missing deps 2015-09-01 20:50:20 -04:00
Christopher Franko
72538db99c hopefully last find replace 2015-09-01 20:45:40 -04:00
Christopher Franko
4dab840f71 expanse 2015-09-01 20:42:36 -04:00
Christopher Franko
ae27c2eb7d update worker.go 2015-09-01 20:07:37 -04:00
Christopher Franko
9f661cc3dd good by colorable 2015-09-01 20:04:17 -04:00
Christopher Franko
7daa319737 last github update 2015-09-01 19:57:32 -04:00
Christopher Franko
1f6c8ebb0e github update 2 2015-09-01 19:42:33 -04:00
Christopher Franko
64ced6629a github update 2015-09-01 19:41:15 -04:00
Christopher Franko
92b5926495 Merge remote-tracking branch 'ethereum/master' into develop 
Conflicts:
	cmd/gexp/main.go
 2015-09-01 19:15:15 -04:00
Christopher Franko
9db4a14176 update backend 2015-09-01 18:59:44 -04:00
Franko
554f07b16e changes 2015-09-01 18:56:30 -04:00
Christopher Franko
1cfc9ec1e9 ether to expanse 2015-09-01 18:26:59 -04:00
Christopher Franko
2c3541ea48 add genesis file 2015-09-01 18:24:03 -04:00
Christopher Franko
a6ece4799a update env 2015-09-01 18:24:03 -04:00
Christopher Franko
b362f1d141 ethash 2015-09-01 18:24:03 -04:00
Christopher Franko
bf234c6b82 gexp change again 2015-09-01 18:24:03 -04:00
Christopher Franko
1a1d9a14ab change folder because why not 2015-09-01 18:24:03 -04:00
Christopher Franko
9d6221444c test change lol 2015-09-01 18:24:03 -04:00
Gustav Simonsson
8f09242d7f Bump version to 1.1.1 2015-09-01 23:43:22 +02:00
Gustav Simonsson
042dcf1b28 Merge pull request #1755 from fjl/coinbase 
core: improve block gas tracking
(cherry picked from commit e9b031b88b)
 2015-09-01 23:41:51 +02:00
Gustav Simonsson
e9b031b88b Merge pull request #1755 from fjl/coinbase 
core: improve block gas tracking
 2015-09-01 23:36:05 +02:00
Felix Lange
00b45acb9e core: improve block gas tracking 2015-09-01 23:11:03 +02:00
Felix Lange
1ffc5b0cfd Merge pull request #1751 from maran/fix_filters 
core: Filter on addresses should work as an OR not an AND.
 2015-09-01 20:10:27 +02:00
Felix Lange
5e4cd599eb Merge pull request #1745 from mrdomino/obsd-build-master 
Pull in ethash and go-isatty updates
 2015-09-01 20:06:13 +02:00
Péter Szilágyi
1f1d73ab74 eth/downloader: fix race causing occasional test failure 2015-09-01 16:11:14 +03:00
Maran
67225de255 Filter on addresses should work as an OR not an AND. 2015-09-01 09:19:45 +02:00
Steven Dee
540eb3d02d Pull in ethash and go-isatty updates 
Fixes build on OpenBSD.
 2015-08-31 12:14:32 -04:00
Gustav Simonsson
fe8093b71f Add TestBcForkUncleTests and update JSON files 2015-08-31 16:45:00 +02:00
Felix Lange
9dc23ce284 Merge pull request #1742 from fjl/rpc-receipt-root 
rpc: add receiptRoot to getBlock* responses
 2015-08-31 14:50:21 +02:00
Felix Lange
1801748ccd Merge pull request #1734 from fjl/ldflags-warning-go1.5 
build: avoid -X separator warning with Go >= 1.5
 2015-08-31 14:49:50 +02:00
Felix Lange
8b12bcc0ac rpc: add receiptRoot to getBlock* responses 
Fixes #1679
 2015-08-29 11:12:01 +02:00
Felix Lange
e1037bd0cf Merge pull request #1724 from Gustav-Simonsson/get_work 
rpc: return error code for eth_getWork when no work ready
 2015-08-29 10:54:10 +02:00