strangelove namespace w/ bank/type replacement (#2)

Makefile

@@ -46,7 +46,7 @@ empty = $(whitespace) $(whitespace)
 comma := ,
 build_tags_comma_sep := $(subst $(empty),$(comma),$(build_tags))
 
-# -X github.com/reecepbcups/tokenfactory/app.Bech32Prefix=tokenfactory
+# -X github.com/strangelove-ventures/tokenfactory/app.Bech32Prefix=tokenfactory
 ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=tokenfactory \
 		  -X github.com/cosmos/cosmos-sdk/version.AppName=tokend \
 		  -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \

app/app.go

@@ -13,11 +13,11 @@ import (
 	"github.com/CosmWasm/wasmd/x/wasm"
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
-	"github.com/reecepbcups/tokenfactory/x/tokenfactory"
-	"github.com/reecepbcups/tokenfactory/x/tokenfactory/bindings"
-	tokenfactorykeeper "github.com/reecepbcups/tokenfactory/x/tokenfactory/keeper"
-	tokenfactorytypes "github.com/reecepbcups/tokenfactory/x/tokenfactory/types"
 	"github.com/spf13/cast"
+	"github.com/strangelove-ventures/tokenfactory/x/tokenfactory"
+	"github.com/strangelove-ventures/tokenfactory/x/tokenfactory/bindings"
+	tokenfactorykeeper "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/keeper"
+	tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types"
 
 	abci "github.com/cometbft/cometbft/abci/types"
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"

app/apptesting/test_suite.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/reecepbcups/tokenfactory/app"
-	appparams "github.com/reecepbcups/tokenfactory/app/params"
+	"github.com/strangelove-ventures/tokenfactory/app"
+	appparams "github.com/strangelove-ventures/tokenfactory/app/params"
 	"github.com/stretchr/testify/suite"
 
 	"github.com/cometbft/cometbft/crypto/ed25519"

app/encoding.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
-	"github.com/reecepbcups/tokenfactory/app/params"
+	"github.com/strangelove-ventures/tokenfactory/app/params"
 
 	dbm "github.com/cosmos/cosmos-db"
 

app/test_helpers.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/CosmWasm/wasmd/x/wasm"
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
-	apphelpers "github.com/reecepbcups/tokenfactory/app/helpers"
-	appparams "github.com/reecepbcups/tokenfactory/app/params"
+	apphelpers "github.com/strangelove-ventures/tokenfactory/app/helpers"
+	appparams "github.com/strangelove-ventures/tokenfactory/app/params"
 	"github.com/stretchr/testify/require"
 
 	abci "github.com/cometbft/cometbft/abci/types"

app/upgrades.go

@@ -3,8 +3,8 @@ package app
 import (
 	"fmt"
 
-	"github.com/reecepbcups/tokenfactory/app/upgrades"
-	"github.com/reecepbcups/tokenfactory/app/upgrades/noop"
+	"github.com/strangelove-ventures/tokenfactory/app/upgrades"
+	"github.com/strangelove-ventures/tokenfactory/app/upgrades/noop"
 
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 )

app/upgrades/noop/upgrades.go

@@ -3,7 +3,7 @@ package noop
 import (
 	"context"
 
-	"github.com/reecepbcups/tokenfactory/app/upgrades"
+	"github.com/strangelove-ventures/tokenfactory/app/upgrades"
 
 	storetypes "cosmossdk.io/store/types"
 	upgradetypes "cosmossdk.io/x/upgrade/types"

cmd/tokend/cmd/commands.go

@@ -9,10 +9,10 @@ import (
 	wasmcli "github.com/CosmWasm/wasmd/x/wasm/client/cli"
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/reecepbcups/tokenfactory/app"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"github.com/strangelove-ventures/tokenfactory/app"
 
 	cmtcfg "github.com/cometbft/cometbft/config"
 

cmd/tokend/cmd/root.go

@@ -6,9 +6,9 @@ import (
 
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
-	"github.com/reecepbcups/tokenfactory/app"
-	"github.com/reecepbcups/tokenfactory/app/params"
 	"github.com/spf13/cobra"
+	"github.com/strangelove-ventures/tokenfactory/app"
+	"github.com/strangelove-ventures/tokenfactory/app/params"
 
 	dbm "github.com/cosmos/cosmos-db"
 

cmd/tokend/cmd/testnet.go

@@ -9,9 +9,9 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/reecepbcups/tokenfactory/app"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+	"github.com/strangelove-ventures/tokenfactory/app"
 
 	cmtconfig "github.com/cometbft/cometbft/config"
 	cmttime "github.com/cometbft/cometbft/types/time"

cmd/tokend/main.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/reecepbcups/tokenfactory/app"
-	"github.com/reecepbcups/tokenfactory/cmd/tokend/cmd"
+	"github.com/strangelove-ventures/tokenfactory/app"
+	"github.com/strangelove-ventures/tokenfactory/cmd/tokend/cmd"
 
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 )

go.mod

@@ -1,4 +1,4 @@
-module github.com/reecepbcups/tokenfactory
+module github.com/strangelove-ventures/tokenfactory
 
 go 1.21
 
@@ -38,7 +38,6 @@ require (
 	github.com/cosmos/cosmos-sdk v0.50.3
 	github.com/cosmos/gogoproto v1.4.11
 	github.com/cosmos/ibc-go/modules/capability v1.0.0
-	github.com/cosmos/ibc-go/v8 v8.0.0
 	github.com/golang/protobuf v1.5.3
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/prometheus/client_golang v1.17.0
@@ -85,7 +84,6 @@ require (
 	github.com/cosmos/btcutil v1.0.5 // indirect
 	github.com/cosmos/go-bip39 v1.0.0 // indirect
 	github.com/cosmos/gogogateway v1.2.0 // indirect
-	github.com/cosmos/iavl v1.0.0 // indirect
 	github.com/cosmos/ics23/go v0.10.0 // indirect
 	github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
 	github.com/creachadair/atomicfile v0.3.1 // indirect
@@ -214,6 +212,8 @@ require (
 )
 
 require (
+	github.com/cosmos/iavl v1.0.1 // indirect
+	github.com/cosmos/ibc-go/v8 v8.1.0
 	github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
 	github.com/opencontainers/runc v1.1.5 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect

go.sum

@@ -971,12 +971,12 @@ github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ
 github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU=
 github.com/cosmos/gogoproto v1.4.11 h1:LZcMHrx4FjUgrqQSWeaGC1v/TeuVFqSLa43CC6aWR2g=
 github.com/cosmos/gogoproto v1.4.11/go.mod h1:/g39Mh8m17X8Q/GDEs5zYTSNaNnInBSohtaxzQnYq1Y=
-github.com/cosmos/iavl v1.0.0 h1:bw6t0Mv/mVCJvlMTOPHWLs5uUE3BRBfVWCRelOzl+so=
-github.com/cosmos/iavl v1.0.0/go.mod h1:CmTGqMnRnucjxbjduneZXT+0vPgNElYvdefjX2q9tYc=
+github.com/cosmos/iavl v1.0.1 h1:D+mYbcRO2wptYzOM1Hxl9cpmmHU1ZEt9T2Wv5nZTeUw=
+github.com/cosmos/iavl v1.0.1/go.mod h1:8xIUkgVvwvVrBu81scdPty+/Dx9GqwHnAvXz4cwF7RY=
 github.com/cosmos/ibc-go/modules/capability v1.0.0 h1:r/l++byFtn7jHYa09zlAdSeevo8ci1mVZNO9+V0xsLE=
 github.com/cosmos/ibc-go/modules/capability v1.0.0/go.mod h1:D81ZxzjZAe0ZO5ambnvn1qedsFQ8lOwtqicG6liLBco=
-github.com/cosmos/ibc-go/v8 v8.0.0 h1:QKipnr/NGwc+9L7NZipURvmSIu+nw9jOIWTJuDBqOhg=
-github.com/cosmos/ibc-go/v8 v8.0.0/go.mod h1:C6IiJom0F3cIQCD5fKwVPDrDK9j/xTu563AWuOmXois=
+github.com/cosmos/ibc-go/v8 v8.1.0 h1:pf1106wl0Cf+p1+FjXzV6odlS9DnqVunPVWCH1Uz+lQ=
+github.com/cosmos/ibc-go/v8 v8.1.0/go.mod h1:o1ipS95xpdjqNcB8Drq0eI3Sn4FRLigjll42ec1ECuU=
 github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM=
 github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0=
 github.com/cosmos/ledger-cosmos-go v0.13.3 h1:7ehuBGuyIytsXbd4MP43mLeoN2LTOEnk5nvue4rK+yM=

interchaintest/go.mod

@@ -1,4 +1,4 @@
-module github.com/reecepbcups/tokenfactory/interchaintest
+module github.com/strangelove-ventures/tokenfactory/interchaintest
 
 go 1.21.1
 
@@ -8,14 +8,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/reecepbcups/tokenfactory => ../
+	github.com/strangelove-ventures/tokenfactory => ../
 )
 
 require (
 	cosmossdk.io/math v1.2.0
 	github.com/cosmos/cosmos-sdk v0.50.3
-	github.com/reecepbcups/tokenfactory v0.0.0-00000000000000-000000000000
 	github.com/strangelove-ventures/interchaintest/v8 v8.0.1-0.20240124225619-c55143141632
+	github.com/strangelove-ventures/tokenfactory v0.0.0-00000000000000-000000000000
 	github.com/stretchr/testify v1.8.4
 	go.uber.org/zap v1.26.0
 )

interchaintest/setup.go

@@ -1,7 +1,7 @@
 package interchaintest
 
 import (
-	tokenfactorytypes "github.com/reecepbcups/tokenfactory/x/tokenfactory/types"
+	tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types"
 
 	sdkmath "cosmossdk.io/math"
 	"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"

proto/buf.gen.pulsar.yaml

@@ -2,7 +2,7 @@ version: v1
 managed:
   enabled: true
   go_package_prefix:
-    default: github.com/reecepbcups/tokenfactory/api
+    default: github.com/strangelove-ventures/tokenfactory/api
     except:
       - buf.build/googleapis/googleapis
       - buf.build/cosmos/gogo-proto

proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto

@@ -4,7 +4,7 @@ package osmosis.tokenfactory.v1beta1;
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/reecepbcups/tokenfactory/x/tokenfactory/types";
+option go_package = "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types";
 
 // DenomAuthorityMetadata specifies metadata for addresses that have specific
 // capabilities over a token factory denom. Right now there is only one Admin

proto/osmosis/tokenfactory/v1beta1/genesis.proto

@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "osmosis/tokenfactory/v1beta1/authorityMetadata.proto";
 import "osmosis/tokenfactory/v1beta1/params.proto";
 
-option go_package = "github.com/reecepbcups/tokenfactory/x/tokenfactory/types";
+option go_package = "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types";
 
 // GenesisState defines the tokenfactory module's genesis state.
 message GenesisState {

proto/osmosis/tokenfactory/v1beta1/params.proto

@@ -6,7 +6,7 @@ import "osmosis/tokenfactory/v1beta1/authorityMetadata.proto";
 import "cosmos_proto/cosmos.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/reecepbcups/tokenfactory/x/tokenfactory/types";
+option go_package = "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types";
 
 // Params defines the parameters for the tokenfactory module.
 message Params {

proto/osmosis/tokenfactory/v1beta1/query.proto

@@ -7,7 +7,7 @@ import "cosmos/base/query/v1beta1/pagination.proto";
 import "osmosis/tokenfactory/v1beta1/authorityMetadata.proto";
 import "osmosis/tokenfactory/v1beta1/params.proto";
 
-option go_package = "github.com/reecepbcups/tokenfactory/x/tokenfactory/types";
+option go_package = "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types";
 
 // Query defines the gRPC querier service.
 service Query {

proto/osmosis/tokenfactory/v1beta1/tx.proto

@@ -8,7 +8,7 @@ import "osmosis/tokenfactory/v1beta1/params.proto";
 import "cosmos/msg/v1/msg.proto";
 import "cosmos_proto/cosmos.proto";
 
-option go_package = "github.com/reecepbcups/tokenfactory/x/tokenfactory/types";
+option go_package = "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types";
 
 // Msg defines the tokefactory module's gRPC message service.
 service Msg {

scripts/protocgen.sh

@@ -9,8 +9,13 @@ buf generate --template buf.gen.gogo.yaml $file
 
 cd ..
 
+
+
 # move proto files to the right places
-cp -r ./github.com/reecepbcups/tokenfactory/x/* x/
+cp -r ./github.com/strangelove-ventures/tokenfactory/x/* x/
 rm -rf ./github.com
 
+# replace incorrect namespace
+find ./x -type f -name '*.pb.go' -exec sed -i -e 's|cosmossdk.io/x/bank/types|github.com/cosmos/cosmos-sdk/x/bank/types|g' {} \;
+
 go mod tidy

x/tokenfactory/bindings/custom_msg_test.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
-	"github.com/reecepbcups/tokenfactory/app"
-	bindings "github.com/reecepbcups/tokenfactory/x/tokenfactory/bindings/types"
-	"github.com/reecepbcups/tokenfactory/x/tokenfactory/types"
+	"github.com/strangelove-ventures/tokenfactory/app"
+	bindings "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/bindings/types"
+	"github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types"
 	"github.com/stretchr/testify/require"
 
 	sdkmath "cosmossdk.io/math"

x/tokenfactory/bindings/custom_query_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
-	"github.com/reecepbcups/tokenfactory/app"
-	bindings "github.com/reecepbcups/tokenfactory/x/tokenfactory/bindings/types"
+	"github.com/strangelove-ventures/tokenfactory/app"
+	bindings "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/bindings/types"
 	"github.com/stretchr/testify/require"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"

x/tokenfactory/bindings/helpers_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/CosmWasm/wasmd/x/wasm/keeper"
-	"github.com/reecepbcups/tokenfactory/app"
+	"github.com/strangelove-ventures/tokenfactory/app"
 	"github.com/stretchr/testify/require"
 
 	"github.com/cometbft/cometbft/crypto"

x/tokenfactory/bindings/message_plugin.go

@@ -5,9 +5,9 @@ import (
 
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
-	bindingstypes "github.com/reecepbcups/tokenfactory/x/tokenfactory/bindings/types"
-	tokenfactorykeeper "github.com/reecepbcups/tokenfactory/x/tokenfactory/keeper"
-	tokenfactorytypes "github.com/reecepbcups/tokenfactory/x/tokenfactory/types"
+	bindingstypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/bindings/types"
+	tokenfactorykeeper "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/keeper"
+	tokenfactorytypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types"
 
 	errorsmod "cosmossdk.io/errors"
 

x/tokenfactory/bindings/queries.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	bindingstypes "github.com/reecepbcups/tokenfactory/x/tokenfactory/bindings/types"
-	tokenfactorykeeper "github.com/reecepbcups/tokenfactory/x/tokenfactory/keeper"
+	bindingstypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/bindings/types"
+	tokenfactorykeeper "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/keeper"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"

x/tokenfactory/bindings/query_plugin.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
-	bindingstypes "github.com/reecepbcups/tokenfactory/x/tokenfactory/bindings/types"
+	bindingstypes "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/bindings/types"
 
 	errorsmod "cosmossdk.io/errors"
 

x/tokenfactory/bindings/validate_msg_test.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	wasmbinding "github.com/reecepbcups/tokenfactory/x/tokenfactory/bindings"
-	bindings "github.com/reecepbcups/tokenfactory/x/tokenfactory/bindings/types"
-	"github.com/reecepbcups/tokenfactory/x/tokenfactory/types"
+	wasmbinding "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/bindings"
+	bindings "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/bindings/types"
+	"github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types"
 	"github.com/stretchr/testify/require"
 
 	sdkmath "cosmossdk.io/math"

x/tokenfactory/bindings/validate_queries_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	wasmbinding "github.com/reecepbcups/tokenfactory/x/tokenfactory/bindings"
+	wasmbinding "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/bindings"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 

x/tokenfactory/bindings/wasm.go

@@ -2,7 +2,7 @@ package bindings
 
 import (
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
-	tokenfactorykeeper "github.com/reecepbcups/tokenfactory/x/tokenfactory/keeper"
+	tokenfactorykeeper "github.com/strangelove-ventures/tokenfactory/x/tokenfactory/keeper"
 
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 )

x/tokenfactory/client/cli/query.go

@@ -3,8 +3,8 @@ package cli
 import (
 	"fmt"
 
-	"github.com/reecepbcups/tokenfactory/x/tokenfactory/types"
 	"github.com/spf13/cobra"
+	"github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"

x/tokenfactory/client/cli/tx.go

@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/reecepbcups/tokenfactory/x/tokenfactory/types"
 	"github.com/spf13/cobra"
+	"github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"

x/tokenfactory/keeper/admins.go

@@ -3,7 +3,7 @@ package keeper
 import (
 	"context"
 
-	"github.com/reecepbcups/tokenfactory/x/tokenfactory/types"
+	"github.com/strangelove-ventures/tokenfactory/x/tokenfactory/types"
 
 	"github.com/cosmos/gogoproto/proto"