multi: move address marshal/unmarshal functions

To resolve another circular dependency issue in an upcoming commit, this
time between the address and taprpc package, we move two more functions
to another place where they fit better.
In general, any RPC package should _not_ have a dependency into other
packages, so this was wrong in the first place.

Author: guggero

address/address.go

@@ -17,6 +17,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/asset"
 	"github.com/lightninglabs/taproot-assets/commitment"
 	"github.com/lightninglabs/taproot-assets/fn"
+	"github.com/lightninglabs/taproot-assets/taprpc"
 	"github.com/lightningnetwork/lnd/tlv"
 )
 
@@ -536,3 +537,40 @@ func DecodeAddress(addr string, net *ChainParams) (*Tap, error) {
 
 	return &a, nil
 }
+
+// UnmarshalVersion parses an address version from the RPC variant.
+func UnmarshalVersion(version taprpc.AddrVersion) (Version, error) {
+	// For now, we'll only support two address versions. The ones in the
+	// future should be reserved for future use, so we disallow unknown
+	// versions.
+	switch version {
+	case taprpc.AddrVersion_ADDR_VERSION_UNSPECIFIED:
+		return V1, nil
+
+	case taprpc.AddrVersion_ADDR_VERSION_V0:
+		return V0, nil
+
+	case taprpc.AddrVersion_ADDR_VERSION_V1:
+		return V1, nil
+
+	default:
+		return 0, fmt.Errorf("unknown address version: %v", version)
+	}
+}
+
+// MarshalVersion marshals the native address version into the RPC variant.
+func MarshalVersion(version Version) (taprpc.AddrVersion, error) {
+	// For now, we'll only support two address versions. The ones in the
+	// future should be reserved for future use, so we disallow unknown
+	// versions.
+	switch version {
+	case V0:
+		return taprpc.AddrVersion_ADDR_VERSION_V0, nil
+
+	case V1:
+		return taprpc.AddrVersion_ADDR_VERSION_V1, nil
+
+	default:
+		return 0, fmt.Errorf("unknown address version: %v", version)
+	}
+}

rpcserver.go

@@ -1461,7 +1461,7 @@ func (r *rpcServer) NewAddr(ctx context.Context,
 		return nil, err
 	}
 
-	addrVersion, err := taprpc.UnmarshalAddressVersion(req.AddressVersion)
+	addrVersion, err := address.UnmarshalVersion(req.AddressVersion)
 	if err != nil {
 		return nil, err
 	}
@@ -3027,7 +3027,7 @@ func marshalAddr(addr *address.Tap,
 		return nil, err
 	}
 
-	addrVersion, err := taprpc.MarshalAddressVersion(addr.Version)
+	addrVersion, err := address.MarshalVersion(addr.Version)
 	if err != nil {
 		return nil, err
 	}

taprpc/marshal.go

@@ -11,7 +11,6 @@ import (
 	"github.com/btcsuite/btcd/btcec/v2/schnorr"
 	"github.com/btcsuite/btcd/txscript"
 	"github.com/btcsuite/btcd/wire"
-	"github.com/lightninglabs/taproot-assets/address"
 	"github.com/lightninglabs/taproot-assets/asset"
 	"github.com/lightninglabs/taproot-assets/commitment"
 	"github.com/lightninglabs/taproot-assets/fn"
@@ -165,44 +164,6 @@ func MarshalAssetVersion(version asset.Version) (AssetVersion, error) {
 	}
 }
 
-// UnmarshalAddressVerion parses an address version from the RPC variant.
-func UnmarshalAddressVersion(version AddrVersion) (address.Version, error) {
-	// For now we'll only support two address versions. The ones in the
-	// future should be reserved for future use, so we disallow unknown
-	// versions.
-	switch version {
-	case AddrVersion_ADDR_VERSION_UNSPECIFIED:
-		return address.V1, nil
-
-	case AddrVersion_ADDR_VERSION_V0:
-		return address.V0, nil
-
-	case AddrVersion_ADDR_VERSION_V1:
-		return address.V1, nil
-
-	default:
-		return 0, fmt.Errorf("unknown address version: %v", version)
-	}
-}
-
-// MarshalAddressVerion marshals the native address version into the RPC
-// variant.
-func MarshalAddressVersion(version address.Version) (AddrVersion, error) {
-	// For now we'll only support two address versions. The ones in the
-	// future should be reserved for future use, so we disallow unknown
-	// versions.
-	switch version {
-	case address.V0:
-		return AddrVersion_ADDR_VERSION_V0, nil
-
-	case address.V1:
-		return AddrVersion_ADDR_VERSION_V1, nil
-
-	default:
-		return 0, fmt.Errorf("unknown address version: %v", version)
-	}
-}
-
 // MarshalGenesisInfo marshals the native asset genesis into the RPC
 // counterpart.
 func MarshalGenesisInfo(gen *asset.Genesis, assetType asset.Type) *GenesisInfo {