[[FIX]] add address key format fork

Author: bysomeone

common/address/driver.go

@@ -40,6 +40,8 @@ type Driver interface {
 	FromString(addr string) ([]byte, error)
 	// ToString encode to string
 	ToString(addr []byte) string
+	// FormatAddr to unified format
+	FormatAddr(addr string) string
 }
 
 // DriverInfo driver info

common/address/driver_test.go

@@ -48,6 +48,8 @@ func (m *mockDriver) ToString([]byte) string { return "" }
 
 func (m *mockDriver) FromString(string) ([]byte, error) { return nil, nil }
 
+func (m *mockDriver) FormatAddr(addr string) string { return "" }
+
 func Test_RegisterDriver(t *testing.T) {
 
 	m := &mockDriver{}

common/address/util.go

@@ -6,6 +6,9 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
+// ForkFormatAddressKey 地址key格式化分叉名称,主要针对eth地址
+const ForkFormatAddressKey = "ForkFormatAddressKey"
+
 // IsEthAddress verifies whether a string can represent
 // a valid hex-encoded eth address
 func IsEthAddress(addr string) bool {
@@ -19,9 +22,11 @@ func ToLower(addr string) string {
 
 // FormatAddrKey format addr as db key
 func FormatAddrKey(addr string) []byte {
+
 	// eth地址有大小写区分, 统一采用小写格式key存储(#1245)
 	if IsEthAddress(addr) {
-		addr = ToLower(addr)
+		ethDriver, _ := LoadDriver(2, -1)
+		addr = ethDriver.FormatAddr(addr)
 	}
 
 	return []byte(addr)

rpc/types/types.go

@@ -7,6 +7,8 @@ package types
 
 import (
 	"encoding/json"
+
+	_ "github.com/33cn/chain33/system/address"
 )
 
 // TransParm transport parameter

system/address/btc/address.go

@@ -77,6 +77,8 @@ func (b *btc) FromString(addr string) ([]byte, error) {
 	return decodeFromString(address.NormalVer, addr)
 }
 
+func (b *btc) FormatAddr(addr string) string { return addr }
+
 type btcMultiSign struct{}
 
 // PubKeyToAddr public key to address
@@ -111,6 +113,8 @@ func (b *btcMultiSign) FromString(addr string) ([]byte, error) {
 	return decodeFromString(address.MultiSignVer, addr)
 }
 
+func (b *btcMultiSign) FormatAddr(addr string) string { return addr }
+
 func encodeToString(version byte, raw []byte) string {
 	var ad [25]byte
 	ad[0] = version

system/address/eth/address.go

@@ -3,6 +3,8 @@ package eth
 import (
 	"errors"
 
+	"github.com/33cn/chain33/common/crypto/client"
+
 	"github.com/33cn/chain33/common/address"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
@@ -41,7 +43,7 @@ func (e *eth) PubKeyToAddr(pubKey []byte) string {
 	if value, ok := addrCache.Get(pubStr); ok {
 		return value.(string)
 	}
-	addr := PubKey2EthAddr(pubKey)
+	addr := pubKey2EthAddr(pubKey)
 	addrCache.Add(pubStr, addr)
 	return addr
 }
@@ -61,7 +63,7 @@ func (e *eth) GetName() string {
 
 // ToString trans to string format
 func (e *eth) ToString(addr []byte) string {
-	return address.ToLower(common.BytesToAddress(addr).String())
+	return formatAddr(common.BytesToAddress(addr).String())
 }
 
 // FromString trans to byte format
@@ -72,16 +74,29 @@ func (e *eth) FromString(addr string) ([]byte, error) {
 	return common.HexToAddress(addr).Bytes(), nil
 }
 
-// PubKey2EthAddr format eth addr
-func PubKey2EthAddr(pubKey []byte) string {
+func (e *eth) FormatAddr(addr string) string {
+
+	return formatAddr(addr)
+}
+
+func formatAddr(addr string) string {
+	ctx := client.GetCryptoContext()
+	if ctx.API == nil || ctx.API.GetConfig().IsFork(ctx.CurrBlockHeight, address.ForkFormatAddressKey) {
+		return address.ToLower(addr)
+	}
+	return addr
+}
+
+// pubKey2EthAddr format eth addr
+func pubKey2EthAddr(pubKey []byte) string {
 
 	pub, err := crypto.DecompressPubkey(pubKey)
 	// ecdsa public key, compatible with ethereum, get address from eth api
 	if err == nil {
-		return address.ToLower(crypto.PubkeyToAddress(*pub).String())
+		return formatAddr(crypto.PubkeyToAddress(*pub).String())
 	}
 	// just format as eth address if pubkey not compatible
 	var a common.Address
 	a.SetBytes(crypto.Keccak256(pubKey[1:])[12:])
-	return address.ToLower(a.String())
+	return formatAddr(a.String())
 }

types/fork.go

@@ -5,6 +5,7 @@
 package types
 
 import (
+	"github.com/33cn/chain33/common/address"
 	"strings"
 )
 
@@ -139,6 +140,7 @@ func (f *Forks) SetTestNetFork() {
 	f.SetFork("ForkCacheDriver", 2580000)
 	f.SetFork("ForkTicketFundAddrV1", 3350000)
 	f.SetFork("ForkRootHash", 4500000)
+	f.SetFork(address.ForkFormatAddressKey, 0)
 }
 
 func (f *Forks) setLocalFork() {

types/types.go

@@ -25,7 +25,6 @@ import (
 	"github.com/golang/protobuf/proto"
 
 	// 注册system的crypto 加密算法
-	_ "github.com/33cn/chain33/system/address"
 	_ "github.com/33cn/chain33/system/crypto/init"
 )