Commit graph

7561 commits

Author SHA1 Message Date
Christopher Franko
7db52dcdb5 Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.4.4 2016-05-26 13:11:02 -04:00
Péter Szilágyi
a269a713d6 Merge pull request #2606 from ethereum/release/1.4
VERSION, cmd/geth: bumped version 1.4.5
2016-05-24 11:31:56 +03:00
Péter Szilágyi
27df30f30f VERSION, cmd/geth: bumped version 1.4.5 2016-05-24 11:26:21 +03:00
Jeffrey Wilcke
311f5a0ed1 Merge branch 'release/1.4' 2016-05-24 10:03:21 +02:00
Péter Szilágyi
68ae6b52e9 [release 1.4.5] accounts/abi: fix abi test for go vet...
(cherry picked from commit 251b3c6406)
2016-05-24 09:45:40 +02:00
Péter Szilágyi
1776c717bf [release 1.4.5] accounts/abi/bind, eth: rely on getCode for sanity checks, not estimate and call
(cherry picked from commit 1580ec1804)
2016-05-24 09:33:15 +02:00
Jeffrey Wilcke
0f6e3e873a [release 1.4.5] eth: fixed regression in eth_signTransaction fixes #2578
Sign transaction returned the unsigned transaction rather than the
signed one.

(cherry picked from commit 4b1a7d3868)
2016-05-24 09:33:10 +02:00
Bas van Kervel
7a7a5acc9f [release 1.4.5] eth/filter: bugfix which can cause a nil pointer crash when parsing filter arguments
(cherry picked from commit 67cd4ee8d2)
2016-05-24 09:33:05 +02:00
Felix Lange
66d74dfb75 [release 1.4.5] cmd/geth: fix console history exclusion
Calls to 'personal' API should be excluded from console history because
they can be called with an account passphrase as argument. The check for
such calls was inverted and didn't work.

(cherry picked from commit 86da6feb40)

Conflicts:
	cmd/geth/js.go
2016-05-24 09:32:55 +02:00
Bas van Kervel
b950a2977c [release/1.4.5] eth: add new RPC method (personal.) SignAndSendTransaction
(cherry picked from commit 64a6c2c1b6)

Conflicts:
	cmd/geth/js.go
	internal/web3ext/web3ext.go
2016-05-24 09:32:45 +02:00
Christopher Franko
dc0a57520f Merge remote-tracking branch 'refs/remotes/origin/master' into rebase-1.4.4 2016-05-22 16:52:08 -04:00
Christopher Franko
bb79e8c2e3 update travis 2016-05-22 16:38:32 -04:00
Christopher Franko
58e149906c Merge pull request #13 from expanse-project/rebase-1.4.4
fix jeth.go
2016-05-22 13:42:38 -04:00
Christopher Franko
990f6f38de fix jeth.go 2016-05-22 13:37:06 -04:00
Christopher Franko
b118fdab7b Merge pull request #12 from expanse-project/rebase-1.4.4
Rebase 1.4.4
2016-05-22 11:17:11 -04:00
Christopher Franko
5ba12acaa6 Merge branch 'rebase-1.4.4' of https://github.com/expanse-project/go-expanse into rebase-1.4.4 2016-05-18 23:09:49 -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
fd63e0317b rpc and js-console both have eth calls on by default now 2016-05-18 22:52:39 -04:00
Christopher Franko
780536af26 adding eth api calls 2016-05-18 22:45:53 -04:00
Christopher Franko
8d53a2d73e rpc fixes continued 2016-05-18 22:26:25 -04:00
Franko
02cc702d0f make jsre console accept both exp and eth cmds 2016-05-18 21:48:06 -04:00
Christopher Franko
41d77c8622 more rpc fixes 2016-05-18 21:34:19 -04:00
Christopher Franko
33905f8b91 rpc calls still acting crazy 2016-05-18 21:11:10 -04:00
Christopher Franko
59522ac5e4 fixing rpc calls for eth_ for compatibility 2016-05-18 20:32:28 -04:00
Christopher Franko
61dd18aa9f merge continue 6
fixing expanse.js

Again not sure why this one got edited from the last one but -shrug-
2016-05-18 14:21:54 -04:00
Christopher Franko
9c61f49cfd Merge continue 5
Not sure why the merge tool changed this file and removed that but it
did.
2016-05-18 13:57:30 -04:00
Christopher Franko
7c1130c237 Merge continue 4
cleaned up a few Eth stragglers
2016-05-18 13:35:43 -04:00
Christopher Franko
46b10efca0 Merge continue 3 2016-05-18 13:32:14 -04:00
Christopher Franko
b37c24cdcd update versionOracle address for expanse 2016-05-18 13:27:22 -04:00
Christopher Franko
bd0ea23908 Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.4.4 2016-05-18 13:26:26 -04:00
Franko
b3d0e73e36 Merge continue 2 2016-05-18 11:45:18 -04:00
Christopher Franko
f3708d75e4 continue merging 1 2016-05-17 19:24:19 -04:00
Jeffrey Wilcke
8ea3c88e44 Fake commit to restart the build servers
Fake commit to hopefully fix the PPA issue.
2016-05-18 01:10:24 +02:00
Christopher Franko
87272925b9 Merge remote-tracking branch 'ethereum/master' into rebase-1.4.4 2016-05-17 17:41:14 -04:00
Jeffrey Wilcke
94ad694a26 Merge branch 'release/1.4' 2016-05-17 14:59:51 +02:00
Péter Szilágyi
4c6953606e [release/1.4.4] eth: skip transaction handling during fast sync
(cherry picked from commit d87f7a1e81)
2016-05-17 14:59:12 +02:00
Jeffrey Wilcke
fc0638f9d8 Merge branch 'release/1.4' 2016-05-13 12:10:31 +02:00
Jeffrey Wilcke
4b11f207cb VERSION, cmd/geth: bumped version 1.4.4 2016-05-12 21:10:38 +02:00
Jeffrey Wilcke
7e5c49cafa [release/1.4.4] event: fixed subscribtions to stopped event mux
This fixes an issue where the following would lead to a panic due to a
channel being closed twice:

* Start mux
* Stop mux
* Sub to mux
* Unsub

This is fixed by setting the subscriptions status to closed resulting in
the Unsubscribe to ignore the request when called.

(cherry picked from commit 7c1f74713e)
2016-05-12 20:53:31 +02:00
Péter Szilágyi
efcfa2209b [release/1.4.4] eth/downloader: bound fork ancestry and allow heavy short forks 2016-05-12 17:32:06 +02:00
Jeffrey Wilcke
aa18aad7ad [release/1.4.4] core: fixed pointer assignment
This fixes an issue where it's theoretical possible to cause a consensus
failure when hitting the lower end of the difficulty, though pratically
impossible it's worth a fix.
2016-05-12 17:31:57 +02:00
Péter Szilágyi
594328c112 [release/1.4.4] accounts/abi/bind: fix multi-value anonymous unmarshalling
(cherry picked from commit cc21706c50)
2016-05-12 17:19:29 +02:00
Jeffrey Wilcke
2e6b9c141b [release/1.4.4] accounts/abi: fixed unpacking in to already slice interfaces
Previously it was assumed that wheneven type `[]interface{}` was given
that the interface was empty. The abigen rightfully assumed that
interface slices which already have pre-allocated variable sets to be
assigned.

This PR fixes that by checking that the given `[]interface{}` is larger
than zero and assigns each value using the generic `set` function (this
function has also been moved to abi/reflect.go) and checks whether the
assignment was possible.

The generic assignment function `set` now also deals with pointers
(useful for interface slice mentioned above) by dereferencing the
pointer until it finds a setable type.

(cherry picked from commit 91a7a4a786)
2016-05-12 17:19:29 +02:00
Bas van Kervel
b38cea6654 [release/1.4.4] rpc: HTTP origin case insensitive
(cherry picked from commit 5479097790)
2016-05-12 17:19:25 +02:00
Jeffrey Wilcke
dd083aa34e Merge branch 'release/1.4'
Conflicts:
	VERSION
	cmd/geth/main.go
2016-05-10 13:48:11 +02:00
Jeffrey Wilcke
f213a9d8e8 VERSION, cmd/geth: bumped version 1.4.3 2016-05-10 13:46:03 +02:00
Jeffrey Wilcke
6826b2040f [release/1.4.3] miner: fixed pending state by not shutting down update loop
(cherry picked from commit a824c3f02f)
2016-05-10 13:46:03 +02:00
Jeffrey Wilcke
2a3657d8d9 VERSION, cmd/geth: bumped version 1.4.2 2016-05-10 13:46:02 +02:00
Jeffrey Wilcke
566af6ef92 VERSION, cmd/geth: bumped version 1.4.2 2016-05-10 10:32:27 +02:00
Jeffrey Wilcke
290e851f57 VERSION, cmd/geth: bumped version 1.4.2 2016-05-09 22:06:27 +02:00