certusone
/
wormhole-explorer
mirror of https://github.com/certusone/wormhole-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix `vaa.txHash` for Solana and Aptos (#443) 

For Solana and Aptos, the transaction hash returned by `GET /api/v1/vaas` is incorrect (currently it's the value transmitted in the gossip network, which is not the real transaction hash).

This pull request replaces it with the real transaction hash.
This commit is contained in:
agodnic 2023-06-21 17:00:11 -03:00 committed by GitHub
parent 4b4b6f61ca
commit 532412077b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/handlers/vaa/model.go
View File

@ -26,13 +26,16 @@ type VaaDoc struct {
UpdatedAt *time.Time `bson:"updatedAt" json:"updatedAt"`
IndexedAt *time.Time `bson:"indexedAt" json:"indexedAt"`
// TxHash is an extension field - it is not present in the guardian API.
TxHash *string `bson:"txHash" json:"txHash"`
TxHash *string `bson:"txHash" json:"txHash,omitempty"`
// AppId is an extension field - it is not present in the guardian API.
AppId string `bson:"appId" json:"appId,omitempty"`
// Payload is an extension field - it is not present in the guardian API.
Payload map[string]interface{} `bson:"payload" json:"payload,omitempty"`
// NativeTxHash is an extension field - it is not present in the guardian API.
NativeTxHash string `bson:"nativeTxHash" json:"nativeTxHash,omitempty"`
// NativeTxHash is an internal field.
//
// It is not intended to be accessed by consumers of this package.
NativeTxHash string `bson:"nativeTxHash"`
}
// MarshalJSON interface implementation.

27
api/handlers/vaa/repository.go
View File

@ -7,7 +7,7 @@ import (
"github.com/pkg/errors"
"github.com/wormhole-foundation/wormhole-explorer/api/handlers/transactions"
"github.com/wormhole-foundation/wormhole-explorer/api/internal/pagination"
"github.com/wormhole-foundation/wormhole/sdk/vaa"
sdk "github.com/wormhole-foundation/wormhole/sdk/vaa"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options"
@ -204,7 +204,7 @@ func (r *Repository) FindVaas(
// execute the aggregation pipeline
var err error
var cur *mongo.Cursor
if q.chainId == vaa.ChainIDPythNet {
if q.chainId == sdk.ChainIDPythNet {
cur, err = r.collections.vaasPythnet.Aggregate(ctx, pipeline)
} else {
cur, err = r.collections.vaas.Aggregate(ctx, pipeline)
@ -241,6 +241,25 @@ func (r *Repository) FindVaas(
}
}
// For Solana and Aptos VAAs, overwrite the txHash found in the `vaas` collection
// with the one from the `globalTransactions` collection.
//
// We have to do this because the value that comes from the gossip network is not
// the real transaction hash in the case of those chains.
//
// If there is no transaction hash in the `globalTransactions` collection, we have no
// option but to set the field to nil.
for i := range vaasWithPayload {
vaa := vaasWithPayload[i]
if (vaa.EmitterChain == sdk.ChainIDSolana) || (vaa.EmitterChain == sdk.ChainIDAptos) {
if vaa.NativeTxHash == "" {
vaa.TxHash = nil
} else {
vaa.TxHash = &vaa.NativeTxHash
}
}
}
return vaasWithPayload, nil
}
@ -269,7 +288,7 @@ func (r *Repository) GetVaaCount(ctx context.Context, q *VaaQuery) ([]*VaaStats,
type VaaQuery struct {
pagination.Pagination
id string
chainId vaa.ChainID
chainId sdk.ChainID
emitter string
sequence string
txHash string
@ -290,7 +309,7 @@ func (q *VaaQuery) SetID(id string) *VaaQuery {
}
// SetChain set the chainId field of the VaaQuery struct.
func (q *VaaQuery) SetChain(chainID vaa.ChainID) *VaaQuery {
func (q *VaaQuery) SetChain(chainID sdk.ChainID) *VaaQuery {
q.chainId = chainID
return q
}