X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=asset%2Fbuilder.go;h=3cd4bfcdcfd967e849dd23611ff7afed96c6daa6;hb=16a3f2c87a10fc223149140138b76c7fa4bb1352;hp=0104553c3383f2a70fbb0f4c3b1865857cf38520;hpb=769788d6c4a72619e119c084f243f392830f0e0e;p=bytom%2Fvapor.git

diff --git a/asset/builder.go b/asset/builder.go
index 0104553c..3cd4bfcd 100644
--- a/asset/builder.go
+++ b/asset/builder.go
@@ -37,7 +37,6 @@ type crossInAction struct {
 }
 
 // TODO: also need to hard-code mapTx
-// TODO: check replay
 func (a *crossInAction) Build(ctx context.Context, builder *txbuilder.TemplateBuilder) error {
 	var missing []string
 	if len(a.FedXPubs) == 0 {
@@ -93,7 +92,7 @@ func (a *crossInAction) Build(ctx context.Context, builder *txbuilder.TemplateBu
 	path := signers.GetBip0032Path(assetSigner, signers.AssetKeySpace)
 	derivedXPubs := chainkd.DeriveXPubs(assetSigner.XPubs, path)
 	derivedPKs := chainkd.XPubKeys(derivedXPubs)
-	pegScript, err := buildPegScript(derivedPKs, assetSigner.Quorum)
+	pegInScript, err := buildPegInScript(derivedPKs, assetSigner.Quorum)
 	if err != nil {
 		return err
 	}
@@ -104,7 +103,7 @@ func (a *crossInAction) Build(ctx context.Context, builder *txbuilder.TemplateBu
 	}
 
 	// arguments will be set when materializeWitnesses
-	txin := types.NewCrossChainInput(nil, sourceID, *a.AssetId, a.Amount, a.SourcePos, pegScript, asset.RawDefinitionByte)
+	txin := types.NewCrossChainInput(nil, sourceID, *a.AssetId, a.Amount, a.SourcePos, pegInScript, asset.RawDefinitionByte)
 	log.Info("cross-chain input action built")
 	builder.RestrictMinTime(time.Now())
 	tplIn := &txbuilder.SigningInstruction{}
@@ -117,7 +116,7 @@ func (a *crossInAction) ActionType() string {
 	return "cross_chain_in"
 }
 
-func buildPegScript(pubkeys []ed25519.PublicKey, nrequired int) (program []byte, err error) {
+func buildPegInScript(pubkeys []ed25519.PublicKey, nrequired int) (program []byte, err error) {
 	controlProg, err := vmutil.P2SPMultiSigProgram(pubkeys, nrequired)
 	if err != nil {
 		return nil, err