chore: prepare v4.1.2 (#359)

Co-authored-by: Dan Kanefsky <[email protected]>
noble-assets · May 2, 2024 · ede45e5 · ede45e5
1 parent 231f91d
commit ede45e5
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 13 deletions.
diff --git a/...eased/dependencies/357-bump-forwarding.md → ...4.1.2/dependencies/357-bump-forwarding.md b/...eased/dependencies/357-bump-forwarding.md → ...4.1.2/dependencies/357-bump-forwarding.md
diff --git a/.changelog/v4.1.2/dependencies/359-bump-cctp.md b/.changelog/v4.1.2/dependencies/359-bump-cctp.md
@@ -0,0 +1 @@
+- Bump CCTP to [`69ee090`](https://github.com/circlefin/noble-cctp/commit/69ee090808c05987c504b383939e71ad491594e7) ([#359](https://github.com/noble-assets/noble/pull/359))
diff --git a/.changelog/v4.1.2/dependencies/359-bump-ftf.md b/.changelog/v4.1.2/dependencies/359-bump-ftf.md
@@ -0,0 +1 @@
+- Bump FiatTokenFactory to [`738932c`](https://github.com/circlefin/noble-fiattokenfactory/commit/738932cb316d06f587c49dfb11a50515cce657d9) ([#359](https://github.com/noble-assets/noble/pull/359))
diff --git a/...ed/improvements/357-migrate-forwarding.md → ....2/improvements/357-migrate-forwarding.md b/...ed/improvements/357-migrate-forwarding.md → ....2/improvements/357-migrate-forwarding.md
diff --git a/.changelog/v4.1.2/summary.md b/.changelog/v4.1.2/summary.md
@@ -0,0 +1,3 @@
+*May 2, 2024*
+
+This is a consensus breaking patch release to the v4.1 Fusion line.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## v4.1.2
+
+*May 2, 2024*
+
+This is a consensus breaking patch release to the v4.1 Fusion line.
+
+### DEPENDENCIES
+
+- Bump `x/forwarding` module to [`v1.1.0`](https://github.com/noble-assets/forwarding/releases/tag/v1.1.0) ([#357](https://github.com/noble-assets/noble/pull/357))
+- Bump FiatTokenFactory to [`738932c`](https://github.com/circlefin/noble-fiattokenfactory/commit/738932cb316d06f587c49dfb11a50515cce657d9) ([#359](https://github.com/noble-assets/noble/pull/359))
+- Bump CCTP to [`69ee090`](https://github.com/circlefin/noble-cctp/commit/69ee090808c05987c504b383939e71ad491594e7) ([#359](https://github.com/noble-assets/noble/pull/359))
+
+### IMPROVEMENTS
+
+- Switch to [migrated](https://github.com/noble-assets/forwarding) version of `x/forwarding` module. ([#357](https://github.com/noble-assets/noble/pull/357))
+
 ## v4.1.1
 
 *Apr 16, 2024*

diff --git a/go.mod b/go.mod
@@ -4,8 +4,8 @@ go 1.21
 
 require (
 	cosmossdk.io/errors v1.0.0
-	github.com/circlefin/noble-cctp v0.0.0-20231108011259-7c5206df02dc
-	github.com/circlefin/noble-fiattokenfactory v0.0.0-20240412141733-0a7385d9a377
+	github.com/circlefin/noble-cctp v0.0.0-20240409141251-69ee090808c0
+	github.com/circlefin/noble-fiattokenfactory v0.0.0-20240502160322-738932cb316d
 	github.com/cosmos/cosmos-sdk v0.45.16
 	github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4 v4.1.2
 	github.com/cosmos/ibc-go/v4 v4.6.0

diff --git a/go.sum b/go.sum
@@ -183,10 +183,10 @@ 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-20231108011259-7c5206df02dc h1:vm2CZfO8sjxPFKzguuZl1FjHHdbgRUWvF3x2lw6NyEU=
-github.com/circlefin/noble-cctp v0.0.0-20231108011259-7c5206df02dc/go.mod h1:ssEHJqFI1f4a5sLtZ7qeYJ7/75LzDgzbBv4C9as3y3w=
-github.com/circlefin/noble-fiattokenfactory v0.0.0-20240412141733-0a7385d9a377 h1:6oyw7h/UnsWBrNcH+Nv1VAeyKqjraM9TADsIMgBywjs=
-github.com/circlefin/noble-fiattokenfactory v0.0.0-20240412141733-0a7385d9a377/go.mod h1:pWbZhxq9IBFK9d24ZdmSKdG3LgFbp97r18IbF56QwnE=
+github.com/circlefin/noble-cctp v0.0.0-20240409141251-69ee090808c0 h1:bgfsdlSW1b42l+n0Qa+MO5u5XQh5pDyQzemddP7wlI4=
+github.com/circlefin/noble-cctp v0.0.0-20240409141251-69ee090808c0/go.mod h1:ssEHJqFI1f4a5sLtZ7qeYJ7/75LzDgzbBv4C9as3y3w=
+github.com/circlefin/noble-fiattokenfactory v0.0.0-20240502160322-738932cb316d h1:fjoPjY5XAEuppXXf86zstq35B+87tUA94aRUkX9lQNk=
+github.com/circlefin/noble-fiattokenfactory v0.0.0-20240502160322-738932cb316d/go.mod h1:0Imc1/GSaR8Ic2ssKJGN4EmNbyDGuTGY8AEvmWeao7w=
 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=

diff --git a/interchaintest/go.mod b/interchaintest/go.mod
@@ -4,8 +4,8 @@ go 1.21
 
 require (
 	cosmossdk.io/math v1.0.1
-	github.com/circlefin/noble-cctp v0.0.0-20231110151013-86f425e6fac9
-	github.com/circlefin/noble-fiattokenfactory v0.0.0-20240412141733-0a7385d9a377
+	github.com/circlefin/noble-cctp v0.0.0-20240409141251-69ee090808c0
+	github.com/circlefin/noble-fiattokenfactory v0.0.0-20240502160322-738932cb316d
 	github.com/cosmos/cosmos-sdk v0.45.16
 	github.com/cosmos/ibc-go/v4 v4.6.0
 	github.com/ethereum/go-ethereum v1.12.2

diff --git a/interchaintest/go.sum b/interchaintest/go.sum
@@ -189,10 +189,10 @@ 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-20231110151013-86f425e6fac9 h1:PvJ69AgxzoVX6UyHbCrWe6oDWRgEL3DQ3r7SGmmUoMY=
-github.com/circlefin/noble-cctp v0.0.0-20231110151013-86f425e6fac9/go.mod h1:ssEHJqFI1f4a5sLtZ7qeYJ7/75LzDgzbBv4C9as3y3w=
-github.com/circlefin/noble-fiattokenfactory v0.0.0-20240412141733-0a7385d9a377 h1:6oyw7h/UnsWBrNcH+Nv1VAeyKqjraM9TADsIMgBywjs=
-github.com/circlefin/noble-fiattokenfactory v0.0.0-20240412141733-0a7385d9a377/go.mod h1:pWbZhxq9IBFK9d24ZdmSKdG3LgFbp97r18IbF56QwnE=
+github.com/circlefin/noble-cctp v0.0.0-20240409141251-69ee090808c0 h1:bgfsdlSW1b42l+n0Qa+MO5u5XQh5pDyQzemddP7wlI4=
+github.com/circlefin/noble-cctp v0.0.0-20240409141251-69ee090808c0/go.mod h1:ssEHJqFI1f4a5sLtZ7qeYJ7/75LzDgzbBv4C9as3y3w=
+github.com/circlefin/noble-fiattokenfactory v0.0.0-20240502160322-738932cb316d h1:fjoPjY5XAEuppXXf86zstq35B+87tUA94aRUkX9lQNk=
+github.com/circlefin/noble-fiattokenfactory v0.0.0-20240502160322-738932cb316d/go.mod h1:0Imc1/GSaR8Ic2ssKJGN4EmNbyDGuTGY8AEvmWeao7w=
 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=

diff --git a/interchaintest/upgrade_grand-1_test.go b/interchaintest/upgrade_grand-1_test.go
@@ -126,6 +126,14 @@ func TestGrand1ChainUpgrade(t *testing.T) {
 			upgradeName: "fusion",
 			image:       ghcrImage("v4.1.0-rc.4"),
 		},
+		{
+			emergency: true,
+			image:     ghcrImage("v4.1.1-rc.0"),
+		},
+		{
+			emergency: true,
+			image:     nobleImageInfo[0],
+		},
 	}
 
 	testNobleChainUpgrade(t, "grand-1", genesis, denomMetadataUsdc, numValidators, numFullNodes, upgrades)

diff --git a/interchaintest/upgrade_noble-1_test.go b/interchaintest/upgrade_noble-1_test.go
@@ -115,8 +115,16 @@ func TestNoble1ChainUpgrade(t *testing.T) {
 			image:     ghcrImage("v4.0.3"),
 		},
 		{
+			// fusion is a minor release to the v4 argon line, that introduced a new forwarding module.
+			// v4.1.0 was retracted due to a consensus failure, and so we use v4.1.1.
 			upgradeName: "fusion",
-			image:       nobleImageInfo[0],
+			image:       ghcrImage("v4.1.1"),
+		},
+		{
+			// v4.1.2 is a patch release that upgraded one core dependency.
+			// It is consensus breaking, and therefore is applied as an emergency upgrade.
+			emergency: true,
+			image:     nobleImageInfo[0],
 		},
 	}