Merge pull request #2258 from obscuren/release/1.3.4v1.3.4

Homestead Release Candidate

3 files changed, 11 insertions, 4 deletions

diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index 64044c421..ef679e373 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -225,10 +225,15 @@ func (self *VMEnv) Call(caller vm.ContractRef, addr common.Address, data []byte,
 	self.Gas = gas
 	return core.Call(self, caller, addr, data, gas, price, value)
 }
+
 func (self *VMEnv) CallCode(caller vm.ContractRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
 	return core.CallCode(self, caller, addr, data, gas, price, value)
 }
 
+func (self *VMEnv) DelegateCall(caller vm.ContractRef, addr common.Address, data []byte, gas, price *big.Int) ([]byte, error) {
+	return core.DelegateCall(self, caller, addr, data, gas, price)
+}
+
 func (self *VMEnv) Create(caller vm.ContractRef, data []byte, gas, price, value *big.Int) ([]byte, common.Address, error) {
 	return core.Create(self, caller, data, gas, price, value)
 }
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 7b8043a24..76abf45f0 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -48,10 +48,10 @@ import (
 
 const (
 	ClientIdentifier = "Geth"
-	Version          = "1.3.3"
+	Version          = "1.3.4"
 	VersionMajor     = 1
 	VersionMinor     = 3
-	VersionPatch     = 3
+	VersionPatch     = 4
 )
 
 var (
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 3792dc1e0..fd73b4417 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -183,7 +183,7 @@ var (
 	GasPriceFlag = cli.StringFlag{
 		Name:  "gasprice",
 		Usage: "Minimal gas price to accept for mining a transactions",
-		Value: new(big.Int).Mul(big.NewInt(50), common.Shannon).String(),
+		Value: new(big.Int).Mul(big.NewInt(20), common.Shannon).String(),
 	}
 	ExtraDataFlag = cli.StringFlag{
 		Name:  "extradata",
@@ -356,7 +356,7 @@ var (
 	GpoMinGasPriceFlag = cli.StringFlag{
 		Name:  "gpomin",
 		Usage: "Minimum suggested gas price",
-		Value: new(big.Int).Mul(big.NewInt(50), common.Shannon).String(),
+		Value: new(big.Int).Mul(big.NewInt(20), common.Shannon).String(),
 	}
 	GpoMaxGasPriceFlag = cli.StringFlag{
 		Name:  "gpomax",
@@ -472,6 +472,8 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config {
 		cfg.DataDir += "/testnet"
 		cfg.NetworkId = 2
 		cfg.TestNet = true
+		// overwrite homestead block
+		params.HomesteadBlock = params.TestNetHomesteadBlock
 	}
 
 	if ctx.GlobalBool(VMEnableJitFlag.Name) {