diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 1ba90565715d0c80960939e045610586548b559f..6d9482e6934e4d0d822b61e2267c30b5b9a9e83d 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -906,6 +906,13 @@ func MakeChainConfigFromDb(ctx *cli.Context, db ethdb.Database) *params.ChainCon
config.EIP158Block = params.MainNetSpuriousDragon
}
}
+ if config.ChainId.BitLen() == 0 {
+ if ctx.GlobalBool(TestNetFlag.Name) {
+ config.ChainId = params.TestNetChainID
+ } else {
+ config.ChainId = params.MainNetChainID
+ }
+ }
config.DAOForkSupport = true
}
diff --git a/core/blockchain_test.go b/core/blockchain_test.go
index dae857f01160fc958287bcb0a93b751bc009422c..934ae74e1afc2a27038a76d7c895c774d4cb94f2 100644
--- a/core/blockchain_test.go
+++ b/core/blockchain_test.go
@@ -1226,11 +1226,8 @@ func TestEIP155Transition(t *testing.T) {
block.AddTx(tx)
}
})
- errExp := "Invalid transaction chain id. Current chain id: 1 tx chain id: 2"
_, err := blockchain.InsertChain(blocks)
- if err == nil {
- t.Error("expected transaction chain id error")
- } else if err.Error() != errExp {
- t.Error("expected:", errExp, "got:", err)
+ if err != types.ErrInvalidChainId {
+ t.Error("expected error:", types.ErrInvalidChainId)
}
}
diff --git a/core/state_processor.go b/core/state_processor.go
index 46c5db0ee7ef5c3cbb6e65081c11f37fc3d53720..375b317f12b947255cc9d03fa8747d92a3b702fc 100644
--- a/core/state_processor.go
+++ b/core/state_processor.go
@@ -17,7 +17,6 @@
package core
import (
- "fmt"
"math/big"
"github.com/ethereum/go-ethereum/core/state"
@@ -73,10 +72,6 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
}
// Iterate over and process the individual transactions
for i, tx := range block.Transactions() {
- if tx.Protected() && tx.ChainId().Cmp(p.config.ChainId) != 0 {
- return nil, nil, nil, fmt.Errorf("Invalid transaction chain id. Current chain id: %v tx chain id: %v", p.config.ChainId, tx.ChainId())
- }
-
statedb.StartRecord(tx.Hash(), block.Hash(), i)
receipt, logs, _, err := ApplyTransaction(p.config, p.bc, gp, statedb, header, tx, totalUsedGas, cfg)
if err != nil {
diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go
index 48209e2d8e54d83016b7e5b19a168f1e5e45dc3d..7d571643f2883a3c7ca31351cbb3371617f7752d 100644
--- a/core/types/transaction_signing.go
+++ b/core/types/transaction_signing.go
@@ -21,13 +21,14 @@ import (
"errors"
"fmt"
"math/big"
- "reflect"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/params"
)
+var ErrInvalidChainId = errors.New("invalid chaid id for signer")
+
// sigCache is used to cache the derived sender and contains
// the signer used to derive it.
type sigCache struct {
@@ -75,7 +76,7 @@ func Sender(signer Signer, tx *Transaction) (common.Address, error) {
// If the signer used to derive from in a previous
// call is not the same as used current, invalidate
// the cache.
- if reflect.TypeOf(sigCache.signer) == reflect.TypeOf(signer) {
+ if sigCache.signer.Equal(signer) {
return sigCache.from, nil
}
}
@@ -104,6 +105,8 @@ type Signer interface {
SignECDSA(tx *Transaction, prv *ecdsa.PrivateKey) (*Transaction, error)
// WithSignature returns a copy of the transaction with the given signature
WithSignature(tx *Transaction, sig []byte) (*Transaction, error)
+ // Checks for equality on the signers
+ Equal(Signer) bool
}
// EIP155Transaction implements TransactionInterface using the
@@ -121,6 +124,11 @@ func NewEIP155Signer(chainId *big.Int) EIP155Signer {
}
}
+func (s EIP155Signer) Equal(s2 Signer) bool {
+ eip155, ok := s2.(EIP155Signer)
+ return ok && eip155.chainId.Cmp(s.chainId) == 0
+}
+
func (s EIP155Signer) SignECDSA(tx *Transaction, prv *ecdsa.PrivateKey) (*Transaction, error) {
return SignECDSA(s, tx, prv)
}
@@ -131,6 +139,10 @@ func (s EIP155Signer) PublicKey(tx *Transaction) ([]byte, error) {
return (HomesteadSigner{}).PublicKey(tx)
}
+ if tx.ChainId().Cmp(s.chainId) != 0 {
+ return nil, ErrInvalidChainId
+ }
+
V := normaliseV(s, tx.data.V)
if !crypto.ValidateSignatureValues(V, tx.data.R, tx.data.S, true) {
return nil, ErrInvalidSig
@@ -200,6 +212,11 @@ func (s EIP155Signer) SigECDSA(tx *Transaction, prv *ecdsa.PrivateKey) (*Transac
// homestead rules.
type HomesteadSigner struct{ FrontierSigner }
+func (s HomesteadSigner) Equal(s2 Signer) bool {
+ _, ok := s2.(HomesteadSigner)
+ return ok
+}
+
// WithSignature returns a new transaction with the given snature.
// This snature needs to be formatted as described in the yellow paper (v+27).
func (hs HomesteadSigner) WithSignature(tx *Transaction, sig []byte) (*Transaction, error) {
@@ -251,6 +268,11 @@ func (hs HomesteadSigner) PublicKey(tx *Transaction) ([]byte, error) {
type FrontierSigner struct{}
+func (s FrontierSigner) Equal(s2 Signer) bool {
+ _, ok := s2.(FrontierSigner)
+ return ok
+}
+
// WithSignature returns a new transaction with the given snature.
// This snature needs to be formatted as described in the yellow paper (v+27).
func (fs FrontierSigner) WithSignature(tx *Transaction, sig []byte) (*Transaction, error) {
diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go
index 89c590262949bc8f93d2fdda7036713736e99aca..dc618e57038f9a0725327fd8c510cee12d1994c6 100644
--- a/core/types/transaction_signing_test.go
+++ b/core/types/transaction_signing_test.go
@@ -114,3 +114,25 @@ func TestEIP155SigningVitalik(t *testing.T) {
}
}
+
+func TestChainId(t *testing.T) {
+ key, _ := defaultTestKey()
+
+ tx := NewTransaction(0, common.Address{}, new(big.Int), new(big.Int), new(big.Int), nil)
+
+ var err error
+ tx, err = tx.SignECDSA(NewEIP155Signer(big.NewInt(1)), key)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ _, err = Sender(NewEIP155Signer(big.NewInt(2)), tx)
+ if err != ErrInvalidChainId {
+ t.Error("expected error:", ErrInvalidChainId)
+ }
+
+ _, err = Sender(NewEIP155Signer(big.NewInt(1)), tx)
+ if err != nil {
+ t.Error("expected no error")
+ }
+}
diff --git a/params/util.go b/params/util.go
index 377f4ce7c9a129db4363a7e26b354eac54c7cf36..b96f33da2734042d5ca2974777e75434e9c837fb 100644
--- a/params/util.go
+++ b/params/util.go
@@ -37,4 +37,7 @@ var (
TestNetSpuriousDragon = big.NewInt(3000000)
MainNetSpuriousDragon = big.NewInt(3000000)
+
+ TestNetChainID = big.NewInt(2) // Test net default chain ID
+ MainNetChainID = big.NewInt(1) // main net default chain ID
)