modify address prefix for diff network

diff --git a/account/accounts.go b/account/accounts.go
index a499269..fc404b0 100644 (file)
--- a/account/accounts.go
+++ b/account/accounts.go
@@ -293,7 +293,7 @@ func (m *Manager) createP2PKH(ctx context.Context, account *Account, change bool
        pubHash := crypto.Ripemd160(derivedPK)
 
        // TODO: pass different params due to config
-       address, err := common.NewAddressWitnessPubKeyHash(pubHash, consensus.ActiveNetParams)
+       address, err := common.NewAddressWitnessPubKeyHash(pubHash, &consensus.ActiveNetParams)
        if err != nil {
                return nil, err
        }
@@ -324,7 +324,7 @@ func (m *Manager) createP2SH(ctx context.Context, account *Account, change bool)
        scriptHash := crypto.Sha256(signScript)
 
        // TODO: pass different params due to config
-       address, err := common.NewAddressWitnessScriptHash(scriptHash, consensus.ActiveNetParams)
+       address, err := common.NewAddressWitnessScriptHash(scriptHash, &consensus.ActiveNetParams)
        if err != nil {
                return nil, err
        }

diff --git a/account/builder.go b/account/builder.go
index 53a4a6c..693e8f8 100644 (file)
--- a/account/builder.go
+++ b/account/builder.go
@@ -152,7 +152,7 @@ func UtxoToInputs(signer *signers.Signer, u *UTXO) (*types.TxInput, *txbuilder.S
                return txInput, sigInst, nil
        }
 
-       address, err := common.DecodeAddress(u.Address, consensus.ActiveNetParams)
+       address, err := common.DecodeAddress(u.Address, &consensus.ActiveNetParams)
        if err != nil {
                return nil, nil, err
        }

diff --git a/api/accounts.go b/api/accounts.go
index 2d0d217..87a39e0 100644 (file)
--- a/api/accounts.go
+++ b/api/accounts.go
@@ -55,7 +55,7 @@ func (a *API) validateAddress(ctx context.Context, ins struct {
                Vaild:   false,
                IsLocal: false,
        }
-       address, err := common.DecodeAddress(ins.Address, consensus.ActiveNetParams)
+       address, err := common.DecodeAddress(ins.Address, &consensus.ActiveNetParams)
        if err != nil {
                return NewSuccessResponse(resp)
        }

diff --git a/blockchain/txbuilder/actions.go b/blockchain/txbuilder/actions.go
index 01bbd89..996c01e 100644 (file)
--- a/blockchain/txbuilder/actions.go
+++ b/blockchain/txbuilder/actions.go
@@ -72,7 +72,7 @@ func (a *controlAddressAction) Build(ctx context.Context, b *TemplateBuilder) er
                return MissingFieldsError(missing...)
        }
 
-       address, err := common.DecodeAddress(a.Address, consensus.ActiveNetParams)
+       address, err := common.DecodeAddress(a.Address, &consensus.ActiveNetParams)
        if err != nil {
                return err
        }

diff --git a/consensus/general.go b/consensus/general.go
index 53406d7..f8ea21c 100644 (file)
--- a/consensus/general.go
+++ b/consensus/general.go
@@ -90,7 +90,13 @@ type Params struct {
        Bech32HRPSegwit string
 }
 
-var ActiveNetParams = &MainNetParams
+var ActiveNetParams = MainNetParams
+
+// NetParams is the correspondence between chain_id and Params
+var NetParams = map[string]Params{
+       "mainnet": MainNetParams,
+       "testnet": TestNetParams,
+}
 
 // MainNetParams is the config for production
 var MainNetParams = Params{

diff --git a/node/node.go b/node/node.go
index 3ccee7b..9cfb885 100644 (file)
--- a/node/node.go
+++ b/node/node.go
@@ -59,9 +59,7 @@ type Node struct {
 
 func NewNode(config *cfg.Config) *Node {
        ctx := context.Background()
-       if config.ChainID == "testnet" {
-               consensus.ActiveNetParams = &consensus.TestNetParams
-       }
+       initActiveNetParams(config)
        // Get store
        txDB := dbm.NewDB("txdb", config.DBBackend, config.DBDir())
        store := leveldb.NewStore(txDB)
@@ -149,6 +147,14 @@ func NewNode(config *cfg.Config) *Node {
        return node
 }
 
+func initActiveNetParams(config *cfg.Config) {
+       var exist bool
+       consensus.ActiveNetParams, exist = consensus.NetParams[config.ChainID]
+       if !exist {
+               cmn.Exit(cmn.Fmt("chain_id[%v] don't exist", config.ChainID))
+       }
+}
+
 func initOrRecoverAccount(hsm *pseudohsm.HSM, wallet *w.Wallet) error {
        xpubs := hsm.ListKeys()
 

diff --git a/wallet/annotated.go b/wallet/annotated.go
index 571f852..a2c674b 100644 (file)
--- a/wallet/annotated.go
+++ b/wallet/annotated.go
@@ -241,7 +241,7 @@ func (w *Wallet) getAddressFromControlProgram(prog []byte) string {
 }
 
 func buildP2PKHAddress(pubHash []byte) string {
-       address, err := common.NewAddressWitnessPubKeyHash(pubHash, consensus.ActiveNetParams)
+       address, err := common.NewAddressWitnessPubKeyHash(pubHash, &consensus.ActiveNetParams)
        if err != nil {
                return ""
        }
@@ -250,7 +250,7 @@ func buildP2PKHAddress(pubHash []byte) string {
 }
 
 func buildP2SHAddress(scriptHash []byte) string {
-       address, err := common.NewAddressWitnessScriptHash(scriptHash, consensus.ActiveNetParams)
+       address, err := common.NewAddressWitnessScriptHash(scriptHash, &consensus.ActiveNetParams)
        if err != nil {
                return ""
        }