Code

Rebase 1.3.4 (homestead)#2286

Code

Closed

chrisfranko wants to merge 142 commits intoethereum:masterethereum/go-ethereum:masterfrom expanse-org:rebase-1.3.4expanse-org/go-expanse:rebase-1.3.4Copy head branch name to clipboard

+8,072-3,635

Commits

Commits on Aug 7, 2015

• test change lol

  chrisfranko

  committed
  d368397

  Copy full SHA for d368397

• change folder because why not

  chrisfranko

  committed
  5008f4c

  Copy full SHA for 5008f4c

• gexp change again

  chrisfranko

  committed
  f44685d

  Copy full SHA for f44685d

• ethash

  chrisfranko

  committed
  272d0f5

  Copy full SHA for 272d0f5

• update env

  chrisfranko

  committed
  589c3d3

  Copy full SHA for 589c3d3

• add genesis file

  chrisfranko

  committed
  b7c8f95

  Copy full SHA for b7c8f95

Commits on Aug 13, 2015

• ether to expanse

  chrisfranko

  committed
  08e1345

  Copy full SHA for 08e1345

Commits on Aug 25, 2015

• Merge pull request ethereum#1710 from bas-vk/useragent

  Show description for dc3fb69
  

  fjl

  authored and

  Gustav Simonsson

  committed
  dc3fb69

  Copy full SHA for dc3fb69

• Merge pull request ethereum#1711 from Gustav-Simonsson/timestamp_big_int

  Show description for fd512fa
  

  fjl

  authored and

  Gustav Simonsson

  committed
  fd512fa

  Copy full SHA for fd512fa

Commits on Sep 1, 2015

• Merge pull request ethereum#1755 from fjl/coinbase

  Show description for 042dcf1
  

  Gustav Simonsson

  committed
  042dcf1

  Copy full SHA for 042dcf1

• Bump version to 1.1.1

  

  Gustav Simonsson

  committed
  8f09242

  Copy full SHA for 8f09242

• test change lol

  

  chrisfranko

  authored and

  franko-org

  committed
  9d62214

  Copy full SHA for 9d62214

• change folder because why not

  

  chrisfranko

  authored and

  franko-org

  committed
  1a1d9a1

  Copy full SHA for 1a1d9a1

• gexp change again

  

  chrisfranko

  authored and

  franko-org

  committed
  bf234c6

  Copy full SHA for bf234c6

• ethash

  

  chrisfranko

  authored and

  franko-org

  committed
  b362f1d

  Copy full SHA for b362f1d

• update env

  

  chrisfranko

  authored and

  franko-org

  committed
  a6ece47

  Copy full SHA for a6ece47

• add genesis file

  

  chrisfranko

  authored and

  franko-org

  committed
  2c3541e

  Copy full SHA for 2c3541e

• ether to expanse

  

  chrisfranko

  authored and

  franko-org

  committed
  1cfc9ec

  Copy full SHA for 1cfc9ec

• changes

  franko-org

  committed
  554f07b

  Copy full SHA for 554f07b

• update backend

  chrisfranko

  committed
  9db4a14

  Copy full SHA for 9db4a14

• Merge remote-tracking branch 'ethereum/master' into develop

  Show description for 92b5926
  chrisfranko

  committed
  92b5926

  Copy full SHA for 92b5926

• github update

  chrisfranko

  committed
  64ced66

  Copy full SHA for 64ced66

• github update 2

  chrisfranko

  committed
  1f6c8eb

  Copy full SHA for 1f6c8eb

• last github update

  chrisfranko

  committed
  7daa319

  Copy full SHA for 7daa319

Commits on Sep 2, 2015

• good by colorable

  chrisfranko

  committed
  9f661cc

  Copy full SHA for 9f661cc

• update worker.go

  chrisfranko

  committed
  ae27c2e

  Copy full SHA for ae27c2e

• expanse

  chrisfranko

  committed
  4dab840

  Copy full SHA for 4dab840

• hopefully last find replace

  chrisfranko

  committed
  72538db

  Copy full SHA for 72538db

• missing deps

  chrisfranko

  committed
  0f1fe48

  Copy full SHA for 0f1fe48

• another dep

  chrisfranko

  committed
  197961b

  Copy full SHA for 197961b

• update main.go deps

  chrisfranko

  committed
  82b3b59

  Copy full SHA for 82b3b59

• fix block time issue

  Show description for fc3941d
  

  CJentzsch

  authored and

  obscuren

  committed
  fc3941d

  Copy full SHA for fc3941d

• cmd/geth: bump 1.1.2

  obscuren

  committed
  5876692

  Copy full SHA for 5876692

Commits on Sep 3, 2015

• update

  chrisfranko

  committed
  c93acd8

  Copy full SHA for c93acd8

• remove idea again

  chrisfranko

  committed
  161bcec

  Copy full SHA for 161bcec

• Merge remote-tracking branch 'ethereum/master' into develop

  Show description for 8b50fbc
  chrisfranko

  committed
  8b50fbc

  Copy full SHA for 8b50fbc

• bye

  chrisfranko

  committed
  b59f825

  Copy full SHA for b59f825

• Merge pull request #2 from expanse-project/develop

  Show description for 2959acc
  expanse-project

  committed
  2959acc

  Copy full SHA for 2959acc

• Merge branch 'master' into develop

  chrisfranko

  committed
  a53996d

  Copy full SHA for a53996d

• update testnet block

  chrisfranko

  committed
  cbf7147

  Copy full SHA for cbf7147

• update docker

  chrisfranko

  committed
  43b929d

  Copy full SHA for 43b929d

• update docker file

  chrisfranko

  committed
  f530fb8

  Copy full SHA for f530fb8

• docker update 2

  chrisfranko

  committed
  338fcf7

  Copy full SHA for 338fcf7

• oi

  chrisfranko

  committed
  2e7a411

  Copy full SHA for 2e7a411

• docker again

  chrisfranko

  committed
  82267ab

  Copy full SHA for 82267ab

• update testnet block

  Show description for 742b0e0
  

  chrisfranko

  authored and

  franko-org

  committed
  742b0e0

  Copy full SHA for 742b0e0

• Merge branch 'develop' of https://github.com/expanse-project/go-expanse into develop

  franko-org

  committed
  f702942

  Copy full SHA for f702942

• docker2

  chrisfranko

  committed
  d02ab42

  Copy full SHA for d02ab42

• docker3

  chrisfranko

  committed
  48ad425

  Copy full SHA for 48ad425

• fixed gvm

  chrisfranko

  committed
  80a7885

  Copy full SHA for 80a7885

• docker change

  chrisfranko

  committed
  a0c09ab

  Copy full SHA for a0c09ab

• docking is meh

  chrisfranko

  committed
  9964835

  Copy full SHA for 9964835

• i hate docker

  chrisfranko

  committed
  93da39a

  Copy full SHA for 93da39a

• dockingsucks

  chrisfranko

  committed
  da507bc

  Copy full SHA for da507bc

• update testnet block

  Show description for 3d68409
  

  chrisfranko

  authored and

  franko-org

  committed
  3d68409

  Copy full SHA for 3d68409

• Merge branch 'develop' of https://github.com/expanse-project/go-expanse into develop

  Show description for 41f1804
  franko-org

  committed
  41f1804

  Copy full SHA for 41f1804

Commits on Sep 5, 2015

• update blockreward to 8

  Show description for 512ebd8
  chrisfranko

  committed
  512ebd8

  Copy full SHA for 512ebd8

• update 60606 to 42786

  Show description for dc4dcab
  chrisfranko

  committed
  dc4dcab

  Copy full SHA for dc4dcab

Commits on Sep 6, 2015

• update jsre

  chrisfranko

  committed
  033d93b

  Copy full SHA for 033d93b

• replace eth for exp

  chrisfranko

  committed
  361a56c

  Copy full SHA for 361a56c

Commits on Sep 7, 2015

• update blocktime and test_genesis

  chrisfranko

  committed
  452e263

  Copy full SHA for 452e263

• fix test genesis

  chrisfranko

  committed
  3b73ce1

  Copy full SHA for 3b73ce1

Commits on Sep 8, 2015

• update testnet block

  Show description for 1c45431
  

  chrisfranko

  authored and

  franko-org

  committed
  1c45431

  Copy full SHA for 1c45431

• Merge branch 'develop' of https://github.com/expanse-project/go-expanse into develop

  franko-org

  committed
  74cee8c

  Copy full SHA for 74cee8c

Commits on Sep 9, 2015

• Merge pull request ethereum#1781 from Gustav-Simonsson/state_object_copy

  Show description for cde06b4
  

  fjl

  authored and

  Gustav Simonsson

  committed
  cde06b4

  Copy full SHA for cde06b4

• cmd/geth: bump 1.1.3

  

  Gustav Simonsson

  committed
  59d25c0

  Copy full SHA for 59d25c0

• Merge remote-tracking branch 'origin/release/1.1.0'

  Show description for 9ebe787
  

  Gustav Simonsson

  committed
  9ebe787

  Copy full SHA for 9ebe787

Commits on Sep 10, 2015

• README: fake commit

  obscuren

  committed
  4813a39

  Copy full SHA for 4813a39

• Merge remote-tracking branch 'ethereum/master' into develop

  Show description for 9d11477
  chrisfranko

  committed
  9d11477

  Copy full SHA for 9d11477

Commits on Sep 11, 2015

• add test builds

  franko-org

  committed
  169141e

  Copy full SHA for 169141e

• Merge branch 'develop' of https://github.com/expanse-project/go-expanse into develop

  franko-org

  committed
  c0ada89

  Copy full SHA for c0ada89

• Update legalese

  chrisfranko

  committed
  ec3fb93

  Copy full SHA for ec3fb93

Commits on Sep 12, 2015

• update builds

  franko-org

  committed
  f774382

  Copy full SHA for f774382

• update some discovery nodes

  Show description for df8d523
  chrisfranko

  committed
  df8d523

  Copy full SHA for df8d523

• newer builds

  franko-org

  committed
  73897d7

  Copy full SHA for 73897d7

• Merge pull request #3 from expanse-project/develop

  Show description for a83d648
  chrisfranko

  committed
  a83d648

  Copy full SHA for a83d648

• removed old builds

  chrisfranko

  committed
  88e35bf

  Copy full SHA for 88e35bf

• updated copyright headers

  chrisfranko

  committed
  164a9ac

  Copy full SHA for 164a9ac

Commits on Sep 14, 2015

• Update genesis

  chrisfranko

  committed
  b0f7a5c

  Copy full SHA for b0f7a5c

• update genesis

  chrisfranko

  committed
  4c72a99

  Copy full SHA for 4c72a99

• Merge pull request #4 from expanse-project/develop

  Show description for 5745c9a
  chrisfranko

  committed
  5745c9a

  Copy full SHA for 5745c9a

Commits on Sep 24, 2015

• make the diff adjustments better

  chrisfranko

  committed
  6767c95

  Copy full SHA for 6767c95

• added fork block number

  chrisfranko

  committed
  78c48ad

  Copy full SHA for 78c48ad

• quickfix

  chrisfranko

  committed
  3cb6e77

  Copy full SHA for 3cb6e77

• qf2

  chrisfranko

  committed
  bfc916c

  Copy full SHA for bfc916c

• make the diff adjustments better

  

  chrisfranko

  authored and

  franko-org

  committed
  8997f08

  Copy full SHA for 8997f08

• Merge branch 'test-difficulty-adjustment' of https://github.com/expanse-project/go-expanse into test-difficulty-adjustment

  franko-org

  committed
  a090568

  Copy full SHA for a090568

• Merge pull request #5 from expanse-project/test-difficulty-adjustment

  Show description for ca1d6c0
  chrisfranko

  committed
  ca1d6c0

  Copy full SHA for ca1d6c0

• update binaries

  franko-org

  committed
  98b173e

  Copy full SHA for 98b173e

• bump version

  franko-org

  committed
  06d0afc

  Copy full SHA for 06d0afc

• remove builds

  franko-org

  committed
  aba7b81

  Copy full SHA for aba7b81

Commits on Oct 2, 2015

• core: deadlock in chainmanager after posting RemovedTransactionEvent

  Show description for b527c9c
  obscuren

  committed
  b527c9c

  Copy full SHA for b527c9c

• eth/downloader: match capabilities when querying idle peers

  

  karalabe

  authored and

  obscuren

  committed
  274f86c

  Copy full SHA for 274f86c

• VERSION, cmd/geth: bumped version 1.2.2

  obscuren

  committed
  465e810

  Copy full SHA for 465e810

• Fake commit

  obscuren

  committed
  2800c33

  Copy full SHA for 2800c33

Commits on Oct 13, 2015

• ignore all those test files

  chrisfranko

  committed
  1487a50

  Copy full SHA for 1487a50

• rebase 1.2.2

  chrisfranko

  committed
  6a6cd10

  Copy full SHA for 6a6cd10

• update rpc mapping

  Show description for f3d24e4
  chrisfranko

  committed
  f3d24e4

  Copy full SHA for f3d24e4

• moving stuff around

  chrisfranko

  committed
  72f70f6

  Copy full SHA for 72f70f6

• fixed import

  chrisfranko

  committed
  4977d41

  Copy full SHA for 4977d41

• one more replace

  chrisfranko

  committed
  a724a1b

  Copy full SHA for a724a1b

• one more

  chrisfranko

  committed
  49d4cf6

  Copy full SHA for 49d4cf6

• wasnt he last but close

  chrisfranko

  committed
  9b6b54f

  Copy full SHA for 9b6b54f

• last one

  chrisfranko

  committed
  7456be5

  Copy full SHA for 7456be5

• update rpc mapping

  Show description for 135b401
  chrisfranko

  committed
  135b401

  Copy full SHA for 135b401

• Merge branch 'rebase-1.2.1' of https://github.com/expanse-project/go-expanse into rebase-1.2.1

  chrisfranko

  committed
  85fab62

  Copy full SHA for 85fab62

• update from expanse-project to org

  chrisfranko

  committed
  1299522

  Copy full SHA for 1299522

• fix web3.js

  chrisfranko

  committed
  789e52a

  Copy full SHA for 789e52a

• bump version

  chrisfranko

  committed
  dfcf6fe

  Copy full SHA for dfcf6fe

• Merge pull request #6 from expanse-project/rebase-1.2.1

  Show description for 7df403e
  chrisfranko

  committed
  7df403e

  Copy full SHA for 7df403e

Commits on Oct 21, 2015

• core, tests: get_hash fix

  Show description for 619b37c
  obscuren

  committed
  619b37c

  Copy full SHA for 619b37c

• VERSION, cmd/geth: version 1.2.3

  obscuren

  committed
  6962eda

  Copy full SHA for 6962eda

• Merge branch 'master' of github.aaakk.us.kg-obscure:ethereum/go-ethereum

  obscuren

  committed
  e55594c

  Copy full SHA for e55594c

Commits on Oct 25, 2015

• Merge remote-tracking branch 'refs/remotes/ethereum/master'

  Show description for 00bf780
  chrisfranko

  committed
  00bf780

  Copy full SHA for 00bf780

Commits on Nov 3, 2015

• Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.3.1

  Show description for 9cdd178
  chrisfranko

  committed
  9cdd178

  Copy full SHA for 9cdd178

• refactor to /exp from /eth

  chrisfranko

  committed
  ad40345

  Copy full SHA for ad40345

• fixed typos

  chrisfranko

  committed
  fa39ba0

  Copy full SHA for fa39ba0

• find replace

  chrisfranko

  committed
  936b85d

  Copy full SHA for 936b85d

• find replace 2

  chrisfranko

  committed
  15d15d5

  Copy full SHA for 15d15d5

• find replace 3

  chrisfranko

  committed
  625543f

  Copy full SHA for 625543f

Commits on Nov 4, 2015

• removed files

  chrisfranko

  committed
  56dbba9

  Copy full SHA for 56dbba9

• remove files 2

  chrisfranko

  committed
  aa2920f

  Copy full SHA for aa2920f

• last rebase-1.3.1 commit

  franko-org

  committed
  9514a34

  Copy full SHA for 9514a34

Commits on Nov 18, 2015

• Merge pull request #7 from expanse-project/rebase-1.3.1

  Show description for 4af642e
  expanse-project

  committed
  4af642e

  Copy full SHA for 4af642e

Commits on Nov 28, 2015

• Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.3.2

  chrisfranko

  committed
  0f51994

  Copy full SHA for 0f51994

• eth -> exp

  Show description for 5bc04ee
  chrisfranko

  committed
  5bc04ee

  Copy full SHA for 5bc04ee

Commits on Nov 29, 2015

• quick fix

  franko-org

  committed
  f620d2c

  Copy full SHA for f620d2c

• param change

  chrisfranko

  committed
  47588d7

  Copy full SHA for 47588d7

• update bootnodes

  Show description for c880ed1
  chrisfranko

  committed
  c880ed1

  Copy full SHA for c880ed1

Commits on Dec 16, 2015

• added the global registrar

  chrisfranko

  committed
  3ec4e69

  Copy full SHA for 3ec4e69

• Merge pull request #8 from expanse-project/rebase-1.3.2

  Show description for 80b554f
  chrisfranko

  committed
  80b554f

  Copy full SHA for 80b554f

Commits on Jan 11, 2016

• update dockerfile

  chrisfranko

  committed
  ce96716

  Copy full SHA for ce96716

• update dockerfile take out develop branch checkout

  chrisfranko

  committed
  89e13e1

  Copy full SHA for 89e13e1

Commits on Jan 15, 2016

• Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.3.3

  Show description for f32e770
  chrisfranko

  committed
  f32e770

  Copy full SHA for f32e770

• update dockerfile

  chrisfranko

  committed
  abff06c

  Copy full SHA for abff06c

• Merge pull request #9 from expanse-project/rebase-1.3.3

  Show description for 73c0cd8
  chrisfranko

  committed
  73c0cd8

  Copy full SHA for 73c0cd8

Commits on Feb 19, 2016

• update readme for travis

  expanse-project

  committed
  ef51a98

  Copy full SHA for ef51a98

• update readme for coveralls and waffle.io

  expanse-project

  committed
  90ef321

  Copy full SHA for 90ef321

• update travis

  expanse-project

  committed
  efc62bc

  Copy full SHA for efc62bc

Commits on Mar 2, 2016

• Merge https://github.com/ethereum/go-ethereum into rebase-1.3.4

  chrisfranko

  committed
  153dd19

  Copy full SHA for 153dd19

• fix dependency

  franko-org

  committed
  d542c9d

  Copy full SHA for d542c9d

• change homestead to be closer to two weeks just incase something goes wrong

  franko-org

  committed
  c8fef26

  Copy full SHA for c8fef26