clean

diff --git a/asset/builder.go b/asset/builder.go
index 8fef62f..4a4ac98 100644 (file)
--- a/asset/builder.go
+++ b/asset/builder.go
@@ -81,12 +81,13 @@ func (a *crossInAction) Build(ctx context.Context, builder *txbuilder.TemplateBu
                return errors.New("invalid sourceID format")
        }
 
+       fed := federation.GetFederation()
        // arguments will be set when materializeWitnesses
-       txin := types.NewCrossChainInput(nil, sourceID, *a.AssetId, a.Amount, a.SourcePos, federation.GetFederation().PegInScript, asset.RawDefinitionByte)
+       txin := types.NewCrossChainInput(nil, sourceID, *a.AssetId, a.Amount, a.SourcePos, fed.PegInScript, asset.RawDefinitionByte)
        log.Info("cross-chain input action built")
        builder.RestrictMinTime(time.Now())
        tplIn := &txbuilder.SigningInstruction{}
-       tplIn.AddRawWitnessKeys(federation.GetFederation().XPubs, federation.GetFederation().Path, federation.GetFederation().Quorum)
+       tplIn.AddRawWitnessKeys(fed.XPubs, fed.Path, fed.Quorum)
        a.reg.db.Set(sourceKey, []byte("true"))
        return builder.AddInput(txin, tplIn)
 }

diff --git a/consensus/federation/federation.go b/consensus/federation/federation.go
index 8672ee6..95d0513 100644 (file)
--- a/consensus/federation/federation.go
+++ b/consensus/federation/federation.go
@@ -56,6 +56,7 @@ func CheckFedConfig() error {
 
 func GetFederation() *federation {
        fed := parseFedConfig()
+       // use 1 for AssetKeyIndex
        assetSigner, err := signers.Create("asset", fed.XPubs, fed.Quorum, 1, signers.BIP0032)
        if err != nil {
                panic("fail to create federation assetSigner")