diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-10-03 16:40:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 16:40:05 +0800 |
| commit | 1639f1174e1021f8c614929615d7ad92fec2d19f (patch) | |
| tree | 47e1e558e2636c680183c921e1be943eef2fc964 /cmd | |
| parent | f88bca7ba96a16e10b9feee453dbdb4f81962f34 (diff) | |
| parent | d9ed63ec3840f9c7f4a58e8e4f5b245cbef05b85 (diff) | |
| download | go-tangerine-1639f1174e1021f8c614929615d7ad92fec2d19f.tar go-tangerine-1639f1174e1021f8c614929615d7ad92fec2d19f.tar.gz go-tangerine-1639f1174e1021f8c614929615d7ad92fec2d19f.tar.bz2 go-tangerine-1639f1174e1021f8c614929615d7ad92fec2d19f.tar.lz go-tangerine-1639f1174e1021f8c614929615d7ad92fec2d19f.tar.xz go-tangerine-1639f1174e1021f8c614929615d7ad92fec2d19f.tar.zst go-tangerine-1639f1174e1021f8c614929615d7ad92fec2d19f.zip | |
Merge pull request #3074 from karalabe/release/1.4
Geth 1.4.15 "Come at me bro"
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/evm/main.go | 5 | ||||
| -rw-r--r-- | cmd/geth/main.go | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/cmd/evm/main.go b/cmd/evm/main.go index aa48f6ede..04f51cecc 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -30,6 +30,7 @@ import ( "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" + "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/logger/glog" "gopkg.in/urfave/cli.v1" @@ -141,7 +142,9 @@ func run(ctx *cli.Context) error { ) } else { receiver := statedb.CreateAccount(common.StringToAddress("receiver")) - receiver.SetCode(common.Hex2Bytes(ctx.GlobalString(CodeFlag.Name))) + + code := common.Hex2Bytes(ctx.GlobalString(CodeFlag.Name)) + receiver.SetCode(crypto.Keccak256Hash(code), code) ret, err = vmenv.Call( sender, receiver.Address(), diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 71a185eb5..b7fc89d7d 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -47,11 +47,11 @@ import ( ) const ( - clientIdentifier = "Geth" // Client identifier to advertise over the network - versionMajor = 1 // Major version component of the current release - versionMinor = 4 // Minor version component of the current release - versionPatch = 14 // Patch version component of the current release - versionMeta = "prerelease" // Version metadata to append to the version string + clientIdentifier = "Geth" // Client identifier to advertise over the network + versionMajor = 1 // Major version component of the current release + versionMinor = 4 // Minor version component of the current release + versionPatch = 15 // Patch version component of the current release + versionMeta = "stable" // Version metadata to append to the version string versionOracle = "0xfa7b9770ca4cb04296cac84f37736d4041251cdf" // Ethereum address of the Geth release oracle ) |