From bf25872404b3606aa1ecbebebaafab5d7ffa6c22 Mon Sep 17 00:00:00 2001 From: David Terpay Date: Thu, 17 Aug 2023 16:40:59 -0400 Subject: [PATCH] init --- .goreleaser.yml | 4 ++-- Makefile | 4 ++-- README.md | 10 +++++----- abci/abci.go | 6 +++--- abci/abci_test.go | 14 +++++++------- block/base/abci.go | 4 ++-- block/base/config.go | 2 +- block/base/handlers.go | 4 ++-- block/base/lane.go | 2 +- block/base/mempool.go | 2 +- block/mempool_test.go | 14 +++++++------- block/proposals.go | 2 +- block/utils/mocks/lane.go | 2 +- block/utils/utils_test.go | 2 +- go.mod | 2 +- go.work.sum | 2 ++ lanes/base/abci_test.go | 10 +++++----- lanes/base/base_test.go | 2 +- lanes/base/lane.go | 4 ++-- lanes/base/mempool_test.go | 4 ++-- lanes/free/lane.go | 4 ++-- lanes/mev/abci.go | 6 +++--- lanes/mev/check_tx.go | 2 +- lanes/mev/factory.go | 4 ++-- lanes/mev/factory_test.go | 2 +- lanes/mev/lane.go | 4 ++-- lanes/mev/mempool.go | 2 +- lanes/mev/mev_test.go | 4 ++-- lanes/mev/utils.go | 2 +- lanes/mev/utils_test.go | 6 +++--- lanes/terminator/lane.go | 2 +- proto/pob/builder/module/v1/module.proto | 2 +- proto/pob/builder/v1/genesis.proto | 2 +- proto/pob/builder/v1/query.proto | 2 +- proto/pob/builder/v1/tx.proto | 2 +- tests/app/ante.go | 8 ++++---- tests/app/app.go | 16 ++++++++-------- tests/app/config.go | 6 +++--- tests/app/testappd/cmd/root.go | 2 +- tests/app/testappd/cmd/testnet.go | 2 +- tests/app/testappd/main.go | 4 ++-- tests/integration/chain_setup.go | 2 +- tests/integration/pob_integration_test.go | 4 ++-- testutils/utils.go | 2 +- x/builder/ante/ante.go | 4 ++-- x/builder/ante/ante_test.go | 16 ++++++++-------- x/builder/client/cli/query.go | 2 +- x/builder/client/cli/tx.go | 2 +- x/builder/keeper/auction.go | 2 +- x/builder/keeper/auction_test.go | 6 +++--- x/builder/keeper/genesis.go | 2 +- x/builder/keeper/grpc_query.go | 2 +- x/builder/keeper/keeper.go | 4 ++-- x/builder/keeper/keeper_test.go | 6 +++--- x/builder/keeper/msg_server.go | 2 +- x/builder/keeper/msg_server_test.go | 4 ++-- x/builder/module.go | 8 ++++---- x/builder/rewards/fixed_provider.go | 2 +- x/builder/rewards/proposer_provider.go | 2 +- x/builder/types/msgs_test.go | 2 +- 60 files changed, 128 insertions(+), 126 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index a7ab2b4..179f59a 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,10 +1,10 @@ --- -project_name: pob +project_name: block-sdk release: github: owner: skip-mev - name: pob + name: block-sdk builds: - skip: true diff --git a/Makefile b/Makefile index 5413e1e..3128e29 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ export COMETBFT_VERSION := $(shell go list -m github.com/cometbft/cometbft | sed BIN_DIR ?= $(GOPATH)/bin BUILD_DIR ?= $(CURDIR)/build PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git) -HTTPS_GIT := https://github.com/skip-mev/pob.git +HTTPS_GIT := https://github.com/skip-mev/block-sdk.git DOCKER := $(shell which docker) ############################################################################### @@ -70,7 +70,7 @@ $(BUILD_TARGETS): $(BUILD_DIR)/ $(BUILD_DIR)/: mkdir -p $(BUILD_DIR)/ -# build-and-start-app builds a POB simulation application binary in the build folder +# build-and-start-app builds a Block SDK simulation application binary in the build folder # and initializes a single validator configuration. If desired, users can suppliment # other addresses using "genesis add-genesis-account address 10000000000000000000000000stake". # This will allow users to bootstrap their wallet with a balance. diff --git a/README.md b/README.md index 92c62bb..b393420 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,11 @@ [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#wip) -[![GoDoc](https://img.shields.io/badge/godoc-reference-blue?style=flat-square&logo=go)](https://godoc.org/github.com/skip-mev/pob) -[![Go Report Card](https://goreportcard.com/badge/github.com/skip-mev/pob?style=flat-square)](https://goreportcard.com/report/github.com/skip-mev/pob) -[![Version](https://img.shields.io/github/tag/skip-mev/pob.svg?style=flat-square)](https://github.com/skip-mev/pob/releases/latest) -[![License: Apache-2.0](https://img.shields.io/github/license/skip-mev/pob.svg?style=flat-square)](https://github.com/skip-mev/pob/blob/main/LICENSE) -[![Lines Of Code](https://img.shields.io/tokei/lines/github/skip-mev/pob?style=flat-square)](https://github.com/skip-mev/pob) +[![GoDoc](https://img.shields.io/badge/godoc-reference-blue?style=flat-square&logo=go)](https://godoc.org/github.com/skip-mev/block-sdk) +[![Go Report Card](https://goreportcard.com/badge/github.com/skip-mev/block-sdk?style=flat-square)](https://goreportcard.com/report/github.com/skip-mev/block-sdk) +[![Version](https://img.shields.io/github/tag/skip-mev/block-sdk.svg?style=flat-square)](https://github.com/skip-mev/block-sdk/releases/latest) +[![License: Apache-2.0](https://img.shields.io/github/license/skip-mev/block-sdk.svg?style=flat-square)](https://github.com/skip-mev/block-sdk/blob/main/LICENSE) +[![Lines Of Code](https://img.shields.io/tokei/lines/github/skip-mev/block-sdk?style=flat-square)](https://github.com/skip-mev/block-sdk) ### 🤔 What is the Block SDK? diff --git a/abci/abci.go b/abci/abci.go index 1e203af..f4aa420 100644 --- a/abci/abci.go +++ b/abci/abci.go @@ -6,9 +6,9 @@ import ( "cosmossdk.io/log" abci "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/block" - "github.com/skip-mev/pob/block/utils" - "github.com/skip-mev/pob/lanes/terminator" + "github.com/skip-mev/block-sdk/block" + "github.com/skip-mev/block-sdk/block/utils" + "github.com/skip-mev/block-sdk/lanes/terminator" ) type ( diff --git a/abci/abci_test.go b/abci/abci_test.go index dace5ed..348d469 100644 --- a/abci/abci_test.go +++ b/abci/abci_test.go @@ -13,13 +13,13 @@ import ( cometabci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/abci" - "github.com/skip-mev/pob/block" - "github.com/skip-mev/pob/block/base" - defaultlane "github.com/skip-mev/pob/lanes/base" - "github.com/skip-mev/pob/lanes/free" - "github.com/skip-mev/pob/lanes/mev" - testutils "github.com/skip-mev/pob/testutils" + "github.com/skip-mev/block-sdk/abci" + "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" "github.com/stretchr/testify/suite" ) diff --git a/block/base/abci.go b/block/base/abci.go index 4eb138a..0f74aec 100644 --- a/block/base/abci.go +++ b/block/base/abci.go @@ -2,8 +2,8 @@ package base import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/block" - "github.com/skip-mev/pob/block/utils" + "github.com/skip-mev/block-sdk/block" + "github.com/skip-mev/block-sdk/block/utils" ) // PrepareLane will prepare a partial proposal for the lane. It will select transactions from the diff --git a/block/base/config.go b/block/base/config.go index e9a404f..6112a58 100644 --- a/block/base/config.go +++ b/block/base/config.go @@ -6,7 +6,7 @@ import ( "cosmossdk.io/log" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/block" + "github.com/skip-mev/block-sdk/block" ) // LaneConfig defines the basic configurations needed for a lane. diff --git a/block/base/handlers.go b/block/base/handlers.go index 3782d36..ad1b75c 100644 --- a/block/base/handlers.go +++ b/block/base/handlers.go @@ -4,8 +4,8 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/block" - "github.com/skip-mev/pob/block/utils" + "github.com/skip-mev/block-sdk/block" + "github.com/skip-mev/block-sdk/block/utils" ) // DefaultPrepareLaneHandler returns a default implementation of the PrepareLaneHandler. It diff --git a/block/base/lane.go b/block/base/lane.go index dc58cf4..2275326 100644 --- a/block/base/lane.go +++ b/block/base/lane.go @@ -6,7 +6,7 @@ import ( "cosmossdk.io/log" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/block" + "github.com/skip-mev/block-sdk/block" ) var _ block.Lane = (*BaseLane)(nil) diff --git a/block/base/mempool.go b/block/base/mempool.go index 22bcf05..fb10ff1 100644 --- a/block/base/mempool.go +++ b/block/base/mempool.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool" - "github.com/skip-mev/pob/block/utils" + "github.com/skip-mev/block-sdk/block/utils" ) type ( diff --git a/block/mempool_test.go b/block/mempool_test.go index 242b27a..a98f529 100644 --- a/block/mempool_test.go +++ b/block/mempool_test.go @@ -10,13 +10,13 @@ import ( storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/block" - "github.com/skip-mev/pob/block/base" - defaultlane "github.com/skip-mev/pob/lanes/base" - "github.com/skip-mev/pob/lanes/free" - "github.com/skip-mev/pob/lanes/mev" - testutils "github.com/skip-mev/pob/testutils" - buildertypes "github.com/skip-mev/pob/x/builder/types" + "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" + buildertypes "github.com/skip-mev/block-sdk/x/builder/types" "github.com/stretchr/testify/suite" ) diff --git a/block/proposals.go b/block/proposals.go index f2d77ea..8878d9d 100644 --- a/block/proposals.go +++ b/block/proposals.go @@ -7,7 +7,7 @@ import ( "cosmossdk.io/log" "cosmossdk.io/math" - "github.com/skip-mev/pob/block/utils" + "github.com/skip-mev/block-sdk/block/utils" ) var _ BlockProposal = (*Proposal)(nil) diff --git a/block/utils/mocks/lane.go b/block/utils/mocks/lane.go index 3473e56..66d16c5 100644 --- a/block/utils/mocks/lane.go +++ b/block/utils/mocks/lane.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - block "github.com/skip-mev/pob/block" + block "github.com/skip-mev/block-sdk/block" log "cosmossdk.io/log" diff --git a/block/utils/utils_test.go b/block/utils/utils_test.go index eb33706..d60d791 100644 --- a/block/utils/utils_test.go +++ b/block/utils/utils_test.go @@ -4,7 +4,7 @@ import ( "testing" "cosmossdk.io/math" - "github.com/skip-mev/pob/block/utils" + "github.com/skip-mev/block-sdk/block/utils" ) func TestGetMaxTxBytesForLane(t *testing.T) { diff --git a/go.mod b/go.mod index bf00d51..0bd2fea 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/skip-mev/pob +module github.com/skip-mev/block-sdk go 1.20 diff --git a/go.work.sum b/go.work.sum index 1b6fa7d..8fc1d8e 100644 --- a/go.work.sum +++ b/go.work.sum @@ -41,6 +41,7 @@ github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5w github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/cosmos/cosmos-db v0.0.0-20221226095112-f3c38ecb5e32 h1:zlCp9n3uwQieELltZWHRmwPmPaZ8+XoL2Sj+A2YJlr8= +github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= github.com/curioswitch/go-reassign v0.2.0/go.mod h1:x6OpXuWvgfQaMGks2BZybTngWjT84hqJfKoO8Tt/Roc= github.com/daixiang0/gci v0.10.1/go.mod h1:xtHP9N7AHdNvtRNfcx9gwTDfw7FRJx4bZUsiEfiNNAI= github.com/denis-tingaikin/go-header v0.4.3/go.mod h1:0wOCWuN71D5qIgE2nz9KrKmuYBAC2Mra5RassOIQ2/c= @@ -68,6 +69,7 @@ github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= +github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-toolsmith/astcast v1.1.0/go.mod h1:qdcuFWeGGS2xX5bLM/c3U9lewg7+Zu4mr+xPwZIB4ZU= github.com/go-toolsmith/astcopy v1.1.0/go.mod h1:hXM6gan18VA1T/daUEHCFcYiW8Ai1tIwIzHY6srfEAw= github.com/go-toolsmith/astequal v1.1.0/go.mod h1:sedf7VIdCL22LD8qIvv7Nn9MuWJruQA/ysswh64lffQ= diff --git a/lanes/base/abci_test.go b/lanes/base/abci_test.go index 317df3b..8cff626 100644 --- a/lanes/base/abci_test.go +++ b/lanes/base/abci_test.go @@ -8,11 +8,11 @@ import ( "cosmossdk.io/log" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/block" - "github.com/skip-mev/pob/block/base" - "github.com/skip-mev/pob/block/utils/mocks" - defaultlane "github.com/skip-mev/pob/lanes/base" - testutils "github.com/skip-mev/pob/testutils" + "github.com/skip-mev/block-sdk/block" + "github.com/skip-mev/block-sdk/block/base" + "github.com/skip-mev/block-sdk/block/utils/mocks" + defaultlane "github.com/skip-mev/block-sdk/lanes/base" + testutils "github.com/skip-mev/block-sdk/testutils" ) func (s *BaseTestSuite) TestPrepareLane() { diff --git a/lanes/base/base_test.go b/lanes/base/base_test.go index 7852dac..604ed80 100644 --- a/lanes/base/base_test.go +++ b/lanes/base/base_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - testutils "github.com/skip-mev/pob/testutils" + testutils "github.com/skip-mev/block-sdk/testutils" "github.com/stretchr/testify/suite" ) diff --git a/lanes/base/lane.go b/lanes/base/lane.go index 9842592..e197df5 100644 --- a/lanes/base/lane.go +++ b/lanes/base/lane.go @@ -1,8 +1,8 @@ package base import ( - "github.com/skip-mev/pob/block" - "github.com/skip-mev/pob/block/base" + "github.com/skip-mev/block-sdk/block" + "github.com/skip-mev/block-sdk/block/base" ) const ( diff --git a/lanes/base/mempool_test.go b/lanes/base/mempool_test.go index b8a5047..a4f01a4 100644 --- a/lanes/base/mempool_test.go +++ b/lanes/base/mempool_test.go @@ -3,8 +3,8 @@ package base_test import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/block/base" - testutils "github.com/skip-mev/pob/testutils" + "github.com/skip-mev/block-sdk/block/base" + testutils "github.com/skip-mev/block-sdk/testutils" ) func (s *BaseTestSuite) TestGetTxPriority() { diff --git a/lanes/free/lane.go b/lanes/free/lane.go index 10dcfaa..678aa3a 100644 --- a/lanes/free/lane.go +++ b/lanes/free/lane.go @@ -3,8 +3,8 @@ package free import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/skip-mev/pob/block" - "github.com/skip-mev/pob/block/base" + "github.com/skip-mev/block-sdk/block" + "github.com/skip-mev/block-sdk/block/base" ) const ( diff --git a/lanes/mev/abci.go b/lanes/mev/abci.go index 137da8c..4a1a192 100644 --- a/lanes/mev/abci.go +++ b/lanes/mev/abci.go @@ -5,9 +5,9 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/block" - "github.com/skip-mev/pob/block/utils" - "github.com/skip-mev/pob/x/builder/types" + "github.com/skip-mev/block-sdk/block" + "github.com/skip-mev/block-sdk/block/utils" + "github.com/skip-mev/block-sdk/x/builder/types" ) // PrepareLaneHandler will attempt to select the highest bid transaction that is valid diff --git a/lanes/mev/check_tx.go b/lanes/mev/check_tx.go index dbe890b..8d8ed78 100644 --- a/lanes/mev/check_tx.go +++ b/lanes/mev/check_tx.go @@ -9,7 +9,7 @@ import ( cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/skip-mev/pob/x/builder/types" + "github.com/skip-mev/block-sdk/x/builder/types" ) type ( diff --git a/lanes/mev/factory.go b/lanes/mev/factory.go index d0bca0c..c13a26f 100644 --- a/lanes/mev/factory.go +++ b/lanes/mev/factory.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/signing" - "github.com/skip-mev/pob/block" - "github.com/skip-mev/pob/x/builder/types" + "github.com/skip-mev/block-sdk/block" + "github.com/skip-mev/block-sdk/x/builder/types" ) type ( diff --git a/lanes/mev/factory_test.go b/lanes/mev/factory_test.go index b68587e..cc1c704 100644 --- a/lanes/mev/factory_test.go +++ b/lanes/mev/factory_test.go @@ -5,7 +5,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - testutils "github.com/skip-mev/pob/testutils" + testutils "github.com/skip-mev/block-sdk/testutils" ) func (suite *MEVTestSuite) TestIsAuctionTx() { diff --git a/lanes/mev/lane.go b/lanes/mev/lane.go index d3da91b..d03d27a 100644 --- a/lanes/mev/lane.go +++ b/lanes/mev/lane.go @@ -4,8 +4,8 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/block" - "github.com/skip-mev/pob/block/base" + "github.com/skip-mev/block-sdk/block" + "github.com/skip-mev/block-sdk/block/base" ) const ( diff --git a/lanes/mev/mempool.go b/lanes/mev/mempool.go index 68946df..487f0ad 100644 --- a/lanes/mev/mempool.go +++ b/lanes/mev/mempool.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/block/base" + "github.com/skip-mev/block-sdk/block/base" ) // TxPriority returns a TxPriority over mev lane transactions only. It diff --git a/lanes/mev/mev_test.go b/lanes/mev/mev_test.go index e1c9e65..c3a0ce6 100644 --- a/lanes/mev/mev_test.go +++ b/lanes/mev/mev_test.go @@ -8,8 +8,8 @@ import ( "cosmossdk.io/log" cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/lanes/mev" - testutils "github.com/skip-mev/pob/testutils" + "github.com/skip-mev/block-sdk/lanes/mev" + testutils "github.com/skip-mev/block-sdk/testutils" "github.com/stretchr/testify/suite" ) diff --git a/lanes/mev/utils.go b/lanes/mev/utils.go index 4406c56..e69cbe4 100644 --- a/lanes/mev/utils.go +++ b/lanes/mev/utils.go @@ -4,7 +4,7 @@ import ( "errors" sdk "github.com/cosmos/cosmos-sdk/types" - buildertypes "github.com/skip-mev/pob/x/builder/types" + buildertypes "github.com/skip-mev/block-sdk/x/builder/types" ) // GetMsgAuctionBidFromTx attempts to retrieve a MsgAuctionBid from an sdk.Tx if diff --git a/lanes/mev/utils_test.go b/lanes/mev/utils_test.go index 7ae1dae..3b3c374 100644 --- a/lanes/mev/utils_test.go +++ b/lanes/mev/utils_test.go @@ -4,9 +4,9 @@ import ( "testing" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/skip-mev/pob/lanes/mev" - testutils "github.com/skip-mev/pob/testutils" - buildertypes "github.com/skip-mev/pob/x/builder/types" + "github.com/skip-mev/block-sdk/lanes/mev" + testutils "github.com/skip-mev/block-sdk/testutils" + buildertypes "github.com/skip-mev/block-sdk/x/builder/types" "github.com/stretchr/testify/require" ) diff --git a/lanes/terminator/lane.go b/lanes/terminator/lane.go index 3fce765..2961da5 100644 --- a/lanes/terminator/lane.go +++ b/lanes/terminator/lane.go @@ -7,7 +7,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" sdkmempool "github.com/cosmos/cosmos-sdk/types/mempool" - "github.com/skip-mev/pob/block" + "github.com/skip-mev/block-sdk/block" ) const ( diff --git a/proto/pob/builder/module/v1/module.proto b/proto/pob/builder/module/v1/module.proto index 24c2db2..c0fc4fd 100644 --- a/proto/pob/builder/module/v1/module.proto +++ b/proto/pob/builder/module/v1/module.proto @@ -7,7 +7,7 @@ import "cosmos/app/v1alpha1/module.proto"; // Module is the config object of the builder module. message Module { option (cosmos.app.v1alpha1.module) = { - go_import : "github.com/skip-mev/pob/x/builder" + go_import : "github.com/skip-mev/block-sdk/x/builder" }; // Authority defines the custom module authority. If not set, defaults to the diff --git a/proto/pob/builder/v1/genesis.proto b/proto/pob/builder/v1/genesis.proto index 0909c23..d740f2b 100644 --- a/proto/pob/builder/v1/genesis.proto +++ b/proto/pob/builder/v1/genesis.proto @@ -6,7 +6,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "amino/amino.proto"; import "cosmos_proto/cosmos.proto"; -option go_package = "github.com/skip-mev/pob/x/builder/types"; +option go_package = "github.com/skip-mev/block-sdk/x/builder/types"; // GenesisState defines the genesis state of the x/builder module. message GenesisState { Params params = 1 [ (gogoproto.nullable) = false ]; } diff --git a/proto/pob/builder/v1/query.proto b/proto/pob/builder/v1/query.proto index 082335b..4cfa578 100644 --- a/proto/pob/builder/v1/query.proto +++ b/proto/pob/builder/v1/query.proto @@ -6,7 +6,7 @@ import "google/api/annotations.proto"; import "cosmos/query/v1/query.proto"; import "pob/builder/v1/genesis.proto"; -option go_package = "github.com/skip-mev/pob/x/builder/types"; +option go_package = "github.com/skip-mev/block-sdk/x/builder/types"; // Query defines the x/builder querier service. service Query { diff --git a/proto/pob/builder/v1/tx.proto b/proto/pob/builder/v1/tx.proto index 47d7b0f..ea41f8d 100644 --- a/proto/pob/builder/v1/tx.proto +++ b/proto/pob/builder/v1/tx.proto @@ -9,7 +9,7 @@ import "cosmos_proto/cosmos.proto"; import "cosmos/msg/v1/msg.proto"; import "amino/amino.proto"; -option go_package = "github.com/skip-mev/pob/x/builder/types"; +option go_package = "github.com/skip-mev/block-sdk/x/builder/types"; // Msg defines the x/builder Msg service. service Msg { diff --git a/tests/app/ante.go b/tests/app/ante.go index 53d0e5c..30ce56e 100644 --- a/tests/app/ante.go +++ b/tests/app/ante.go @@ -3,10 +3,10 @@ package app import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/ante" - "github.com/skip-mev/pob/block" - "github.com/skip-mev/pob/block/utils" - builderante "github.com/skip-mev/pob/x/builder/ante" - builderkeeper "github.com/skip-mev/pob/x/builder/keeper" + "github.com/skip-mev/block-sdk/block" + "github.com/skip-mev/block-sdk/block/utils" + builderante "github.com/skip-mev/block-sdk/x/builder/ante" + builderkeeper "github.com/skip-mev/block-sdk/x/builder/keeper" ) type POBHandlerOptions struct { diff --git a/tests/app/app.go b/tests/app/app.go index 8185791..ec19be6 100644 --- a/tests/app/app.go +++ b/tests/app/app.go @@ -61,14 +61,14 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "github.com/skip-mev/pob/abci" - "github.com/skip-mev/pob/block" - "github.com/skip-mev/pob/block/base" - defaultlane "github.com/skip-mev/pob/lanes/base" - "github.com/skip-mev/pob/lanes/free" - "github.com/skip-mev/pob/lanes/mev" - buildermodule "github.com/skip-mev/pob/x/builder" - builderkeeper "github.com/skip-mev/pob/x/builder/keeper" + "github.com/skip-mev/block-sdk/abci" + "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" + buildermodule "github.com/skip-mev/block-sdk/x/builder" + builderkeeper "github.com/skip-mev/block-sdk/x/builder/keeper" ) const ( diff --git a/tests/app/config.go b/tests/app/config.go index 8d181fa..ff7e1d4 100644 --- a/tests/app/config.go +++ b/tests/app/config.go @@ -43,7 +43,7 @@ import ( _ "github.com/cosmos/cosmos-sdk/x/params" // import for side-effects _ "github.com/cosmos/cosmos-sdk/x/slashing" // import for side-effects _ "github.com/cosmos/cosmos-sdk/x/staking" // import for side-effects - _ "github.com/skip-mev/pob/x/builder" // import for side-effects + _ "github.com/skip-mev/block-sdk/x/builder" // import for side-effects "cosmossdk.io/core/appconfig" circuittypes "cosmossdk.io/x/circuit/types" @@ -68,8 +68,8 @@ import ( paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - buildermodulev1 "github.com/skip-mev/pob/api/pob/builder/module/v1" - buildertypes "github.com/skip-mev/pob/x/builder/types" + buildermodulev1 "github.com/skip-mev/block-sdk/api/pob/builder/module/v1" + buildertypes "github.com/skip-mev/block-sdk/x/builder/types" ) var ( diff --git a/tests/app/testappd/cmd/root.go b/tests/app/testappd/cmd/root.go index 5c6de93..9ff2244 100644 --- a/tests/app/testappd/cmd/root.go +++ b/tests/app/testappd/cmd/root.go @@ -14,7 +14,7 @@ import ( "cosmossdk.io/depinject" "cosmossdk.io/log" confixcmd "cosmossdk.io/tools/confix/cmd" - "github.com/skip-mev/pob/tests/app" + "github.com/skip-mev/block-sdk/tests/app" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/config" diff --git a/tests/app/testappd/cmd/testnet.go b/tests/app/testappd/cmd/testnet.go index 2ca9f82..5e399af 100644 --- a/tests/app/testappd/cmd/testnet.go +++ b/tests/app/testappd/cmd/testnet.go @@ -15,7 +15,7 @@ import ( "cosmossdk.io/math" "cosmossdk.io/math/unsafe" - "github.com/skip-mev/pob/tests/app" + "github.com/skip-mev/block-sdk/tests/app" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/tests/app/testappd/main.go b/tests/app/testappd/main.go index c644f01..e4327d1 100644 --- a/tests/app/testappd/main.go +++ b/tests/app/testappd/main.go @@ -5,8 +5,8 @@ import ( "cosmossdk.io/log" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/skip-mev/pob/tests/app" - cmd "github.com/skip-mev/pob/tests/app/testappd/cmd" + "github.com/skip-mev/block-sdk/tests/app" + cmd "github.com/skip-mev/block-sdk/tests/app/testappd/cmd" ) func main() { diff --git a/tests/integration/chain_setup.go b/tests/integration/chain_setup.go index ba753a9..759652a 100644 --- a/tests/integration/chain_setup.go +++ b/tests/integration/chain_setup.go @@ -15,7 +15,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - buildertypes "github.com/skip-mev/pob/x/builder/types" + buildertypes "github.com/skip-mev/block-sdk/x/builder/types" interchaintest "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" diff --git a/tests/integration/pob_integration_test.go b/tests/integration/pob_integration_test.go index e5b775d..0c98d49 100644 --- a/tests/integration/pob_integration_test.go +++ b/tests/integration/pob_integration_test.go @@ -5,8 +5,8 @@ import ( "testing" testutil "github.com/cosmos/cosmos-sdk/types/module/testutil" - "github.com/skip-mev/pob/tests/integration" - buildertypes "github.com/skip-mev/pob/x/builder/types" + "github.com/skip-mev/block-sdk/tests/integration" + buildertypes "github.com/skip-mev/block-sdk/x/builder/types" "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" diff --git a/testutils/utils.go b/testutils/utils.go index 9dd0c5b..a99beae 100644 --- a/testutils/utils.go +++ b/testutils/utils.go @@ -19,7 +19,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/cosmos/gogoproto/proto" - buildertypes "github.com/skip-mev/pob/x/builder/types" + buildertypes "github.com/skip-mev/block-sdk/x/builder/types" ) type EncodingConfig struct { diff --git a/x/builder/ante/ante.go b/x/builder/ante/ante.go index ae62909..077c17f 100644 --- a/x/builder/ante/ante.go +++ b/x/builder/ante/ante.go @@ -7,8 +7,8 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/x/builder/keeper" - "github.com/skip-mev/pob/x/builder/types" + "github.com/skip-mev/block-sdk/x/builder/keeper" + "github.com/skip-mev/block-sdk/x/builder/types" ) var _ sdk.AnteDecorator = BuilderDecorator{} diff --git a/x/builder/ante/ante_test.go b/x/builder/ante/ante_test.go index 6c25a43..21b8359 100644 --- a/x/builder/ante/ante_test.go +++ b/x/builder/ante/ante_test.go @@ -11,14 +11,14 @@ import ( "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/golang/mock/gomock" - "github.com/skip-mev/pob/block" - "github.com/skip-mev/pob/block/base" - defaultlane "github.com/skip-mev/pob/lanes/base" - "github.com/skip-mev/pob/lanes/mev" - testutils "github.com/skip-mev/pob/testutils" - "github.com/skip-mev/pob/x/builder/ante" - "github.com/skip-mev/pob/x/builder/keeper" - buildertypes "github.com/skip-mev/pob/x/builder/types" + "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/mev" + testutils "github.com/skip-mev/block-sdk/testutils" + "github.com/skip-mev/block-sdk/x/builder/ante" + "github.com/skip-mev/block-sdk/x/builder/keeper" + buildertypes "github.com/skip-mev/block-sdk/x/builder/types" "github.com/stretchr/testify/suite" ) diff --git a/x/builder/client/cli/query.go b/x/builder/client/cli/query.go index dea9519..b69c5a4 100644 --- a/x/builder/client/cli/query.go +++ b/x/builder/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/skip-mev/pob/x/builder/types" + "github.com/skip-mev/block-sdk/x/builder/types" "github.com/spf13/cobra" ) diff --git a/x/builder/client/cli/tx.go b/x/builder/client/cli/tx.go index 73ce0b8..e1ab60a 100644 --- a/x/builder/client/cli/tx.go +++ b/x/builder/client/cli/tx.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/x/builder/types" + "github.com/skip-mev/block-sdk/x/builder/types" "github.com/spf13/cobra" ) diff --git a/x/builder/keeper/auction.go b/x/builder/keeper/auction.go index f2a37cb..21d7933 100644 --- a/x/builder/keeper/auction.go +++ b/x/builder/keeper/auction.go @@ -4,7 +4,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/x/builder/types" + "github.com/skip-mev/block-sdk/x/builder/types" ) // ValidateBidInfo validates that the bid can be included in the auction. diff --git a/x/builder/keeper/auction_test.go b/x/builder/keeper/auction_test.go index 7779f85..2224a4a 100644 --- a/x/builder/keeper/auction_test.go +++ b/x/builder/keeper/auction_test.go @@ -6,9 +6,9 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - testutils "github.com/skip-mev/pob/testutils" - "github.com/skip-mev/pob/x/builder/keeper" - "github.com/skip-mev/pob/x/builder/types" + testutils "github.com/skip-mev/block-sdk/testutils" + "github.com/skip-mev/block-sdk/x/builder/keeper" + "github.com/skip-mev/block-sdk/x/builder/types" ) func (suite *KeeperTestSuite) TestValidateBidInfo() { diff --git a/x/builder/keeper/genesis.go b/x/builder/keeper/genesis.go index 40a38b3..9969cb5 100644 --- a/x/builder/keeper/genesis.go +++ b/x/builder/keeper/genesis.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/x/builder/types" + "github.com/skip-mev/block-sdk/x/builder/types" ) // InitGenesis initializes the builder module's state from a given genesis state. diff --git a/x/builder/keeper/grpc_query.go b/x/builder/keeper/grpc_query.go index 272ff74..6ce60ff 100644 --- a/x/builder/keeper/grpc_query.go +++ b/x/builder/keeper/grpc_query.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/x/builder/types" + "github.com/skip-mev/block-sdk/x/builder/types" ) var _ types.QueryServer = QueryServer{} diff --git a/x/builder/keeper/keeper.go b/x/builder/keeper/keeper.go index f175f72..d55af4f 100644 --- a/x/builder/keeper/keeper.go +++ b/x/builder/keeper/keeper.go @@ -9,8 +9,8 @@ import ( storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/x/builder/rewards" - "github.com/skip-mev/pob/x/builder/types" + "github.com/skip-mev/block-sdk/x/builder/rewards" + "github.com/skip-mev/block-sdk/x/builder/types" ) type Keeper struct { diff --git a/x/builder/keeper/keeper_test.go b/x/builder/keeper/keeper_test.go index bd09d89..8bcce66 100644 --- a/x/builder/keeper/keeper_test.go +++ b/x/builder/keeper/keeper_test.go @@ -7,9 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/golang/mock/gomock" - testutils "github.com/skip-mev/pob/testutils" - "github.com/skip-mev/pob/x/builder/keeper" - "github.com/skip-mev/pob/x/builder/types" + testutils "github.com/skip-mev/block-sdk/testutils" + "github.com/skip-mev/block-sdk/x/builder/keeper" + "github.com/skip-mev/block-sdk/x/builder/types" "github.com/stretchr/testify/suite" ) diff --git a/x/builder/keeper/msg_server.go b/x/builder/keeper/msg_server.go index 742e61e..81c9fff 100644 --- a/x/builder/keeper/msg_server.go +++ b/x/builder/keeper/msg_server.go @@ -8,7 +8,7 @@ import ( "strings" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/x/builder/types" + "github.com/skip-mev/block-sdk/x/builder/types" ) var _ types.MsgServer = MsgServer{} diff --git a/x/builder/keeper/msg_server_test.go b/x/builder/keeper/msg_server_test.go index 6b2a0ac..cbc6d63 100644 --- a/x/builder/keeper/msg_server_test.go +++ b/x/builder/keeper/msg_server_test.go @@ -7,8 +7,8 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - testutils "github.com/skip-mev/pob/testutils" - "github.com/skip-mev/pob/x/builder/types" + testutils "github.com/skip-mev/block-sdk/testutils" + "github.com/skip-mev/block-sdk/x/builder/types" ) func (suite *KeeperTestSuite) TestMsgAuctionBid() { diff --git a/x/builder/module.go b/x/builder/module.go index 4308e8f..c70590d 100644 --- a/x/builder/module.go +++ b/x/builder/module.go @@ -18,10 +18,10 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" - modulev1 "github.com/skip-mev/pob/api/pob/builder/module/v1" - "github.com/skip-mev/pob/x/builder/client/cli" - "github.com/skip-mev/pob/x/builder/keeper" - "github.com/skip-mev/pob/x/builder/types" + modulev1 "github.com/skip-mev/block-sdk/api/pob/builder/module/v1" + "github.com/skip-mev/block-sdk/x/builder/client/cli" + "github.com/skip-mev/block-sdk/x/builder/keeper" + "github.com/skip-mev/block-sdk/x/builder/types" "github.com/spf13/cobra" ) diff --git a/x/builder/rewards/fixed_provider.go b/x/builder/rewards/fixed_provider.go index 45fc5eb..af5e09a 100644 --- a/x/builder/rewards/fixed_provider.go +++ b/x/builder/rewards/fixed_provider.go @@ -4,7 +4,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/x/builder/types" + "github.com/skip-mev/block-sdk/x/builder/types" ) var _ types.RewardsAddressProvider = (*FixedAddressRewardsAddressProvider)(nil) diff --git a/x/builder/rewards/proposer_provider.go b/x/builder/rewards/proposer_provider.go index a1094b5..dc32632 100644 --- a/x/builder/rewards/proposer_provider.go +++ b/x/builder/rewards/proposer_provider.go @@ -3,7 +3,7 @@ package rewards import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/x/builder/types" + "github.com/skip-mev/block-sdk/x/builder/types" ) var _ types.RewardsAddressProvider = (*ProposerRewardsAddressProvider)(nil) diff --git a/x/builder/types/msgs_test.go b/x/builder/types/msgs_test.go index 09ea34d..132afee 100644 --- a/x/builder/types/msgs_test.go +++ b/x/builder/types/msgs_test.go @@ -5,7 +5,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/skip-mev/pob/x/builder/types" + "github.com/skip-mev/block-sdk/x/builder/types" ) // TestMsgAuctionBid tests the ValidateBasic method of MsgAuctionBid