go-ethereum/core
Christopher Franko 61796668c8 continue merging 1
Merge continue 2

Fake commit to restart the build servers

Fake commit to hopefully fix the PPA issue.

update versionOracle address for expanse

Merge continue 3

Merge continue 4

cleaned up a few Eth stragglers

Merge continue 5

Not sure why the merge tool changed this file and removed that but it
did.

merge continue 6

fixing expanse.js

Again not sure why this one got edited from the last one but -shrug-

fixing rpc calls for eth_ for compatibility

rpc calls still acting crazy

more rpc fixes

make jsre console accept both exp and eth cmds

rpc fixes continued

adding eth api calls

rpc and js-console both have eth calls on by default now
2016-05-18 23:06:16 -04:00
..
state Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
types continue merging 1 2016-05-18 23:06:16 -04:00
vm continue merging 1 2016-05-18 23:06:16 -04:00
.gitignore Renamed chain => core 2014-12-04 10:28:02 +01:00
asm.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
bad_block.go test change lol 2015-09-01 18:24:03 -04:00
bench_test.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
block_validator.go continue merging 1 2016-05-18 23:06:16 -04:00
block_validator_test.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
blockchain.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
blockchain_test.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
blocks.go test change lol 2015-09-01 18:24:03 -04:00
canary.go continue merging 1 2016-05-18 23:06:16 -04:00
chain_makers.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
chain_makers_test.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
chain_pow.go rebase 1.2.2 2015-10-13 11:56:11 -04:00
chain_pow_test.go Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.3.1 2015-11-03 18:25:50 -05:00
config.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
database_util.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
database_util_test.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
default_genesis.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
error.go Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.3.1 2015-11-03 18:25:50 -05:00
events.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
execution.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
fees.go updated copyright headers 2015-09-12 18:17:11 -04:00
filter_test.go updated copyright headers 2015-09-12 18:17:11 -04:00
gaspool.go all: update license information 2016-04-15 09:48:05 +02:00
genesis.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
headerchain.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
helper_test.go Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.3.1 2015-11-03 18:25:50 -05:00
state_processor.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
state_transition.go continue merging 1 2016-05-18 23:06:16 -04:00
tx_pool.go continue merging 1 2016-05-18 23:06:16 -04:00
tx_pool_test.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
types.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
vm_env.go Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00