From 28104b6342d4912177fb96859b33f49af2407d07 Mon Sep 17 00:00:00 2001 From: Slavomir Date: Sat, 4 Sep 2021 14:03:55 +0200 Subject: [PATCH] Use github.com/gagliardetto/binary --- README.md | 2 +- cmd/slnc/cmd/decoding.go | 2 +- cmd/slnc/cmd/get_spl_token.go | 2 +- go.mod | 4 +--- go.sum | 4 ++-- programs/serum/instruction.go | 2 +- programs/serum/instruction_test.go | 2 +- programs/serum/queue.go | 2 +- programs/serum/queue_test.go | 2 +- programs/serum/rpc.go | 2 +- programs/serum/types.go | 2 +- programs/serum/types_test.go | 2 +- programs/system/AdvanceNonceAccount.go | 3 ++- programs/system/Allocate.go | 3 ++- programs/system/AllocateWithSeed.go | 3 ++- programs/system/Assign.go | 3 ++- programs/system/AssignWithSeed.go | 3 ++- programs/system/AuthorizeNonceAccount.go | 3 ++- programs/system/CreateAccount.go | 3 ++- programs/system/CreateAccountWithSeed.go | 2 +- programs/system/InitializeNonceAccount.go | 3 ++- programs/system/Transfer.go | 3 ++- programs/system/TransferWithSeed.go | 3 ++- programs/system/WithdrawNonceAccount.go | 3 ++- programs/system/instructions.go | 2 +- programs/system/testing_utils.go | 3 ++- programs/token/instructions.go | 2 +- programs/token/types.go | 2 +- programs/token/types_test.go | 2 +- programs/tokenregistry/instruction.go | 2 +- programs/tokenregistry/types.go | 2 +- rpc/examples/getAccountInfo/getAccountInfo.go | 2 +- rpc/getAccountInfo.go | 2 +- transaction.go | 2 +- transaction_test.go | 2 +- types.go | 2 +- types_test.go | 2 +- 37 files changed, 50 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 5042fcef..88189410 100644 --- a/README.md +++ b/README.md @@ -357,7 +357,7 @@ import ( "context" "github.com/davecgh/go-spew/spew" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" solana "github.com/gagliardetto/solana-go" "github.com/gagliardetto/solana-go/programs/token" "github.com/gagliardetto/solana-go/rpc" diff --git a/cmd/slnc/cmd/decoding.go b/cmd/slnc/cmd/decoding.go index b64f7e83..555cd95a 100644 --- a/cmd/slnc/cmd/decoding.go +++ b/cmd/slnc/cmd/decoding.go @@ -18,7 +18,7 @@ import ( "fmt" "log" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/gagliardetto/solana-go" "github.com/gagliardetto/solana-go/programs/token" ) diff --git a/cmd/slnc/cmd/get_spl_token.go b/cmd/slnc/cmd/get_spl_token.go index 6716d65e..72a8e4c3 100644 --- a/cmd/slnc/cmd/get_spl_token.go +++ b/cmd/slnc/cmd/get_spl_token.go @@ -19,7 +19,7 @@ import ( "log" "os" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/gagliardetto/solana-go" "github.com/gagliardetto/solana-go/programs/token" "github.com/gagliardetto/solana-go/rpc" diff --git a/go.mod b/go.mod index 2243d5be..2adc5bc8 100644 --- a/go.mod +++ b/go.mod @@ -15,9 +15,9 @@ require ( github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59 github.com/buger/jsonparser v1.1.1 github.com/davecgh/go-spew v1.1.1 - github.com/dfuse-io/binary v0.0.0-20210216024852-4ae6830a495d github.com/dfuse-io/logging v0.0.0-20210109005628-b97a57253f70 github.com/fatih/color v1.7.0 + github.com/gagliardetto/binary v0.4.1 github.com/gagliardetto/gofuzz v1.2.2 github.com/gagliardetto/treeout v0.1.2 github.com/google/go-cmp v0.5.1 @@ -49,5 +49,3 @@ require ( golang.org/x/tools v0.0.0-20200601175630-2caf76543d99 // indirect google.golang.org/api v0.29.0 ) - -replace github.com/dfuse-io/binary => github.com/gagliardetto/binary v0.4.0 diff --git a/go.sum b/go.sum index 2e0a9587..ba847950 100644 --- a/go.sum +++ b/go.sum @@ -89,8 +89,8 @@ github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/gagliardetto/binary v0.4.0 h1:dxLndYArHtdZYbLYwnpLY86mlAa9gWgxG2zSDPFINjM= -github.com/gagliardetto/binary v0.4.0/go.mod h1:55fxN6CKhVnsBhSr3Hmyn7i2igseIzN9/NC+gHvv42k= +github.com/gagliardetto/binary v0.4.1 h1:3HXeBOfmR2HHIrF1YBnoqgFKQBtN8+rWA770KyXmU0U= +github.com/gagliardetto/binary v0.4.1/go.mod h1:peJR9PvwamL4YOh1nHWCPLry2VEfeeD1ADvewka7HnQ= github.com/gagliardetto/gofuzz v1.2.2 h1:XL/8qDMzcgvR4+CyRQW9UGdwPRPMHVJfqQ/uMvSUuQw= github.com/gagliardetto/gofuzz v1.2.2/go.mod h1:bkH/3hYLZrMLbfYWA0pWzXmi5TTRZnu4pMGZBkqMKvY= github.com/gagliardetto/treeout v0.1.2 h1:WXO7LDJTwINO37OQfNlf7s095Z1bAiwN2ACaZQic33Q= diff --git a/programs/serum/instruction.go b/programs/serum/instruction.go index 6cce7f65..17e019ad 100644 --- a/programs/serum/instruction.go +++ b/programs/serum/instruction.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/gagliardetto/solana-go" "github.com/gagliardetto/solana-go/text" ) diff --git a/programs/serum/instruction_test.go b/programs/serum/instruction_test.go index 249d25e7..efe820f6 100644 --- a/programs/serum/instruction_test.go +++ b/programs/serum/instruction_test.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "testing" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/programs/serum/queue.go b/programs/serum/queue.go index bb4bc9ec..8a1d213b 100644 --- a/programs/serum/queue.go +++ b/programs/serum/queue.go @@ -17,7 +17,7 @@ package serum import ( "strings" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/gagliardetto/solana-go" ) diff --git a/programs/serum/queue_test.go b/programs/serum/queue_test.go index 04909c06..d539fea8 100644 --- a/programs/serum/queue_test.go +++ b/programs/serum/queue_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/gagliardetto/solana-go" "github.com/gagliardetto/solana-go/diff" "github.com/gagliardetto/solana-go/rpc" diff --git a/programs/serum/rpc.go b/programs/serum/rpc.go index baba0fa1..044bee48 100644 --- a/programs/serum/rpc.go +++ b/programs/serum/rpc.go @@ -20,7 +20,7 @@ import ( "fmt" rice "github.com/GeertJohan/go.rice" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/gagliardetto/solana-go" "github.com/gagliardetto/solana-go/rpc" "github.com/gagliardetto/solana-go/rpc/ws" diff --git a/programs/serum/types.go b/programs/serum/types.go index caf9bd00..5bb4e617 100644 --- a/programs/serum/types.go +++ b/programs/serum/types.go @@ -19,7 +19,7 @@ import ( "fmt" "math/big" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/gagliardetto/solana-go" "go.uber.org/zap" ) diff --git a/programs/serum/types_test.go b/programs/serum/types_test.go index 82042a69..7513d075 100644 --- a/programs/serum/types_test.go +++ b/programs/serum/types_test.go @@ -11,7 +11,7 @@ import ( "github.com/gagliardetto/solana-go/diff" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/gagliardetto/solana-go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/programs/system/AdvanceNonceAccount.go b/programs/system/AdvanceNonceAccount.go index aa741939..7830fd73 100644 --- a/programs/system/AdvanceNonceAccount.go +++ b/programs/system/AdvanceNonceAccount.go @@ -3,7 +3,8 @@ package system import ( "encoding/binary" "fmt" - ag_binary "github.com/dfuse-io/binary" + + ag_binary "github.com/gagliardetto/binary" ag_solanago "github.com/gagliardetto/solana-go" ag_format "github.com/gagliardetto/solana-go/text/format" ag_treeout "github.com/gagliardetto/treeout" diff --git a/programs/system/Allocate.go b/programs/system/Allocate.go index 1b97f82f..2d06becf 100644 --- a/programs/system/Allocate.go +++ b/programs/system/Allocate.go @@ -4,7 +4,8 @@ import ( "encoding/binary" "errors" "fmt" - ag_binary "github.com/dfuse-io/binary" + + ag_binary "github.com/gagliardetto/binary" ag_solanago "github.com/gagliardetto/solana-go" ag_format "github.com/gagliardetto/solana-go/text/format" ag_treeout "github.com/gagliardetto/treeout" diff --git a/programs/system/AllocateWithSeed.go b/programs/system/AllocateWithSeed.go index 463dc7f9..64490601 100644 --- a/programs/system/AllocateWithSeed.go +++ b/programs/system/AllocateWithSeed.go @@ -4,7 +4,8 @@ import ( "encoding/binary" "errors" "fmt" - ag_binary "github.com/dfuse-io/binary" + + ag_binary "github.com/gagliardetto/binary" ag_solanago "github.com/gagliardetto/solana-go" ag_format "github.com/gagliardetto/solana-go/text/format" ag_treeout "github.com/gagliardetto/treeout" diff --git a/programs/system/Assign.go b/programs/system/Assign.go index 33d4e0fb..67b183c8 100644 --- a/programs/system/Assign.go +++ b/programs/system/Assign.go @@ -4,7 +4,8 @@ import ( "encoding/binary" "errors" "fmt" - ag_binary "github.com/dfuse-io/binary" + + ag_binary "github.com/gagliardetto/binary" ag_solanago "github.com/gagliardetto/solana-go" ag_format "github.com/gagliardetto/solana-go/text/format" ag_treeout "github.com/gagliardetto/treeout" diff --git a/programs/system/AssignWithSeed.go b/programs/system/AssignWithSeed.go index e233e0d5..ba4ec998 100644 --- a/programs/system/AssignWithSeed.go +++ b/programs/system/AssignWithSeed.go @@ -4,7 +4,8 @@ import ( "encoding/binary" "errors" "fmt" - ag_binary "github.com/dfuse-io/binary" + + ag_binary "github.com/gagliardetto/binary" ag_solanago "github.com/gagliardetto/solana-go" ag_format "github.com/gagliardetto/solana-go/text/format" ag_treeout "github.com/gagliardetto/treeout" diff --git a/programs/system/AuthorizeNonceAccount.go b/programs/system/AuthorizeNonceAccount.go index f1a5e79a..3025b8e1 100644 --- a/programs/system/AuthorizeNonceAccount.go +++ b/programs/system/AuthorizeNonceAccount.go @@ -4,7 +4,8 @@ import ( "encoding/binary" "errors" "fmt" - ag_binary "github.com/dfuse-io/binary" + + ag_binary "github.com/gagliardetto/binary" ag_solanago "github.com/gagliardetto/solana-go" ag_format "github.com/gagliardetto/solana-go/text/format" ag_treeout "github.com/gagliardetto/treeout" diff --git a/programs/system/CreateAccount.go b/programs/system/CreateAccount.go index d531230e..0ba84047 100644 --- a/programs/system/CreateAccount.go +++ b/programs/system/CreateAccount.go @@ -4,7 +4,8 @@ import ( "encoding/binary" "errors" "fmt" - ag_binary "github.com/dfuse-io/binary" + + ag_binary "github.com/gagliardetto/binary" ag_solanago "github.com/gagliardetto/solana-go" ag_format "github.com/gagliardetto/solana-go/text/format" ag_treeout "github.com/gagliardetto/treeout" diff --git a/programs/system/CreateAccountWithSeed.go b/programs/system/CreateAccountWithSeed.go index 961e0dd8..56c466c1 100644 --- a/programs/system/CreateAccountWithSeed.go +++ b/programs/system/CreateAccountWithSeed.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - ag_binary "github.com/dfuse-io/binary" + ag_binary "github.com/gagliardetto/binary" ag_solanago "github.com/gagliardetto/solana-go" ag_format "github.com/gagliardetto/solana-go/text/format" ag_treeout "github.com/gagliardetto/treeout" diff --git a/programs/system/InitializeNonceAccount.go b/programs/system/InitializeNonceAccount.go index 6ddbb0c7..3d21c05e 100644 --- a/programs/system/InitializeNonceAccount.go +++ b/programs/system/InitializeNonceAccount.go @@ -4,7 +4,8 @@ import ( "encoding/binary" "errors" "fmt" - ag_binary "github.com/dfuse-io/binary" + + ag_binary "github.com/gagliardetto/binary" ag_solanago "github.com/gagliardetto/solana-go" ag_format "github.com/gagliardetto/solana-go/text/format" ag_treeout "github.com/gagliardetto/treeout" diff --git a/programs/system/Transfer.go b/programs/system/Transfer.go index e75f3519..78f96df9 100644 --- a/programs/system/Transfer.go +++ b/programs/system/Transfer.go @@ -4,7 +4,8 @@ import ( "encoding/binary" "errors" "fmt" - ag_binary "github.com/dfuse-io/binary" + + ag_binary "github.com/gagliardetto/binary" ag_solanago "github.com/gagliardetto/solana-go" ag_format "github.com/gagliardetto/solana-go/text/format" ag_treeout "github.com/gagliardetto/treeout" diff --git a/programs/system/TransferWithSeed.go b/programs/system/TransferWithSeed.go index 50c1cb50..ac12f6a4 100644 --- a/programs/system/TransferWithSeed.go +++ b/programs/system/TransferWithSeed.go @@ -4,7 +4,8 @@ import ( "encoding/binary" "errors" "fmt" - ag_binary "github.com/dfuse-io/binary" + + ag_binary "github.com/gagliardetto/binary" ag_solanago "github.com/gagliardetto/solana-go" ag_format "github.com/gagliardetto/solana-go/text/format" ag_treeout "github.com/gagliardetto/treeout" diff --git a/programs/system/WithdrawNonceAccount.go b/programs/system/WithdrawNonceAccount.go index 26b7f1b1..b023da10 100644 --- a/programs/system/WithdrawNonceAccount.go +++ b/programs/system/WithdrawNonceAccount.go @@ -4,7 +4,8 @@ import ( "encoding/binary" "errors" "fmt" - ag_binary "github.com/dfuse-io/binary" + + ag_binary "github.com/gagliardetto/binary" ag_solanago "github.com/gagliardetto/solana-go" ag_format "github.com/gagliardetto/solana-go/text/format" ag_treeout "github.com/gagliardetto/treeout" diff --git a/programs/system/instructions.go b/programs/system/instructions.go index 001bd876..5f41b993 100644 --- a/programs/system/instructions.go +++ b/programs/system/instructions.go @@ -9,7 +9,7 @@ import ( "fmt" ag_spew "github.com/davecgh/go-spew/spew" - ag_binary "github.com/dfuse-io/binary" + ag_binary "github.com/gagliardetto/binary" ag_solanago "github.com/gagliardetto/solana-go" ag_text "github.com/gagliardetto/solana-go/text" ag_treeout "github.com/gagliardetto/treeout" diff --git a/programs/system/testing_utils.go b/programs/system/testing_utils.go index 22e6ad8b..c7916c09 100644 --- a/programs/system/testing_utils.go +++ b/programs/system/testing_utils.go @@ -3,7 +3,8 @@ package system import ( "bytes" "fmt" - ag_binary "github.com/dfuse-io/binary" + + ag_binary "github.com/gagliardetto/binary" ) func encodeT(data interface{}, buf *bytes.Buffer) error { diff --git a/programs/token/instructions.go b/programs/token/instructions.go index ae34e5f5..68bbd17d 100644 --- a/programs/token/instructions.go +++ b/programs/token/instructions.go @@ -19,7 +19,7 @@ import ( "github.com/gagliardetto/solana-go/text" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/gagliardetto/solana-go" ) diff --git a/programs/token/types.go b/programs/token/types.go index 81e2d57e..dc013a66 100644 --- a/programs/token/types.go +++ b/programs/token/types.go @@ -3,7 +3,7 @@ package token import ( "fmt" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/gagliardetto/solana-go" ) diff --git a/programs/token/types_test.go b/programs/token/types_test.go index 159e08fd..042f39c7 100644 --- a/programs/token/types_test.go +++ b/programs/token/types_test.go @@ -20,7 +20,7 @@ import ( "os" "testing" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/gagliardetto/solana-go" "github.com/gagliardetto/solana-go/rpc" "github.com/mr-tron/base58" diff --git a/programs/tokenregistry/instruction.go b/programs/tokenregistry/instruction.go index bddfb1a3..82146647 100644 --- a/programs/tokenregistry/instruction.go +++ b/programs/tokenregistry/instruction.go @@ -7,7 +7,7 @@ import ( "github.com/gagliardetto/solana-go/text" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/gagliardetto/solana-go" ) diff --git a/programs/tokenregistry/types.go b/programs/tokenregistry/types.go index 87c7d93f..db4c9da4 100644 --- a/programs/tokenregistry/types.go +++ b/programs/tokenregistry/types.go @@ -16,7 +16,7 @@ package tokenregistry import ( "fmt" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/gagliardetto/solana-go" ) diff --git a/rpc/examples/getAccountInfo/getAccountInfo.go b/rpc/examples/getAccountInfo/getAccountInfo.go index 78bbc2fe..c0b83648 100644 --- a/rpc/examples/getAccountInfo/getAccountInfo.go +++ b/rpc/examples/getAccountInfo/getAccountInfo.go @@ -4,7 +4,7 @@ import ( "context" "github.com/davecgh/go-spew/spew" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" solana "github.com/gagliardetto/solana-go" "github.com/gagliardetto/solana-go/programs/token" "github.com/gagliardetto/solana-go/rpc" diff --git a/rpc/getAccountInfo.go b/rpc/getAccountInfo.go index 8b404bc5..42da8917 100644 --- a/rpc/getAccountInfo.go +++ b/rpc/getAccountInfo.go @@ -17,7 +17,7 @@ import ( "context" "errors" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/gagliardetto/solana-go" ) diff --git a/transaction.go b/transaction.go index b07fe92a..5c5b57b9 100644 --- a/transaction.go +++ b/transaction.go @@ -6,7 +6,7 @@ import ( "sort" "github.com/davecgh/go-spew/spew" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/gagliardetto/solana-go/text" "github.com/gagliardetto/treeout" "go.uber.org/zap" diff --git a/transaction_test.go b/transaction_test.go index 6fc5b120..89238fcb 100644 --- a/transaction_test.go +++ b/transaction_test.go @@ -4,7 +4,7 @@ import ( "encoding/base64" "testing" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/magiconair/properties/assert" "github.com/mr-tron/base58" "github.com/stretchr/testify/require" diff --git a/types.go b/types.go index 13ed0b4f..7ab1cffa 100644 --- a/types.go +++ b/types.go @@ -17,7 +17,7 @@ package solana import ( "fmt" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/gagliardetto/solana-go/text" "github.com/gagliardetto/treeout" ) diff --git a/types_test.go b/types_test.go index f51f4a6d..ba569cd8 100644 --- a/types_test.go +++ b/types_test.go @@ -18,7 +18,7 @@ import ( "bytes" "testing" - bin "github.com/dfuse-io/binary" + bin "github.com/gagliardetto/binary" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" )