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

node/pkg/solana: fork solana-go to add GetConfirmedTransactionWithOpts 

certusone/wormhole#248

Change-Id: I093d619cb82b35b963447cf4a5dc18ef6be1a0f5
This commit is contained in:
Leo 2021-07-29 13:18:32 +02:00
parent cd8d2f68ed
commit b9633d6d65
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bridge/go.mod
View File

@ -36,3 +36,7 @@ require (
google.golang.org/grpc v1.33.2
google.golang.org/protobuf v1.26.0
)
// Temporary fork that adds GetConfirmedTransactionWithOpts. Can be removed
// once Solana mainnet has upgraded to v1.7.x.
replace github.com/gagliardetto/solana-go => github.com/certusone/solana-go v0.3.7-0.20210729105530-67b495e4e529

4
bridge/go.sum
View File

@ -160,6 +160,8 @@ github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH
github.com/cenkalti/backoff/v4 v4.1.1 h1:G2HAfAmvm/GcKan2oOQpBXOd2tT2G57ZnZGWa1PxPBQ=
github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/certusone/solana-go v0.3.7-0.20210729105530-67b495e4e529 h1:D25SWQpocC/pt9rUSm8kiatG5UnYvBKoRojVfYGj8bo=
github.com/certusone/solana-go v0.3.7-0.20210729105530-67b495e4e529/go.mod h1:C+RTxMF4yVLstKfNhHZc5+ICi7TCxc09iAvrCQLR5G0=
github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
@ -277,8 +279,6 @@ github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/gagliardetto/solana-go v0.3.5-0.20210727215348-0cf016734976 h1:GI1jyfodEY04A2NlMTLVpPkW4kzAhTdMTyewR66cMls=
github.com/gagliardetto/solana-go v0.3.5-0.20210727215348-0cf016734976/go.mod h1:C+RTxMF4yVLstKfNhHZc5+ICi7TCxc09iAvrCQLR5G0=
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI=
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=

5
bridge/pkg/solana/client.go
View File

@ -230,7 +230,10 @@ OUTER:
rCtx, cancel := context.WithTimeout(ctx, rpcTimeout)
defer cancel()
start := time.Now()
tr, err := rpcClient.GetConfirmedTransaction(rCtx, signature)
tr, err := rpcClient.GetConfirmedTransactionWithOpts(rCtx, signature, &rpc.GetTransactionOpts{
Encoding: "json",
Commitment: commitment,
})
queryLatency.WithLabelValues("get_confirmed_transaction", string(commitment)).Observe(time.Since(start).Seconds())
if err != nil {
solanaConnectionErrors.WithLabelValues("get_confirmed_transaction_error").Inc()