Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/geyser_transform/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func main() {
txSig := solana.MustSignatureFromBase58(cmd.StringArg("signature"))

// Fetch the transaction from the RPC
maxSupportedTransactionVersion := uint64(0)
maxSupportedTransactionVersion := uint64(1)
txRes, err := rpcClient.GetTransaction(ctx, txSig, &rpc.GetTransactionOpts{
Commitment: rpc.CommitmentConfirmed,
MaxSupportedTransactionVersion: &maxSupportedTransactionVersion,
Expand Down Expand Up @@ -167,7 +167,7 @@ func main() {
s := solana.MustSignatureFromBase58(sigArg)
txSig = &s

maxSupportedTransactionVersion := uint64(0)
maxSupportedTransactionVersion := uint64(1)
txRes, err := rpcClient.GetTransaction(ctx, *txSig, &rpc.GetTransactionOpts{
Commitment: rpc.CommitmentConfirmed,
MaxSupportedTransactionVersion: &maxSupportedTransactionVersion,
Expand Down
67 changes: 67 additions & 0 deletions cmd/reclaim_rent/gpa_v2.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package main

import (
"context"

"github.com/gagliardetto/solana-go"
"github.com/gagliardetto/solana-go/rpc"
)

// getProgramAccountsV2 is a thin wrapper around the getProgramAccountsV2 RPC
// method (a paginated getProgramAccounts). Upstream solana-go does not expose
// it, so it lives here rather than in a fork of the SDK.

type getProgramAccountsV2Opts struct {
rpc.GetProgramAccountsOpts

Limit *uint64 `json:"limit,omitempty"`
PaginationKey *string `json:"paginationKey,omitempty"`
ChangedSinceSlot *uint64 `json:"changedSinceSlot,omitempty"`
}

type getProgramAccountsV2Result struct {
Accounts []*rpc.KeyedAccount `json:"accounts"`
PaginationKey *string `json:"paginationKey,omitempty"`
TotalResults *uint64 `json:"totalResults,omitempty"`
}

func getProgramAccountsV2WithOpts(
ctx context.Context,
client *rpc.Client,
publicKey solana.PublicKey,
opts *getProgramAccountsV2Opts,
) (out getProgramAccountsV2Result, err error) {
obj := map[string]any{
"encoding": "base64",
}
if opts != nil {
if opts.Commitment != "" {
obj["commitment"] = string(opts.Commitment)
}
if len(opts.Filters) != 0 {
obj["filters"] = opts.Filters
}
if opts.Encoding != "" {
obj["encoding"] = opts.Encoding
}
if opts.DataSlice != nil {
obj["dataSlice"] = map[string]any{
"offset": opts.DataSlice.Offset,
"length": opts.DataSlice.Length,
}
}
if opts.Limit != nil {
obj["limit"] = opts.Limit
}
if opts.PaginationKey != nil {
obj["paginationKey"] = opts.PaginationKey
}
if opts.ChangedSinceSlot != nil {
obj["changedSinceSlot"] = opts.ChangedSinceSlot
}
}

params := []any{publicKey, obj}
err = client.RPCCallForInto(ctx, &out, "getProgramAccountsV2", params)
return
}
4 changes: 2 additions & 2 deletions cmd/reclaim_rent/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ func processBatch(ctx context.Context, rpcClient *rpc.Client, batch []DatabaseAc
return &txSig, nil
}

func getEmptyTokenAccounts(ctx context.Context, client *rpc.Client, mint solana.PublicKey, owner solana.PublicKey, pageKey *string) (rpc.GetProgramAccountsV2Result, error) {
func getEmptyTokenAccounts(ctx context.Context, client *rpc.Client, mint solana.PublicKey, owner solana.PublicKey, pageKey *string) (getProgramAccountsV2Result, error) {
mintOffset := uint64(0)
ownerOffset := uint64(32)
balanceOffset := uint64(64)
Expand All @@ -261,7 +261,7 @@ func getEmptyTokenAccounts(ctx context.Context, client *rpc.Client, mint solana.
dataSliceLength := uint64(0)
limit := uint64(10000)

return client.GetProgramAccountsV2WithOpts(ctx, solana.TokenProgramID, &rpc.GetProgramAccountsV2Opts{
return getProgramAccountsV2WithOpts(ctx, client, solana.TokenProgramID, &getProgramAccountsV2Opts{
GetProgramAccountsOpts: rpc.GetProgramAccountsOpts{
DataSlice: &rpc.DataSlice{
Offset: &dataSliceOffset,
Expand Down
2 changes: 1 addition & 1 deletion cmd/sol_refresher/cmd/coin.go
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ func findMigrationOrInitForPosition(ctx context.Context, rpcClient *rpc.Client,

fmt.Printf("Checking %d transactions for DBC migrations or inits...\n", len(signatures))

version := uint64(0)
version := uint64(1)
for _, sig := range signatures {
signature := sig.Signature.String()
txRes, err := rpcClient.GetTransaction(ctx, sig.Signature, &rpc.GetTransactionOpts{
Expand Down
36 changes: 15 additions & 21 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/ethereum/go-ethereum v1.15.8
github.com/gagliardetto/anchor-go v1.0.0
github.com/gagliardetto/binary v0.8.0
github.com/gagliardetto/solana-go v1.13.0
github.com/gagliardetto/solana-go v1.23.0
github.com/gagliardetto/treeout v0.1.4
github.com/go-playground/validator/v10 v10.26.0
github.com/gofiber/contrib/fiberzap/v2 v2.1.5
Expand Down Expand Up @@ -47,27 +47,26 @@ require (
golang.org/x/crypto v0.48.0
golang.org/x/net v0.50.0
golang.org/x/sync v0.19.0
google.golang.org/grpc v1.71.1
google.golang.org/grpc v1.80.0
google.golang.org/protobuf v1.36.11
)

require github.com/bdragon300/tusgo v0.1.2 // indirect

require (
filippo.io/edwards25519 v1.0.0-rc.1 // indirect
github.com/DataDog/zstd v1.5.2 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect
github.com/andybalholm/brotli v1.2.0 // indirect
github.com/artyom/autoflags v1.1.1 // indirect
github.com/artyom/httpflags v1.2.0 // indirect
github.com/artyom/oembed v1.0.1 // indirect
github.com/benbjohnson/clock v1.3.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.17.0 // indirect
github.com/blendle/zapdriver v1.3.1 // indirect
github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/buger/jsonparser v1.1.2 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cockroachdb/errors v1.11.3 // indirect
Expand Down Expand Up @@ -101,7 +100,7 @@ require (
github.com/fatih/color v1.18.0 // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.9 // indirect
github.com/gammazero/deque v1.0.0 // indirect
github.com/getsentry/sentry-go v0.27.0 // indirect
Expand All @@ -114,6 +113,7 @@ require (
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/goccy/go-json v0.10.6 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/golang-migrate/migrate/v4 v4.18.3 // indirect
Expand All @@ -125,7 +125,7 @@ require (
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/orderedcode v0.0.1 // indirect
github.com/gorilla/rpc v1.2.0 // indirect
github.com/gorilla/rpc v1.2.1 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/gowebpki/jcs v1.0.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
Expand All @@ -142,7 +142,6 @@ require (
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kamstrup/intmap v0.5.1 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/klauspost/compress v1.18.0 // indirect
Expand All @@ -164,16 +163,14 @@ require (
github.com/minio/sha256-simd v1.0.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mmcloughlin/addchain v0.4.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 // indirect
github.com/multiformats/go-base32 v0.0.3 // indirect
github.com/multiformats/go-base36 v0.1.0 // indirect
github.com/multiformats/go-multibase v0.0.3 // indirect
github.com/multiformats/go-multihash v0.2.3 // indirect
github.com/multiformats/go-varint v0.0.6 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
github.com/oasisprotocol/curve25519-voi v0.0.0-20251114093237-2ab5a27a1729 // indirect
github.com/oklog/ulid/v2 v2.1.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/petermattis/goid v0.0.0-20250319124200-ccd6737f222a // indirect
Expand All @@ -197,7 +194,7 @@ require (
github.com/shopspring/decimal v1.4.0 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/spf13/pflag v1.0.10 // indirect
github.com/streamingfast/logging v0.0.0-20230608130331-f22c91403091 // indirect
github.com/streamingfast/logging v0.0.0-20250404134358-92b15d2fbd2e // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/supranational/blst v0.3.14 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
Expand All @@ -209,29 +206,26 @@ require (
github.com/valyala/fasttemplate v1.2.2 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.etcd.io/bbolt v1.4.0-alpha.0.0.20240404170359-43604f3112c5 // indirect
go.mongodb.org/mongo-driver v1.14.0 // indirect
go.mongodb.org/mongo-driver/v2 v2.5.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
go.opentelemetry.io/otel v1.40.0 // indirect
go.opentelemetry.io/otel/metric v1.40.0 // indirect
go.opentelemetry.io/otel/trace v1.40.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/ratelimit v0.2.0 // indirect
go.uber.org/ratelimit v0.3.1 // indirect
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
golang.org/x/sys v0.41.0 // indirect
golang.org/x/term v0.40.0 // indirect
golang.org/x/text v0.34.0 // indirect
golang.org/x/time v0.10.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
golang.org/x/time v0.11.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gorm.io/driver/postgres v1.5.0 // indirect
gorm.io/gorm v1.25.5 // indirect
lukechampine.com/blake3 v1.1.6 // indirect
rsc.io/markdown v0.0.0-20241212154241-6bf72452917f // indirect
rsc.io/tmplfunc v0.0.3 // indirect
)

replace github.com/gagliardetto/solana-go => github.com/rickyrombo/solana-go v0.0.0-20251201234416-e59646f7798f
Loading
Loading