Skip to content
This repository was archived by the owner on Jan 31, 2025. It is now read-only.

Commit d983846

Browse files
author
Alex Johnson
authored
Merge branch 'release/v2.x.x' into dependabot/go_modules/release/v2.x.x/cosmossdk.io/errors-1.0.1
2 parents dbcade8 + 98dfd29 commit d983846

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+658
-316
lines changed

‎abci/abci.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
abci "github.com/cometbft/cometbft/abci/types"
88
sdk "github.com/cosmos/cosmos-sdk/types"
99

10-
"github.com/skip-mev/block-sdk/block"
11-
"github.com/skip-mev/block-sdk/block/proposals"
12-
"github.com/skip-mev/block-sdk/block/utils"
10+
"github.com/skip-mev/block-sdk/v2/block"
11+
"github.com/skip-mev/block-sdk/v2/block/proposals"
12+
"github.com/skip-mev/block-sdk/v2/block/utils"
1313
)
1414

1515
type (

‎abci/abci_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313
sdk "github.com/cosmos/cosmos-sdk/types"
1414
"github.com/stretchr/testify/suite"
1515

16-
"github.com/skip-mev/block-sdk/abci"
17-
"github.com/skip-mev/block-sdk/block"
18-
"github.com/skip-mev/block-sdk/lanes/free"
19-
testutils "github.com/skip-mev/block-sdk/testutils"
16+
"github.com/skip-mev/block-sdk/v2/abci"
17+
"github.com/skip-mev/block-sdk/v2/block"
18+
"github.com/skip-mev/block-sdk/v2/lanes/free"
19+
"github.com/skip-mev/block-sdk/v2/testutils"
2020
)
2121

2222
type ProposalsTestSuite struct {

‎abci/checktx/check_tx_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ import (
1515
sdk "github.com/cosmos/cosmos-sdk/types"
1616
"github.com/stretchr/testify/suite"
1717

18-
"github.com/skip-mev/block-sdk/abci/checktx"
19-
"github.com/skip-mev/block-sdk/block"
20-
mevlanetestutils "github.com/skip-mev/block-sdk/lanes/mev/testutils"
21-
"github.com/skip-mev/block-sdk/testutils"
22-
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
18+
"github.com/skip-mev/block-sdk/v2/abci/checktx"
19+
"github.com/skip-mev/block-sdk/v2/block"
20+
mevlanetestutils "github.com/skip-mev/block-sdk/v2/lanes/mev/testutils"
21+
"github.com/skip-mev/block-sdk/v2/testutils"
22+
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
2323
)
2424

2525
type CheckTxTestSuite struct {

‎abci/checktx/mempool_parity_check_tx.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
sdk "github.com/cosmos/cosmos-sdk/types"
1010
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
1111

12-
"github.com/skip-mev/block-sdk/block"
12+
"github.com/skip-mev/block-sdk/v2/block"
1313
)
1414

1515
// MempoolParityCheckTx is a CheckTx function that evicts txs that are not in the app-side mempool

‎abci/checktx/mev_check_tx.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"cosmossdk.io/log"
1313
storetypes "cosmossdk.io/store/types"
1414

15-
"github.com/skip-mev/block-sdk/block"
16-
mevlane "github.com/skip-mev/block-sdk/lanes/mev"
17-
"github.com/skip-mev/block-sdk/x/auction/types"
15+
"github.com/skip-mev/block-sdk/v2/block"
16+
mevlane "github.com/skip-mev/block-sdk/v2/lanes/mev"
17+
"github.com/skip-mev/block-sdk/v2/x/auction/types"
1818
)
1919

2020
// MevCheckTxHandler is a wrapper around baseapp's CheckTx method that allows us to

‎abci/utils.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package abci
33
import (
44
sdk "github.com/cosmos/cosmos-sdk/types"
55

6-
"github.com/skip-mev/block-sdk/block"
7-
"github.com/skip-mev/block-sdk/block/proposals"
8-
"github.com/skip-mev/block-sdk/lanes/terminator"
6+
"github.com/skip-mev/block-sdk/v2/block"
7+
"github.com/skip-mev/block-sdk/v2/block/proposals"
8+
"github.com/skip-mev/block-sdk/v2/lanes/terminator"
99
)
1010

1111
// ChainPrepareLanes chains together the proposal preparation logic from each lane into a

‎abci/utils_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import (
1111

1212
tmprototypes "github.com/cometbft/cometbft/proto/tendermint/types"
1313

14-
"github.com/skip-mev/block-sdk/abci"
15-
signeradaptors "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
16-
"github.com/skip-mev/block-sdk/block"
17-
"github.com/skip-mev/block-sdk/block/base"
18-
defaultlane "github.com/skip-mev/block-sdk/lanes/base"
19-
"github.com/skip-mev/block-sdk/lanes/free"
20-
"github.com/skip-mev/block-sdk/lanes/mev"
14+
"github.com/skip-mev/block-sdk/v2/abci"
15+
signeradaptors "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
16+
"github.com/skip-mev/block-sdk/v2/block"
17+
"github.com/skip-mev/block-sdk/v2/block/base"
18+
defaultlane "github.com/skip-mev/block-sdk/v2/lanes/base"
19+
"github.com/skip-mev/block-sdk/v2/lanes/free"
20+
"github.com/skip-mev/block-sdk/v2/lanes/mev"
2121
)
2222

2323
func (s *ProposalsTestSuite) setUpAnteHandler(expectedExecution map[sdk.Tx]bool) sdk.AnteHandler {

‎adapters/signer_extraction_adapter/signer_extraction_adapter_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
1111
"github.com/stretchr/testify/suite"
1212

13-
signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
14-
testutils "github.com/skip-mev/block-sdk/testutils"
13+
signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
14+
testutils "github.com/skip-mev/block-sdk/v2/testutils"
1515
)
1616

1717
type SignerExtractionAdapterTestSuite struct {

‎block/base/abci.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package base
33
import (
44
sdk "github.com/cosmos/cosmos-sdk/types"
55

6-
"github.com/skip-mev/block-sdk/block"
7-
"github.com/skip-mev/block-sdk/block/proposals"
8-
"github.com/skip-mev/block-sdk/block/utils"
6+
"github.com/skip-mev/block-sdk/v2/block"
7+
"github.com/skip-mev/block-sdk/v2/block/proposals"
8+
"github.com/skip-mev/block-sdk/v2/block/utils"
99
)
1010

1111
// PrepareLane will prepare a partial proposal for the lane. It will select transactions from the

‎block/base/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"cosmossdk.io/math"
88
sdk "github.com/cosmos/cosmos-sdk/types"
99

10-
signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
10+
signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
1111
)
1212

1313
// LaneConfig defines the basic configurations needed for a lane.

‎block/base/lane.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"cosmossdk.io/math"
88
sdk "github.com/cosmos/cosmos-sdk/types"
99

10-
"github.com/skip-mev/block-sdk/block"
10+
"github.com/skip-mev/block-sdk/v2/block"
1111
)
1212

1313
var _ block.Lane = (*BaseLane)(nil)

‎block/base/mempool.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
sdk "github.com/cosmos/cosmos-sdk/types"
99
sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
1010

11-
signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
12-
"github.com/skip-mev/block-sdk/block/utils"
11+
signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
12+
"github.com/skip-mev/block-sdk/v2/block/utils"
1313
)
1414

1515
type (

‎block/base/mempool_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
sdk "github.com/cosmos/cosmos-sdk/types"
1010
"github.com/stretchr/testify/require"
1111

12-
signerextraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
13-
"github.com/skip-mev/block-sdk/block/base"
14-
"github.com/skip-mev/block-sdk/testutils"
12+
signerextraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
13+
"github.com/skip-mev/block-sdk/v2/block/base"
14+
"github.com/skip-mev/block-sdk/v2/testutils"
1515
)
1616

1717
type txGen struct {

‎block/base/options.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package base
33
import (
44
sdk "github.com/cosmos/cosmos-sdk/types"
55

6-
"github.com/skip-mev/block-sdk/block"
6+
"github.com/skip-mev/block-sdk/v2/block"
77
)
88

99
// LaneOption defines a function that can be used to set options on a lane.

‎block/base/priority_nonce.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
sdk "github.com/cosmos/cosmos-sdk/types"
2323
sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
2424

25-
signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
25+
signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
2626
)
2727

2828
var (

‎block/base/proposals.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
sdk "github.com/cosmos/cosmos-sdk/types"
77

8-
"github.com/skip-mev/block-sdk/block/proposals"
8+
"github.com/skip-mev/block-sdk/v2/block/proposals"
99
)
1010

1111
// DefaultProposalHandler returns a default implementation of the PrepareLaneHandler and

‎block/base/tx_info.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
comettypes "github.com/cometbft/cometbft/types"
99
sdk "github.com/cosmos/cosmos-sdk/types"
1010

11-
"github.com/skip-mev/block-sdk/block/utils"
11+
"github.com/skip-mev/block-sdk/v2/block/utils"
1212
)
1313

1414
// GetTxInfo returns various information about the transaction that

‎block/base/tx_priority_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
sdk "github.com/cosmos/cosmos-sdk/types"
1010
"github.com/stretchr/testify/require"
1111

12-
"github.com/skip-mev/block-sdk/block/base"
13-
"github.com/skip-mev/block-sdk/testutils"
12+
"github.com/skip-mev/block-sdk/v2/block/base"
13+
"github.com/skip-mev/block-sdk/v2/testutils"
1414
)
1515

1616
func TestNopTxPriority(t *testing.T) {

‎block/base/types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package base
33
import (
44
sdk "github.com/cosmos/cosmos-sdk/types"
55

6-
"github.com/skip-mev/block-sdk/block/proposals"
6+
"github.com/skip-mev/block-sdk/v2/block/proposals"
77
)
88

99
type (

‎block/lane.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
sdk "github.com/cosmos/cosmos-sdk/types"
66
sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool"
77

8-
"github.com/skip-mev/block-sdk/block/proposals"
9-
"github.com/skip-mev/block-sdk/block/utils"
8+
"github.com/skip-mev/block-sdk/v2/block/proposals"
9+
"github.com/skip-mev/block-sdk/v2/block/utils"
1010
)
1111

1212
// LaneMempool defines the interface a lane's mempool should implement. The basic API

‎block/mempool_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import (
1212
sdk "github.com/cosmos/cosmos-sdk/types"
1313
"github.com/stretchr/testify/suite"
1414

15-
signer_extraction "github.com/skip-mev/block-sdk/adapters/signer_extraction_adapter"
16-
"github.com/skip-mev/block-sdk/block"
17-
"github.com/skip-mev/block-sdk/block/base"
18-
defaultlane "github.com/skip-mev/block-sdk/lanes/base"
19-
"github.com/skip-mev/block-sdk/lanes/free"
20-
"github.com/skip-mev/block-sdk/lanes/mev"
21-
testutils "github.com/skip-mev/block-sdk/testutils"
22-
auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
15+
signer_extraction "github.com/skip-mev/block-sdk/v2/adapters/signer_extraction_adapter"
16+
"github.com/skip-mev/block-sdk/v2/block"
17+
"github.com/skip-mev/block-sdk/v2/block/base"
18+
defaultlane "github.com/skip-mev/block-sdk/v2/lanes/base"
19+
"github.com/skip-mev/block-sdk/v2/lanes/free"
20+
"github.com/skip-mev/block-sdk/v2/lanes/mev"
21+
testutils "github.com/skip-mev/block-sdk/v2/testutils"
22+
auctiontypes "github.com/skip-mev/block-sdk/v2/x/auction/types"
2323
)
2424

2525
type BlockBusterTestSuite struct {

0 commit comments

Comments
 (0)