Skip to content

Commit d69e003

Browse files
committed
Fix parsing getTx response
1 parent cf71ad1 commit d69e003

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

indexer/pchain/utils.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package pchain
22

33
import (
4+
"encoding/json"
45
"flare-indexer/utils/chain"
56

67
"github.com/ava-labs/avalanchego/ids"
78
"github.com/ava-labs/avalanchego/utils/formatting"
8-
"github.com/ava-labs/avalanchego/utils/json"
9+
avaJson "github.com/ava-labs/avalanchego/utils/json"
910
"github.com/ava-labs/avalanchego/vms/components/avax"
1011
"github.com/ava-labs/avalanchego/vms/platformvm/genesis"
1112
"github.com/ava-labs/avalanchego/vms/platformvm/txs"
13+
"github.com/pkg/errors"
1214
)
1315

1416
func CallPChainGetTxApi(client chain.RPCClient, txID string) (*txs.Tx, error) {
@@ -29,7 +31,12 @@ func CallPChainGetTxApi(client chain.RPCClient, txID string) (*txs.Tx, error) {
2931
}
3032

3133
// Parse from hex string
32-
txData, err := formatting.Decode(formatting.Hex, string(reply.Tx))
34+
var txString string
35+
err = json.Unmarshal(reply.Tx, &txString)
36+
if err != nil {
37+
return nil, errors.Wrap(err, "failed to unmarshal tx string")
38+
}
39+
txData, err := formatting.Decode(formatting.Hex, txString)
3340
if err != nil {
3441
return nil, err
3542
}
@@ -46,7 +53,7 @@ func CallPChainGetTxApi(client chain.RPCClient, txID string) (*txs.Tx, error) {
4653
//
4754
// To avoid an additional dependency
4855
type GetRewardUTXOsReply struct {
49-
NumFetched json.Uint64 `json:"numFetched"`
56+
NumFetched avaJson.Uint64 `json:"numFetched"`
5057
UTXOs []string `json:"utxos"`
5158
Encoding formatting.Encoding `json:"encoding"`
5259
}

0 commit comments

Comments
 (0)