forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-30 16:43:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
6648 commits 77 branches 276 tags 1.2 GiB
Commit graph

6648 commits

This branch
This branch
All branches
Author SHA1 Message Date
Franko
f774382702 update builds 2015-09-12 10:21:27 -04:00
Christopher Franko
ec3fb93c03 Update legalese 2015-09-11 08:22:53 -04:00
Franko
c0ada89e75 Merge branch 'develop' of https://github.com/expanse-project/go-expanse into develop 2015-09-11 07:28:01 -04:00
Franko
169141eb3e add test builds 2015-09-11 07:27:28 -04:00
Christopher Franko
9d114778a0 Merge remote-tracking branch 'ethereum/master' into develop 
Conflicts:
	cmd/gexp/main.go
 2015-09-10 19:18:27 -04:00
Jeffrey Wilcke
4813a39100 README: fake commit 2015-09-10 15:48:14 +02:00
Gustav Simonsson
9ebe787d3a Merge remote-tracking branch 'origin/release/1.1.0' 
* origin/release/1.1.0:
  cmd/geth: bump 1.1.3
  Merge pull request #1781 from Gustav-Simonsson/state_object_copy
 2015-09-10 00:20:20 +02:00
Gustav Simonsson
59d25c0c2c cmd/geth: bump 1.1.3 2015-09-09 18:48:35 +02:00
Felix Lange
cde06b4009 Merge pull request #1781 from Gustav-Simonsson/state_object_copy 
core/state: deleted field in StateObject Copy() and unit test
(cherry picked from commit 90f1fe0ed2)
 2015-09-09 18:46:27 +02:00
Franko
74cee8c3ed Merge branch 'develop' of https://github.com/expanse-project/go-expanse into develop 2015-09-07 20:25:20 -04:00
Christopher Franko
1c45431c53 update testnet block 
update docker

update docker file

docker update 2

oi

docker again

update testnet block

update docker

update docker file

docker update 2

oi

docker again

update testnet block

update docker

update docker file

docker update 2

oi

docker again

docker2

docker3

fixed gvm

docker change

docking is meh

i hate docker

dockingsucks

update blockreward to 8

because its a lucky number 💃

update 60606 to 42786

60606 looks evil
42786 is my birthday

update jsre

replace eth for exp

update blocktime and test_genesis

fix test genesis
 2015-09-07 20:25:05 -04:00
Christopher Franko
3b73ce143c fix test genesis 2015-09-07 19:20:48 -04:00
Christopher Franko
452e263d5d update blocktime and test_genesis 2015-09-07 19:13:38 -04:00
Christopher Franko
361a56ce32 replace eth for exp 2015-09-06 13:06:52 -04:00
Christopher Franko
033d93b733 update jsre 2015-09-06 12:58:10 -04:00
Christopher Franko
dc4dcaba48 update 60606 to 42786 
60606 looks evil
42786 is my birthday
 2015-09-05 15:38:49 -04:00
Christopher Franko
512ebd876b update blockreward to 8 
because its a lucky number 💃
 2015-09-05 15:26:15 -04:00
Franko
41f1804126 Merge branch 'develop' of https://github.com/expanse-project/go-expanse into develop 
Conflicts:
	docker/Dockerfile
 2015-09-03 18:49:44 -04:00
Christopher Franko
3d684095f7 update testnet block 
update docker

update docker file

docker update 2

oi

docker again
 2015-09-03 18:48:01 -04:00
Christopher Franko
da507bc9da dockingsucks 2015-09-03 17:36:57 -04:00
Christopher Franko
93da39a0b9 i hate docker 2015-09-03 17:19:31 -04:00
Christopher Franko
9964835efd docking is meh 2015-09-03 16:59:59 -04:00
Christopher Franko
a0c09ab5ce docker change 2015-09-03 16:48:29 -04:00
Christopher Franko
80a7885a9e fixed gvm 2015-09-03 16:30:29 -04:00
Christopher Franko
48ad425cb3 docker3 2015-09-03 16:17:12 -04:00
Christopher Franko
d02ab42248 docker2 2015-09-03 15:32:29 -04:00
Franko
f7029428ea Merge branch 'develop' of https://github.com/expanse-project/go-expanse into develop 2015-09-03 13:38:39 -04:00
Christopher Franko
742b0e0ff7 update testnet block 
update docker

update docker file

docker update 2

oi

docker again
 2015-09-03 13:37:31 -04:00
Christopher Franko
82267ab812 docker again 2015-09-03 13:31:48 -04:00
Christopher Franko
2e7a411dd0 oi 2015-09-03 13:21:46 -04:00
Christopher Franko
338fcf7b3d docker update 2 2015-09-03 13:14:41 -04:00
Christopher Franko
f530fb8150 update docker file 2015-09-03 12:51:01 -04:00
Christopher Franko
43b929d242 update docker 2015-09-03 12:42:15 -04: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
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
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