chore: prepare v4.1.0 (#352)

Co-authored-by: Stefan Coolican <[email protected]>
noble-assets · Apr 15, 2024 · b63123a · b63123a
1 parent 51efd55
commit b63123a
Show file tree

Hide file tree

Showing 13 changed files with 63 additions and 5 deletions.
diff --git a/.changelog/v4.1.0/dependencies/000-ftf.md b/.changelog/v4.1.0/dependencies/000-ftf.md
@@ -0,0 +1 @@
+- Bump FiatTokenFactory to [`0a7385d`](https://github.com/circlefin/noble-fiattokenfactory/commit/0a7385d9a37744ced1e4d61eae10de2b117f482b) for various blocklist and paused check improvements.
diff --git a/.changelog/v4.1.0/dependencies/000-ibc.md b/.changelog/v4.1.0/dependencies/000-ibc.md
@@ -0,0 +1 @@
+- Bump IBC to [`v4.6.0`](https://github.com/cosmos/ibc-go/releases/tag/v4.6.0) to resolve [ASA-2024-007](https://github.com/cosmos/ibc-go/security/advisories/GHSA-j496-crgh-34mx) security advisory.
diff --git a/.changelog/v4.1.0/dependencies/000-pfm.md b/.changelog/v4.1.0/dependencies/000-pfm.md
@@ -0,0 +1 @@
+- Bump PFM from Mandrake patch commit ([`455757b`](https://github.com/cosmos/ibc-apps/commit/455757bb5771c29cf2f83b59e37f6513e07c92be)) to release tag ([`v4.1.2`](https://github.com/cosmos/ibc-apps/releases/tag/middleware%2Fpacket-forward-middleware%2Fv4.1.2)).
diff --git a/.changelog/v4.1.0/dependencies/000-sdk.md b/.changelog/v4.1.0/dependencies/000-sdk.md
@@ -0,0 +1 @@
+- Switch to Noble's Cosmos SDK fork ([`v0.45.16-noble`](https://github.com/noble-assets/cosmos-sdk/releases/tag/v0.45.16-noble)), allowing `DeliverTx` to be extended.
diff --git a/.changelog/v4.1.0/improvements/249-283-module-path.md b/.changelog/v4.1.0/improvements/249-283-module-path.md
@@ -0,0 +1 @@
+- 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), [#283](https://github.com/noble-assets/noble/pull/283))
diff --git a/.changelog/v4.1.0/improvements/346-migrate-blockibc.md b/.changelog/v4.1.0/improvements/346-migrate-blockibc.md
@@ -0,0 +1 @@
+- Switch to migrated `x/blockibc` under [`circlefin/noble-fiattokenfactory`](https://github.com/circlefin/noble-fiattokenfactory). ([#346](https://github.com/noble-assets/noble/pull/346))
diff --git a/.changelog/v4.1.0/summary.md b/.changelog/v4.1.0/summary.md
@@ -0,0 +1,15 @@
+*Apr 15, 2024*
+
+This is a minor release to the v4 Argon line, codenamed Fusion.
+
+The main part of this release is the introduction of the `x/forwarding` module.
+It allows users to create a new account type, where the receipt of funds into
+that account triggers an automatic IBC transfer over a specified channel to a
+recipient address. This allows for one-click transfers to any IBC-enabled chain,
+and can be used in tandem with, for example, the receipt of funds from a
+[Circle Mint][mint] account or via [CCTP].
+
+Other notable changes include are documented below.
+
+[cctp]: https://www.circle.com/en/cross-chain-transfer-protocol
+[mint]: https://www.circle.com/en/circle-mint
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # CHANGELOG
 
+## v4.1.0
+
+*Apr 15, 2024*
+
+This is a minor release to the v4 Argon line, codenamed Fusion.
+
+The main part of this release is the introduction of the `x/forwarding` module.
+It allows users to create a new account type, where the receipt of funds into
+that account triggers an automatic IBC transfer over a specified channel to a
+recipient address. This allows for one-click transfers to any IBC-enabled chain,
+and can be used in tandem with, for example, the receipt of funds from a
+[Circle Mint][mint] account or via [CCTP].
+
+Other notable changes include are documented below.
+
+[cctp]: https://www.circle.com/en/cross-chain-transfer-protocol
+[mint]: https://www.circle.com/en/circle-mint
+
+### DEPENDENCIES
+
+- Switch to Noble's Cosmos SDK fork ([`v0.45.16-noble`](https://github.com/noble-assets/cosmos-sdk/releases/tag/v0.45.16-noble)), allowing `DeliverTx` to be extended.
+- Bump PFM from Mandrake patch commit ([`455757b`](https://github.com/cosmos/ibc-apps/commit/455757bb5771c29cf2f83b59e37f6513e07c92be)) to release tag ([`v4.1.2`](https://github.com/cosmos/ibc-apps/releases/tag/middleware%2Fpacket-forward-middleware%2Fv4.1.2)).
+- Bump IBC to [`v4.6.0`](https://github.com/cosmos/ibc-go/releases/tag/v4.6.0) to resolve [ASA-2024-007](https://github.com/cosmos/ibc-go/security/advisories/GHSA-j496-crgh-34mx) security advisory.
+- Bump FiatTokenFactory to [`0a7385d`](https://github.com/circlefin/noble-fiattokenfactory/commit/0a7385d9a37744ced1e4d61eae10de2b117f482b) for various blocklist and paused check improvements.
+
+### IMPROVEMENTS
+
+- 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), [#283](https://github.com/noble-assets/noble/pull/283))
+- Switch to migrated `x/blockibc` under [`circlefin/noble-fiattokenfactory`](https://github.com/circlefin/noble-fiattokenfactory). ([#346](https://github.com/noble-assets/noble/pull/346))
+
 ## v4.1.0-rc.4
 
 *Apr 14, 2024*

diff --git a/app/upgrades/fusion/constants.go b/app/upgrades/fusion/constants.go
@@ -3,5 +3,5 @@ package fusion
 // UpgradeName is the name of this specific software upgrade used on-chain.
 const UpgradeName = "fusion"
 
-// TestnetChainID is the Chain ID of the Noble testnet (Grand).
-const TestnetChainID = "grand-1"
+// MainnetChainID is the Chain ID of the Noble mainnet.
+const MainnetChainID = "noble-1"
diff --git a/app/upgrades/fusion/store.go b/app/upgrades/fusion/store.go
@@ -4,10 +4,13 @@ import (
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+	forwardingtypes "github.com/noble-assets/noble/v4/x/forwarding/types"
 )
 
 func CreateStoreLoader(upgradeHeight int64) baseapp.StoreLoader {
-	storeUpgrades := storetypes.StoreUpgrades{}
+	storeUpgrades := storetypes.StoreUpgrades{
+		Added: []string{forwardingtypes.ModuleName},
+	}
 
 	return upgradetypes.UpgradeStoreLoader(upgradeHeight, &storeUpgrades)
 }
diff --git a/app/upgrades/fusion/upgrade.go b/app/upgrades/fusion/upgrade.go
@@ -13,7 +13,7 @@ func CreateUpgradeHandler(
 	cfg module.Configurator,
 ) upgradetypes.UpgradeHandler {
 	return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
-		if ctx.ChainID() != TestnetChainID {
+		if ctx.ChainID() != MainnetChainID {
 			return vm, fmt.Errorf("%s upgrade not allowed to execute on %s chain", UpgradeName, ctx.ChainID())
 		}
 

diff --git a/interchaintest/upgrade_grand-1_test.go b/interchaintest/upgrade_grand-1_test.go
@@ -124,7 +124,7 @@ func TestGrand1ChainUpgrade(t *testing.T) {
 		},
 		{
 			upgradeName: "fusion",
-			image:       nobleImageInfo[0],
+			image:       ghcrImage("v4.1.0-rc.4"),
 		},
 	}
 

diff --git a/interchaintest/upgrade_noble-1_test.go b/interchaintest/upgrade_noble-1_test.go
@@ -114,6 +114,10 @@ func TestNoble1ChainUpgrade(t *testing.T) {
 			emergency: true,
 			image:     ghcrImage("v4.0.3"),
 		},
+		{
+			upgradeName: "fusion",
+			image:       nobleImageInfo[0],
+		},
 	}
 
 	testNobleChainUpgrade(t, "noble-1", genesis, denomMetadataFrienzies, numValidators, numFullNodes, upgrades)