request id [goreleaser]

synapsecns · Jul 5, 2024 · e28b400 · e28b400
1 parent 5f0b232
commit e28b400
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/contrib/opbot/botmd/commands.go b/contrib/opbot/botmd/commands.go
@@ -330,7 +330,7 @@ func (b *Bot) rfqRefund() *slacker.CommandDefinition {
 				}
 
 				nonce, err := b.submitter.SubmitTransaction(ctx.Context(), big.NewInt(int64(originChainID)), func(transactor *bind.TransactOpts) (tx *types.Transaction, err error) {
-					return fastBridgeHandle.Refund(transactor, rawRequest)
+					return fastBridgeHandle.Refund(transactor, common.Hex2Bytes(rawRequest.QuoteRequestRaw))
 				})
 				if err != nil {
 					log.Printf("error submitting refund: %v\n", err)
@@ -384,7 +384,7 @@ func convertChainName(input string) string {
 	return input
 }
 
-func getQuoteRequest(ctx context.Context, client relapi.RelayerClient, tx string) ([]byte, error) {
+func getQuoteRequest(ctx context.Context, client relapi.RelayerClient, tx string) (*relapi.GetQuoteRequestResponse, error) {
 	// at this point tx can be a txid or a has, we try both
 	txRequest, err := client.GetQuoteRequestStatusByTxHash(ctx, tx)
 	if err == nil {
@@ -398,5 +398,5 @@ func getQuoteRequest(ctx context.Context, client relapi.RelayerClient, tx string
 		return nil, fmt.Errorf("error fetching quote request: %w", err)
 	}
 
-	return common.Hex2Bytes(qr.QuoteRequestRaw), nil
+	return qr, nil
 }
diff --git a/services/rfq/relayer/relapi/handler.go b/services/rfq/relayer/relapi/handler.go
@@ -166,6 +166,10 @@ func (h *Handler) GetQuoteRequestByTxID(c *gin.Context) {
 
 	resp := GetQuoteRequestResponse{
 		QuoteRequestRaw: common.Bytes2Hex(quoteRequest.RawRequest),
+		OriginChainID:   quoteRequest.Transaction.OriginChainId,
+		DestChainID:     quoteRequest.Transaction.DestChainId,
+		OriginToken:     quoteRequest.Transaction.OriginToken.Hex(),
+		DestToken:       quoteRequest.Transaction.DestToken.Hex(),
 	}
 	c.JSON(http.StatusOK, resp)
 }

diff --git a/services/rfq/relayer/relapi/model.go b/services/rfq/relayer/relapi/model.go
@@ -28,4 +28,8 @@ type PutRelayAckResponse struct {
 // GetQuoteRequestResponse is the response to a get quote request.
 type GetQuoteRequestResponse struct {
 	QuoteRequestRaw string `json:"quote_request"`
+	OriginChainID   uint32 `json:"origin_chain_id"`
+	DestChainID     uint32 `json:"dest_chain_id"`
+	OriginToken     string `json:"origin_token"`
+	DestToken       string `json:"dest_token"`
 }