Skip to content

Commit 25ce321

Browse files
askolesovaskolesov
committed
Implemented signing and broadcasting
1 parent 65a9b35 commit 25ce321

File tree

10 files changed

+164
-150
lines changed

10 files changed

+164
-150
lines changed

‎cmd/zblcli/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"path"
66

77
app "git.dsr-corporation.com/zb-ledger/zb-ledger"
8-
codecUtils "git.dsr-corporation.com/zb-ledger/zb-ledger/utils/codec/rest"
98
keyUtils "git.dsr-corporation.com/zb-ledger/zb-ledger/utils/key/rest"
109
proxyUtils "git.dsr-corporation.com/zb-ledger/zb-ledger/utils/proxy/rest"
10+
txUtils "git.dsr-corporation.com/zb-ledger/zb-ledger/utils/tx/rest"
1111

1212
"github.com/cosmos/cosmos-sdk/client"
1313
"github.com/cosmos/cosmos-sdk/client/keys"
@@ -75,8 +75,8 @@ func registerRoutes(rs *lcd.RestServer) {
7575
authrest.RegisterTxRoutes(rs.CliCtx, rs.Mux)
7676
app.ModuleBasics.RegisterRESTRoutes(rs.CliCtx, rs.Mux)
7777
proxyUtils.RegisterRoutes(rs.CliCtx, rs.Mux)
78-
codecUtils.RegisterRoutes(rs.CliCtx, rs.Mux)
7978
keyUtils.RegisterRoutes(rs.CliCtx, rs.Mux)
79+
txUtils.RegisterRoutes(rs.CliCtx, rs.Mux)
8080
}
8181

8282
func queryCmd(cdc *amino.Codec) *cobra.Command {

‎utils/codec/rest/query.go

-68
This file was deleted.

‎utils/codec/rest/rest.go

-11
This file was deleted.

‎utils/proxy/rest/query.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/cosmos/cosmos-sdk/types/rest"
1212
)
1313

14-
func blocksHandler(cliCtx context.CLIContext) http.HandlerFunc {
14+
func BlocksHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
1515
return func(w http.ResponseWriter, r *http.Request) {
1616
err := r.ParseForm()
1717
if err != nil {

‎utils/proxy/rest/rest.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ import (
77
)
88

99
func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router) {
10-
r.HandleFunc("/blocks", blocksHandler(cliCtx)).Methods("GET")
10+
r.HandleFunc("/blocks", BlocksHandlerFn(cliCtx)).Methods("GET")
1111
}

‎utils/tx/rest/query.go

+147
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
package rest
2+
3+
import (
4+
"encoding/base64"
5+
"io/ioutil"
6+
"net/http"
7+
8+
sdk "github.com/cosmos/cosmos-sdk/types"
9+
10+
"github.com/cosmos/cosmos-sdk/client/flags"
11+
"github.com/cosmos/cosmos-sdk/x/auth/client/utils"
12+
13+
"github.com/cosmos/cosmos-sdk/codec"
14+
15+
"github.com/cosmos/cosmos-sdk/types/rest"
16+
"github.com/cosmos/cosmos-sdk/x/auth/types"
17+
auth "github.com/cosmos/cosmos-sdk/x/auth/types"
18+
19+
"github.com/cosmos/cosmos-sdk/client/context"
20+
)
21+
22+
// EncodeTxRequestHandlerFn returns the decode tx REST handler. In particular,
23+
// it takes a base64-encoded bytes, decodes it using the Amino wire protocol,
24+
// and responds with JSON-encoded transaction.
25+
func DecodeTxRequestHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
26+
return func(w http.ResponseWriter, r *http.Request) {
27+
body, err := ioutil.ReadAll(r.Body)
28+
if err != nil {
29+
rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
30+
return
31+
}
32+
33+
var req DecodeTxsRequest
34+
35+
err = cliCtx.Codec.UnmarshalJSON(body, &req)
36+
if err != nil {
37+
rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
38+
return
39+
}
40+
41+
resp := DecodeTxsResponse{
42+
Txs: []auth.StdTx{},
43+
}
44+
45+
for _, base64str := range req.Txs {
46+
tx, err := decodeTx(cliCtx.Codec, base64str)
47+
if err != nil {
48+
rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
49+
return
50+
}
51+
52+
resp.Txs = append(resp.Txs, tx)
53+
}
54+
55+
rest.PostProcessResponseBare(w, cliCtx, &resp)
56+
}
57+
}
58+
59+
func decodeTx(cdc *codec.Codec, base64str string) (tx auth.StdTx, err error) {
60+
var res types.StdTx
61+
62+
bytes, err := base64.StdEncoding.DecodeString(base64str)
63+
if err != nil {
64+
return auth.StdTx{}, err
65+
}
66+
67+
err = cdc.UnmarshalBinaryLengthPrefixed(bytes, &res)
68+
if err != nil {
69+
return auth.StdTx{}, err
70+
}
71+
72+
return res, nil
73+
}
74+
75+
func SignTxHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
76+
return func(w http.ResponseWriter, r *http.Request) {
77+
err := r.ParseForm()
78+
if err != nil {
79+
rest.WriteErrorResponse(w, http.StatusBadRequest, sdk.AppendMsgToErr("could not parse query parameters", err.Error()))
80+
return
81+
}
82+
83+
name, passphrase := r.FormValue("name"), r.FormValue("passphrase")
84+
85+
var signMsg types.StdSignMsg
86+
87+
if !rest.ReadRESTReq(w, r, cliCtx.Codec, &signMsg) {
88+
rest.WriteErrorResponse(w, http.StatusBadRequest, "failed to parse request")
89+
return
90+
}
91+
92+
txBldr := types.NewTxBuilder(
93+
utils.GetTxEncoder(cliCtx.Codec),
94+
signMsg.AccountNumber,
95+
signMsg.Sequence,
96+
signMsg.Fee.Gas,
97+
flags.DefaultGasAdjustment,
98+
false,
99+
signMsg.ChainID,
100+
signMsg.Memo,
101+
signMsg.Fee.Amount,
102+
nil,
103+
)
104+
105+
stdTx := auth.StdTx{
106+
Msgs: signMsg.Msgs,
107+
Fee: signMsg.Fee,
108+
Signatures: nil,
109+
Memo: signMsg.Memo,
110+
}
111+
112+
signedStdTx, err := txBldr.SignStdTx(name, passphrase, stdTx, false)
113+
114+
if err != nil {
115+
rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
116+
return
117+
}
118+
119+
rest.PostProcessResponse(w, cliCtx, signedStdTx)
120+
}
121+
}
122+
123+
func BroadcastTxHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
124+
return func(w http.ResponseWriter, r *http.Request) {
125+
var stdTx types.StdTx
126+
127+
if !rest.ReadRESTReq(w, r, cliCtx.Codec, &stdTx) {
128+
rest.WriteErrorResponse(w, http.StatusBadRequest, "failed to parse request")
129+
return
130+
}
131+
132+
txBytes, err := cliCtx.Codec.MarshalBinaryLengthPrefixed(stdTx)
133+
if err != nil {
134+
rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
135+
return
136+
}
137+
138+
cliCtx.BroadcastMode = "block"
139+
res, err := cliCtx.BroadcastTx(txBytes)
140+
if err != nil {
141+
rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
142+
return
143+
}
144+
145+
rest.PostProcessResponse(w, cliCtx, res)
146+
}
147+
}

‎utils/tx/rest/rest.go

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package rest
2+
3+
import (
4+
"github.com/cosmos/cosmos-sdk/client/context"
5+
6+
"github.com/gorilla/mux"
7+
)
8+
9+
func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router) {
10+
r.HandleFunc("/tx/decode", DecodeTxRequestHandlerFn(cliCtx)).Methods("POST")
11+
r.HandleFunc("/tx/sign", SignTxHandlerFn(cliCtx)).Methods("POST")
12+
r.HandleFunc("/tx/broadcast", BroadcastTxHandlerFn(cliCtx)).Methods("POST")
13+
}

‎utils/codec/rest/types.go ‎utils/tx/rest/types.go

File renamed without changes.

‎x/compliance/client/rest/rest.go

-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@ func RegisterRoutes(cliCtx context.CLIContext, r *mux.Router, storeName string)
1717
r.HandleFunc(fmt.Sprintf("/%s/model_info", storeName), modelInfoHeadersHandler(cliCtx, storeName)).Methods("GET")
1818
r.HandleFunc(fmt.Sprintf("/%s/model_info/{%s}", storeName, restName), modelInfoHandler(cliCtx,
1919
storeName)).Methods("GET")
20-
r.HandleFunc(fmt.Sprintf("/%s/model_info", storeName), addModelInfoHandler(cliCtx)).Methods("POST")
2120
}

‎x/compliance/client/rest/tx.go

-66
This file was deleted.

0 commit comments

Comments
 (0)