Skip to content

Commit e3903d0

Browse files
committed
taprpc: add script key type to asset
1 parent 8c230eb commit e3903d0

File tree

5 files changed

+989
-938
lines changed

5 files changed

+989
-938
lines changed

taprpc/marshal.go

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -581,11 +581,18 @@ func MarshalAsset(ctx context.Context, a *asset.Asset,
581581
isSpent, withWitness bool, keyRing KeyLookup,
582582
decDisplay fn.Option[uint32]) (*Asset, error) {
583583

584-
scriptKeyIsLocal := false
585-
if a.ScriptKey.TweakedScriptKey != nil && keyRing != nil {
586-
scriptKeyIsLocal = keyRing.IsLocalKey(
587-
ctx, a.ScriptKey.RawKey,
588-
)
584+
var (
585+
scriptKeyIsLocal = false
586+
scriptKeyType = asset.ScriptKeyUnknown
587+
)
588+
if a.ScriptKey.TweakedScriptKey != nil {
589+
if keyRing != nil {
590+
scriptKeyIsLocal = keyRing.IsLocalKey(
591+
ctx, a.ScriptKey.RawKey,
592+
)
593+
}
594+
595+
scriptKeyType = a.ScriptKey.Type
589596
}
590597

591598
assetVersion, err := MarshalAssetVersion(a.Version)
@@ -607,6 +614,7 @@ func MarshalAsset(ctx context.Context, a *asset.Asset,
607614
ScriptKeyHasScriptPath: a.ScriptKey.HasScriptPath(),
608615
IsSpent: isSpent,
609616
IsBurn: a.IsBurn(),
617+
ScriptKeyType: MarshalScriptKeyType(scriptKeyType),
610618
}
611619

612620
decDisplay.WhenSome(func(u uint32) {

0 commit comments

Comments
 (0)