Skip to content

Commit

Permalink
fix: use dcaf-labs binary
Browse files Browse the repository at this point in the history
  • Loading branch information
sol-mocha committed Mar 10, 2023
1 parent ce70352 commit b4b6dd9
Show file tree
Hide file tree
Showing 85 changed files with 133 additions and 136 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ import (
"reflect"

"github.com/davecgh/go-spew/spew"
bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
"github.com/dcaf-labs/solana-go"
"github.com/dcaf-labs/solana-go/programs/system"
"github.com/dcaf-labs/solana-go/rpc"
Expand Down Expand Up @@ -386,7 +386,7 @@ func decodeSystemTransfer(tx *solana.Transaction) {

## Borsh encoding/decoding

You can use the `github.com/gagliardetto/binary` package for encoding/decoding borsh-encoded data:
You can use the `github.com/dcaf-labs/binary` package for encoding/decoding borsh-encoded data:

Decoder:

Expand Down Expand Up @@ -914,7 +914,7 @@ import (
"context"

"github.com/davecgh/go-spew/spew"
bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
solana "github.com/dcaf-labs/solana-go"
"github.com/dcaf-labs/solana-go/programs/token"
"github.com/dcaf-labs/solana-go/rpc"
Expand Down Expand Up @@ -2551,7 +2551,7 @@ import (
"context"

"github.com/davecgh/go-spew/spew"
bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
"github.com/dcaf-labs/solana-go"
"github.com/dcaf-labs/solana-go/programs/token"
"github.com/dcaf-labs/solana-go/rpc"
Expand Down
2 changes: 1 addition & 1 deletion cmd/slnc/cmd/decoding.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"fmt"
"log"

bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
"github.com/dcaf-labs/solana-go"
"github.com/dcaf-labs/solana-go/programs/token"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/slnc/cmd/get_spl_token.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"log"
"os"

bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
"github.com/dcaf-labs/solana-go"
"github.com/dcaf-labs/solana-go/programs/token"
"github.com/dcaf-labs/solana-go/rpc"
Expand Down
47 changes: 42 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,15 +1,53 @@
module github.com/dcaf-labs/solana-go

go 1.16
go 1.18

require (
github.com/gagliardetto/binary v0.7.7
github.com/dcaf-labs/binary v0.0.0-20230310044436-2ffd54be1497
github.com/gagliardetto/gofuzz v1.2.2
github.com/gagliardetto/treeout v0.1.4
)

require (
contrib.go.opencensus.io/exporter/stackdriver v0.13.4 // indirect
cloud.google.com/go v0.56.0 // indirect
github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect
github.com/blendle/zapdriver v1.3.1 // indirect
github.com/daaku/go.zipexe v1.0.0 // indirect
github.com/fsnotify/fsnotify v1.4.7 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/protobuf v1.4.2 // indirect
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/magiconair/properties v1.8.1 // indirect
github.com/mattn/go-colorable v0.1.4 // indirect
github.com/mattn/go-isatty v0.0.11 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/mapstructure v1.1.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml v1.2.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/afero v1.1.2 // indirect
github.com/spf13/cast v1.3.0 // indirect
github.com/spf13/jwalterweatherman v1.0.0 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.5 // indirect
google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940 // indirect
google.golang.org/grpc v1.28.0 // indirect
google.golang.org/protobuf v1.23.0 // indirect
gopkg.in/ini.v1 v1.51.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

require (
filippo.io/edwards25519 v1.0.0-rc.1
github.com/AlekSi/pointer v1.1.0
github.com/GeertJohan/go.rice v1.0.0
Expand All @@ -30,9 +68,8 @@ require (
github.com/spf13/cobra v1.1.1
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.7.1
github.com/streamingfast/logging v0.0.0-20220405224725-2755dab2ce75
github.com/streamingfast/logging v0.0.0-20221209193439-bff11742bf4c
github.com/stretchr/testify v1.7.0
github.com/teris-io/shortid v0.0.0-20201117134242-e59966efd125 // indirect
go.mongodb.org/mongo-driver v1.11.0
go.opencensus.io v0.22.5 // indirect
go.uber.org/ratelimit v0.2.0
Expand Down
50 changes: 5 additions & 45 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion message.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"encoding/base64"
"fmt"

bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
"github.com/gagliardetto/treeout"

"github.com/dcaf-labs/solana-go/text"
Expand Down
2 changes: 1 addition & 1 deletion nativetypes.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"fmt"
"io"

bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
"github.com/mostynb/zstdpool-freelist"
"github.com/mr-tron/base58"
)
Expand Down
2 changes: 1 addition & 1 deletion programs/address-lookup-table/address-lookup.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"math"

bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
"github.com/dcaf-labs/solana-go"
"github.com/dcaf-labs/solana-go/rpc"
)
Expand Down
2 changes: 1 addition & 1 deletion programs/address-lookup-table/address-lookup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"math"
"testing"

bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
"github.com/dcaf-labs/solana-go"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion programs/associated-token-account/Create.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"errors"
"fmt"

bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
solana "github.com/dcaf-labs/solana-go"
format "github.com/dcaf-labs/solana-go/text/format"
treeout "github.com/gagliardetto/treeout"
Expand Down
2 changes: 1 addition & 1 deletion programs/associated-token-account/instructions.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"fmt"

spew "github.com/davecgh/go-spew/spew"
bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
solana "github.com/dcaf-labs/solana-go"
text "github.com/dcaf-labs/solana-go/text"
treeout "github.com/gagliardetto/treeout"
Expand Down
2 changes: 1 addition & 1 deletion programs/compute-budget/RequestHeapFrame.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package computebudget
import (
"errors"

ag_binary "github.com/gagliardetto/binary"
ag_binary "github.com/dcaf-labs/binary"
ag_solanago "github.com/dcaf-labs/solana-go"
ag_format "github.com/dcaf-labs/solana-go/text/format"
ag_treeout "github.com/gagliardetto/treeout"
Expand Down
2 changes: 1 addition & 1 deletion programs/compute-budget/RequestUnitsDeprecated.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package computebudget
import (
"errors"

ag_binary "github.com/gagliardetto/binary"
ag_binary "github.com/dcaf-labs/binary"
ag_solanago "github.com/dcaf-labs/solana-go"
ag_format "github.com/dcaf-labs/solana-go/text/format"
ag_treeout "github.com/gagliardetto/treeout"
Expand Down
2 changes: 1 addition & 1 deletion programs/compute-budget/SetComputeUnitLimit.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package computebudget
import (
"errors"

ag_binary "github.com/gagliardetto/binary"
ag_binary "github.com/dcaf-labs/binary"
ag_solanago "github.com/dcaf-labs/solana-go"
ag_format "github.com/dcaf-labs/solana-go/text/format"
ag_treeout "github.com/gagliardetto/treeout"
Expand Down
2 changes: 1 addition & 1 deletion programs/compute-budget/SetComputeUnitPrice.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package computebudget
import (
"errors"

ag_binary "github.com/gagliardetto/binary"
ag_binary "github.com/dcaf-labs/binary"
ag_solanago "github.com/dcaf-labs/solana-go"
ag_format "github.com/dcaf-labs/solana-go/text/format"
ag_treeout "github.com/gagliardetto/treeout"
Expand Down
2 changes: 1 addition & 1 deletion programs/compute-budget/instruction.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"

ag_spew "github.com/davecgh/go-spew/spew"
ag_binary "github.com/gagliardetto/binary"
ag_binary "github.com/dcaf-labs/binary"
ag_solanago "github.com/dcaf-labs/solana-go"
ag_text "github.com/dcaf-labs/solana-go/text"
ag_treeout "github.com/gagliardetto/treeout"
Expand Down
2 changes: 1 addition & 1 deletion programs/compute-budget/instruction_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"encoding/hex"
"testing"

bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion programs/serum/instruction.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"encoding/binary"
"fmt"

bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
"github.com/dcaf-labs/solana-go"
"github.com/dcaf-labs/solana-go/text"
)
Expand Down
2 changes: 1 addition & 1 deletion programs/serum/instruction_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"encoding/hex"
"testing"

bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion programs/serum/queue.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package serum
import (
"strings"

bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
"github.com/dcaf-labs/solana-go"
)

Expand Down
2 changes: 1 addition & 1 deletion programs/serum/queue_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"testing"
"time"

bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
"github.com/dcaf-labs/solana-go"
"github.com/dcaf-labs/solana-go/diff"
"github.com/dcaf-labs/solana-go/rpc"
Expand Down
2 changes: 1 addition & 1 deletion programs/serum/rpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"fmt"

rice "github.com/GeertJohan/go.rice"
bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
"github.com/dcaf-labs/solana-go"
"github.com/dcaf-labs/solana-go/rpc"
"github.com/dcaf-labs/solana-go/rpc/ws"
Expand Down
2 changes: 1 addition & 1 deletion programs/serum/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"fmt"
"math/big"

bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
"github.com/dcaf-labs/solana-go"
"go.uber.org/zap"
)
Expand Down
2 changes: 1 addition & 1 deletion programs/serum/types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"io/ioutil"
"testing"

bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
"github.com/dcaf-labs/solana-go"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion programs/system/AdvanceNonceAccount.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"encoding/binary"
"fmt"

ag_binary "github.com/gagliardetto/binary"
ag_binary "github.com/dcaf-labs/binary"
ag_solanago "github.com/dcaf-labs/solana-go"
ag_format "github.com/dcaf-labs/solana-go/text/format"
ag_treeout "github.com/gagliardetto/treeout"
Expand Down
2 changes: 1 addition & 1 deletion programs/system/Allocate.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"errors"
"fmt"

ag_binary "github.com/gagliardetto/binary"
ag_binary "github.com/dcaf-labs/binary"
ag_solanago "github.com/dcaf-labs/solana-go"
ag_format "github.com/dcaf-labs/solana-go/text/format"
ag_treeout "github.com/gagliardetto/treeout"
Expand Down
2 changes: 1 addition & 1 deletion programs/system/AllocateWithSeed.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"errors"
"fmt"

ag_binary "github.com/gagliardetto/binary"
ag_binary "github.com/dcaf-labs/binary"
ag_solanago "github.com/dcaf-labs/solana-go"
ag_format "github.com/dcaf-labs/solana-go/text/format"
ag_treeout "github.com/gagliardetto/treeout"
Expand Down
2 changes: 1 addition & 1 deletion programs/system/Assign.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"errors"
"fmt"

ag_binary "github.com/gagliardetto/binary"
ag_binary "github.com/dcaf-labs/binary"
ag_solanago "github.com/dcaf-labs/solana-go"
ag_format "github.com/dcaf-labs/solana-go/text/format"
ag_treeout "github.com/gagliardetto/treeout"
Expand Down
2 changes: 1 addition & 1 deletion programs/system/AssignWithSeed.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"errors"
"fmt"

ag_binary "github.com/gagliardetto/binary"
ag_binary "github.com/dcaf-labs/binary"
ag_solanago "github.com/dcaf-labs/solana-go"
ag_format "github.com/dcaf-labs/solana-go/text/format"
ag_treeout "github.com/gagliardetto/treeout"
Expand Down
2 changes: 1 addition & 1 deletion programs/system/AuthorizeNonceAccount.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"errors"
"fmt"

ag_binary "github.com/gagliardetto/binary"
ag_binary "github.com/dcaf-labs/binary"
ag_solanago "github.com/dcaf-labs/solana-go"
ag_format "github.com/dcaf-labs/solana-go/text/format"
ag_treeout "github.com/gagliardetto/treeout"
Expand Down
2 changes: 1 addition & 1 deletion programs/system/CreateAccount.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"errors"
"fmt"

ag_binary "github.com/gagliardetto/binary"
ag_binary "github.com/dcaf-labs/binary"
ag_solanago "github.com/dcaf-labs/solana-go"
ag_format "github.com/dcaf-labs/solana-go/text/format"
ag_treeout "github.com/gagliardetto/treeout"
Expand Down
2 changes: 1 addition & 1 deletion programs/system/CreateAccountWithSeed.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"errors"
"fmt"

ag_binary "github.com/gagliardetto/binary"
ag_binary "github.com/dcaf-labs/binary"
ag_solanago "github.com/dcaf-labs/solana-go"
ag_format "github.com/dcaf-labs/solana-go/text/format"
ag_treeout "github.com/gagliardetto/treeout"
Expand Down
2 changes: 1 addition & 1 deletion programs/system/CreateAccountWithSeed_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"strconv"
"testing"

bin "github.com/gagliardetto/binary"
bin "github.com/dcaf-labs/binary"
ag_gofuzz "github.com/gagliardetto/gofuzz"
"github.com/dcaf-labs/solana-go"
ag_require "github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion programs/system/InitializeNonceAccount.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"errors"
"fmt"

ag_binary "github.com/gagliardetto/binary"
ag_binary "github.com/dcaf-labs/binary"
ag_solanago "github.com/dcaf-labs/solana-go"
ag_format "github.com/dcaf-labs/solana-go/text/format"
ag_treeout "github.com/gagliardetto/treeout"
Expand Down
2 changes: 1 addition & 1 deletion programs/system/Transfer.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"errors"
"fmt"

ag_binary "github.com/gagliardetto/binary"
ag_binary "github.com/dcaf-labs/binary"
ag_solanago "github.com/dcaf-labs/solana-go"
ag_format "github.com/dcaf-labs/solana-go/text/format"
ag_treeout "github.com/gagliardetto/treeout"
Expand Down
Loading

0 comments on commit b4b6dd9

Please sign in to comment.