chore: change import path to v4

noble-assets · Oct 17, 2023 · daa6b87 · daa6b87
1 parent b958b91
commit daa6b87
Show file tree

Hide file tree

Showing 398 changed files with 1,079 additions and 25,738 deletions.
diff --git a/Makefile b/Makefile
@@ -120,35 +120,32 @@ endif
 	go-mod-cache build interchaintest get-heighliner local-image \
 
 ###############################################################################
-###                               Protobuf                                  ###
+###                                Protobuf                                 ###
 ###############################################################################
-containerProtoVer=v0.2
-containerProtoImage=tendermintdev/sdk-proto-gen:$(containerProtoVer)
-containerProtoGen=cosmos-sdk-proto-gen-$(containerProtoVer)
-containerProtoGenSwagger=cosmos-sdk-proto-gen-swagger-$(containerProtoVer)
-containerProtoFmt=cosmos-sdk-proto-fmt-$(containerProtoVer)
 
-proto-all: proto-format proto-lint proto-gen
+BUF_VERSION=1.27.0
 
-proto-gen:
-	@echo "Generating Protobuf files"
-	@if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerProtoGen}$$"; then docker start -a $(containerProtoGen); else docker run --name $(containerProtoGen) -v $(CURDIR):/workspace --workdir /workspace $(containerProtoImage) \
-		sh ./scripts/protocgen.sh; fi
+proto-all: proto-format proto-lint proto-gen
 
 proto-format:
-	@echo "Formatting Protobuf files"
-	@if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerProtoFmt}$$"; then docker start -a $(containerProtoFmt); else docker run --name $(containerProtoFmt) -v $(CURDIR):/workspace --workdir /workspace tendermintdev/docker-build-proto \
-		find ./ -not -path "./third_party/*" -name "*.proto" -exec clang-format -i {} \; ; fi
+	@echo "🤖 Running protobuf formatter..."
+	@docker run --rm --volume "$(PWD)":/workspace --workdir /workspace \
+		bufbuild/buf:$(BUF_VERSION) format --diff --write
+	@echo "✅ Completed protobuf formatting!"
 
-proto-swagger-gen:
-	@echo "Generating Protobuf Swagger"
-	@if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerProtoGenSwagger}$$"; then docker start -a $(containerProtoGenSwagger); else docker run --name $(containerProtoGenSwagger) -v $(CURDIR):/workspace --workdir /workspace $(containerProtoImage) \
-		sh ./scripts/protoc-swagger-gen.sh; fi
+proto-gen:
+	@echo "🤖 Generating code from protobuf..."
+	@docker run --rm --volume "$(PWD)":/workspace --workdir /workspace \
+		noble-proto sh ./proto/generate.sh
+	@echo "✅ Completed code generation!"
 
 proto-lint:
-	@$(DOCKER_BUF) lint --error-format=json
-
-proto-check-breaking:
-	@$(DOCKER_BUF) breaking --against $(HTTPS_GIT)#branch=main
-
-.PHONY: proto-all proto-gen proto-format proto-swagger-gen proto-lint proto-check-breaking
+	@echo "🤖 Running protobuf linter..."
+	@docker run --rm --volume "$(PWD)":/workspace --workdir /workspace \
+		bufbuild/buf:$(BUF_VERSION) lint
+	@echo "✅ Completed protobuf linting!"
+
+proto-setup:
+	@echo "🤖 Setting up protobuf environment..."
+	@docker build --rm --tag noble-proto:latest --file proto/Dockerfile .
+	@echo "✅ Setup protobuf environment!"
diff --git a/app/ante.go b/app/ante.go
@@ -1,11 +1,11 @@
 package app
 
 import (
+	fiattokenfactory "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/keeper"
+	fiattokenfactorytypes "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/types"
 	"github.com/cosmos/cosmos-sdk/types/bech32"
-	fiattokenfactory "github.com/strangelove-ventures/noble/x/fiattokenfactory/keeper"
-	fiattokenfactorytypes "github.com/strangelove-ventures/noble/x/fiattokenfactory/types"
-	tokenfactory "github.com/strangelove-ventures/noble/x/tokenfactory/keeper"
-	tokenfactorytypes "github.com/strangelove-ventures/noble/x/tokenfactory/types"
+	tokenfactory "github.com/strangelove-ventures/noble/v4/x/tokenfactory/keeper"
+	tokenfactorytypes "github.com/strangelove-ventures/noble/v4/x/tokenfactory/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
@@ -16,7 +16,7 @@ import (
 	ibcante "github.com/cosmos/ibc-go/v3/modules/core/ante"
 	ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"
 
-	feeante "github.com/strangelove-ventures/noble/x/globalfee/ante"
+	feeante "github.com/strangelove-ventures/noble/v4/x/globalfee/ante"
 )
 
 type HandlerOptions struct {

diff --git a/app/app.go b/app/app.go
@@ -87,27 +87,27 @@ import (
 	tmos "github.com/tendermint/tendermint/libs/os"
 	dbm "github.com/tendermint/tm-db"
 
+	fiattokenfactorymodule "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory"
+	fiattokenfactorymodulekeeper "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/keeper"
+	fiattokenfactorymoduletypes "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	"github.com/strangelove-ventures/noble/app/upgrades/argon"
-	"github.com/strangelove-ventures/noble/app/upgrades/argon4"
-	"github.com/strangelove-ventures/noble/app/upgrades/neon"
-	"github.com/strangelove-ventures/noble/app/upgrades/radon"
-	v3m1p0 "github.com/strangelove-ventures/noble/app/upgrades/v3.1.0"
-	"github.com/strangelove-ventures/noble/cmd"
-	"github.com/strangelove-ventures/noble/docs"
-	"github.com/strangelove-ventures/noble/x/blockibc"
-	fiattokenfactorymodule "github.com/strangelove-ventures/noble/x/fiattokenfactory"
-	fiattokenfactorymodulekeeper "github.com/strangelove-ventures/noble/x/fiattokenfactory/keeper"
-	fiattokenfactorymoduletypes "github.com/strangelove-ventures/noble/x/fiattokenfactory/types"
-	"github.com/strangelove-ventures/noble/x/globalfee"
-	tariff "github.com/strangelove-ventures/noble/x/tariff"
-	tariffkeeper "github.com/strangelove-ventures/noble/x/tariff/keeper"
-	tarifftypes "github.com/strangelove-ventures/noble/x/tariff/types"
-	tokenfactorymodule "github.com/strangelove-ventures/noble/x/tokenfactory"
-	tokenfactorymodulekeeper "github.com/strangelove-ventures/noble/x/tokenfactory/keeper"
-	tokenfactorymoduletypes "github.com/strangelove-ventures/noble/x/tokenfactory/types"
+	"github.com/strangelove-ventures/noble/v4/app/upgrades/argon"
+	"github.com/strangelove-ventures/noble/v4/app/upgrades/argon4"
+	"github.com/strangelove-ventures/noble/v4/app/upgrades/neon"
+	"github.com/strangelove-ventures/noble/v4/app/upgrades/radon"
+	v3m1p0 "github.com/strangelove-ventures/noble/v4/app/upgrades/v3.1.0"
+	"github.com/strangelove-ventures/noble/v4/cmd"
+	"github.com/strangelove-ventures/noble/v4/docs"
+	"github.com/strangelove-ventures/noble/v4/x/blockibc"
+	"github.com/strangelove-ventures/noble/v4/x/globalfee"
+	tariff "github.com/strangelove-ventures/noble/v4/x/tariff"
+	tariffkeeper "github.com/strangelove-ventures/noble/v4/x/tariff/keeper"
+	tarifftypes "github.com/strangelove-ventures/noble/v4/x/tariff/types"
+	tokenfactorymodule "github.com/strangelove-ventures/noble/v4/x/tokenfactory"
+	tokenfactorymodulekeeper "github.com/strangelove-ventures/noble/v4/x/tokenfactory/keeper"
+	tokenfactorymoduletypes "github.com/strangelove-ventures/noble/v4/x/tokenfactory/types"
 
 	cctp "github.com/circlefin/noble-cctp/x/cctp"
 	cctpkeeper "github.com/circlefin/noble-cctp/x/cctp/keeper"

diff --git a/app/simulation_test.go b/app/simulation_test.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/strangelove-ventures/noble/app"
-	"github.com/strangelove-ventures/noble/cmd"
+	"github.com/strangelove-ventures/noble/v4/app"
+	"github.com/strangelove-ventures/noble/v4/cmd"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"

diff --git a/app/upgrades/argon/upgrade.go b/app/upgrades/argon/upgrade.go
@@ -6,10 +6,10 @@ import (
 	"cosmossdk.io/math"
 	cctpkeeper "github.com/circlefin/noble-cctp/x/cctp/keeper"
 	cctptypes "github.com/circlefin/noble-cctp/x/cctp/types"
+	fiattokenfactorykeeper "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/keeper"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradeTypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-	fiattokenfactorykeeper "github.com/strangelove-ventures/noble/x/fiattokenfactory/keeper"
 	paramauthoritykeeper "github.com/strangelove-ventures/paramauthority/x/params/keeper"
 )
 

diff --git a/app/upgrades/neon/store.go b/app/upgrades/neon/store.go
@@ -5,7 +5,7 @@ import (
 	storeTypes "github.com/cosmos/cosmos-sdk/store/types"
 
 	// FiatTokenFactory
-	fiatTokenFactoryTypes "github.com/strangelove-ventures/noble/x/fiattokenfactory/types"
+	fiatTokenFactoryTypes "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/types"
 	// Upgrade
 	upgradeTypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )

diff --git a/app/upgrades/neon/upgrade.go b/app/upgrades/neon/upgrade.go
@@ -8,10 +8,10 @@ import (
 
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
+	"github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory"
+	fiattokenfactorykeeper "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/keeper"
+	fiattokenfactorytypes "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/types"
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
-	"github.com/strangelove-ventures/noble/x/fiattokenfactory"
-	fiattokenfactorykeeper "github.com/strangelove-ventures/noble/x/fiattokenfactory/keeper"
-	fiattokenfactorytypes "github.com/strangelove-ventures/noble/x/fiattokenfactory/types"
 )
 
 func initialFiatTokenFactoryState() fiattokenfactorytypes.GenesisState {

diff --git a/app/upgrades/radon/store.go b/app/upgrades/radon/store.go
@@ -5,9 +5,9 @@ import (
 	storeTypes "github.com/cosmos/cosmos-sdk/store/types"
 
 	// GlobalFee
-	globalFeeTypes "github.com/strangelove-ventures/noble/x/globalfee/types"
+	globalFeeTypes "github.com/strangelove-ventures/noble/v4/x/globalfee/types"
 	// Tariff
-	tariffTypes "github.com/strangelove-ventures/noble/x/tariff/types"
+	tariffTypes "github.com/strangelove-ventures/noble/v4/x/tariff/types"
 	// Upgrade
 	upgradeTypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )

diff --git a/app/upgrades/radon/upgrade.go b/app/upgrades/radon/upgrade.go
@@ -6,11 +6,11 @@ import (
 
 	paramauthoritykeeper "github.com/strangelove-ventures/paramauthority/x/params/keeper"
 
+	fiattokenfactorykeeper "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/keeper"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-	fiattokenfactorykeeper "github.com/strangelove-ventures/noble/x/fiattokenfactory/keeper"
-	globalfeetypes "github.com/strangelove-ventures/noble/x/globalfee/types"
+	globalfeetypes "github.com/strangelove-ventures/noble/v4/x/globalfee/types"
 
-	tarifftypes "github.com/strangelove-ventures/noble/x/tariff/types"
+	tarifftypes "github.com/strangelove-ventures/noble/v4/x/tariff/types"
 )
 
 func CreateRadonUpgradeHandler(

diff --git a/buf.yaml → buf.work.yaml b/buf.yaml → buf.work.yaml
@@ -1,4 +1,3 @@
 version: v1
 directories:
   - proto
-  - third_party/proto
diff --git a/cmd/nobled/main.go b/cmd/nobled/main.go
@@ -5,8 +5,8 @@ import (
 
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 
-	"github.com/strangelove-ventures/noble/app"
-	"github.com/strangelove-ventures/noble/cmd"
+	"github.com/strangelove-ventures/noble/v4/app"
+	"github.com/strangelove-ventures/noble/v4/cmd"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -1,13 +1,12 @@
-module github.com/strangelove-ventures/noble
+module github.com/strangelove-ventures/noble/v4
 
 go 1.21
 
-toolchain go1.21.3
-
 require (
 	cosmossdk.io/errors v1.0.0
 	cosmossdk.io/math v1.0.1
 	github.com/circlefin/noble-cctp v0.0.0-20231013164358-dc81b3e0d566
+	github.com/circlefin/noble-fiattokenfactory v1.0.0
 	github.com/cosmos/cosmos-sdk v0.45.16
 	github.com/cosmos/ibc-go/v3 v3.4.0
 	github.com/gogo/protobuf v1.3.3
@@ -152,6 +151,9 @@ require (
 )
 
 replace (
+	github.com/circlefin/noble-cctp => github.com/noble-assets/cctp v0.0.0-20231017104045-821e63c6c4cb
+	github.com/circlefin/noble-fiattokenfactory => github.com/noble-assets/fiattokenfactory v0.0.0-20231017103812-a2afc92603fc
+
 	// huckleberry patch for ibc-go v3
 	github.com/cosmos/ibc-go/v3 => github.com/noble-assets/ibc-go/v3 v3.4.0-huckleberry
 

diff --git a/go.sum b/go.sum
@@ -152,8 +152,9 @@ github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY
 github.com/btcsuite/btcd/btcutil v1.1.2 h1:XLMbX8JQEiwMcYft2EGi8zPUkoa0abKIU6/BJSRsjzQ=
 github.com/btcsuite/btcd/btcutil v1.1.2/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
-github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
+github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 h1:KdUfX2zKommPRa+PD0sWZUyXe9w277ABlgELO7H04IM=
+github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
 github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
 github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
@@ -183,8 +184,6 @@ github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/circlefin/noble-cctp v0.0.0-20231013164358-dc81b3e0d566 h1:PUo/InK7onrx6gt1aMfng5nBRIqKf523coNYhFvexmc=
-github.com/circlefin/noble-cctp v0.0.0-20231013164358-dc81b3e0d566/go.mod h1:kTaX51dOT10LBoERZYT1ahuove3dL/+q5IagWQUABd0=
 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
@@ -765,6 +764,10 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/noble-assets/cctp v0.0.0-20231017104045-821e63c6c4cb h1:3hfZp1F9tODzmOpn8h7/jF24GrlWiGYM4c99Jy8jrIE=
+github.com/noble-assets/cctp v0.0.0-20231017104045-821e63c6c4cb/go.mod h1:1ZvRyADVcYsTc19Amu32UzEhQnTqrbCm1qU1elKmcAI=
+github.com/noble-assets/fiattokenfactory v0.0.0-20231017103812-a2afc92603fc h1:rB/yl4XrL5uMchI9iCAoGpWetuOpzLjw23tUmasDYKI=
+github.com/noble-assets/fiattokenfactory v0.0.0-20231017103812-a2afc92603fc/go.mod h1:CfnRGSj43vzFKVjHMmxB5HE3B16ZjU1T4+Lo+7leYgA=
 github.com/noble-assets/ibc-go/v3 v3.4.0-huckleberry h1:02oo/GHLGITexbPNUO/jmYa67xE+B5BvNv/i+wufdHI=
 github.com/noble-assets/ibc-go/v3 v3.4.0-huckleberry/go.mod h1:VwB/vWu4ysT5DN2aF78d17LYmx3omSAdq6gpKvM7XRA=
 github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=

diff --git a/interchaintest/cctp_deposit_for_burn_test.go b/interchaintest/cctp_deposit_for_burn_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/strangelove-ventures/interchaintest/v3"
 	"github.com/strangelove-ventures/interchaintest/v3/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v3/testreporter"
-	"github.com/strangelove-ventures/noble/cmd"
+	"github.com/strangelove-ventures/noble/v4/cmd"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 )

diff --git a/interchaintest/cctp_deposit_for_burn_with_caller_test.go b/interchaintest/cctp_deposit_for_burn_with_caller_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/strangelove-ventures/interchaintest/v3"
 	"github.com/strangelove-ventures/interchaintest/v3/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v3/testreporter"
-	"github.com/strangelove-ventures/noble/cmd"
+	"github.com/strangelove-ventures/noble/v4/cmd"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 )

diff --git a/interchaintest/cctp_receive_message_test.go b/interchaintest/cctp_receive_message_test.go
@@ -22,7 +22,7 @@ import (
 	"github.com/strangelove-ventures/interchaintest/v3"
 	"github.com/strangelove-ventures/interchaintest/v3/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v3/testreporter"
-	"github.com/strangelove-ventures/noble/cmd"
+	"github.com/strangelove-ventures/noble/v4/cmd"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 )

diff --git a/interchaintest/cctp_receive_message_with_caller_test.go b/interchaintest/cctp_receive_message_with_caller_test.go
@@ -22,7 +22,7 @@ import (
 	"github.com/strangelove-ventures/interchaintest/v3"
 	"github.com/strangelove-ventures/interchaintest/v3/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v3/testreporter"
-	"github.com/strangelove-ventures/noble/cmd"
+	"github.com/strangelove-ventures/noble/v4/cmd"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 )

diff --git a/interchaintest/cctp_replace_deposit_for_burn_test.go b/interchaintest/cctp_replace_deposit_for_burn_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/strangelove-ventures/interchaintest/v3"
 	"github.com/strangelove-ventures/interchaintest/v3/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v3/testreporter"
-	"github.com/strangelove-ventures/noble/cmd"
+	"github.com/strangelove-ventures/noble/v4/cmd"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 )

diff --git a/interchaintest/genesis_test.go b/interchaintest/genesis_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/strangelove-ventures/interchaintest/v3/ibc"
 	"github.com/strangelove-ventures/interchaintest/v3/relayer"
 	"github.com/strangelove-ventures/interchaintest/v3/relayer/rly"
-	tokenfactorytypes "github.com/strangelove-ventures/noble/x/tokenfactory/types"
+	tokenfactorytypes "github.com/strangelove-ventures/noble/v4/x/tokenfactory/types"
 	proposaltypes "github.com/strangelove-ventures/paramauthority/x/params/types/proposal"
 	upgradetypes "github.com/strangelove-ventures/paramauthority/x/upgrade/types"
 )

diff --git a/interchaintest/globalfee_test.go b/interchaintest/globalfee_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/strangelove-ventures/interchaintest/v3"
 	"github.com/strangelove-ventures/interchaintest/v3/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v3/testreporter"
-	"github.com/strangelove-ventures/noble/cmd"
+	"github.com/strangelove-ventures/noble/v4/cmd"
 	proposaltypes "github.com/strangelove-ventures/paramauthority/x/params/types/proposal"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"

diff --git a/interchaintest/go.mod b/interchaintest/go.mod
@@ -1,16 +1,17 @@
-module github.com/strangelove-ventures/noble/interchaintest
+module github.com/strangelove-ventures/noble/v4/interchaintest
 
 go 1.21
 
 require (
 	cosmossdk.io/math v1.0.1
 	github.com/circlefin/noble-cctp v0.0.0-20231013164358-dc81b3e0d566
+	github.com/circlefin/noble-fiattokenfactory v1.0.0
 	github.com/cosmos/cosmos-sdk v0.45.16
 	github.com/cosmos/ibc-go/v3 v3.4.0
 	github.com/ethereum/go-ethereum v1.12.2
 	github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845
 	github.com/strangelove-ventures/interchaintest/v3 v3.0.0-20230622221919-28c608364e27
-	github.com/strangelove-ventures/noble v1.0.1-0.20230717234609-400609f26a31
+	github.com/strangelove-ventures/noble/v4 v4.0.0
 	github.com/strangelove-ventures/paramauthority v1.0.0
 	github.com/stretchr/testify v1.8.4
 	go.uber.org/zap v1.24.0
@@ -184,10 +185,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/circlefin/noble-cctp => ../../cctp/upstream
+	github.com/circlefin/noble-fiattokenfactory => github.com/noble-assets/fiattokenfactory v0.0.0-20231017103812-a2afc92603fc
+
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
 	// For this nested module, you always want to replace the parent reference with the current worktree.
-	github.com/strangelove-ventures/noble => ../
+	github.com/strangelove-ventures/noble/v4 => ../
 
 	// cometbft
 	github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.27