Christopher Franko
efc04c3cbd
Merge branch 'rebase-1.5.9'
2017-03-29 19:39:05 -04:00
Christopher Franko
85d410d34e
move all the deps to the latest repo
...
This was over looked for so long because it was already taken care of in
the newer branches.
2017-03-20 09:11:55 -04:00
Christopher Franko
428072d760
Merge remote-tracking branch 'refs/remotes/ethereum/master'
2016-10-11 18:11:05 -04:00
Christopher Franko
87ec39aadb
Merge https://github.com/ethereum/go-ethereum into rebase-1.4.16
2016-10-08 09:23:35 -04:00
Christopher Franko
6a1f963ce2
Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.4.4
2016-06-16 20:02:11 -04:00
Franko
77b280115b
cleanup rebase 1.4.6
2016-06-14 19:19:09 -04:00
Christopher Franko
e959453cda
Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.4.4
2016-06-14 18:14:19 -04:00
Christopher Franko
7db52dcdb5
Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.4.4
2016-05-26 13:11:02 -04:00
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
Christopher Franko
87272925b9
Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4
2016-05-17 17:41:14 -04:00
Christopher Franko
fa5f67607b
Merge https://github.com/ethereum/go-ethereum into rebase-1.3.4
2016-03-07 08:15:13 -05:00
Christopher Franko
153dd19ec1
Merge https://github.com/ethereum/go-ethereum into rebase-1.3.4
2016-03-02 11:54:34 -05:00
Christopher Franko
f32e770d2c
Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.3.3
...
# Conflicts:
# cmd/gexp/main.go
2016-01-15 08:50:40 -05:00
Christopher Franko
c880ed1843
update bootnodes
...
added new ones
2015-11-29 09:07:14 -05:00
Christopher Franko
47588d735a
param change
2015-11-29 08:18:01 -05:00
Christopher Franko
5bc04ee47b
eth -> exp
...
eth to exp
2015-11-28 18:57:50 -05:00
Christopher Franko
0f519942a4
Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.3.2
2015-11-28 18:40:20 -05:00
Franko
9514a34050
last rebase-1.3.1 commit
2015-11-03 19:36:42 -05:00
Christopher Franko
625543fcd8
find replace 3
2015-11-03 18:52:31 -05:00
Christopher Franko
15d15d5d81
find replace 2
2015-11-03 18:48:15 -05:00
Christopher Franko
936b85dbe9
find replace
2015-11-03 18:44:44 -05:00
Christopher Franko
fa39ba0d6e
fixed typos
2015-11-03 18:40:53 -05:00
Christopher Franko
ad40345157
refactor to /exp from /eth
2015-11-03 18:27:41 -05:00
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
