taprpc: move ImportProof from tapdevrpc to taprpc

cmd/tapcli/main.go

@@ -347,7 +347,6 @@ func main() {
 	app.Commands = append(app.Commands, proofCommands...)
 	app.Commands = append(app.Commands, rfqCommands...)
 	app.Commands = append(app.Commands, universeCommands...)
-	app.Commands = append(app.Commands, devCommands...)
 
 	if err := app.Run(os.Args); err != nil {
 		fatal(err)

cmd/tapcli/proofs.go

@@ -23,6 +23,7 @@ var proofCommands = []cli.Command{
 			verifyProofCommand,
 			decodeProofCommand,
 			exportProofCommand,
+			importProofCommand,
 			proveOwnershipCommand,
 			verifyOwnershipCommand,
 		},
@@ -277,6 +278,52 @@ func exportProof(ctx *cli.Context) error {
 	return nil
 }
 
+var importProofCommand = cli.Command{
+	Name:      "importproof",
+	ShortName: "i",
+	Usage:     "import a taproot asset proof",
+	Description: `
+	Imports a taproot asset proof that contains the full provenance of an
+	asset. If the asset script key of the asset is known to the lnd node
+	the daemon is connected to, then this results in a spendable asset being
+	imported into the wallet.
+	`,
+	Flags: []cli.Flag{
+		cli.StringFlag{
+			Name: proofPathName,
+			Usage: "the path to the proof file on disk; use the " +
+				"dash character (-) to read from stdin instead",
+		},
+	},
+	Action: importProof,
+}
+
+func importProof(ctx *cli.Context) error {
+	ctxc := getContext()
+	client, cleanUp := getClient(ctx)
+	defer cleanUp()
+
+	if ctx.String(proofPathName) == "" {
+		return cli.ShowSubcommandHelp(ctx)
+	}
+
+	filePath := lncfg.CleanAndExpandPath(ctx.String(proofPathName))
+	proofFile, err := readFile(filePath)
+	if err != nil {
+		return fmt.Errorf("unable to read proof file: %w", err)
+	}
+
+	resp, err := client.ImportProof(ctxc, &taprpc.ImportProofRequest{
+		ProofFile: proofFile,
+	})
+	if err != nil {
+		return fmt.Errorf("unable to import proof file: %w", err)
+	}
+
+	printRespJSON(resp)
+	return nil
+}
+
 var proveOwnershipCommand = cli.Command{
 	Name:      "proveownership",
 	ShortName: "po",

itest/addrs_test.go

@@ -19,7 +19,6 @@ import (
 	"github.com/lightninglabs/taproot-assets/taprpc"
 	wrpc "github.com/lightninglabs/taproot-assets/taprpc/assetwalletrpc"
 	"github.com/lightninglabs/taproot-assets/taprpc/mintrpc"
-	"github.com/lightninglabs/taproot-assets/taprpc/tapdevrpc"
 	unirpc "github.com/lightninglabs/taproot-assets/taprpc/universerpc"
 	"github.com/lightninglabs/taproot-assets/universe"
 	"github.com/lightningnetwork/lnd/lntest/wait"
@@ -840,7 +839,7 @@ func testUnknownTlvType(t *harnessTest) {
 // using the development only ImportProof RPC on the destination node.
 func sendProof(t *harnessTest, src, dst *tapdHarness,
 	sendResp *taprpc.SendAssetResponse, scriptKey []byte,
-	genInfo *taprpc.GenesisInfo) *tapdevrpc.ImportProofResponse {
+	genInfo *taprpc.GenesisInfo) *taprpc.ImportProofResponse {
 
 	proofResp := exportProof(t, src, sendResp, scriptKey, genInfo)
 	return importProof(t, dst, proofResp.RawProofFile, genInfo.GenesisPoint)
@@ -892,12 +891,12 @@ func exportProof(t *harnessTest, src *tapdHarness,
 // importProof manually imports a proof using the development only ImportProof
 // RPC.
 func importProof(t *harnessTest, dst *tapdHarness, rawFile []byte,
-	genesisPoint string) *tapdevrpc.ImportProofResponse {
+	genesisPoint string) *taprpc.ImportProofResponse {
 
 	t.Logf("Importing proof %x", rawFile)
 
 	ctxb := context.Background()
-	importResp, err := dst.ImportProof(ctxb, &tapdevrpc.ImportProofRequest{
+	importResp, err := dst.ImportProof(ctxb, &taprpc.ImportProofRequest{
 		ProofFile:    rawFile,
 		GenesisPoint: genesisPoint,
 	})
@@ -910,7 +909,7 @@ func importProof(t *harnessTest, dst *tapdHarness, rawFile []byte,
 // universe RPCs and then imports it into the destination node.
 func sendUniProof(t *harnessTest, src, dst *tapdHarness, scriptKey []byte,
 	genInfo *taprpc.GenesisInfo, group *taprpc.AssetGroup,
-	outpoint string) *tapdevrpc.ImportProofResponse {
+	outpoint string) *taprpc.ImportProofResponse {
 
 	ctxb := context.Background()
 	ctxt, cancel := context.WithTimeout(ctxb, defaultWaitTimeout)
@@ -990,7 +989,7 @@ func sendUniProof(t *harnessTest, src, dst *tapdHarness, scriptKey []byte,
 
 	t.Logf("Importing proof %x", buf.Bytes())
 
-	importResp, err := dst.ImportProof(ctxb, &tapdevrpc.ImportProofRequest{
+	importResp, err := dst.ImportProof(ctxb, &taprpc.ImportProofRequest{
 		ProofFile:    buf.Bytes(),
 		GenesisPoint: genInfo.GenesisPoint,
 	})

itest/assets_test.go

@@ -21,7 +21,6 @@ import (
 	"github.com/lightninglabs/taproot-assets/taprpc"
 	wrpc "github.com/lightninglabs/taproot-assets/taprpc/assetwalletrpc"
 	"github.com/lightninglabs/taproot-assets/taprpc/mintrpc"
-	"github.com/lightninglabs/taproot-assets/taprpc/tapdevrpc"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
 	"github.com/stretchr/testify/require"
@@ -229,7 +228,7 @@ func transferAssetProofs(t *harnessTest, src, dst *tapdHarness,
 		proofFile := AssertAssetProofs(
 			t.t, src, chainClient, existingAsset,
 		)
-		_, err := dst.ImportProof(ctxt, &tapdevrpc.ImportProofRequest{
+		_, err := dst.ImportProof(ctxt, &taprpc.ImportProofRequest{
 			ProofFile:    proofFile,
 			GenesisPoint: gen.GenesisPoint,
 		})

itest/utils.go

@@ -507,7 +507,7 @@ func ConfirmBatch(t *testing.T, minerClient *rpcclient.Client,
 
 func ManualMintSimpleAsset(t *harnessTest, lndNode *node.HarnessNode,
 	tapClient *tapdHarness, commitVersion commitment.TapCommitmentVersion,
-	req *mintrpc.MintAsset) (*taprpc.Asset, *tapdevrpc.ImportProofRequest) {
+	req *mintrpc.MintAsset) (*taprpc.Asset, *taprpc.ImportProofRequest) {
 
 	ctxb := context.Background()
 	ctxt, cancel := context.WithTimeout(ctxb, defaultWaitTimeout)
@@ -668,7 +668,7 @@ func ManualMintSimpleAsset(t *harnessTest, lndNode *node.HarnessNode,
 	require.NoError(t.t, err)
 	require.True(t.t, proof.IsProofFile(proofBlob))
 
-	importReq := tapdevrpc.ImportProofRequest{
+	importReq := taprpc.ImportProofRequest{
 		ProofFile:    proofBlob,
 		GenesisPoint: genesisOutpoint.String(),
 	}

perms/perms.go

@@ -88,6 +88,10 @@ var (
 			Entity: "assets",
 			Action: "read",
 		}},
+		"/taprpc.TaprootAssets/ImportProof": {{
+			Entity: "proofs",
+			Action: "write",
+		}},
 		"/assetwalletrpc.AssetWallet/FundVirtualPsbt": {{
 			Entity: "assets",
 			Action: "write",
@@ -280,10 +284,6 @@ var (
 			// This RPC is completely stateless and doesn't require
 			// any permissions to use.
 		},
-		"/tapdevrpc.TapDev/ImportProof": {{
-			Entity: "proofs",
-			Action: "write",
-		}},
 		"/tapdevrpc.TapDev/SubscribeSendAssetEventNtfns": {{
 			Entity: "assets",
 			Action: "write",

rpcserver.go

@@ -1899,7 +1899,7 @@ func (r *rpcServer) ExportProof(ctx context.Context,
 // new asset will be inserted on disk, spendable using the specified target
 // script key, and internal key.
 func (r *rpcServer) ImportProof(ctx context.Context,
-	req *tapdevrpc.ImportProofRequest) (*tapdevrpc.ImportProofResponse,
+	req *taprpc.ImportProofRequest) (*taprpc.ImportProofResponse,
 	error) {
 
 	// We'll perform some basic input validation before we move forward.
@@ -1939,7 +1939,7 @@ func (r *rpcServer) ImportProof(ctx context.Context,
 		return nil, err
 	}
 
-	return &tapdevrpc.ImportProofResponse{}, nil
+	return &taprpc.ImportProofResponse{}, nil
 }
 
 // AddrReceives lists all receives for incoming asset transfers for addresses

taprpc/gen_protos.sh

@@ -26,6 +26,7 @@ tapchannelrpc/tapchannel.proto"
 
     # Generate the REST reverse proxy.
     annotationsFile=${file//proto/yaml}
+    echo $annotationsFile
     protoc -I/usr/local/include -I. \
       -I/tmp/build/.modcache/github.com/lightningnetwork/lnd@${LND_VERSION}/lnrpc \
       --grpc-gateway_out . \