From 7689fcd9362572c2886c08e64255a1f5ec062ccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Tigerstr=C3=B6m?= Date: Thu, 8 Jun 2023 21:54:18 +0200 Subject: [PATCH 1/2] taprpc: remove js build tag --- taprpc/assetwalletrpc/assetwallet.pb.json.go | 2 -- taprpc/gen_protos.sh | 4 ++-- taprpc/taprootassets.pb.json.go | 2 -- taprpc/universerpc/universe.pb.json.go | 2 -- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/taprpc/assetwalletrpc/assetwallet.pb.json.go b/taprpc/assetwalletrpc/assetwallet.pb.json.go index d6e10e537..6c529705b 100644 --- a/taprpc/assetwalletrpc/assetwallet.pb.json.go +++ b/taprpc/assetwalletrpc/assetwallet.pb.json.go @@ -1,8 +1,6 @@ // Code generated by falafel 0.9.1. DO NOT EDIT. // source: assetwallet.proto -// +build js - package assetwalletrpc import ( diff --git a/taprpc/gen_protos.sh b/taprpc/gen_protos.sh index 12a8086f1..15512b774 100755 --- a/taprpc/gen_protos.sh +++ b/taprpc/gen_protos.sh @@ -41,7 +41,7 @@ function generate() { # Generate the JSON/WASM client stubs. falafel=$(which falafel) pkg="taprpc" - opts="package_name=$pkg,js_stubs=1,build_tags=// +build js" + opts="package_name=$pkg,js_stubs=1" protoc -I/usr/local/include -I. -I.. \ --plugin=protoc-gen-custom=$falafel\ --custom_out=. \ @@ -51,7 +51,7 @@ function generate() { PACKAGES="assetwalletrpc universerpc" for package in $PACKAGES; do - opts="package_name=$package,manual_import=$manual_import,js_stubs=1,build_tags=// +build js" + opts="package_name=$package,manual_import=$manual_import,js_stubs=1" pushd $package protoc -I/usr/local/include -I. -I.. \ --plugin=protoc-gen-custom=$falafel\ diff --git a/taprpc/taprootassets.pb.json.go b/taprpc/taprootassets.pb.json.go index 9c47a0d28..bf046f651 100644 --- a/taprpc/taprootassets.pb.json.go +++ b/taprpc/taprootassets.pb.json.go @@ -1,8 +1,6 @@ // Code generated by falafel 0.9.1. DO NOT EDIT. // source: taprootassets.proto -// +build js - package taprpc import ( diff --git a/taprpc/universerpc/universe.pb.json.go b/taprpc/universerpc/universe.pb.json.go index de1e7816b..5f941e029 100644 --- a/taprpc/universerpc/universe.pb.json.go +++ b/taprpc/universerpc/universe.pb.json.go @@ -1,8 +1,6 @@ // Code generated by falafel 0.9.1. DO NOT EDIT. // source: universe.proto -// +build js - package universerpc import ( From 7e29f9f4cf3ceb38b038c7a97fad37b8bcf5313b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Tigerstr=C3=B6m?= Date: Fri, 9 Jun 2023 11:19:18 +0200 Subject: [PATCH 2/2] taprpc: add `mintrpc` to JSON callbacks generation --- taprpc/gen_protos.sh | 2 +- taprpc/mintrpc/mint.pb.json.go | 123 +++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+), 1 deletion(-) create mode 100644 taprpc/mintrpc/mint.pb.json.go diff --git a/taprpc/gen_protos.sh b/taprpc/gen_protos.sh index 15512b774..ebda64036 100755 --- a/taprpc/gen_protos.sh +++ b/taprpc/gen_protos.sh @@ -48,7 +48,7 @@ function generate() { --custom_opt="$opts" \ taprootassets.proto - PACKAGES="assetwalletrpc universerpc" + PACKAGES="assetwalletrpc universerpc mintrpc" for package in $PACKAGES; do opts="package_name=$package,manual_import=$manual_import,js_stubs=1" diff --git a/taprpc/mintrpc/mint.pb.json.go b/taprpc/mintrpc/mint.pb.json.go new file mode 100644 index 000000000..866eb81fe --- /dev/null +++ b/taprpc/mintrpc/mint.pb.json.go @@ -0,0 +1,123 @@ +// Code generated by falafel 0.9.1. DO NOT EDIT. +// source: mint.proto + +package mintrpc + +import ( + "context" + + gateway "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "google.golang.org/grpc" + "google.golang.org/protobuf/encoding/protojson" +) + +func RegisterMintJSONCallbacks(registry map[string]func(ctx context.Context, + conn *grpc.ClientConn, reqJSON string, callback func(string, error))) { + + marshaler := &gateway.JSONPb{ + MarshalOptions: protojson.MarshalOptions{ + UseProtoNames: true, + EmitUnpopulated: true, + }, + } + + registry["mintrpc.Mint.MintAsset"] = func(ctx context.Context, + conn *grpc.ClientConn, reqJSON string, callback func(string, error)) { + + req := &MintAssetRequest{} + err := marshaler.Unmarshal([]byte(reqJSON), req) + if err != nil { + callback("", err) + return + } + + client := NewMintClient(conn) + resp, err := client.MintAsset(ctx, req) + if err != nil { + callback("", err) + return + } + + respBytes, err := marshaler.Marshal(resp) + if err != nil { + callback("", err) + return + } + callback(string(respBytes), nil) + } + + registry["mintrpc.Mint.FinalizeBatch"] = func(ctx context.Context, + conn *grpc.ClientConn, reqJSON string, callback func(string, error)) { + + req := &FinalizeBatchRequest{} + err := marshaler.Unmarshal([]byte(reqJSON), req) + if err != nil { + callback("", err) + return + } + + client := NewMintClient(conn) + resp, err := client.FinalizeBatch(ctx, req) + if err != nil { + callback("", err) + return + } + + respBytes, err := marshaler.Marshal(resp) + if err != nil { + callback("", err) + return + } + callback(string(respBytes), nil) + } + + registry["mintrpc.Mint.CancelBatch"] = func(ctx context.Context, + conn *grpc.ClientConn, reqJSON string, callback func(string, error)) { + + req := &CancelBatchRequest{} + err := marshaler.Unmarshal([]byte(reqJSON), req) + if err != nil { + callback("", err) + return + } + + client := NewMintClient(conn) + resp, err := client.CancelBatch(ctx, req) + if err != nil { + callback("", err) + return + } + + respBytes, err := marshaler.Marshal(resp) + if err != nil { + callback("", err) + return + } + callback(string(respBytes), nil) + } + + registry["mintrpc.Mint.ListBatches"] = func(ctx context.Context, + conn *grpc.ClientConn, reqJSON string, callback func(string, error)) { + + req := &ListBatchRequest{} + err := marshaler.Unmarshal([]byte(reqJSON), req) + if err != nil { + callback("", err) + return + } + + client := NewMintClient(conn) + resp, err := client.ListBatches(ctx, req) + if err != nil { + callback("", err) + return + } + + respBytes, err := marshaler.Marshal(resp) + if err != nil { + callback("", err) + return + } + callback(string(respBytes), nil) + } +}