Christopher Franko
9cdd178759
Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.3.1
...
Conflicts:
Godeps/Godeps.json
Godeps/_workspace/src/github.com/expanse-project/ethash/ethash_test.go
Makefile
VERSION
cmd/gexp/blocktestcmd.go
cmd/gexp/js.go
cmd/gexp/js_test.go
cmd/gexp/main.go
cmd/utils/cmd.go
cmd/utils/flags.go
common/natspec/natspec.go
common/natspec/natspec_e2e_test.go
common/natspec/natspec_e2e_test.go.orig
common/path.go
common/registrar/registrar.go
core/block_processor.go
core/block_processor_test.go
core/chain_manager.go
core/chain_manager_test.go
core/chain_util_test.go
core/events.go
core/execution.go
core/filter.go
core/state/errors.go
core/state/statedb.go
core/state_transition.go
core/transaction_util.go
core/types/bloom9.go
core/types/common.go
core/types/derive_sha.go
core/types/receipt.go
core/vm/common.go
core/vm/environment.go
core/vm/instructions.go
core/vm/jit.go
core/vm/jit_test.go
core/vm/vm.go
docker/Dockerfile
docker/supervisord.conf
eth/downloader/modes.go
event/filter/eth_filter.go
exp/backend.go
exp/downloader/downloader.go
exp/downloader/downloader_test.go
exp/downloader/peer.go
exp/downloader/queue.go
exp/gasprice.go
exp/handler.go
exp/sync.go
miner/worker.go
rpc/api/admin.go
rpc/api/debug.go
rpc/api/eth.go
rpc/api/eth_args.go
rpc/api/miner.go
rpc/api/personal.go
rpc/comms/ipc.go
rpc/comms/ipc_unix.go
rpc/comms/ipc_windows.go
tests/block_test_util.go
tests/files/BlockchainTests/bcUncleTest.json
trie/cache.go
trie/fullnode.go
trie/hashnode.go
trie/secure_trie.go
trie/shortnode.go
trie/trie.go
trie/trie_test.go
trie/valuenode.go
xeth/xeth.go
2015-11-03 18:25:50 -05: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
6a6cd10299
rebase 1.2.2
2015-10-13 11:56:11 -04:00
Christopher Franko
164a9acc5d
updated copyright headers
2015-09-12 18:17:11 -04:00
Christopher Franko
df8d523760
update some discovery nodes
...
will this help?
2015-09-12 10:59:51 -04:00
Christopher Franko
ec3fb93c03
Update legalese
2015-09-11 08:22:53 -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
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
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
9db4a14176
update backend
2015-09-01 18:59:44 -04:00
Franko
554f07b16e
changes
2015-09-01 18:56:30 -04:00
Christopher Franko
1a1d9a14ab
change folder because why not
2015-09-01 18:24:03 -04:00
Christopher Franko
5008f4cabd
change folder because why not
2015-08-07 15:38:43 -04:00
