| 修订版 | 3fa2288f08b3752ed437221f5efffbc3d529789f (tree) |
|---|---|
| 时间 | 2019-10-24 14:09:26 |
| 作者 | wz <mars@byto...> |
| Commiter | wz |
fix
blockchain/txbuilder/actions.go (diff) common/crossin_asset.go (diff) protocol/validation/tx.go (diff)| @@ -294,7 +294,7 @@ func (c *crossInAction) Build(ctx context.Context, builder *TemplateBuilder) err | ||
| 294 | 294 | tplIn := &SigningInstruction{} |
| 295 | 295 | fed := cfg.CommonConfig.Federation |
| 296 | 296 | |
| 297 | - if !common.IsCrossChainAssetOfNoBytom(c.RawDefinitionByte) { | |
| 297 | + if !common.IsOpenFederationIssueAsset(c.RawDefinitionByte) { | |
| 298 | 298 | tplIn.AddRawWitnessKeys(fed.Xpubs, cfg.FedAddressPath, fed.Quorum) |
| 299 | 299 | tplIn.AddDataWitness(cfg.FederationPMultiSigScript(cfg.CommonConfig)) |
| 300 | 300 | } |
| @@ -4,7 +4,7 @@ import ( | ||
| 4 | 4 | "encoding/json" |
| 5 | 5 | ) |
| 6 | 6 | |
| 7 | -func IsCrossChainAssetOfNoBytom(rawDefinitionByte []byte) bool { | |
| 7 | +func IsOpenFederationIssueAsset(rawDefinitionByte []byte) bool { | |
| 8 | 8 | var defMap map[string]interface{} |
| 9 | 9 | if err := json.Unmarshal(rawDefinitionByte, &defMap); err != nil { |
| 10 | 10 | return false |
| @@ -280,7 +280,7 @@ func checkValid(vs *validationState, e bc.Entry) (err error) { | ||
| 280 | 280 | |
| 281 | 281 | prog := e.ControlProgram |
| 282 | 282 | |
| 283 | - if !common.IsCrossChainAssetOfNoBytom(e.RawDefinitionByte) { | |
| 283 | + if !common.IsOpenFederationIssueAsset(e.RawDefinitionByte) { | |
| 284 | 284 | prog.Code = config.FederationWScript(config.CommonConfig) |
| 285 | 285 | } |
| 286 | 286 |
Fork