Merge branch 'master' into nit-1280-switch-to-go-ethereum-pos-apis-to-write-new-blocks-and

Author: ganeshvanahalli

accounts/abi/bind/bind.go

@@ -77,6 +77,21 @@ func isKeyWord(arg string) bool {
 	return true
 }
 
+func duplicates(methods map[string]abi.Method) map[string]bool {
+	var (
+		identifiers = make(map[string]bool)
+		dups        = make(map[string]bool)
+	)
+	for _, method := range methods {
+		identifiers, dups := identifiers, dups
+		if identifiers[method.RawName] {
+			dups[method.RawName] = true
+		}
+		identifiers[method.RawName] = true
+	}
+	return dups
+}
+
 // Bind generates a Go wrapper around a contract ABI. This wrapper isn't meant
 // to be used as is in client code, but rather as an intermediate struct which
 // enforces compile time type safety and naming convention opposed to having to
@@ -121,6 +136,7 @@ func Bind(types []string, abis []string, bytecodes []string, fsigs []map[string]
 			callIdentifiers     = make(map[string]bool)
 			transactIdentifiers = make(map[string]bool)
 			eventIdentifiers    = make(map[string]bool)
+			dups                = duplicates(evmABI.Methods)
 		)
 
 		for _, input := range evmABI.Constructor.Inputs {
@@ -132,12 +148,16 @@ func Bind(types []string, abis []string, bytecodes []string, fsigs []map[string]
 		for _, original := range evmABI.Methods {
 			// Normalize the method for capital cases and non-anonymous inputs/outputs
 			normalized := original
-			normalizedName := methodNormalizer[lang](alias(aliases, original.Name))
 			// Ensure there is no duplicated identifier
 			var identifiers = callIdentifiers
 			if !original.IsConstant() {
 				identifiers = transactIdentifiers
 			}
+			name := original.RawName
+			if dups[original.RawName] {
+				name = fmt.Sprintf("%s%x", original.RawName, original.ID)
+			}
+			normalizedName := methodNormalizer[lang](alias(aliases, name))
 			// Name shouldn't start with a digit. It will make the generated code invalid.
 			if len(normalizedName) > 0 && unicode.IsDigit(rune(normalizedName[0])) {
 				normalizedName = fmt.Sprintf("M%s", normalizedName)

accounts/abi/bind/bind_test.go

@@ -1486,7 +1486,7 @@ var bindTests = []struct {
 				}
 			}
 		}()
-		contract.Foo(auth, big.NewInt(1), big.NewInt(2))
+		contract.Foo04bc52f8(auth, big.NewInt(1), big.NewInt(2))
 		sim.Commit()
 		select {
 		case n := <-resCh:
@@ -1497,7 +1497,7 @@ var bindTests = []struct {
 			t.Fatalf("Wait bar0 event timeout")
 		}
 
-		contract.Foo0(auth, big.NewInt(1))
+		contract.Foo2fbebd38(auth, big.NewInt(1))
 		sim.Commit()
 		select {
 		case n := <-resCh:

eth/tracers/api.go

@@ -128,6 +128,10 @@ func (api *API) blockByHash(ctx context.Context, hash common.Hash) (*types.Block
 	if block == nil {
 		return nil, fmt.Errorf("block %s not found", hash.Hex())
 	}
+	canonical := rawdb.ReadCanonicalHash(api.backend.ChainDb(), block.NumberU64())
+	if hash != canonical {
+		return nil, fmt.Errorf("hash %s is not currently canonical", hash.Hex())
+	}
 	return block, nil
 }
 

internal/ethapi/api.go

@@ -1178,13 +1178,14 @@ func doCall(ctx context.Context, b Backend, args TransactionArgs, state *state.S
 func updateHeaderForPendingBlocks(blockNrOrHash rpc.BlockNumberOrHash, header *types.Header) *types.Header {
 	if blockNrOrHash.BlockNumber != nil &&
 		*blockNrOrHash.BlockNumber == rpc.PendingBlockNumber {
-		headerCopy := *header
+		headerCopy := types.CopyHeader(header)
 		now := uint64(time.Now().Unix())
 		if now > headerCopy.Time {
 			headerCopy.Time = now
 		}
 		headerCopy.Number = new(big.Int).Add(headerCopy.Number, common.Big1)
-		return &headerCopy
+		headerCopy.ParentHash = header.Hash()
+		return headerCopy
 	}
 	return header
 }