Skip to content

Commit

Permalink
github.com/strangelove-ventures/globalfee (#3)
Browse files Browse the repository at this point in the history
  • Loading branch information
Reecepbcups authored Mar 7, 2024
1 parent d38f93f commit 3d22c51
Show file tree
Hide file tree
Showing 34 changed files with 105 additions and 104 deletions.
4 changes: 2 additions & 2 deletions app/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/cosmos/cosmos-sdk/x/auth/ante"
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"

globalfeeante "github.com/reecepbcups/globalfee/x/globalfee/ante"
globalfeekeeper "github.com/reecepbcups/globalfee/x/globalfee/keeper"
globalfeeante "github.com/strangelove-ventures/globalfee/x/globalfee/ante"
globalfeekeeper "github.com/strangelove-ventures/globalfee/x/globalfee/keeper"
)

const maxBypassMinFeeMsgGasUsage = 2_000_000
Expand Down
6 changes: 3 additions & 3 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,9 @@ import (
ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
ibcchanneltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"

globalfee "github.com/reecepbcups/globalfee/x/globalfee"
globalfeekeeper "github.com/reecepbcups/globalfee/x/globalfee/keeper"
globalfeetypes "github.com/reecepbcups/globalfee/x/globalfee/types"
globalfee "github.com/strangelove-ventures/globalfee/x/globalfee"
globalfeekeeper "github.com/strangelove-ventures/globalfee/x/globalfee/keeper"
globalfeetypes "github.com/strangelove-ventures/globalfee/x/globalfee/types"
)

// We pull these out so we can set them with LDFLAGS in the Makefile
Expand Down
4 changes: 2 additions & 2 deletions app/apptesting/test_suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"time"

"github.com/reecepbcups/globalfee/app"
appparams "github.com/reecepbcups/globalfee/app/params"
"github.com/strangelove-ventures/globalfee/app"
appparams "github.com/strangelove-ventures/globalfee/app/params"
"github.com/stretchr/testify/suite"

"github.com/cometbft/cometbft/crypto/ed25519"
Expand Down
2 changes: 1 addition & 1 deletion app/encoding.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package app
import (
"testing"

"github.com/reecepbcups/globalfee/app/params"
"github.com/strangelove-ventures/globalfee/app/params"

dbm "github.com/cosmos/cosmos-db"

Expand Down
4 changes: 2 additions & 2 deletions app/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"testing"
"time"

apphelpers "github.com/reecepbcups/globalfee/app/helpers"
appparams "github.com/reecepbcups/globalfee/app/params"
apphelpers "github.com/strangelove-ventures/globalfee/app/helpers"
appparams "github.com/strangelove-ventures/globalfee/app/params"
"github.com/stretchr/testify/require"

abci "github.com/cometbft/cometbft/abci/types"
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package app
import (
"fmt"

"github.com/reecepbcups/globalfee/app/upgrades"
"github.com/reecepbcups/globalfee/app/upgrades/noop"
"github.com/strangelove-ventures/globalfee/app/upgrades"
"github.com/strangelove-ventures/globalfee/app/upgrades/noop"

upgradetypes "cosmossdk.io/x/upgrade/types"
)
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/noop/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package noop
import (
"context"

"github.com/reecepbcups/globalfee/app/upgrades"
"github.com/strangelove-ventures/globalfee/app/upgrades"

storetypes "cosmossdk.io/store/types"
upgradetypes "cosmossdk.io/x/upgrade/types"
Expand Down
2 changes: 1 addition & 1 deletion cmd/globald/cmd/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"io"
"os"

"github.com/reecepbcups/globalfee/app"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/strangelove-ventures/globalfee/app"

cmtcfg "github.com/cometbft/cometbft/config"

Expand Down
4 changes: 2 additions & 2 deletions cmd/globald/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"os"

"github.com/reecepbcups/globalfee/app"
"github.com/reecepbcups/globalfee/app/params"
"github.com/spf13/cobra"
"github.com/strangelove-ventures/globalfee/app"
"github.com/strangelove-ventures/globalfee/app/params"

dbm "github.com/cosmos/cosmos-db"

Expand Down
2 changes: 1 addition & 1 deletion cmd/globald/cmd/testnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"path/filepath"
"time"

"github.com/reecepbcups/globalfee/app"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"github.com/strangelove-ventures/globalfee/app"

cmtconfig "github.com/cometbft/cometbft/config"
cmttime "github.com/cometbft/cometbft/types/time"
Expand Down
4 changes: 2 additions & 2 deletions cmd/globald/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"os"

"github.com/reecepbcups/globalfee/app"
"github.com/reecepbcups/globalfee/cmd/globald/cmd"
"github.com/strangelove-ventures/globalfee/app"
"github.com/strangelove-ventures/globalfee/cmd/globald/cmd"

svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/reecepbcups/globalfee
module github.com/strangelove-ventures/globalfee

go 1.21

Expand Down
6 changes: 3 additions & 3 deletions interchaintest/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/reecepbcups/globalfee/interchaintest
module github.com/strangelove-ventures/globalfee/interchaintest

go 1.21.1

Expand All @@ -8,13 +8,13 @@ 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/reecepbcups/globalfee => ../
github.com/strangelove-ventures/globalfee => ../
)

require (
cosmossdk.io/math v1.2.0
github.com/cosmos/cosmos-sdk v0.50.3
github.com/reecepbcups/globalfee v0.0.0-00000000000000-000000000000
github.com/strangelove-ventures/globalfee v0.0.0-00000000000000-000000000000
github.com/strangelove-ventures/interchaintest/v8 v8.0.1-0.20240124225619-c55143141632
github.com/stretchr/testify v1.8.4
go.uber.org/zap v1.26.0
Expand Down
2 changes: 1 addition & 1 deletion interchaintest/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
sdkmath "cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"

globalfee "github.com/reecepbcups/globalfee/x/globalfee/types"
globalfee "github.com/strangelove-ventures/globalfee/x/globalfee/types"
"github.com/strangelove-ventures/interchaintest/v8"
"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v8/ibc"
Expand Down
2 changes: 1 addition & 1 deletion proto/buf.gen.pulsar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: v1
managed:
enabled: true
go_package_prefix:
default: github.com/reecepbcups/globalfee/api
default: github.com/strangelove-ventures/globalfee/api
except:
- buf.build/googleapis/googleapis
- buf.build/cosmos/gogo-proto
Expand Down
2 changes: 1 addition & 1 deletion proto/gaia/globalfee/v1beta1/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package gaia.globalfee.v1beta1;
import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";

option go_package = "github.com/reecepbcups/globalfee/x/globalfee/types";
option go_package = "github.com/strangelove-ventures/globalfee/x/globalfee/types";

// GenesisState - initial state of module
message GenesisState {
Expand Down
2 changes: 1 addition & 1 deletion proto/gaia/globalfee/v1beta1/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
import "google/api/annotations.proto";
import "cosmos/base/v1beta1/coin.proto";

option go_package = "github.com/reecepbcups/globalfee/x/globalfee/types";
option go_package = "github.com/strangelove-ventures/globalfee/x/globalfee/types";

// Query defines the gRPC querier service.
service Query {
Expand Down
2 changes: 1 addition & 1 deletion proto/gaia/globalfee/v1beta1/tx.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package gaia.globalfee.v1beta1;

option go_package = "github.com/reecepbcups/globalfee/x/globalfee/types";
option go_package = "github.com/strangelove-ventures/globalfee/x/globalfee/types";

import "cosmos/msg/v1/msg.proto";
import "gaia/globalfee/v1beta1/genesis.proto";
Expand Down
2 changes: 1 addition & 1 deletion scripts/protocgen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buf generate --template buf.gen.gogo.yaml $file
cd ..

# move proto files to the right places
cp -r ./github.com/reecepbcups/globalfee/x/* x/
cp -r ./github.com/strangelove-ventures/globalfee/x/* x/
rm -rf ./github.com

go mod tidy
2 changes: 1 addition & 1 deletion x/globalfee/alias.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package globalfee

import (
"github.com/reecepbcups/globalfee/x/globalfee/types"
"github.com/strangelove-ventures/globalfee/x/globalfee/types"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion x/globalfee/ante/fee.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"

globalfeekeeper "github.com/reecepbcups/globalfee/x/globalfee/keeper"
globalfeekeeper "github.com/strangelove-ventures/globalfee/x/globalfee/keeper"
)

// FeeWithBypassDecorator checks if the transaction's fee is at least as large
Expand Down
2 changes: 1 addition & 1 deletion x/globalfee/client/cli/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"

"github.com/reecepbcups/globalfee/x/globalfee/types"
"github.com/strangelove-ventures/globalfee/x/globalfee/types"
)

func GetQueryCmd() *cobra.Command {
Expand Down
6 changes: 3 additions & 3 deletions x/globalfee/genesis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
storetypes "cosmossdk.io/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"

appparams "github.com/reecepbcups/globalfee/app/params"
globalfeekeeper "github.com/reecepbcups/globalfee/x/globalfee/keeper"
"github.com/reecepbcups/globalfee/x/globalfee/types"
appparams "github.com/strangelove-ventures/globalfee/app/params"
globalfeekeeper "github.com/strangelove-ventures/globalfee/x/globalfee/keeper"
"github.com/strangelove-ventures/globalfee/x/globalfee/types"
)

func TestDefaultGenesis(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion x/globalfee/keeper/keeper.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"github.com/cosmos/cosmos-sdk/codec"
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/reecepbcups/globalfee/x/globalfee/types"
"github.com/strangelove-ventures/globalfee/x/globalfee/types"
)

// Keeper of the globalfee store
Expand Down
2 changes: 1 addition & 1 deletion x/globalfee/keeper/migrator.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package keeper
import (
sdk "github.com/cosmos/cosmos-sdk/types"

v2 "github.com/reecepbcups/globalfee/x/globalfee/migrations/v2"
v2 "github.com/strangelove-ventures/globalfee/x/globalfee/migrations/v2"
)

// Migrator is a struct for handling in-place state migrations.
Expand Down
2 changes: 1 addition & 1 deletion x/globalfee/keeper/msg_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"

"github.com/reecepbcups/globalfee/x/globalfee/types"
"github.com/strangelove-ventures/globalfee/x/globalfee/types"
)

var _ types.MsgServer = msgServer{}
Expand Down
2 changes: 1 addition & 1 deletion x/globalfee/migrations/v2/migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/cosmos/cosmos-sdk/codec"
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/reecepbcups/globalfee/x/globalfee/types"
"github.com/strangelove-ventures/globalfee/x/globalfee/types"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions x/globalfee/migrations/v2/migrator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"

"github.com/reecepbcups/globalfee/x/globalfee"
v2 "github.com/reecepbcups/globalfee/x/globalfee/migrations/v2"
"github.com/reecepbcups/globalfee/x/globalfee/types"
"github.com/strangelove-ventures/globalfee/x/globalfee"
v2 "github.com/strangelove-ventures/globalfee/x/globalfee/migrations/v2"
"github.com/strangelove-ventures/globalfee/x/globalfee/types"
)

func TestMigrateMainnet(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions x/globalfee/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"

"github.com/reecepbcups/globalfee/x/globalfee/client/cli"
"github.com/reecepbcups/globalfee/x/globalfee/keeper"
"github.com/reecepbcups/globalfee/x/globalfee/types"
"github.com/strangelove-ventures/globalfee/x/globalfee/client/cli"
"github.com/strangelove-ventures/globalfee/x/globalfee/keeper"
"github.com/strangelove-ventures/globalfee/x/globalfee/types"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions x/globalfee/querier.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

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

"github.com/reecepbcups/globalfee/x/globalfee/keeper"
"github.com/reecepbcups/globalfee/x/globalfee/types"
"github.com/strangelove-ventures/globalfee/x/globalfee/keeper"
"github.com/strangelove-ventures/globalfee/x/globalfee/types"
)

var _ types.QueryServer = &GrpcQuerier{}
Expand Down
4 changes: 2 additions & 2 deletions x/globalfee/querier_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
sdkmath "cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"

globalfeekeeper "github.com/reecepbcups/globalfee/x/globalfee/keeper"
"github.com/reecepbcups/globalfee/x/globalfee/types"
globalfeekeeper "github.com/strangelove-ventures/globalfee/x/globalfee/keeper"
"github.com/strangelove-ventures/globalfee/x/globalfee/types"
)

func TestQueryMinimumGasPrices(t *testing.T) {
Expand Down
45 changes: 23 additions & 22 deletions x/globalfee/types/genesis.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3d22c51

Please sign in to comment.