From 61404979ed9b4f88b0fe3fc02beb2ef47149cec6 Mon Sep 17 00:00:00 2001 From: Gustav Simonsson Date: Fri, 27 Nov 2015 15:40:29 +0100 Subject: [release/1.3.4] parmas, crypto, core, core/vm: homestead consensus protocol changes * change gas cost for contract creating txs * invalidate signature with s value greater than secp256k1 N / 2 * OOG contract creation if not enough gas to store code * new difficulty adjustment algorithm * new DELEGATECALL op code Conflicts: core/vm/environment.go crypto/crypto.go crypto/secp256k1/secp256.go eth/api.go --- cmd/evm/main.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'cmd') 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) } -- cgit v1.2.3 From e7fb300053cee6add25b5cd1547abce5aaee8d21 Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Wed, 24 Feb 2016 13:35:20 +0100 Subject: [release/1.3.4] cmd/geth: bump version v1.3.4 --- cmd/geth/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmd') 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 ( -- cgit v1.2.3 From 5f7e74d5c8c7bef4481d8457183e6d2b4a8a79a6 Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Mon, 29 Feb 2016 14:15:18 +0100 Subject: [release/1.3.4] cmd/utils: lower the min accepted gas price for relay and GPO to 20 shannon (cherry picked from commit ab92678fb39300d5823857a170be6638b1c2b2c5) --- cmd/utils/flags.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmd') diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 3792dc1e0..815e233a8 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", -- cgit v1.2.3 From 61be63bb9b8527bb3e2357ad35a0f4ef29304da1 Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Mon, 29 Feb 2016 10:01:01 +0100 Subject: [release/1.3.4] cmd/utils, params: homestead block (cherry picked from commit e22fd22c97b4f5d4af118dca3fb2cb6292a520a6) Conflicts: cmd/utils/flags.go --- cmd/utils/flags.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'cmd') diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 815e233a8..fd73b4417 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -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) { -- cgit v1.2.3