chore: Upgrade module path for v2 (#383)

This commit is contained in:
Eric Warehime 2024-01-24 09:06:20 -08:00 committed by GitHub
parent 234e2ff719
commit acff9d0edf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
104 changed files with 363 additions and 258 deletions

View File

@ -7,9 +7,9 @@ import (
abci "github.com/cometbft/cometbft/abci/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/proposals"
"github.com/skip-mev/block-sdk/block/utils"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/proposals"
"github.com/skip-mev/block-sdk/v2/block/utils"
)
type (

View File

@ -13,12 +13,12 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/suite"
"github.com/skip-mev/block-sdk/abci"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/mocks"
"github.com/skip-mev/block-sdk/lanes/free"
testutils "github.com/skip-mev/block-sdk/testutils"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/abci"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/mocks"
"github.com/skip-mev/block-sdk/v2/lanes/free"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
type MockLaneFetcher struct {

View File

@ -15,13 +15,13 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/suite"
"github.com/skip-mev/block-sdk/abci/checktx"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/lanes/mev"
mevlanetestutils "github.com/skip-mev/block-sdk/lanes/mev/testutils"
"github.com/skip-mev/block-sdk/testutils"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
blocksdktypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/abci/checktx"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/lanes/mev"
mevlanetestutils "github.com/skip-mev/block-sdk/v2/lanes/mev/testutils"
"github.com/skip-mev/block-sdk/v2/testutils"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
blocksdktypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
type CheckTxTestSuite struct {

View File

@ -9,7 +9,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/v2/block"
)
// MempoolParityCheckTx is a CheckTx function that evicts txs that are not in the app-side mempool

View File

@ -12,9 +12,9 @@ import (
"cosmossdk.io/log"
storetypes "cosmossdk.io/store/types"
"github.com/skip-mev/block-sdk/block"
mevlane "github.com/skip-mev/block-sdk/lanes/mev"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/block"
mevlane "github.com/skip-mev/block-sdk/v2/lanes/mev"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
// MevCheckTxHandler is a wrapper around baseapp's CheckTx method that allows us to

View File

@ -3,9 +3,9 @@ package abci
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/proposals"
"github.com/skip-mev/block-sdk/lanes/terminator"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/proposals"
"github.com/skip-mev/block-sdk/v2/lanes/terminator"
)
// ChainPrepareLanes chains together the proposal preparation logic from each lane into a

View File

@ -5,7 +5,7 @@ import (
"encoding/hex"
"fmt"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
"cosmossdk.io/log"
"cosmossdk.io/math"
@ -13,13 +13,13 @@ import (
tmprototypes "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/skip-mev/block-sdk/abci"
signeradaptors "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/base"
defaultlane "github.com/skip-mev/block-sdk/lanes/base"
"github.com/skip-mev/block-sdk/lanes/free"
"github.com/skip-mev/block-sdk/lanes/mev"
"github.com/skip-mev/block-sdk/v2/abci"
signeradaptors "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/base"
defaultlane "github.com/skip-mev/block-sdk/v2/lanes/base"
"github.com/skip-mev/block-sdk/v2/lanes/free"
"github.com/skip-mev/block-sdk/v2/lanes/mev"
)
func (s *ProposalsTestSuite) setUpAnteHandler(expectedExecution map[sdk.Tx]bool) sdk.AnteHandler {

View File

@ -10,8 +10,8 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/stretchr/testify/suite"
signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
testutils "github.com/skip-mev/block-sdk/testutils"
signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
)
type SignerExtractionAdapterTestSuite struct {

View File

@ -3,9 +3,9 @@ package base
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/proposals"
"github.com/skip-mev/block-sdk/block/utils"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/proposals"
"github.com/skip-mev/block-sdk/v2/block/utils"
)
// PrepareLane will prepare a partial proposal for the lane. It will select transactions from the

View File

@ -7,7 +7,7 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
)
// LaneConfig defines the basic configurations needed for a lane.

View File

@ -7,7 +7,7 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/v2/block"
)
var _ block.Lane = (*BaseLane)(nil)

View File

@ -8,8 +8,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/block/utils"
signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/v2/block/utils"
)
type (

View File

@ -9,8 +9,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/require"
signerextraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/testutils"
signerextraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/v2/testutils"
)
type txGen struct {

View File

@ -3,7 +3,7 @@ package base
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/v2/block"
)
// LaneOption defines a function that can be used to set options on a lane.

View File

@ -22,7 +22,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
)
var (

View File

@ -5,7 +5,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block/proposals"
"github.com/skip-mev/block-sdk/v2/block/proposals"
)
// DefaultProposalHandler returns a default implementation of the PrepareLaneHandler and

View File

@ -8,7 +8,7 @@ import (
comettypes "github.com/cometbft/cometbft/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block/utils"
"github.com/skip-mev/block-sdk/v2/block/utils"
)
// GetTxInfo returns various information about the transaction that

View File

@ -7,9 +7,10 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block/base"
"github.com/skip-mev/block-sdk/testutils"
"github.com/stretchr/testify/require"
"github.com/skip-mev/block-sdk/v2/block/base"
"github.com/skip-mev/block-sdk/v2/testutils"
)
func TestNopTxPriority(t *testing.T) {

View File

@ -3,7 +3,7 @@ package base
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block/proposals"
"github.com/skip-mev/block-sdk/v2/block/proposals"
)
type (

View File

@ -5,8 +5,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
"github.com/skip-mev/block-sdk/block/proposals"
"github.com/skip-mev/block-sdk/block/utils"
"github.com/skip-mev/block-sdk/v2/block/proposals"
"github.com/skip-mev/block-sdk/v2/block/utils"
)
// LaneMempool defines the interface a lane's mempool should implement. The basic API

View File

@ -3,8 +3,8 @@ package block_test
import (
"fmt"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/mocks"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/mocks"
)
func (suite *BlockBusterTestSuite) TestFindLane() {

View File

@ -9,7 +9,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
var _ Mempool = (*LanedMempool)(nil)

View File

@ -5,9 +5,9 @@ import (
"testing"
"time"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
"github.com/skip-mev/block-sdk/block/mocks"
"github.com/skip-mev/block-sdk/v2/block/mocks"
"cosmossdk.io/log"
"cosmossdk.io/math"
@ -16,14 +16,14 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/suite"
signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/base"
defaultlane "github.com/skip-mev/block-sdk/lanes/base"
"github.com/skip-mev/block-sdk/lanes/free"
"github.com/skip-mev/block-sdk/lanes/mev"
testutils "github.com/skip-mev/block-sdk/testutils"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/base"
defaultlane "github.com/skip-mev/block-sdk/v2/lanes/base"
"github.com/skip-mev/block-sdk/v2/lanes/free"
"github.com/skip-mev/block-sdk/v2/lanes/mev"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
)
type BlockBusterTestSuite struct {

View File

@ -1,11 +1,11 @@
// Code generated by mockery v2.30.1. DO NOT EDIT.
// Code generated by mockery v2.40.1. DO NOT EDIT.
package mocks
import (
context "context"
block "github.com/skip-mev/block-sdk/block"
block "github.com/skip-mev/block-sdk/v2/block"
math "cosmossdk.io/math"
@ -13,11 +13,11 @@ import (
mock "github.com/stretchr/testify/mock"
proposals "github.com/skip-mev/block-sdk/block/proposals"
proposals "github.com/skip-mev/block-sdk/v2/block/proposals"
types "github.com/cosmos/cosmos-sdk/types"
utils "github.com/skip-mev/block-sdk/block/utils"
utils "github.com/skip-mev/block-sdk/v2/block/utils"
)
// Lane is an autogenerated mock type for the Lane type
@ -29,6 +29,10 @@ type Lane struct {
func (_m *Lane) Compare(ctx types.Context, this types.Tx, other types.Tx) (int, error) {
ret := _m.Called(ctx, this, other)
if len(ret) == 0 {
panic("no return value specified for Compare")
}
var r0 int
var r1 error
if rf, ok := ret.Get(0).(func(types.Context, types.Tx, types.Tx) (int, error)); ok {
@ -53,6 +57,10 @@ func (_m *Lane) Compare(ctx types.Context, this types.Tx, other types.Tx) (int,
func (_m *Lane) Contains(tx types.Tx) bool {
ret := _m.Called(tx)
if len(ret) == 0 {
panic("no return value specified for Contains")
}
var r0 bool
if rf, ok := ret.Get(0).(func(types.Tx) bool); ok {
r0 = rf(tx)
@ -67,6 +75,10 @@ func (_m *Lane) Contains(tx types.Tx) bool {
func (_m *Lane) CountTx() int {
ret := _m.Called()
if len(ret) == 0 {
panic("no return value specified for CountTx")
}
var r0 int
if rf, ok := ret.Get(0).(func() int); ok {
r0 = rf()
@ -81,6 +93,10 @@ func (_m *Lane) CountTx() int {
func (_m *Lane) GetMaxBlockSpace() math.LegacyDec {
ret := _m.Called()
if len(ret) == 0 {
panic("no return value specified for GetMaxBlockSpace")
}
var r0 math.LegacyDec
if rf, ok := ret.Get(0).(func() math.LegacyDec); ok {
r0 = rf()
@ -95,6 +111,10 @@ func (_m *Lane) GetMaxBlockSpace() math.LegacyDec {
func (_m *Lane) GetTxInfo(ctx types.Context, tx types.Tx) (utils.TxWithInfo, error) {
ret := _m.Called(ctx, tx)
if len(ret) == 0 {
panic("no return value specified for GetTxInfo")
}
var r0 utils.TxWithInfo
var r1 error
if rf, ok := ret.Get(0).(func(types.Context, types.Tx) (utils.TxWithInfo, error)); ok {
@ -119,6 +139,10 @@ func (_m *Lane) GetTxInfo(ctx types.Context, tx types.Tx) (utils.TxWithInfo, err
func (_m *Lane) Insert(_a0 context.Context, _a1 types.Tx) error {
ret := _m.Called(_a0, _a1)
if len(ret) == 0 {
panic("no return value specified for Insert")
}
var r0 error
if rf, ok := ret.Get(0).(func(context.Context, types.Tx) error); ok {
r0 = rf(_a0, _a1)
@ -133,6 +157,10 @@ func (_m *Lane) Insert(_a0 context.Context, _a1 types.Tx) error {
func (_m *Lane) Match(ctx types.Context, tx types.Tx) bool {
ret := _m.Called(ctx, tx)
if len(ret) == 0 {
panic("no return value specified for Match")
}
var r0 bool
if rf, ok := ret.Get(0).(func(types.Context, types.Tx) bool); ok {
r0 = rf(ctx, tx)
@ -147,6 +175,10 @@ func (_m *Lane) Match(ctx types.Context, tx types.Tx) bool {
func (_m *Lane) Name() string {
ret := _m.Called()
if len(ret) == 0 {
panic("no return value specified for Name")
}
var r0 string
if rf, ok := ret.Get(0).(func() string); ok {
r0 = rf()
@ -161,6 +193,10 @@ func (_m *Lane) Name() string {
func (_m *Lane) PrepareLane(ctx types.Context, proposal proposals.Proposal, next block.PrepareLanesHandler) (proposals.Proposal, error) {
ret := _m.Called(ctx, proposal, next)
if len(ret) == 0 {
panic("no return value specified for PrepareLane")
}
var r0 proposals.Proposal
var r1 error
if rf, ok := ret.Get(0).(func(types.Context, proposals.Proposal, block.PrepareLanesHandler) (proposals.Proposal, error)); ok {
@ -185,6 +221,10 @@ func (_m *Lane) PrepareLane(ctx types.Context, proposal proposals.Proposal, next
func (_m *Lane) Priority(ctx types.Context, tx types.Tx) interface{} {
ret := _m.Called(ctx, tx)
if len(ret) == 0 {
panic("no return value specified for Priority")
}
var r0 interface{}
if rf, ok := ret.Get(0).(func(types.Context, types.Tx) interface{}); ok {
r0 = rf(ctx, tx)
@ -201,6 +241,10 @@ func (_m *Lane) Priority(ctx types.Context, tx types.Tx) interface{} {
func (_m *Lane) ProcessLane(ctx types.Context, proposal proposals.Proposal, txs []types.Tx, next block.ProcessLanesHandler) (proposals.Proposal, error) {
ret := _m.Called(ctx, proposal, txs, next)
if len(ret) == 0 {
panic("no return value specified for ProcessLane")
}
var r0 proposals.Proposal
var r1 error
if rf, ok := ret.Get(0).(func(types.Context, proposals.Proposal, []types.Tx, block.ProcessLanesHandler) (proposals.Proposal, error)); ok {
@ -225,6 +269,10 @@ func (_m *Lane) ProcessLane(ctx types.Context, proposal proposals.Proposal, txs
func (_m *Lane) Remove(_a0 types.Tx) error {
ret := _m.Called(_a0)
if len(ret) == 0 {
panic("no return value specified for Remove")
}
var r0 error
if rf, ok := ret.Get(0).(func(types.Tx) error); ok {
r0 = rf(_a0)
@ -239,6 +287,10 @@ func (_m *Lane) Remove(_a0 types.Tx) error {
func (_m *Lane) Select(_a0 context.Context, _a1 [][]byte) mempool.Iterator {
ret := _m.Called(_a0, _a1)
if len(ret) == 0 {
panic("no return value specified for Select")
}
var r0 mempool.Iterator
if rf, ok := ret.Get(0).(func(context.Context, [][]byte) mempool.Iterator); ok {
r0 = rf(_a0, _a1)

View File

@ -3,7 +3,7 @@ package mocks
import (
sdk "github.com/cosmos/cosmos-sdk/types"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
type MockLaneFetcher struct {

View File

@ -1,4 +1,4 @@
// Code generated by mockery v2.30.1. DO NOT EDIT.
// Code generated by mockery v2.40.1. DO NOT EDIT.
package mocks
@ -20,6 +20,10 @@ type LaneMempool struct {
func (_m *LaneMempool) Compare(ctx types.Context, this types.Tx, other types.Tx) (int, error) {
ret := _m.Called(ctx, this, other)
if len(ret) == 0 {
panic("no return value specified for Compare")
}
var r0 int
var r1 error
if rf, ok := ret.Get(0).(func(types.Context, types.Tx, types.Tx) (int, error)); ok {
@ -44,6 +48,10 @@ func (_m *LaneMempool) Compare(ctx types.Context, this types.Tx, other types.Tx)
func (_m *LaneMempool) Contains(tx types.Tx) bool {
ret := _m.Called(tx)
if len(ret) == 0 {
panic("no return value specified for Contains")
}
var r0 bool
if rf, ok := ret.Get(0).(func(types.Tx) bool); ok {
r0 = rf(tx)
@ -58,6 +66,10 @@ func (_m *LaneMempool) Contains(tx types.Tx) bool {
func (_m *LaneMempool) CountTx() int {
ret := _m.Called()
if len(ret) == 0 {
panic("no return value specified for CountTx")
}
var r0 int
if rf, ok := ret.Get(0).(func() int); ok {
r0 = rf()
@ -72,6 +84,10 @@ func (_m *LaneMempool) CountTx() int {
func (_m *LaneMempool) Insert(_a0 context.Context, _a1 types.Tx) error {
ret := _m.Called(_a0, _a1)
if len(ret) == 0 {
panic("no return value specified for Insert")
}
var r0 error
if rf, ok := ret.Get(0).(func(context.Context, types.Tx) error); ok {
r0 = rf(_a0, _a1)
@ -86,6 +102,10 @@ func (_m *LaneMempool) Insert(_a0 context.Context, _a1 types.Tx) error {
func (_m *LaneMempool) Priority(ctx types.Context, tx types.Tx) interface{} {
ret := _m.Called(ctx, tx)
if len(ret) == 0 {
panic("no return value specified for Priority")
}
var r0 interface{}
if rf, ok := ret.Get(0).(func(types.Context, types.Tx) interface{}); ok {
r0 = rf(ctx, tx)
@ -102,6 +122,10 @@ func (_m *LaneMempool) Priority(ctx types.Context, tx types.Tx) interface{} {
func (_m *LaneMempool) Remove(_a0 types.Tx) error {
ret := _m.Called(_a0)
if len(ret) == 0 {
panic("no return value specified for Remove")
}
var r0 error
if rf, ok := ret.Get(0).(func(types.Tx) error); ok {
r0 = rf(_a0)
@ -116,6 +140,10 @@ func (_m *LaneMempool) Remove(_a0 types.Tx) error {
func (_m *LaneMempool) Select(_a0 context.Context, _a1 [][]byte) mempool.Iterator {
ret := _m.Called(_a0, _a1)
if len(ret) == 0 {
panic("no return value specified for Select")
}
var r0 mempool.Iterator
if rf, ok := ret.Get(0).(func(context.Context, [][]byte) mempool.Iterator); ok {
r0 = rf(_a0, _a1)

View File

@ -5,7 +5,7 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block/proposals/types"
"github.com/skip-mev/block-sdk/v2/block/proposals/types"
)
type (

View File

@ -9,14 +9,14 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/require"
signerextraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/block/base"
"github.com/skip-mev/block-sdk/block/mocks"
"github.com/skip-mev/block-sdk/block/proposals"
"github.com/skip-mev/block-sdk/block/proposals/types"
"github.com/skip-mev/block-sdk/block/utils"
defaultlane "github.com/skip-mev/block-sdk/lanes/base"
"github.com/skip-mev/block-sdk/testutils"
signerextraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/v2/block/base"
"github.com/skip-mev/block-sdk/v2/block/mocks"
"github.com/skip-mev/block-sdk/v2/block/proposals"
"github.com/skip-mev/block-sdk/v2/block/proposals/types"
"github.com/skip-mev/block-sdk/v2/block/utils"
defaultlane "github.com/skip-mev/block-sdk/v2/lanes/base"
"github.com/skip-mev/block-sdk/v2/testutils"
)
func TestUpdateProposal(t *testing.T) {

View File

@ -5,7 +5,7 @@ import (
"cosmossdk.io/math"
"github.com/skip-mev/block-sdk/block/utils"
"github.com/skip-mev/block-sdk/v2/block/utils"
)
// Lane defines the contract interface for a lane.

View File

@ -6,8 +6,8 @@ import (
gogogrpc "github.com/cosmos/gogoproto/grpc"
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/service/types"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/service/types"
)
var _ types.ServiceServer = (*QueryService)(nil)

View File

@ -10,14 +10,14 @@ import (
"github.com/stretchr/testify/require"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/service"
"github.com/skip-mev/block-sdk/block/service/types"
"github.com/skip-mev/block-sdk/lanes/base"
"github.com/skip-mev/block-sdk/lanes/free"
"github.com/skip-mev/block-sdk/lanes/mev"
"github.com/skip-mev/block-sdk/testutils"
"github.com/skip-mev/block-sdk/testutils/mempool"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/service"
"github.com/skip-mev/block-sdk/v2/block/service/types"
"github.com/skip-mev/block-sdk/v2/lanes/base"
"github.com/skip-mev/block-sdk/v2/lanes/free"
"github.com/skip-mev/block-sdk/v2/lanes/mev"
"github.com/skip-mev/block-sdk/v2/testutils"
"github.com/skip-mev/block-sdk/v2/testutils/mempool"
)
func TestGetTxDistribution(t *testing.T) {

View File

@ -3,7 +3,7 @@ package block
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block/proposals"
"github.com/skip-mev/block-sdk/v2/block/proposals"
)
type (

View File

@ -9,7 +9,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
signerextraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
signerextraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
)
// TxWithInfo contains the information required for a transaction to be

2
go.mod
View File

@ -1,4 +1,4 @@
module github.com/skip-mev/block-sdk
module github.com/skip-mev/block-sdk/v2
go 1.21.5

View File

@ -11,14 +11,14 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/base"
"github.com/skip-mev/block-sdk/block/mocks"
"github.com/skip-mev/block-sdk/block/proposals"
"github.com/skip-mev/block-sdk/block/utils"
defaultlane "github.com/skip-mev/block-sdk/lanes/base"
testutils "github.com/skip-mev/block-sdk/testutils"
signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/base"
"github.com/skip-mev/block-sdk/v2/block/mocks"
"github.com/skip-mev/block-sdk/v2/block/proposals"
"github.com/skip-mev/block-sdk/v2/block/utils"
defaultlane "github.com/skip-mev/block-sdk/v2/lanes/base"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
)
func (s *BaseTestSuite) TestPrepareLane() {

View File

@ -9,8 +9,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/suite"
testutils "github.com/skip-mev/block-sdk/testutils"
"github.com/skip-mev/block-sdk/x/auction/types"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
type BaseTestSuite struct {

View File

@ -1,7 +1,7 @@
package base
import (
"github.com/skip-mev/block-sdk/block/base"
"github.com/skip-mev/block-sdk/v2/block/base"
)
const (

View File

@ -4,9 +4,9 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/block/base"
testutils "github.com/skip-mev/block-sdk/testutils"
signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/v2/block/base"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
)
func (s *BaseTestSuite) TestCompareTxPriority() {

View File

@ -6,7 +6,7 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/testutils"
"github.com/skip-mev/block-sdk/v2/testutils"
)
func (s *BaseTestSuite) TestGetTxInfo() {

View File

@ -4,7 +4,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/staking/types"
"github.com/skip-mev/block-sdk/block/base"
"github.com/skip-mev/block-sdk/v2/block/base"
)
const (

View File

@ -6,8 +6,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block/base"
"github.com/skip-mev/block-sdk/block/proposals"
"github.com/skip-mev/block-sdk/v2/block/base"
"github.com/skip-mev/block-sdk/v2/block/proposals"
)
// Implements the MEV lane's PrepareLaneHandler and ProcessLaneHandler.

View File

@ -5,11 +5,11 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/proposals"
"github.com/skip-mev/block-sdk/block/utils"
"github.com/skip-mev/block-sdk/lanes/mev"
testutils "github.com/skip-mev/block-sdk/testutils"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/proposals"
"github.com/skip-mev/block-sdk/v2/block/utils"
"github.com/skip-mev/block-sdk/v2/lanes/mev"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
)
func (s *MEVTestSuite) TestPrepareLane() {

View File

@ -5,9 +5,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/block/base"
"github.com/skip-mev/block-sdk/x/auction/types"
signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/v2/block/base"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
type (

View File

@ -6,7 +6,7 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
testutils "github.com/skip-mev/block-sdk/testutils"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
)
func (s *MEVTestSuite) TestIsAuctionTx() {

View File

@ -1,7 +1,7 @@
package mev
import (
"github.com/skip-mev/block-sdk/block/base"
"github.com/skip-mev/block-sdk/v2/block/base"
)
const (

View File

@ -5,7 +5,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/block/base"
"github.com/skip-mev/block-sdk/v2/block/base"
)
// TxPriority returns a TxPriority over mev lane transactions only. It

View File

@ -6,8 +6,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/suite"
"github.com/skip-mev/block-sdk/block/utils"
"github.com/skip-mev/block-sdk/lanes/mev/testutils"
"github.com/skip-mev/block-sdk/v2/block/utils"
"github.com/skip-mev/block-sdk/v2/lanes/mev/testutils"
)
type MEVTestSuite struct {

View File

@ -14,10 +14,10 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/stretchr/testify/suite"
signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/block/base"
"github.com/skip-mev/block-sdk/lanes/mev"
testutils "github.com/skip-mev/block-sdk/testutils"
signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/v2/block/base"
"github.com/skip-mev/block-sdk/v2/lanes/mev"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
)
type MEVLaneTestSuiteBase struct {

View File

@ -5,7 +5,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
)
// GetMsgAuctionBidFromTx attempts to retrieve a MsgAuctionBid from an sdk.Tx if

View File

@ -6,9 +6,9 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/stretchr/testify/require"
"github.com/skip-mev/block-sdk/lanes/mev"
testutils "github.com/skip-mev/block-sdk/testutils"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/lanes/mev"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
)
func TestGetMsgAuctionBidFromTx_Valid(t *testing.T) {

View File

@ -9,9 +9,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/proposals"
"github.com/skip-mev/block-sdk/block/utils"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/proposals"
"github.com/skip-mev/block-sdk/v2/block/utils"
)
const (

View File

@ -4,9 +4,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/ante"
"github.com/skip-mev/block-sdk/block"
auctionante "github.com/skip-mev/block-sdk/x/auction/ante"
auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper"
"github.com/skip-mev/block-sdk/v2/block"
auctionante "github.com/skip-mev/block-sdk/v2/x/auction/ante"
auctionkeeper "github.com/skip-mev/block-sdk/v2/x/auction/keeper"
)
type BSDKHandlerOptions struct {

View File

@ -41,13 +41,13 @@ import (
slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
"github.com/skip-mev/block-sdk/abci"
"github.com/skip-mev/block-sdk/abci/checktx"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/base"
service "github.com/skip-mev/block-sdk/block/service"
auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper"
blocksdkkeeper "github.com/skip-mev/block-sdk/x/blocksdk/keeper"
"github.com/skip-mev/block-sdk/v2/abci"
"github.com/skip-mev/block-sdk/v2/abci/checktx"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/base"
service "github.com/skip-mev/block-sdk/v2/block/service"
auctionkeeper "github.com/skip-mev/block-sdk/v2/x/auction/keeper"
blocksdkkeeper "github.com/skip-mev/block-sdk/v2/x/blocksdk/keeper"
)
const (

View File

@ -66,12 +66,12 @@ import (
_ "github.com/cosmos/cosmos-sdk/x/slashing" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/staking" // import for side-effects
auctionmodulev1 "github.com/skip-mev/block-sdk/api/sdk/auction/module/v1"
blocksdkmodulev1 "github.com/skip-mev/block-sdk/api/sdk/blocksdk/module/v1"
_ "github.com/skip-mev/block-sdk/x/auction" // import for side-effects
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
_ "github.com/skip-mev/block-sdk/x/blocksdk" // import for side-effects
blocksdktypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
auctionmodulev1 "github.com/skip-mev/block-sdk/v2/api/sdk/auction/module/v1"
blocksdkmodulev1 "github.com/skip-mev/block-sdk/v2/api/sdk/blocksdk/module/v1"
_ "github.com/skip-mev/block-sdk/v2/x/auction" // import for side-effects
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
_ "github.com/skip-mev/block-sdk/v2/x/blocksdk" // import for side-effects
blocksdktypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
var (

View File

@ -3,11 +3,11 @@ package app
import (
"cosmossdk.io/math"
signerextraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/block/base"
defaultlane "github.com/skip-mev/block-sdk/lanes/base"
freelane "github.com/skip-mev/block-sdk/lanes/free"
mevlane "github.com/skip-mev/block-sdk/lanes/mev"
signerextraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/v2/block/base"
defaultlane "github.com/skip-mev/block-sdk/v2/lanes/base"
freelane "github.com/skip-mev/block-sdk/v2/lanes/free"
mevlane "github.com/skip-mev/block-sdk/v2/lanes/mev"
)
// CreateLanes walks through the process of creating the lanes for the block sdk. In this function

View File

@ -15,7 +15,7 @@ import (
"cosmossdk.io/log"
confixcmd "cosmossdk.io/tools/confix/cmd"
"github.com/skip-mev/block-sdk/tests/app"
"github.com/skip-mev/block-sdk/v2/tests/app"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/config"

View File

@ -16,7 +16,7 @@ import (
"cosmossdk.io/math"
"cosmossdk.io/math/unsafe"
"github.com/skip-mev/block-sdk/tests/app"
"github.com/skip-mev/block-sdk/v2/tests/app"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"

View File

@ -6,8 +6,8 @@ import (
"cosmossdk.io/log"
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
"github.com/skip-mev/block-sdk/tests/app"
"github.com/skip-mev/block-sdk/tests/app/testappd/cmd"
"github.com/skip-mev/block-sdk/v2/tests/app"
"github.com/skip-mev/block-sdk/v2/tests/app/testappd/cmd"
)
func main() {

View File

@ -13,12 +13,12 @@ import (
ictestutil "github.com/strangelove-ventures/interchaintest/v8/testutil"
"github.com/stretchr/testify/suite"
"github.com/skip-mev/block-sdk/lanes/base"
"github.com/skip-mev/block-sdk/lanes/free"
"github.com/skip-mev/block-sdk/lanes/mev"
"github.com/skip-mev/block-sdk/tests/e2e"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/lanes/base"
"github.com/skip-mev/block-sdk/v2/lanes/free"
"github.com/skip-mev/block-sdk/v2/lanes/mev"
"github.com/skip-mev/block-sdk/v2/tests/e2e"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
blocksdkmoduletypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
var (

View File

@ -18,8 +18,8 @@ import (
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"github.com/skip-mev/block-sdk/lanes/base"
"github.com/skip-mev/block-sdk/lanes/free"
"github.com/skip-mev/block-sdk/v2/lanes/base"
"github.com/skip-mev/block-sdk/v2/lanes/free"
)
const (

View File

@ -37,8 +37,8 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
servicetypes "github.com/skip-mev/block-sdk/block/service/types"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
servicetypes "github.com/skip-mev/block-sdk/v2/block/service/types"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
)
type KeyringOverride struct {

View File

@ -1,4 +1,4 @@
module github.com/skip-mev/block-sdk/tests/e2e
module github.com/skip-mev/block-sdk/v2/tests/e2e
go 1.21.5
@ -6,14 +6,14 @@ replace (
github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d
github.com/ChainSafe/go-schnorrkel/1 => github.com/ChainSafe/go-schnorrkel v1.0.0
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
github.com/skip-mev/block-sdk => ../../
github.com/skip-mev/block-sdk/v2 => ../../
)
require (
cosmossdk.io/math v1.2.0
github.com/cometbft/cometbft v0.38.2
github.com/cosmos/cosmos-sdk v0.50.2
github.com/skip-mev/block-sdk v1.0.0 // reference local
github.com/skip-mev/block-sdk/v2 v2.1.0 // reference local
github.com/strangelove-ventures/interchaintest/v8 v8.0.0
github.com/stretchr/testify v1.8.4
go.uber.org/zap v1.26.0
@ -235,7 +235,7 @@ require (
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect

View File

@ -1759,8 +1759,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

View File

@ -8,9 +8,9 @@ import (
"github.com/skip-mev/chaintestutil/encoding"
"github.com/stretchr/testify/suite"
testkeeper "github.com/skip-mev/block-sdk/testutils/keeper"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
blocksdktypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
testkeeper "github.com/skip-mev/block-sdk/v2/testutils/keeper"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
blocksdktypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
type IntegrationTestSuite struct {

View File

@ -12,7 +12,7 @@ import (
"github.com/skip-mev/chaintestutil/network"
"github.com/stretchr/testify/require"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
)
func (s *NetworkTestSuite) TestAuctionWithValidBids() {

View File

@ -20,8 +20,8 @@ import (
"github.com/skip-mev/chaintestutil/account"
"github.com/skip-mev/chaintestutil/network"
blockservicetypes "github.com/skip-mev/block-sdk/block/service/types"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
blockservicetypes "github.com/skip-mev/block-sdk/v2/block/service/types"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
)
const (

View File

@ -19,9 +19,9 @@ import (
"github.com/stretchr/testify/suite"
"google.golang.org/grpc/status"
"github.com/skip-mev/block-sdk/testutils/networksuite"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
blocksdktypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/testutils/networksuite"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
blocksdktypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
// NetworkTestSuite is a test suite for network integration tests.

View File

@ -19,13 +19,13 @@ import (
testkeeper "github.com/skip-mev/chaintestutil/keeper"
"github.com/stretchr/testify/require"
"github.com/skip-mev/block-sdk/lanes/base"
"github.com/skip-mev/block-sdk/lanes/free"
"github.com/skip-mev/block-sdk/lanes/mev"
auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
blocksdkkeeper "github.com/skip-mev/block-sdk/x/blocksdk/keeper"
blocksdktypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/lanes/base"
"github.com/skip-mev/block-sdk/v2/lanes/free"
"github.com/skip-mev/block-sdk/v2/lanes/mev"
auctionkeeper "github.com/skip-mev/block-sdk/v2/x/auction/keeper"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
blocksdkkeeper "github.com/skip-mev/block-sdk/v2/x/blocksdk/keeper"
blocksdktypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
// TestKeepers holds all keepers used during keeper tests for all modules

View File

@ -4,15 +4,15 @@ import (
"cosmossdk.io/log"
"cosmossdk.io/math"
"github.com/skip-mev/block-sdk/block/mocks"
"github.com/skip-mev/block-sdk/v2/block/mocks"
signerextraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/block"
"github.com/skip-mev/block-sdk/block/base"
defaultlane "github.com/skip-mev/block-sdk/lanes/base"
"github.com/skip-mev/block-sdk/lanes/free"
"github.com/skip-mev/block-sdk/lanes/mev"
"github.com/skip-mev/block-sdk/testutils"
signerextraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
"github.com/skip-mev/block-sdk/v2/block"
"github.com/skip-mev/block-sdk/v2/block/base"
defaultlane "github.com/skip-mev/block-sdk/v2/lanes/base"
"github.com/skip-mev/block-sdk/v2/lanes/free"
"github.com/skip-mev/block-sdk/v2/lanes/mev"
"github.com/skip-mev/block-sdk/v2/testutils"
)
func CreateMempool() *block.LanedMempool {

View File

@ -25,12 +25,12 @@ import (
"github.com/skip-mev/chaintestutil/account"
"github.com/skip-mev/block-sdk/lanes/base"
"github.com/skip-mev/block-sdk/lanes/free"
"github.com/skip-mev/block-sdk/lanes/mev"
"github.com/skip-mev/block-sdk/tests/app"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
blocksdktypes "github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/lanes/base"
"github.com/skip-mev/block-sdk/v2/lanes/free"
"github.com/skip-mev/block-sdk/v2/lanes/mev"
"github.com/skip-mev/block-sdk/v2/tests/app"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
blocksdktypes "github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
var (

View File

@ -24,7 +24,7 @@ import (
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
"github.com/cosmos/gogoproto/proto"
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
)
type EncodingConfig struct {

View File

@ -6,7 +6,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
// nextHeightExecModes is the subset of execution modes that need special treatment. In

View File

@ -8,7 +8,7 @@ import (
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/spf13/cobra"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
// GetQueryCmd returns the cli query commands for the auction module.

View File

@ -12,7 +12,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/spf13/cobra"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
// NewTxCmd returns a root CLI command handler for all x/auction transaction

View File

@ -5,7 +5,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
// ValidateBidInfo validates that the bid can be included in the auction.

View File

@ -10,10 +10,10 @@ import (
mock "github.com/stretchr/testify/mock"
testutils "github.com/skip-mev/block-sdk/testutils"
"github.com/skip-mev/block-sdk/x/auction/keeper"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/x/auction/types/mocks"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
"github.com/skip-mev/block-sdk/v2/x/auction/keeper"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types/mocks"
)
func (s *KeeperTestSuite) TestValidateAuctionBid() {

View File

@ -3,7 +3,7 @@ package keeper
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
// InitGenesis initializes the auction module's state from a given genesis state.

View File

@ -5,7 +5,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
var _ types.QueryServer = QueryServer{}

View File

@ -3,7 +3,7 @@ package keeper_test
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
func (s *KeeperTestSuite) TestQueryParams() {

View File

@ -10,8 +10,8 @@ import (
"github.com/cosmos/cosmos-sdk/codec"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/rewards"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/rewards"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
type Keeper struct {

View File

@ -7,10 +7,10 @@ import (
"github.com/cosmos/cosmos-sdk/testutil"
sdk "github.com/cosmos/cosmos-sdk/types"
testutils "github.com/skip-mev/block-sdk/testutils"
"github.com/skip-mev/block-sdk/x/auction/keeper"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/x/auction/types/mocks"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
"github.com/skip-mev/block-sdk/v2/x/auction/keeper"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types/mocks"
"github.com/stretchr/testify/suite"
)

View File

@ -9,7 +9,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
var _ types.MsgServer = MsgServer{}

View File

@ -7,8 +7,8 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
testutils "github.com/skip-mev/block-sdk/testutils"
"github.com/skip-mev/block-sdk/x/auction/types"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
func (s *KeeperTestSuite) TestMsgUpdateParams() {

View File

@ -19,10 +19,10 @@ import (
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/spf13/cobra"
modulev1 "github.com/skip-mev/block-sdk/api/sdk/auction/module/v1"
"github.com/skip-mev/block-sdk/x/auction/client/cli"
"github.com/skip-mev/block-sdk/x/auction/keeper"
"github.com/skip-mev/block-sdk/x/auction/types"
modulev1 "github.com/skip-mev/block-sdk/v2/api/sdk/auction/module/v1"
"github.com/skip-mev/block-sdk/v2/x/auction/client/cli"
"github.com/skip-mev/block-sdk/v2/x/auction/keeper"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
var (

View File

@ -5,7 +5,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
var _ types.RewardsAddressProvider = (*FixedAddressRewardsAddressProvider)(nil)

View File

@ -3,7 +3,7 @@ package rewards
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
var _ types.RewardsAddressProvider = (*ProposerRewardsAddressProvider)(nil)

View File

@ -1,4 +1,4 @@
// Code generated by mockery v2.30.1. DO NOT EDIT.
// Code generated by mockery v2.40.1. DO NOT EDIT.
package mocks
@ -16,6 +16,10 @@ type AccountKeeper struct {
func (_m *AccountKeeper) GetModuleAddress(moduleName string) types.AccAddress {
ret := _m.Called(moduleName)
if len(ret) == 0 {
panic("no return value specified for GetModuleAddress")
}
var r0 types.AccAddress
if rf, ok := ret.Get(0).(func(string) types.AccAddress); ok {
r0 = rf(moduleName)

View File

@ -1,4 +1,4 @@
// Code generated by mockery v2.30.1. DO NOT EDIT.
// Code generated by mockery v2.40.1. DO NOT EDIT.
package mocks
@ -18,6 +18,10 @@ type BankKeeper struct {
func (_m *BankKeeper) GetBalance(ctx context.Context, addr types.AccAddress, denom string) types.Coin {
ret := _m.Called(ctx, addr, denom)
if len(ret) == 0 {
panic("no return value specified for GetBalance")
}
var r0 types.Coin
if rf, ok := ret.Get(0).(func(context.Context, types.AccAddress, string) types.Coin); ok {
r0 = rf(ctx, addr, denom)
@ -32,6 +36,10 @@ func (_m *BankKeeper) GetBalance(ctx context.Context, addr types.AccAddress, den
func (_m *BankKeeper) SendCoins(ctx context.Context, fromAddr types.AccAddress, toAddr types.AccAddress, amt types.Coins) error {
ret := _m.Called(ctx, fromAddr, toAddr, amt)
if len(ret) == 0 {
panic("no return value specified for SendCoins")
}
var r0 error
if rf, ok := ret.Get(0).(func(context.Context, types.AccAddress, types.AccAddress, types.Coins) error); ok {
r0 = rf(ctx, fromAddr, toAddr, amt)

View File

@ -1,4 +1,4 @@
// Code generated by mockery v2.30.1. DO NOT EDIT.
// Code generated by mockery v2.40.1. DO NOT EDIT.
package mocks
@ -18,6 +18,10 @@ type DistributionKeeper struct {
func (_m *DistributionKeeper) GetPreviousProposerConsAddr(ctx context.Context) (types.ConsAddress, error) {
ret := _m.Called(ctx)
if len(ret) == 0 {
panic("no return value specified for GetPreviousProposerConsAddr")
}
var r0 types.ConsAddress
var r1 error
if rf, ok := ret.Get(0).(func(context.Context) (types.ConsAddress, error)); ok {

View File

@ -1,4 +1,4 @@
// Code generated by mockery v2.30.1. DO NOT EDIT.
// Code generated by mockery v2.40.1. DO NOT EDIT.
package mocks
@ -16,6 +16,10 @@ type RewardsAddressProvider struct {
func (_m *RewardsAddressProvider) GetRewardsAddress(context types.Context) (types.AccAddress, error) {
ret := _m.Called(context)
if len(ret) == 0 {
panic("no return value specified for GetRewardsAddress")
}
var r0 types.AccAddress
var r1 error
if rf, ok := ret.Get(0).(func(types.Context) (types.AccAddress, error)); ok {

View File

@ -1,4 +1,4 @@
// Code generated by mockery v2.30.1. DO NOT EDIT.
// Code generated by mockery v2.40.1. DO NOT EDIT.
package mocks
@ -20,6 +20,10 @@ type StakingKeeper struct {
func (_m *StakingKeeper) GetValidatorByConsAddr(_a0 context.Context, _a1 types.ConsAddress) (stakingtypes.Validator, error) {
ret := _m.Called(_a0, _a1)
if len(ret) == 0 {
panic("no return value specified for GetValidatorByConsAddr")
}
var r0 stakingtypes.Validator
var r1 error
if rf, ok := ret.Get(0).(func(context.Context, types.ConsAddress) (stakingtypes.Validator, error)); ok {

View File

@ -6,7 +6,7 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/auction/types"
"github.com/skip-mev/block-sdk/v2/x/auction/types"
)
// TestMsgAuctionBid tests the ValidateBasic method of MsgAuctionBid

View File

@ -8,7 +8,7 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/spf13/cobra"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
// GetQueryCmd returns the cli query commands for the blocksdk module.

View File

@ -4,7 +4,7 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/spf13/cobra"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
// NewTxCmd returns a root CLI command handler for all x/blocksdk transaction

View File

@ -3,7 +3,7 @@ package keeper
import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
// InitGenesis initializes the blocksdk module's state from a given genesis state.

View File

@ -5,7 +5,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
var _ types.QueryServer = QueryServer{}

View File

@ -3,7 +3,7 @@ package keeper_test
import (
"cosmossdk.io/math"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
func (s *KeeperTestSuite) TestQueryLane() {

View File

@ -10,7 +10,7 @@ import (
"github.com/cosmos/cosmos-sdk/codec"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
type Keeper struct {

View File

@ -11,9 +11,9 @@ import (
"github.com/stretchr/testify/suite"
testutils "github.com/skip-mev/block-sdk/testutils"
"github.com/skip-mev/block-sdk/x/blocksdk/keeper"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
testutils "github.com/skip-mev/block-sdk/v2/testutils"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/keeper"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
type KeeperTestSuite struct {

View File

@ -6,7 +6,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/skip-mev/block-sdk/x/blocksdk/types"
"github.com/skip-mev/block-sdk/v2/x/blocksdk/types"
)
var _ types.MsgServer = MsgServer{}

Some files were not shown because too many files have changed in this diff Show More