feat: v8.0.0-rc.4 upgrade handler (#422)

Co-authored-by: John Letey <[email protected]>
noble-assets · Nov 6, 2024 · dd84043 · dd84043
1 parent f5dc67c
commit dd84043
Show file tree

Hide file tree

Showing 22 changed files with 1,683 additions and 222 deletions.
diff --git a/Makefile b/Makefile
@@ -87,7 +87,7 @@ ifeq (,$(shell which heighliner))
 	@echo heighliner not found. https://github.com/strangelove-ventures/heighliner
 else
 	@echo "🤖 Building image..."
-	@heighliner build --chain noble --local 1> /dev/null
+	@heighliner build --chain noble --local
 	@echo "✅ Completed build!"
 endif
 

diff --git a/app.go b/app.go
@@ -34,8 +34,7 @@ import (
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
-	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
-	"github.com/noble-assets/noble/v8/upgrade"
+	"github.com/noble-assets/noble/v8/upgrade/testnet"
 
 	_ "cosmossdk.io/x/evidence"
 	_ "cosmossdk.io/x/feegrant/module"
@@ -73,21 +72,27 @@ import (
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
+
 	// IBC Modules
 	pfmkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/keeper"
 	capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
 	icahostkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/keeper"
 	transferkeeper "github.com/cosmos/ibc-go/v8/modules/apps/transfer/keeper"
 	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
+
 	// Circle Modules
 	cctpkeeper "github.com/circlefin/noble-cctp/x/cctp/keeper"
 	ftfkeeper "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/keeper"
+
 	// Ondo Modules
 	aurakeeper "github.com/ondoprotocol/usdy-noble/v2/keeper"
+
 	// Hashnote Modules
 	halokeeper "github.com/noble-assets/halo/v2/keeper"
+
 	// Monerium Modules
 	florinkeeper "github.com/monerium/module-noble/v2/keeper"
+
 	// Noble Modules
 	authoritykeeper "github.com/noble-assets/authority/keeper"
 	forwardingkeeper "github.com/noble-assets/forwarding/v2/keeper"
@@ -295,23 +300,13 @@ func (app *App) GetSubspace(moduleName string) paramstypes.Subspace {
 
 func (app *App) RegisterUpgradeHandler() error {
 	app.UpgradeKeeper.SetUpgradeHandler(
-		upgrade.UpgradeName,
-		upgrade.CreateUpgradeHandler(
+		testnet.UpgradeName,
+		testnet.CreateUpgradeHandler(
 			app.ModuleManager,
 			app.Configurator(),
-			app.appCodec,
 			app.interfaceRegistry,
-			app.Logger(),
-			app.GetKey(capabilitytypes.StoreKey),
-			app.AccountKeeper,
-			app.AuthorityKeeper,
-			app.BankKeeper,
-			app.CapabilityKeeper,
-			app.IBCKeeper.ClientKeeper,
-			app.ConsensusKeeper,
 			app.GlobalFeeKeeper,
 			app.ParamsKeeper,
-			app.StakingKeeper,
 		),
 	)
 
@@ -323,8 +318,8 @@ func (app *App) RegisterUpgradeHandler() error {
 		return nil
 	}
 
-	if upgradeInfo.Name == upgrade.UpgradeName {
-		app.SetStoreLoader(upgrade.CreateStoreLoader(upgradeInfo.Height))
+	if upgradeInfo.Name == testnet.UpgradeName {
+		app.SetStoreLoader(testnet.CreateStoreLoader(upgradeInfo.Height))
 	}
 
 	return nil

diff --git a/cmd/init.go b/cmd/init.go
@@ -1,3 +1,17 @@
+// Copyright 2024 NASD Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package cmd
 
 import (

diff --git a/cmd/nobled/main.go b/cmd/nobled/main.go
@@ -1,3 +1,17 @@
+// Copyright 2024 NASD Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package main
 
 import (

diff --git a/e2e/cctp_deposit_for_burn_test.go b/e2e/cctp_deposit_for_burn_test.go
@@ -38,7 +38,7 @@ func TestCCTP_DepositForBurn(t *testing.T) {
 	t.Parallel()
 
 	ctx := context.Background()
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	nobleValidator := noble.Validators[0]
 

diff --git a/e2e/cctp_deposit_for_burn_with_caller_test.go b/e2e/cctp_deposit_for_burn_with_caller_test.go
@@ -38,7 +38,7 @@ func TestCCTP_DepositForBurnWithCaller(t *testing.T) {
 	t.Parallel()
 
 	ctx := context.Background()
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	nobleValidator := noble.Validators[0]
 

diff --git a/e2e/cctp_receive_message_test.go b/e2e/cctp_receive_message_test.go
@@ -42,7 +42,7 @@ func TestCCTP_ReceiveMessage(t *testing.T) {
 	t.Parallel()
 
 	ctx := context.Background()
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	nobleValidator := noble.Validators[0]
 

diff --git a/e2e/cctp_receive_message_with_caller_test.go b/e2e/cctp_receive_message_with_caller_test.go
@@ -43,7 +43,7 @@ func TestCCTP_ReceiveMessageWithCaller(t *testing.T) {
 	t.Parallel()
 
 	ctx := context.Background()
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	nobleValidator := noble.Validators[0]
 

diff --git a/e2e/cctp_replace_deposit_for_burn_test.go b/e2e/cctp_replace_deposit_for_burn_test.go
@@ -44,7 +44,7 @@ func TestCCTP_ReplaceDepositForBurn(t *testing.T) {
 	t.Parallel()
 
 	ctx := context.Background()
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	nobleValidator := noble.Validators[0]
 

diff --git a/e2e/cctp_roles_test.go b/e2e/cctp_roles_test.go
@@ -34,7 +34,7 @@ func TestCCTP_UpdateOwner(t *testing.T) {
 	t.Parallel()
 
 	ctx := context.Background()
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	nobleValidator := noble.Validators[0]
 
@@ -67,7 +67,7 @@ func TestCCTP_UpdateAttesterManager(t *testing.T) {
 	t.Parallel()
 
 	ctx := context.Background()
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	nobleValidator := noble.Validators[0]
 
@@ -91,7 +91,7 @@ func TestCCTP_UpdatePauser(t *testing.T) {
 	t.Parallel()
 
 	ctx := context.Background()
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	nobleValidator := noble.Validators[0]
 
@@ -115,7 +115,7 @@ func TestCCTP_UpdateTokenController(t *testing.T) {
 	t.Parallel()
 
 	ctx := context.Background()
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	nobleValidator := noble.Validators[0]
 

diff --git a/e2e/conformance_test.go b/e2e/conformance_test.go
@@ -28,7 +28,7 @@ func TestConformance(t *testing.T) {
 	ctx := context.Background()
 
 	var nw e2e.NobleWrapper
-	nw, ibcSimd, rf, r, ibcPathName, rep, _, client, network := e2e.NobleSpinUpIBC(t, ctx, false)
+	nw, ibcSimd, rf, r, ibcPathName, rep, _, client, network := e2e.NobleSpinUpIBC(t, ctx, e2e.LocalImages, false)
 
 	conformance.TestChainPair(t, ctx, client, network, nw.Chain, ibcSimd, rf, rep, r, ibcPathName)
 }
diff --git a/e2e/fiat_tf_test.go b/e2e/fiat_tf_test.go
@@ -39,7 +39,7 @@ func TestFiatTFUpdateOwner(t *testing.T) {
 	t.Parallel()
 
 	ctx := context.Background()
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -89,7 +89,7 @@ func TestFiatTFAcceptOwner(t *testing.T) {
 	t.Parallel()
 
 	ctx := context.Background()
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -201,7 +201,7 @@ func TestFiatTFUpdateMasterMinter(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -316,7 +316,7 @@ func TestFiatTFConfigureMinterController(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -530,7 +530,7 @@ func TestFiatTFRemoveMinterController(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -625,7 +625,7 @@ func TestFiatTFConfigureMinter(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -716,7 +716,7 @@ func TestFiatTFRemoveMinter(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -799,7 +799,7 @@ func TestFiatTFUpdatePauser(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -913,7 +913,7 @@ func TestFiatTFPause(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -971,7 +971,7 @@ func TestFiatTFUnpause(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -1029,7 +1029,7 @@ func TestFiatTFUpdateBlacklister(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -1143,7 +1143,7 @@ func TestFiatTFBlacklist(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -1233,7 +1233,7 @@ func TestFiatTFUnblacklist(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -1314,7 +1314,7 @@ func TestFiatTFMint(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -1453,7 +1453,7 @@ func TestFiatTFBurn(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -1547,7 +1547,7 @@ func TestFiatTFAuth(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -1621,7 +1621,7 @@ func TestFiatTFAuthzGrant(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -1674,7 +1674,7 @@ func TestFiatTFAuthzSend(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -1791,7 +1791,7 @@ func TestFiatTFBankSend(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw := e2e.NobleSpinUp(t, ctx, true)
+	nw, _ := e2e.NobleSpinUp(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -1869,7 +1869,7 @@ func TestFiatTFIBCOut(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw, gaia, _, r, ibcPathName, _, eRep, _, _ := e2e.NobleSpinUpIBC(t, ctx, true)
+	nw, gaia, _, r, ibcPathName, _, eRep, _, _ := e2e.NobleSpinUpIBC(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]
 
@@ -1982,7 +1982,7 @@ func TestFiatTFIBCIn(t *testing.T) {
 
 	ctx := context.Background()
 
-	nw, gaia, _, r, ibcPathName, _, eRep, _, _ := e2e.NobleSpinUpIBC(t, ctx, true)
+	nw, gaia, _, r, ibcPathName, _, eRep, _, _ := e2e.NobleSpinUpIBC(t, ctx, e2e.LocalImages, true)
 	noble := nw.Chain
 	val := noble.Validators[0]