Skip to content

Commit

Permalink
use orm robert/orm-alpha.13-rapid1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
robert-zaremba committed May 16, 2024
1 parent 159bb92 commit 581ef21
Show file tree
Hide file tree
Showing 9 changed files with 90 additions and 124 deletions.
18 changes: 13 additions & 5 deletions api/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@ require (
)

require (
github.com/DataDog/zstd v1.4.5 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cosmos/cosmos-sdk/api v0.1.0
github.com/cosmos/cosmos-sdk/errors v1.0.0-beta.5 // indirect
github.com/cosmos/gorocksdb v1.2.0 // indirect
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
github.com/dgraph-io/ristretto v0.1.0 // indirect
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
Expand All @@ -28,7 +25,6 @@ require (
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
github.com/tendermint/tm-db v0.6.7 // indirect
go.etcd.io/bbolt v1.3.6 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect; must be v0.0.0-20230711153332-06a737ee72cb for gogoproto v1.4.10
golang.org/x/net v0.23.0 // indirect
Expand All @@ -38,4 +34,16 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect
)

require github.com/gogo/protobuf v1.3.2 // indirect
require (
cosmossdk.io/api v0.3.1 // indirect
cosmossdk.io/errors v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cometbft/cometbft-db v0.7.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.1.2 // indirect
github.com/klauspost/compress v1.17.0 // indirect
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
)

// stick with compatible version or x/exp in v0.47.x line for gogoproto v1.4.10
replace golang.org/x/exp => golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb
81 changes: 37 additions & 44 deletions api/go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion types/coin.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package types

import (
basev1beta1 "cosmossdk.io/api/cosmos/base/v1beta1"
apilegacy "github.com/cosmos/cosmos-sdk/api/cosmos/base/v1beta1"
apilegacy "cosmossdk.io/api/cosmos/base/v1beta1"
sdk "github.com/cosmos/cosmos-sdk/types"
)

Expand Down
7 changes: 3 additions & 4 deletions types/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ require (
github.com/cometbft/cometbft v0.37.4
github.com/cometbft/cometbft-db v0.11.0
github.com/cosmos/cosmos-sdk v0.47.10
github.com/cosmos/cosmos-sdk/api v0.1.0
github.com/cosmos/cosmos-sdk/orm v1.0.0-alpha.12.0.20240514101554-56648741cbd6
github.com/golang/mock v1.6.0
github.com/grpc-ecosystem/grpc-gateway v1.16.0
Expand All @@ -28,6 +27,7 @@ require (
github.com/DataDog/zstd v1.5.0 // indirect
github.com/cockroachdb/pebble v1.1.0 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/cosmos/cosmos-sdk/api v0.1.0 // indirect
github.com/gogo/protobuf v1.3.3 // indirect
)

Expand All @@ -53,10 +53,8 @@ require (
github.com/confio/ics23/go v0.9.0 // indirect
github.com/cosmos/btcutil v1.0.5 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect
github.com/cosmos/cosmos-sdk/errors v1.0.0-beta.5 // indirect
github.com/cosmos/go-bip39 v1.0.0 // indirect
github.com/cosmos/gogoproto v1.4.10
github.com/cosmos/gorocksdb v1.2.0 // indirect
github.com/cosmos/iavl v0.20.1 // indirect
github.com/cosmos/ledger-cosmos-go v0.12.4 // indirect
github.com/cucumber/common/messages/go/v19 v19.1.2 // indirect
Expand Down Expand Up @@ -127,7 +125,6 @@ require (
github.com/subosito/gotenv v1.4.2 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
github.com/tendermint/go-amino v0.16.0 // indirect
github.com/tendermint/tm-db v0.6.7 // indirect
github.com/tidwall/btree v1.6.0 // indirect
github.com/zondax/hid v0.9.2 // indirect
github.com/zondax/ledger-go v0.14.3 // indirect
Expand All @@ -152,6 +149,8 @@ replace (
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
// stick with compatible version or x/exp in v0.47.x line for gogoproto v1.4.10
golang.org/x/exp => golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb
)

replace github.com/regen-network/regen-ledger/api/v2 => ../api
98 changes: 31 additions & 67 deletions types/go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion types/ormstore/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ormstore
import (
"context"

ormv1alpha1 "github.com/cosmos/cosmos-sdk/api/cosmos/orm/v1alpha1"
ormv1alpha1 "cosmossdk.io/api/cosmos/orm/v1alpha1"
"github.com/cosmos/cosmos-sdk/orm/model/ormdb"
"github.com/cosmos/cosmos-sdk/orm/model/ormtable"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
Expand Down
2 changes: 1 addition & 1 deletion types/ormstore/db_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/cometbft/cometbft/libs/log"
tmproto "github.com/cometbft/cometbft/proto/tendermint/types"

ormv1alpha1 "github.com/cosmos/cosmos-sdk/api/cosmos/orm/v1alpha1"
ormv1alpha1 "cosmossdk.io/api/cosmos/orm/v1alpha1"
"github.com/cosmos/cosmos-sdk/orm/model/ormdb"
"github.com/cosmos/cosmos-sdk/store"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
Expand Down
2 changes: 1 addition & 1 deletion types/ormutil/compatability.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"google.golang.org/protobuf/proto"

queryv1beta1 "cosmossdk.io/api/cosmos/base/query/v1beta1"
queryapi "github.com/cosmos/cosmos-sdk/api/cosmos/base/query/v1beta1"
queryapi "cosmossdk.io/api/cosmos/base/query/v1beta1"
"github.com/cosmos/cosmos-sdk/orm/model/ormlist"
"github.com/cosmos/cosmos-sdk/types/query"
)
Expand Down
2 changes: 2 additions & 0 deletions x/intertx/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ replace (
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
// stick with compatible version or x/exp in v0.47.x line for gogoproto v1.4.10
golang.org/x/exp => golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb
)

replace github.com/regen-network/regen-ledger/types/v2 => ../../types

0 comments on commit 581ef21

Please sign in to comment.