refactor: update rosetta to use coinbase/rosetta-sdk-go/types (#14272)

cosmos · Dec 13, 2022 · 5c02a4c · 5c02a4c
1 parent c6c7eb9
commit 5c02a4c
Show file tree

Hide file tree

Showing 20 changed files with 32 additions and 28 deletions.
diff --git a/tools/rosetta/CHANGELOG.md b/tools/rosetta/CHANGELOG.md
@@ -36,6 +36,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
 
+### Improvements
+
+* [#14272](https://github.com/cosmos/cosmos-sdk/pull/14272) Use `coinbase/rosetta-sdk-go/types` packages instead of comsos fork.
+
 ## v0.2.0 2022-12-07
 
 ### Improvements

diff --git a/tools/rosetta/README.md b/tools/rosetta/README.md
@@ -86,7 +86,7 @@ package custom_client
 import (
 
 "context"
-"github.com/cosmos/rosetta-sdk-go/types"
+"github.com/coinbase/rosetta-sdk-go/types"
 "cosmossdk.io/tools/rosetta/lib"
 )
 

diff --git a/tools/rosetta/client_offline.go b/tools/rosetta/client_offline.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/hex"
 
-	"github.com/cosmos/rosetta-sdk-go/types"
+	"github.com/coinbase/rosetta-sdk-go/types"
 
 	crgerrs "cosmossdk.io/tools/rosetta/lib/errors"
 

diff --git a/tools/rosetta/client_online.go b/tools/rosetta/client_online.go
@@ -15,7 +15,7 @@ import (
 
 	abcitypes "github.com/tendermint/tendermint/abci/types"
 
-	rosettatypes "github.com/cosmos/rosetta-sdk-go/types"
+	rosettatypes "github.com/coinbase/rosetta-sdk-go/types"
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/metadata"
 

diff --git a/tools/rosetta/config.go b/tools/rosetta/config.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cosmos/rosetta-sdk-go/types"
+	"github.com/coinbase/rosetta-sdk-go/types"
 	"github.com/spf13/pflag"
 
 	crg "cosmossdk.io/tools/rosetta/lib/server"

diff --git a/tools/rosetta/converter.go b/tools/rosetta/converter.go
@@ -8,7 +8,7 @@ import (
 
 	"cosmossdk.io/math"
 	"github.com/btcsuite/btcd/btcec/v2"
-	rosettatypes "github.com/cosmos/rosetta-sdk-go/types"
+	rosettatypes "github.com/coinbase/rosetta-sdk-go/types"
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/crypto"
 	tmcoretypes "github.com/tendermint/tendermint/rpc/core/types"

diff --git a/tools/rosetta/converter_test.go b/tools/rosetta/converter_test.go
@@ -1,25 +1,22 @@
 package rosetta_test
 
 import (
-	"cosmossdk.io/tools/rosetta"
 	"encoding/hex"
 	"encoding/json"
 	"testing"
 
-	abci "github.com/tendermint/tendermint/abci/types"
+	"cosmossdk.io/tools/rosetta"
+	crgerrs "cosmossdk.io/tools/rosetta/lib/errors"
 
-	authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
+	rosettatypes "github.com/coinbase/rosetta-sdk-go/types"
+	"github.com/stretchr/testify/suite"
+	abci "github.com/tendermint/tendermint/abci/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
-
-	rosettatypes "github.com/cosmos/rosetta-sdk-go/types"
-	"github.com/stretchr/testify/suite"
-
-	crgerrs "cosmossdk.io/tools/rosetta/lib/errors"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
 	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
 	bank "github.com/cosmos/cosmos-sdk/x/bank/types"
 )

diff --git a/tools/rosetta/go.mod b/tools/rosetta/go.mod
@@ -5,8 +5,9 @@ go 1.19
 require (
 	cosmossdk.io/math v1.0.0-beta.4
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2
+	github.com/coinbase/rosetta-sdk-go/types v1.0.0
 	github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20221207001918-ed5124f932fd
-	github.com/cosmos/rosetta-sdk-go v0.9.0
+	github.com/cosmos/rosetta-sdk-go v0.10.0
 	github.com/rs/zerolog v1.28.0
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/pflag v1.0.5

diff --git a/tools/rosetta/go.sum b/tools/rosetta/go.sum
@@ -98,6 +98,8 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cockroachdb/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w=
+github.com/coinbase/rosetta-sdk-go/types v1.0.0 h1:jpVIwLcPoOeCR6o1tU+Xv7r5bMONNbHU7MuEHboiFuA=
+github.com/coinbase/rosetta-sdk-go/types v1.0.0/go.mod h1:eq7W2TMRH22GTW0N0beDnN931DW0/WOI1R2sdHNHG4c=
 github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4=
 github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -122,8 +124,8 @@ github.com/cosmos/iavl v0.19.4 h1:t82sN+Y0WeqxDLJRSpNd8YFX5URIrT+p8n6oJbJ2Dok=
 github.com/cosmos/iavl v0.19.4/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw=
 github.com/cosmos/ledger-cosmos-go v0.12.1 h1:sMBxza5p/rNK/06nBSNmsI/WDqI0pVJFVNihy1Y984w=
 github.com/cosmos/ledger-cosmos-go v0.12.1/go.mod h1:dhO6kj+Y+AHIOgAe4L9HL/6NDdyyth4q238I9yFpD2g=
-github.com/cosmos/rosetta-sdk-go v0.9.0 h1:3mj2naR+GUhUXabtb96WWSsPFZDCYkdtp6r0jffgugg=
-github.com/cosmos/rosetta-sdk-go v0.9.0/go.mod h1:2v41yXL25xxAXrczVSnbDHcQH9CgildruDlGQGKW/JU=
+github.com/cosmos/rosetta-sdk-go v0.10.0 h1:E5RhTruuoA7KTIXUcMicL76cffyeoyvNybzUGSKFTcM=
+github.com/cosmos/rosetta-sdk-go v0.10.0/go.mod h1:SImAZkb96YbwvoRkzSMQB6noNJXFgWl/ENIznEoYQI4=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creachadair/taskgroup v0.3.2 h1:zlfutDS+5XG40AOxcHDSThxKzns8Tnr9jnr6VqkYlkM=

diff --git a/tools/rosetta/lib/errors/errors.go b/tools/rosetta/lib/errors/errors.go
@@ -9,7 +9,7 @@ import (
 	grpccodes "google.golang.org/grpc/codes"
 	grpcstatus "google.golang.org/grpc/status"
 
-	"github.com/cosmos/rosetta-sdk-go/types"
+	"github.com/coinbase/rosetta-sdk-go/types"
 	tmtypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
 )
 

diff --git a/tools/rosetta/lib/errors/registry.go b/tools/rosetta/lib/errors/registry.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"sync"
 
-	"github.com/cosmos/rosetta-sdk-go/types"
+	"github.com/coinbase/rosetta-sdk-go/types"
 )
 
 type errorRegistry struct {

diff --git a/tools/rosetta/lib/internal/service/account.go b/tools/rosetta/lib/internal/service/account.go
@@ -5,7 +5,7 @@ import (
 
 	"cosmossdk.io/tools/rosetta/lib/errors"
 	crgtypes "cosmossdk.io/tools/rosetta/lib/types"
-	"github.com/cosmos/rosetta-sdk-go/types"
+	"github.com/coinbase/rosetta-sdk-go/types"
 )
 
 // AccountBalance retrieves the account balance of an address

diff --git a/tools/rosetta/lib/internal/service/block.go b/tools/rosetta/lib/internal/service/block.go
@@ -5,7 +5,7 @@ import (
 
 	"cosmossdk.io/tools/rosetta/lib/errors"
 	crgtypes "cosmossdk.io/tools/rosetta/lib/types"
-	"github.com/cosmos/rosetta-sdk-go/types"
+	"github.com/coinbase/rosetta-sdk-go/types"
 )
 
 // Block gets the transactions in the given block

diff --git a/tools/rosetta/lib/internal/service/construction.go b/tools/rosetta/lib/internal/service/construction.go
@@ -9,7 +9,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/cosmos/rosetta-sdk-go/types"
+	"github.com/coinbase/rosetta-sdk-go/types"
 
 	"cosmossdk.io/tools/rosetta/lib/errors"
 )

diff --git a/tools/rosetta/lib/internal/service/mempool.go b/tools/rosetta/lib/internal/service/mempool.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"cosmossdk.io/tools/rosetta/lib/errors"
-	"github.com/cosmos/rosetta-sdk-go/types"
+	"github.com/coinbase/rosetta-sdk-go/types"
 )
 
 // Mempool fetches the transactions contained in the mempool

diff --git a/tools/rosetta/lib/internal/service/network.go b/tools/rosetta/lib/internal/service/network.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"cosmossdk.io/tools/rosetta/lib/errors"
-	"github.com/cosmos/rosetta-sdk-go/types"
+	"github.com/coinbase/rosetta-sdk-go/types"
 )
 
 func (on OnlineNetwork) NetworkList(_ context.Context, _ *types.MetadataRequest) (*types.NetworkListResponse, *types.Error) {

diff --git a/tools/rosetta/lib/internal/service/offline.go b/tools/rosetta/lib/internal/service/offline.go
@@ -3,7 +3,7 @@ package service
 import (
 	"context"
 
-	"github.com/cosmos/rosetta-sdk-go/types"
+	"github.com/coinbase/rosetta-sdk-go/types"
 
 	crgerrs "cosmossdk.io/tools/rosetta/lib/errors"
 	crgtypes "cosmossdk.io/tools/rosetta/lib/types"

diff --git a/tools/rosetta/lib/internal/service/online.go b/tools/rosetta/lib/internal/service/online.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/cosmos/rosetta-sdk-go/types"
+	"github.com/coinbase/rosetta-sdk-go/types"
 	"github.com/rs/zerolog"
 
 	crgerrs "cosmossdk.io/tools/rosetta/lib/errors"

diff --git a/tools/rosetta/lib/server/server.go b/tools/rosetta/lib/server/server.go
@@ -5,9 +5,9 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/coinbase/rosetta-sdk-go/types"
 	assert "github.com/cosmos/rosetta-sdk-go/asserter"
 	"github.com/cosmos/rosetta-sdk-go/server"
-	"github.com/cosmos/rosetta-sdk-go/types"
 	"github.com/rs/zerolog"
 
 	"cosmossdk.io/tools/rosetta/lib/internal/service"

diff --git a/tools/rosetta/lib/types/types.go b/tools/rosetta/lib/types/types.go
@@ -3,8 +3,8 @@ package types
 import (
 	"context"
 
+	"github.com/coinbase/rosetta-sdk-go/types"
 	"github.com/cosmos/rosetta-sdk-go/server"
-	"github.com/cosmos/rosetta-sdk-go/types"
 )
 
 // SpecVersion defines the specification of rosetta
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"os"
     	"sync"
-    	"github.com/cosmos/rosetta-sdk-go/types"
+    	"github.com/coinbase/rosetta-sdk-go/types"
     )
     type errorRegistry struct {
@@ Expand Down @@