Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move importproof RPC endpoint into new tapdev RPC server #420

Merged
merged 3 commits into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions perms/perms.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,6 @@ var (
Entity: "proofs",
Action: "read",
}},
"/taprpc.TaprootAssets/ImportProof": {{
Entity: "proofs",
Action: "write",
}},
"/taprpc.TaprootAssets/SendAsset": {{
Entity: "assets",
Action: "write",
Expand Down Expand Up @@ -184,6 +180,10 @@ var (
Entity: "universe",
Action: "read",
}},
"/tapdevrpc.TapDev/ImportProof": {{
Entity: "proofs",
Action: "write",
}},
}

// defaultMacaroonWhitelist defines a default set of RPC endpoints that
Expand Down
7 changes: 5 additions & 2 deletions rpcserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ 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/tapscript"
"github.com/lightninglabs/taproot-assets/universe"
Expand Down Expand Up @@ -77,6 +78,7 @@ type rpcServer struct {
wrpc.UnimplementedAssetWalletServer
mintrpc.UnimplementedMintServer
unirpc.UnimplementedUniverseServer
tapdevrpc.UnimplementedTapDevServer

interceptor signal.Interceptor

Expand Down Expand Up @@ -143,6 +145,7 @@ func (r *rpcServer) RegisterWithGrpcServer(grpcServer *grpc.Server) error {
wrpc.RegisterAssetWalletServer(grpcServer, r)
mintrpc.RegisterMintServer(grpcServer, r)
unirpc.RegisterUniverseServer(grpcServer, r)
tapdevrpc.RegisterGrpcServer(grpcServer, r)
return nil
}

Expand Down Expand Up @@ -1314,7 +1317,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,
in *taprpc.ImportProofRequest) (*taprpc.ImportProofResponse, error) {
in *tapdevrpc.ImportProofRequest) (*tapdevrpc.ImportProofResponse, error) {

// We'll perform some basic input validation before we move forward.
if len(in.ProofFile) == 0 {
Expand All @@ -1332,7 +1335,7 @@ func (r *rpcServer) ImportProof(ctx context.Context,
return nil, err
}

return &taprpc.ImportProofResponse{}, nil
return &tapdevrpc.ImportProofResponse{}, nil
}

// AddrReceives lists all receives for incoming asset transfers for addresses
Expand Down
2 changes: 1 addition & 1 deletion taprpc/gen_protos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -e
function generate() {
echo "Generating root gRPC server protos"

PROTOS="taprootassets.proto assetwalletrpc/assetwallet.proto mintrpc/mint.proto universerpc/universe.proto"
PROTOS="taprootassets.proto assetwalletrpc/assetwallet.proto mintrpc/mint.proto universerpc/universe.proto tapdevrpc/tapdev.proto"

# For each of the sub-servers, we then generate their protos, but a restricted
# set as they don't yet require REST proxies, or swagger docs.
Expand Down
9 changes: 9 additions & 0 deletions taprpc/tapdevrpc/config_active.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
//go:build dev

package tapdevrpc

import "google.golang.org/grpc"

func RegisterGrpcServer(grpcServer *grpc.Server, srv TapDevServer) {
RegisterTapDevServer(grpcServer, srv)
}
8 changes: 8 additions & 0 deletions taprpc/tapdevrpc/config_default.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//go:build !dev

package tapdevrpc

import "google.golang.org/grpc"

func RegisterGrpcServer(_ *grpc.Server, _ TapDevServer) {
}
216 changes: 216 additions & 0 deletions taprpc/tapdevrpc/tapdev.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading