chore: sync

.changelog/epilogue.md

@@ -2,4 +2,4 @@
 
 ## Previous Changes
 
-This changelog has yet to be fully initialized. For previous verions please refer to the release notes for a summary of changes.
+This changelog has yet to be fully initialized. For previous versions please refer to the release notes for a summary of changes.

.changelog/v4.0.0/bug-fixes/252-simulation-tests.md

@@ -0,0 +1 @@
+- Fix simulation tests. ([#252](https://github.com/strangelove-ventures/noble/pull/252))

.changelog/v4.0.0/bug-fixes/253-ledger-macos-sonoma.md

@@ -0,0 +1 @@
+- Fix Ledger support for macOS Sonoma. ([#253](https://github.com/strangelove-ventures/noble/pull/253))

.changelog/v4.0.0/features/215-rosetta-support.md

@@ -0,0 +1 @@
+- Include support for Coinbase's [Rosetta API](https://docs.cloud.coinbase.com/rosetta/docs/welcome). ([#215](https://github.com/strangelove-ventures/noble/pull/215))

.changelog/v4.0.0/improvements/241-ftf-interface-changes.md

@@ -0,0 +1 @@
+- Add `x/fiattokenfactory` interface changes required for CCTP. ([#241](https://github.com/strangelove-ventures/noble/pull/241))

.changelog/v4.0.0/summary.md

@@ -0,0 +1,5 @@
+*Nov 6, 2023*
+
+This is the long awaited Argon major release of Noble. It introduces a new [`x/cctp`](https://github.com/circlefin/noble-cctp) module that implements Circle's [Cross Chain Transfer Protocol (CCTP)](https://www.circle.com/en/cross-chain-transfer-protocol), allowing native $USDC transfers between supported EVM networks and Noble (with many more networks to come). 
+
+Along with the integration of the CCTP module, the following changes were made.

CHANGELOG.md

@@ -1,5 +1,31 @@
 # CHANGELOG
 
+## v4.0.0
+
+*Nov 6, 2023*
+
+This is the long awaited Argon major release of Noble. It introduces a new [`x/cctp`](https://github.com/circlefin/noble-cctp) module that implements Circle's [Cross Chain Transfer Protocol (CCTP)](https://www.circle.com/en/cross-chain-transfer-protocol), allowing native $USDC transfers between supported EVM networks and Noble (with many more networks to come). 
+
+Along with the integration of the CCTP module, the following changes were made.
+
+### BUG FIXES
+
+- Fix simulation tests. ([#252](https://github.com/strangelove-ventures/noble/pull/252))
+- Fix Ledger support for macOS Sonoma. ([#253](https://github.com/strangelove-ventures/noble/pull/253))
+
+### DEPENDENCIES
+
+- Bump IBC to [`v4.5.1`](https://github.com/cosmos/ibc-go/releases/tag/v4.5.1) ([#250](https://github.com/strangelove-ventures/noble/pull/250))
+- Bump Packet Forward Middleware to [`v4.1.1`](https://github.com/cosmos/ibc-apps/releases/tag/middleware%2Fpacket-forward-middleware%2Fv4.1.1) ([#250](https://github.com/strangelove-ventures/noble/pull/250), [#258](https://github.com/strangelove-ventures/noble/pull/258))
+
+### FEATURES
+
+- Include support for Coinbase's [Rosetta API](https://docs.cloud.coinbase.com/rosetta/docs/welcome). ([#215](https://github.com/strangelove-ventures/noble/pull/215))
+
+### IMPROVEMENTS
+
+- Add `x/fiattokenfactory` interface changes required for CCTP. ([#241](https://github.com/strangelove-ventures/noble/pull/241))
+
 ## v3.1.0
 
 *Sep 15, 2023*
@@ -20,5 +46,5 @@ In response to multiple IBC channels expiring on Noble's mainnet network, it was
 
 ## Previous Changes
 
-This changelog has yet to be fully initialized. For previous verions please refer to the release notes for a summary of changes.
+This changelog has yet to be fully initialized. For previous versions please refer to the release notes for a summary of changes.
 

app/app.go

@@ -98,6 +98,7 @@ import (
 	"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"
+	v4m0p0rc0 "github.com/strangelove-ventures/noble/v4/app/upgrades/v4.0.0-rc0"
 	"github.com/strangelove-ventures/noble/v4/cmd"
 	"github.com/strangelove-ventures/noble/v4/docs"
 	"github.com/strangelove-ventures/noble/v4/x/blockibc"
@@ -891,9 +892,8 @@ func (app *App) setupUpgradeHandlers() {
 		argon.CreateUpgradeHandler(
 			app.mm,
 			app.configurator,
-			app.FiatTokenFactoryKeeper,
-			app.ParamsKeeper,
 			app.CCTPKeeper,
+			app.FiatTokenFactoryKeeper,
 		),
 	)
 
@@ -906,6 +906,15 @@ func (app *App) setupUpgradeHandlers() {
 		),
 	)
 
+	// v4.0.0-rc0 upgrade
+	app.UpgradeKeeper.SetUpgradeHandler(
+		v4m0p0rc0.UpgradeName,
+		v4m0p0rc0.CreateUpgradeHandler(
+			app.mm,
+			app.configurator,
+		),
+	)
+
 	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
 	if err != nil {
 		panic(fmt.Errorf("failed to read upgrade info from disk: %w", err))
@@ -927,6 +936,8 @@ func (app *App) setupUpgradeHandlers() {
 		storeLoader = argon.CreateStoreLoader(upgradeInfo.Height)
 	case argon4.UpgradeName:
 		storeLoader = argon4.CreateStoreLoader(upgradeInfo.Height)
+	case v4m0p0rc0.UpgradeName:
+		storeLoader = v4m0p0rc0.CreateStoreLoader(upgradeInfo.Height)
 	}
 
 	if storeLoader != nil {

app/upgrades/argon/constants.go

@@ -2,9 +2,3 @@ package argon
 
 // UpgradeName is the name of this specific software upgrade used on-chain.
 const UpgradeName = "argon"
-
-// 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"

app/upgrades/argon/store.go

@@ -3,16 +3,14 @@ package argon
 import (
 	cctptypes "github.com/circlefin/noble-cctp/x/cctp/types"
 	"github.com/cosmos/cosmos-sdk/baseapp"
-	storeTypes "github.com/cosmos/cosmos-sdk/store/types"
-	upgradeTypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
 
 func CreateStoreLoader(upgradeHeight int64) baseapp.StoreLoader {
-	storeUpgrades := storeTypes.StoreUpgrades{
-		Added: []string{
-			cctptypes.ModuleName,
-		},
+	storeUpgrades := storetypes.StoreUpgrades{
+		Added: []string{cctptypes.ModuleName},
 	}
 
-	return upgradeTypes.UpgradeStoreLoader(upgradeHeight, &storeUpgrades)
+	return upgradetypes.UpgradeStoreLoader(upgradeHeight, &storeUpgrades)
 }

app/upgrades/argon/upgrade.go

@@ -1,51 +1,49 @@
 package argon
 
 import (
-	"fmt"
-
 	"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"
-	paramauthoritykeeper "github.com/strangelove-ventures/paramauthority/x/params/keeper"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
 
 func CreateUpgradeHandler(
 	mm *module.Manager,
 	configurator module.Configurator,
-	fiatTFKeeper *fiattokenfactorykeeper.Keeper,
-	paramauthoritykeeper paramauthoritykeeper.Keeper,
 	cctpKeeper *cctpkeeper.Keeper,
-) upgradeTypes.UpgradeHandler {
-	return func(ctx sdk.Context, _ upgradeTypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
-		var cctpAuthority string
-		paramAuthority := paramauthoritykeeper.GetAuthority(ctx)
-		if ctx.ChainID() == TestnetChainID {
-			cctpAuthority = paramAuthority
-		} else {
-			owner, ok := fiatTFKeeper.GetOwner(ctx)
-			if !ok {
-				return nil, fmt.Errorf("fiat token factory owner not found")
-			}
-
-			cctpAuthority = owner.Address
+	fiatTokenFactoryKeeper *fiattokenfactorykeeper.Keeper,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		vm, err := mm.RunMigrations(ctx, configurator, vm)
+		if err != nil {
+			return vm, nil
 		}
 
-		denom := fiatTFKeeper.GetMintingDenom(ctx)
+		cctpKeeper.SetOwner(ctx, "noble1ye45j5c5gks2r68z6s8k9aehma372r927nuze4")
+		cctpKeeper.SetAttesterManager(ctx, "noble1ak4d4dsrx5ec37h3qpsm8x6kg39xy0d0l8ptdq")
+		cctpKeeper.SetPauser(ctx, "noble1cnl6q0c7g3aq8fjgeh9ygy5p2gv83kxqp4pfw4")
+		cctpKeeper.SetTokenController(ctx, "noble1ye45j5c5gks2r68z6s8k9aehma372r927nuze4")
+
+		// The below attesters are obtained from Circle's Iris API.
+		// https://iris-api.circle.com/v1/publicKeys
+		cctpKeeper.SetAttester(ctx, cctptypes.Attester{Attester: "0x04702317a335170cb26fef7577eeb5009451f72aca4ac5c03e330f68dd6a0d73728d2047346f216d9f3abc0337e77ed5e3b4995cd60cfa92f523faa29bce34e08b"})
+		cctpKeeper.SetAttester(ctx, cctptypes.Attester{Attester: "0x0414f25da528fa94f46f081d4be46bcee81cb873297072cfcff0d60737e649d52158bebd0ed79f87959f152e0bb737de80574f79828b21c2b7e8a30b10fd6a56c5"})
+
+		denom := fiatTokenFactoryKeeper.GetMintingDenom(ctx)
+		cctpKeeper.SetPerMessageBurnLimit(ctx, cctptypes.PerMessageBurnLimit{
+			Denom:  denom.Denom,
+			Amount: math.NewInt(1_000_000_000_000),
+		})
 
-		cctpKeeper.SetOwner(ctx, cctpAuthority)
-		cctpKeeper.SetAttesterManager(ctx, cctpAuthority)
-		cctpKeeper.SetPauser(ctx, cctpAuthority)
-		cctpKeeper.SetTokenController(ctx, cctpAuthority)
-		cctpKeeper.SetPerMessageBurnLimit(ctx, cctptypes.PerMessageBurnLimit{Denom: denom.Denom, Amount: math.NewInt(99999999)})
 		cctpKeeper.SetBurningAndMintingPaused(ctx, cctptypes.BurningAndMintingPaused{Paused: false})
 		cctpKeeper.SetSendingAndReceivingMessagesPaused(ctx, cctptypes.SendingAndReceivingMessagesPaused{Paused: false})
-		cctpKeeper.SetMaxMessageBodySize(ctx, cctptypes.MaxMessageBodySize{Amount: 8000})
+
+		cctpKeeper.SetMaxMessageBodySize(ctx, cctptypes.MaxMessageBodySize{Amount: 8192})
 		cctpKeeper.SetSignatureThreshold(ctx, cctptypes.SignatureThreshold{Amount: 2})
 
-		return mm.RunMigrations(ctx, configurator, vm)
+		return vm, nil
 	}
 }

app/upgrades/v4.0.0-rc0/constants.go

@@ -0,0 +1,7 @@
+package v4m0p0rc0
+
+// UpgradeName is the name of this specific software upgrade used on-chain.
+const UpgradeName = "v4.0.0-rc0"
+
+// TestnetChainID is the Chain ID of the Noble testnet (Grand).
+const TestnetChainID = "grand-1"

app/upgrades/v4.0.0-rc0/store.go

@@ -0,0 +1,15 @@
+package v4m0p0rc0
+
+import (
+	"github.com/cosmos/cosmos-sdk/baseapp"
+	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+)
+
+func CreateStoreLoader(upgradeHeight int64) baseapp.StoreLoader {
+	storeUpgrades := storetypes.StoreUpgrades{
+		Deleted: []string{"router"},
+	}
+
+	return upgradetypes.UpgradeStoreLoader(upgradeHeight, &storeUpgrades)
+}

app/upgrades/v4.0.0-rc0/upgrade.go

@@ -0,0 +1,24 @@
+package v4m0p0rc0
+
+import (
+	"errors"
+	"fmt"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+)
+
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	cfg module.Configurator,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		// Ensure that this upgrade is only run on Noble's testnet.
+		if ctx.ChainID() != TestnetChainID {
+			return vm, errors.New(fmt.Sprintf("%s upgrade not allowed to execute on %s chain", UpgradeName, ctx.ChainID()))
+		}
+
+		return mm.RunMigrations(ctx, cfg, vm)
+	}
+}

interchaintest/cctp_deposit_for_burn_test.go

@@ -78,12 +78,12 @@ func TestCCTP_DepositForBurn(t *testing.T) {
 	require.NoError(t, err, "failed to execute configure minter controller tx")
 
 	_, err = nobleValidator.ExecTx(ctx, gw.fiatTfRoles.MinterController.KeyName(),
-		"fiat-tokenfactory", "configure-minter", gw.fiatTfRoles.Minter.FormattedAddress(), "1000000000000"+denomMetadataDrachma.Base, "-b", "block",
+		"fiat-tokenfactory", "configure-minter", gw.fiatTfRoles.Minter.FormattedAddress(), "1000000000000"+denomMetadataUsdc.Base, "-b", "block",
 	)
 	require.NoError(t, err, "failed to execute configure minter tx")
 
 	_, err = nobleValidator.ExecTx(ctx, gw.fiatTfRoles.Minter.KeyName(),
-		"fiat-tokenfactory", "mint", gw.extraWallets.User.FormattedAddress(), "1000000000000"+denomMetadataDrachma.Base, "-b", "block",
+		"fiat-tokenfactory", "mint", gw.extraWallets.User.FormattedAddress(), "1000000000000"+denomMetadataUsdc.Base, "-b", "block",
 	)
 	require.NoError(t, err, "failed to execute mint to user tx")
 
@@ -93,7 +93,7 @@ func TestCCTP_DepositForBurn(t *testing.T) {
 	require.NoError(t, err, "failed to configure cctp minter controller")
 
 	_, err = nobleValidator.ExecTx(ctx, gw.fiatTfRoles.MinterController.KeyName(),
-		"fiat-tokenfactory", "configure-minter", cctptypes.ModuleAddress.String(), "1000000000000"+denomMetadataDrachma.Base, "-b", "block",
+		"fiat-tokenfactory", "configure-minter", cctptypes.ModuleAddress.String(), "1000000000000"+denomMetadataUsdc.Base, "-b", "block",
 	)
 	require.NoError(t, err, "failed to configure cctp minter")
 
@@ -122,7 +122,7 @@ func TestCCTP_DepositForBurn(t *testing.T) {
 		From:         gw.fiatTfRoles.Owner.FormattedAddress(),
 		RemoteDomain: 0,
 		RemoteToken:  burnToken,
-		LocalToken:   denomMetadataDrachma.Base,
+		LocalToken:   denomMetadataUsdc.Base,
 	})
 
 	bCtx, bCancel := context.WithTimeout(ctx, 20*time.Second)
@@ -137,7 +137,7 @@ func TestCCTP_DepositForBurn(t *testing.T) {
 	require.NoError(t, err, "error configuring remote domain")
 	require.Zero(t, tx.Code, "configuring remote domain failed: %s - %s - %s", tx.Codespace, tx.RawLog, tx.Data)
 
-	beforeBurnBal, err := noble.GetBalance(ctx, gw.extraWallets.User.FormattedAddress(), denomMetadataDrachma.Base)
+	beforeBurnBal, err := noble.GetBalance(ctx, gw.extraWallets.User.FormattedAddress(), denomMetadataUsdc.Base)
 	require.NoError(t, err)
 
 	mintRecipient := make([]byte, 32)
@@ -146,7 +146,7 @@ func TestCCTP_DepositForBurn(t *testing.T) {
 	depositForBurnNoble := &cctptypes.MsgDepositForBurn{
 		From:              gw.extraWallets.User.FormattedAddress(),
 		Amount:            cosmossdk_io_math.NewInt(1000000),
-		BurnToken:         denomMetadataDrachma.Base,
+		BurnToken:         denomMetadataUsdc.Base,
 		DestinationDomain: 0,
 		MintRecipient:     mintRecipient,
 	}
@@ -160,7 +160,7 @@ func TestCCTP_DepositForBurn(t *testing.T) {
 	require.NoError(t, err, "error broadcasting msgDepositForBurn")
 	require.Zero(t, tx.Code, "msgDepositForBurn failed: %s - %s - %s", tx.Codespace, tx.RawLog, tx.Data)
 
-	afterBurnBal, err := noble.GetBalance(ctx, gw.extraWallets.User.FormattedAddress(), denomMetadataDrachma.Base)
+	afterBurnBal, err := noble.GetBalance(ctx, gw.extraWallets.User.FormattedAddress(), denomMetadataUsdc.Base)
 	require.NoError(t, err)
 
 	require.Equal(t, afterBurnBal, beforeBurnBal-1000000)
@@ -173,7 +173,7 @@ func TestCCTP_DepositForBurn(t *testing.T) {
 			depositForBurn, ok := parsedEvent.(*cctptypes.DepositForBurn)
 			require.True(t, ok)
 
-			expectedBurnToken := hex.EncodeToString(crypto.Keccak256([]byte(denomMetadataDrachma.Base)))
+			expectedBurnToken := hex.EncodeToString(crypto.Keccak256([]byte(denomMetadataUsdc.Base)))
 
 			require.Equal(t, uint64(0), depositForBurn.Nonce)
 			require.Equal(t, expectedBurnToken, depositForBurn.BurnToken)