chore: resolve conflicts

.changelog/v4.1.0-rc.1/bug-fixes/275-distribution-hooks.md

@@ -0,0 +1 @@
+- Unregister `x/distribution` hooks to address consensus failure. ([#275](https://github.com/noble-assets/noble/pull/275))

.changelog/v4.1.0-rc.1/summary.md

@@ -0,0 +1,3 @@
+*Nov 16, 2023*
+
+This is the second release candidate for a minor release to the v4 Argon line.

.github/mergify.yml

@@ -22,11 +22,3 @@ pull_request_rules:
       backport:
         branches:
           - release/v4.1.x
-  - name: backport patches to v5.0.x branch
-    conditions:
-      - base=main
-      - label=backport/v5.0.x
-    actions:
-      backport:
-        branches:
-          - release/v4.0.x

CHANGELOG.md

@@ -1,6 +1,15 @@
 # CHANGELOG
 
-<<<<<<< HEAD
+## v4.1.0-rc.1
+
+*Nov 16, 2023*
+
+This is the second release candidate for a minor release to the v4 Argon line.
+
+### BUG FIXES
+
+- Unregister `x/distribution` hooks to address consensus failure. ([#275](https://github.com/noble-assets/noble/pull/275))
+
 ## v4.1.0-rc.0
 
 *Nov 15, 2023*
@@ -9,18 +18,18 @@ This is the first release candidate for a minor release to the v4 Argon line.
 
 ### DEPENDENCIES
 
-- Bump CCTP from [`dc81b3e`](https://github.com/circlefin/noble-cctp/commit/dc81b3e0d566d195c869a213519fcecd38b020a5) to [`86f425e`](https://github.com/circlefin/noble-cctp/commit/86f425e6fac94ff57865dd11b42c95de303e0d96) ([#259](https://github.com/strangelove-ventures/noble/pull/259))
+- Bump CCTP from [`dc81b3e`](https://github.com/circlefin/noble-cctp/commit/dc81b3e0d566d195c869a213519fcecd38b020a5) to [`86f425e`](https://github.com/circlefin/noble-cctp/commit/86f425e6fac94ff57865dd11b42c95de303e0d96) ([#259](https://github.com/noble-assets/noble/pull/259))
 
 ### FEATURES
 
-- Introduce a new `x/stabletokenfactory` module for issuing [USDLR by Stable](https://withstable.com). ([#269](https://github.com/strangelove-ventures/noble/pull/269))
+- Introduce a new `x/stabletokenfactory` module for issuing [USDLR by Stable](https://withstable.com). ([#269](https://github.com/noble-assets/noble/pull/269))
 
 ### IMPROVEMENTS
 
-- Align module path with Go's [naming convention](https://go.dev/doc/modules/version-numbers#major-version). ([#249](https://github.com/strangelove-ventures/noble/pull/249))
-- Remove `x/fiattokenfactory` module from codebase and switch to migrated version under [`circlefin/noble-fiattokenfactory`](https://github.com/circlefin/noble-fiattokenfactory) ([#259](https://github.com/strangelove-ventures/noble/pull/259))
-- Add multiple fee denom support to the `x/tariff` module. ([#269](https://github.com/strangelove-ventures/noble/pull/269))
-=======
+- Align module path with Go's [naming convention](https://go.dev/doc/modules/version-numbers#major-version). ([#249](https://github.com/noble-assets/noble/pull/249))
+- Remove `x/fiattokenfactory` module from codebase and switch to migrated version under [`circlefin/noble-fiattokenfactory`](https://github.com/circlefin/noble-fiattokenfactory) ([#259](https://github.com/noble-assets/noble/pull/259))
+- Add multiple fee denom support to the `x/tariff` module. ([#269](https://github.com/noble-assets/noble/pull/269))
+
 ## v4.0.2
 
 *Nov 21, 2023*
@@ -40,7 +49,6 @@ This is a consensus breaking patch release to the v4 Argon line.
 ### BUG FIXES
 
 - Unregister `x/distribution` hooks to address consensus failure. ([#274](https://github.com/noble-assets/noble/pull/274))
->>>>>>> a4ad980 (chore: rename module path (#283))
 
 ## v4.0.0
 

Makefile

@@ -123,11 +123,7 @@ endif
 ###                                Protobuf                                 ###
 ###############################################################################
 
-<<<<<<< HEAD
-BUF_VERSION=1.27.2
-=======
 BUF_VERSION=1.28.1
->>>>>>> a4ad980 (chore: rename module path (#283))
 
 proto-all: proto-format proto-lint proto-gen
 

app/ante.go

@@ -4,17 +4,10 @@ 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"
-<<<<<<< HEAD
-	stabletokenfactorykeeper "github.com/strangelove-ventures/noble/v4/x/stabletokenfactory/keeper"
-	stabletokenfactorytypes "github.com/strangelove-ventures/noble/v4/x/stabletokenfactory/types"
-	tokenfactory "github.com/strangelove-ventures/noble/v4/x/tokenfactory/keeper"
-	tokenfactorytypes "github.com/strangelove-ventures/noble/v4/x/tokenfactory/types"
-=======
-	stabletokenfactorykeeper "github.com/noble-assets/noble/v5/x/stabletokenfactory/keeper"
-	stabletokenfactorytypes "github.com/noble-assets/noble/v5/x/stabletokenfactory/types"
-	tokenfactory "github.com/noble-assets/noble/v5/x/tokenfactory/keeper"
-	tokenfactorytypes "github.com/noble-assets/noble/v5/x/tokenfactory/types"
->>>>>>> a4ad980 (chore: rename module path (#283))
+	stabletokenfactorykeeper "github.com/noble-assets/noble/v4/x/stabletokenfactory/keeper"
+	stabletokenfactorytypes "github.com/noble-assets/noble/v4/x/stabletokenfactory/types"
+	tokenfactory "github.com/noble-assets/noble/v4/x/tokenfactory/keeper"
+	tokenfactorytypes "github.com/noble-assets/noble/v4/x/tokenfactory/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
@@ -25,11 +18,7 @@ import (
 	ibcante "github.com/cosmos/ibc-go/v4/modules/core/ante"
 	ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
 
-<<<<<<< HEAD
-	feeante "github.com/strangelove-ventures/noble/v4/x/globalfee/ante"
-=======
-	feeante "github.com/noble-assets/noble/v5/x/globalfee/ante"
->>>>>>> a4ad980 (chore: rename module path (#283))
+	feeante "github.com/noble-assets/noble/v4/x/globalfee/ante"
 )
 
 type HandlerOptions struct {

app/app.go

@@ -93,37 +93,20 @@ import (
 	"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"
-<<<<<<< HEAD
-	v4m1p0rc0 "github.com/strangelove-ventures/noble/v4/app/upgrades/v4.1.0-rc.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"
-	"github.com/strangelove-ventures/noble/v4/x/stabletokenfactory"
-	stabletokenfactorykeeper "github.com/strangelove-ventures/noble/v4/x/stabletokenfactory/keeper"
-	stabletokenfactorytypes "github.com/strangelove-ventures/noble/v4/x/stabletokenfactory/types"
-	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"
-=======
-	v4m1p0rc0 "github.com/noble-assets/noble/v5/app/upgrades/v4.1.0-rc.0"
-	"github.com/noble-assets/noble/v5/cmd"
-	"github.com/noble-assets/noble/v5/docs"
-	"github.com/noble-assets/noble/v5/x/blockibc"
-	"github.com/noble-assets/noble/v5/x/globalfee"
-	"github.com/noble-assets/noble/v5/x/stabletokenfactory"
-	stabletokenfactorykeeper "github.com/noble-assets/noble/v5/x/stabletokenfactory/keeper"
-	stabletokenfactorytypes "github.com/noble-assets/noble/v5/x/stabletokenfactory/types"
-	tariff "github.com/noble-assets/noble/v5/x/tariff"
-	tariffkeeper "github.com/noble-assets/noble/v5/x/tariff/keeper"
-	tarifftypes "github.com/noble-assets/noble/v5/x/tariff/types"
-	tokenfactorymodule "github.com/noble-assets/noble/v5/x/tokenfactory"
-	tokenfactorymodulekeeper "github.com/noble-assets/noble/v5/x/tokenfactory/keeper"
-	tokenfactorymoduletypes "github.com/noble-assets/noble/v5/x/tokenfactory/types"
->>>>>>> a4ad980 (chore: rename module path (#283))
+	v4m1p0rc0 "github.com/noble-assets/noble/v4/app/upgrades/v4.1.0-rc.0"
+	"github.com/noble-assets/noble/v4/cmd"
+	"github.com/noble-assets/noble/v4/docs"
+	"github.com/noble-assets/noble/v4/x/blockibc"
+	"github.com/noble-assets/noble/v4/x/globalfee"
+	"github.com/noble-assets/noble/v4/x/stabletokenfactory"
+	stabletokenfactorykeeper "github.com/noble-assets/noble/v4/x/stabletokenfactory/keeper"
+	stabletokenfactorytypes "github.com/noble-assets/noble/v4/x/stabletokenfactory/types"
+	tariff "github.com/noble-assets/noble/v4/x/tariff"
+	tariffkeeper "github.com/noble-assets/noble/v4/x/tariff/keeper"
+	tarifftypes "github.com/noble-assets/noble/v4/x/tariff/types"
+	tokenfactorymodule "github.com/noble-assets/noble/v4/x/tokenfactory"
+	tokenfactorymodulekeeper "github.com/noble-assets/noble/v4/x/tokenfactory/keeper"
+	tokenfactorymoduletypes "github.com/noble-assets/noble/v4/x/tokenfactory/types"
 
 	cctp "github.com/circlefin/noble-cctp/x/cctp"
 	cctpkeeper "github.com/circlefin/noble-cctp/x/cctp/keeper"

app/simulation_test.go

@@ -4,13 +4,8 @@ import (
 	"os"
 	"testing"
 
-<<<<<<< HEAD
-	"github.com/strangelove-ventures/noble/v4/app"
-	"github.com/strangelove-ventures/noble/v4/cmd"
-=======
-	"github.com/noble-assets/noble/v5/app"
-	"github.com/noble-assets/noble/v5/cmd"
->>>>>>> a4ad980 (chore: rename module path (#283))
+	"github.com/noble-assets/noble/v4/app"
+	"github.com/noble-assets/noble/v4/cmd"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"

app/upgrades/v4.1.0-rc.0/store.go

@@ -4,11 +4,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-<<<<<<< HEAD
-	stabletokenfactorytypes "github.com/strangelove-ventures/noble/v4/x/stabletokenfactory/types"
-=======
-	stabletokenfactorytypes "github.com/noble-assets/noble/v5/x/stabletokenfactory/types"
->>>>>>> a4ad980 (chore: rename module path (#283))
+	stabletokenfactorytypes "github.com/noble-assets/noble/v4/x/stabletokenfactory/types"
 )
 
 func CreateStoreLoader(upgradeHeight int64) baseapp.StoreLoader {

app/upgrades/v4.1.0-rc.0/upgrade.go

@@ -12,17 +12,10 @@ import (
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-<<<<<<< HEAD
-	"github.com/strangelove-ventures/noble/v4/x/stabletokenfactory"
-	stabletokenfactorykeeper "github.com/strangelove-ventures/noble/v4/x/stabletokenfactory/keeper"
-	stabletokenfactorytypes "github.com/strangelove-ventures/noble/v4/x/stabletokenfactory/types"
-	tarifftypes "github.com/strangelove-ventures/noble/v4/x/tariff/types"
-=======
-	"github.com/noble-assets/noble/v5/x/stabletokenfactory"
-	stabletokenfactorykeeper "github.com/noble-assets/noble/v5/x/stabletokenfactory/keeper"
-	stabletokenfactorytypes "github.com/noble-assets/noble/v5/x/stabletokenfactory/types"
-	tarifftypes "github.com/noble-assets/noble/v5/x/tariff/types"
->>>>>>> a4ad980 (chore: rename module path (#283))
+	"github.com/noble-assets/noble/v4/x/stabletokenfactory"
+	stabletokenfactorykeeper "github.com/noble-assets/noble/v4/x/stabletokenfactory/keeper"
+	stabletokenfactorytypes "github.com/noble-assets/noble/v4/x/stabletokenfactory/types"
+	tarifftypes "github.com/noble-assets/noble/v4/x/tariff/types"
 )
 
 func CreateUpgradeHandler(

cmd/nobled/main.go

@@ -5,13 +5,8 @@ import (
 
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 
-<<<<<<< HEAD
-	"github.com/strangelove-ventures/noble/v4/app"
-	"github.com/strangelove-ventures/noble/v4/cmd"
-=======
-	"github.com/noble-assets/noble/v5/app"
-	"github.com/noble-assets/noble/v5/cmd"
->>>>>>> a4ad980 (chore: rename module path (#283))
+	"github.com/noble-assets/noble/v4/app"
+	"github.com/noble-assets/noble/v4/cmd"
 )
 
 func main() {

go.mod

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-module github.com/strangelove-ventures/noble/v4
-=======
-module github.com/noble-assets/noble/v5
->>>>>>> a4ad980 (chore: rename module path (#283))
+module github.com/noble-assets/noble/v4
 
 go 1.21
 

interchaintest/cctp_deposit_for_burn_test.go

@@ -14,14 +14,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/noble-assets/noble/v5/cmd"
+	"github.com/noble-assets/noble/v4/cmd"
 	"github.com/strangelove-ventures/interchaintest/v4"
 	"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v4/testreporter"
-<<<<<<< HEAD
-	"github.com/strangelove-ventures/noble/v4/cmd"
-=======
->>>>>>> a4ad980 (chore: rename module path (#283))
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 )

interchaintest/cctp_deposit_for_burn_with_caller_test.go

@@ -14,14 +14,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/noble-assets/noble/v5/cmd"
+	"github.com/noble-assets/noble/v4/cmd"
 	"github.com/strangelove-ventures/interchaintest/v4"
 	"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v4/testreporter"
-<<<<<<< HEAD
-	"github.com/strangelove-ventures/noble/v4/cmd"
-=======
->>>>>>> a4ad980 (chore: rename module path (#283))
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 )

interchaintest/cctp_receive_message_test.go

@@ -19,14 +19,10 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/noble-assets/noble/v5/cmd"
+	"github.com/noble-assets/noble/v4/cmd"
 	"github.com/strangelove-ventures/interchaintest/v4"
 	"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v4/testreporter"
-<<<<<<< HEAD
-	"github.com/strangelove-ventures/noble/v4/cmd"
-=======
->>>>>>> a4ad980 (chore: rename module path (#283))
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 )

interchaintest/cctp_receive_message_with_caller_test.go

@@ -19,14 +19,10 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/noble-assets/noble/v5/cmd"
+	"github.com/noble-assets/noble/v4/cmd"
 	"github.com/strangelove-ventures/interchaintest/v4"
 	"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v4/testreporter"
-<<<<<<< HEAD
-	"github.com/strangelove-ventures/noble/v4/cmd"
-=======
->>>>>>> a4ad980 (chore: rename module path (#283))
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 )

interchaintest/cctp_replace_deposit_for_burn_test.go

@@ -20,14 +20,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/noble-assets/noble/v5/cmd"
+	"github.com/noble-assets/noble/v4/cmd"
 	"github.com/strangelove-ventures/interchaintest/v4"
 	"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v4/testreporter"
-<<<<<<< HEAD
-	"github.com/strangelove-ventures/noble/v4/cmd"
-=======
->>>>>>> a4ad980 (chore: rename module path (#283))
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 )

interchaintest/cctp_roles_test.go

@@ -6,14 +6,10 @@ import (
 
 	"github.com/circlefin/noble-cctp/x/cctp/types"
 	"github.com/gogo/protobuf/jsonpb"
-	"github.com/noble-assets/noble/v5/cmd"
+	"github.com/noble-assets/noble/v4/cmd"
 	"github.com/strangelove-ventures/interchaintest/v4"
 	"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v4/testreporter"
-<<<<<<< HEAD
-	"github.com/strangelove-ventures/noble/v4/cmd"
-=======
->>>>>>> a4ad980 (chore: rename module path (#283))
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 )

interchaintest/genesis_test.go

@@ -9,18 +9,13 @@ import (
 	"github.com/cosmos/cosmos-sdk/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/icza/dyno"
-	tarifftypes "github.com/noble-assets/noble/v5/x/tariff/types"
-	tokenfactorytypes "github.com/noble-assets/noble/v5/x/tokenfactory/types"
+	tarifftypes "github.com/noble-assets/noble/v4/x/tariff/types"
+	tokenfactorytypes "github.com/noble-assets/noble/v4/x/tokenfactory/types"
 	"github.com/strangelove-ventures/interchaintest/v4"
 	"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v4/ibc"
 	"github.com/strangelove-ventures/interchaintest/v4/relayer"
 	"github.com/strangelove-ventures/interchaintest/v4/relayer/rly"
-<<<<<<< HEAD
-	tarifftypes "github.com/strangelove-ventures/noble/v4/x/tariff/types"
-	tokenfactorytypes "github.com/strangelove-ventures/noble/v4/x/tokenfactory/types"
-=======
->>>>>>> a4ad980 (chore: rename module path (#283))
 	proposaltypes "github.com/strangelove-ventures/paramauthority/x/params/types/proposal"
 	upgradetypes "github.com/strangelove-ventures/paramauthority/x/upgrade/types"
 )

interchaintest/globalfee_test.go

@@ -6,14 +6,10 @@ import (
 	"testing"
 
 	"github.com/cosmos/cosmos-sdk/x/params/types/proposal"
-	"github.com/noble-assets/noble/v5/cmd"
+	"github.com/noble-assets/noble/v4/cmd"
 	"github.com/strangelove-ventures/interchaintest/v4"
 	"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v4/testreporter"
-<<<<<<< HEAD
-	"github.com/strangelove-ventures/noble/v4/cmd"
-=======
->>>>>>> a4ad980 (chore: rename module path (#283))
 	proposaltypes "github.com/strangelove-ventures/paramauthority/x/params/types/proposal"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"