consensus should be able to change (#300)

diff --git a/blockchain/txbuilder/actions.go b/blockchain/txbuilder/actions.go
index 8021f35..f5b40bc 100644 (file)
--- a/blockchain/txbuilder/actions.go
+++ b/blockchain/txbuilder/actions.go
@@ -168,7 +168,7 @@ func (a *crossOutAction) Build(ctx context.Context, b *TemplateBuilder) error {
                return MissingFieldsError(missing...)
        }
 
                return MissingFieldsError(missing...)
        }
 

-       address, err := common.DecodeAddress(a.Address, &consensus.BytomMainNetParams)
+       address, err := common.DecodeAddress(a.Address, consensus.BytomMainNetParams(&consensus.ActiveNetParams))

        if err != nil {
                return err
        }
        if err != nil {
                return err
        }

diff --git a/blockchain/txbuilder/txbuilder_test.go b/blockchain/txbuilder/txbuilder_test.go
index 76035ed..bc85f8f 100644 (file)
--- a/blockchain/txbuilder/txbuilder_test.go
+++ b/blockchain/txbuilder/txbuilder_test.go
@@ -88,7 +88,7 @@ func TestBuildIntra(t *testing.T) {
 }
 
 func newCrossOutAction(assetAmt bc.AssetAmount, redeemContract []byte) *crossOutAction {
 }
 
 func newCrossOutAction(assetAmt bc.AssetAmount, redeemContract []byte) *crossOutAction {

-       address, err := common.NewAddressWitnessPubKeyHash(redeemContract, &consensus.BytomMainNetParams)
+       address, err := common.NewAddressWitnessPubKeyHash(redeemContract, consensus.BytomMainNetParams(&consensus.ActiveNetParams))

        if err != nil {
                panic(err)
        }
        if err != nil {
                panic(err)
        }

diff --git a/consensus/general.go b/consensus/general.go
index bc311b2..0a399c2 100644 (file)
--- a/consensus/general.go
+++ b/consensus/general.go
@@ -206,7 +206,13 @@ func BlockSubsidy(height uint64) uint64 {
 }
 
 // BytomMainNetParams is the config for bytom mainnet
 }
 
 // BytomMainNetParams is the config for bytom mainnet

-var BytomMainNetParams = Params{
-       Name:            "main",
-       Bech32HRPSegwit: "bm",
+func BytomMainNetParams(vaporParam *Params) *Params {
+       bech32HRPSegwit := "sm"
+       switch vaporParam.Name {
+       case "main":
+               bech32HRPSegwit = "bm"
+       case "test":
+               bech32HRPSegwit = "tm"
+       }
+       return &Params{Bech32HRPSegwit: bech32HRPSegwit}

 }
 }

diff --git a/toolbar/federation/synchron/mainchain_keeper.go b/toolbar/federation/synchron/mainchain_keeper.go
index 37d5aeb..37cb747 100644 (file)
--- a/toolbar/federation/synchron/mainchain_keeper.go
+++ b/toolbar/federation/synchron/mainchain_keeper.go
@@ -68,7 +68,7 @@ func (m *mainchainKeeper) Run() {
 
 func (m *mainchainKeeper) createCrossChainReqs(db *gorm.DB, crossTransactionID uint64, tx *types.Tx, statusFail bool) error {
        prog := tx.Inputs[0].ControlProgram()
 
 func (m *mainchainKeeper) createCrossChainReqs(db *gorm.DB, crossTransactionID uint64, tx *types.Tx, statusFail bool) error {
        prog := tx.Inputs[0].ControlProgram()

-       fromAddress := common.ProgToAddress(prog, &consensus.BytomMainNetParams)
+       fromAddress := common.ProgToAddress(prog, consensus.BytomMainNetParams(&consensus.ActiveNetParams))

        toAddress := common.ProgToAddress(prog, &consensus.MainNetParams)
        for i, rawOutput := range tx.Outputs {
                if !bytes.Equal(rawOutput.OutputCommitment.ControlProgram, m.federationProg) {
        toAddress := common.ProgToAddress(prog, &consensus.MainNetParams)
        for i, rawOutput := range tx.Outputs {
                if !bytes.Equal(rawOutput.OutputCommitment.ControlProgram, m.federationProg) {

diff --git a/toolbar/federation/synchron/sidechain_keeper.go b/toolbar/federation/synchron/sidechain_keeper.go
index f60b4af..9cb22be 100644 (file)
--- a/toolbar/federation/synchron/sidechain_keeper.go
+++ b/toolbar/federation/synchron/sidechain_keeper.go
@@ -84,7 +84,7 @@ func (s *sidechainKeeper) createCrossChainReqs(db *gorm.DB, crossTransactionID u
                        AssetAmount:        rawOutput.OutputCommitment().AssetAmount.Amount,
                        Script:             hex.EncodeToString(prog),
                        FromAddress:        fromAddress,
                        AssetAmount:        rawOutput.OutputCommitment().AssetAmount.Amount,
                        Script:             hex.EncodeToString(prog),
                        FromAddress:        fromAddress,

-                       ToAddress:          common.ProgToAddress(prog, &consensus.BytomMainNetParams),
+                       ToAddress:          common.ProgToAddress(prog, consensus.BytomMainNetParams(&consensus.ActiveNetParams)),

                }
 
                if err := db.Create(req).Error; err != nil {
                }
 
                if err := db.Create(req).Error; err != nil {

diff --git a/wallet/annotated.go b/wallet/annotated.go
index b6bf016..50746ce 100644 (file)
--- a/wallet/annotated.go
+++ b/wallet/annotated.go
@@ -192,7 +192,7 @@ func (w *Wallet) BuildAnnotatedInput(tx *types.Tx, i uint32) *query.AnnotatedInp
 func (w *Wallet) getAddressFromControlProgram(prog []byte, isMainchain bool) string {
        netParams := &consensus.ActiveNetParams
        if isMainchain {
 func (w *Wallet) getAddressFromControlProgram(prog []byte, isMainchain bool) string {
        netParams := &consensus.ActiveNetParams
        if isMainchain {

-               netParams = &consensus.BytomMainNetParams
+               netParams = consensus.BytomMainNetParams(&consensus.ActiveNetParams)

        }
 
        if segwit.IsP2WPKHScript(prog) {
        }
 
        if segwit.IsP2WPKHScript(prog) {