fix

skip-mev · Jul 2, 2024 · 3461aca · 3461aca
1 parent 97885fd
commit 3461aca
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 2,544 deletions.
diff --git a/README.md b/README.md
@@ -25,15 +25,7 @@
 
 > **Note**: The BlockSDK is open source software that Skip maintains. We strive to be responsive to questions and issues within 1-2 weeks - please ask in our [#block-sdk-support discord](https://discord.com/invite/hFeHVAE26P) channel, or open a GitHub issue!
 
-<<<<<<< HEAD
 Please note, we are not currently providing hands-on support for new integrations.
-=======
-**Please note the status of BlockSDK maintenance:**
-
-1. We are not currently providing hands-on support for new integrations.
-2. We have not yet completed our entire testing process for the FreeLane. We recommend integrators who want to have the best experience utilize the MEV Lane and the Default Lane only at this time.
-3. Integrators are responsible for the design, testing, and correctness of custom lanes they build.
->>>>>>> f1cde2a (fix: mempool lane size check on `CheckTx` (#561))
 
 **🌐 The Block SDK is a toolkit for building customized blocks**. The Block SDK is a set of Cosmos SDK and ABCI++ primitives that allow chains to fully customize blocks to specific use cases. It turns your chain's blocks into a **`highway`** consisting of individual **`lanes`** with their own special functionality.
 

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/x/auction/types/mocks/account_keeper.go b/x/auction/types/mocks/account_keeper.go
diff --git a/x/auction/types/mocks/bank_keeper.go b/x/auction/types/mocks/bank_keeper.go
diff --git a/x/auction/types/mocks/distribution_keeper.go b/x/auction/types/mocks/distribution_keeper.go
diff --git a/x/auction/types/mocks/rewards_address_provider.go b/x/auction/types/mocks/rewards_address_provider.go
diff --git a/x/auction/types/mocks/staking_keeper.go b/x/auction/types/mocks/staking_keeper.go