Skip to content

Commit 6b9b69e

Browse files
johnleteyDan Kanefsky
johnletey
and
Dan Kanefsky
authored
chore: prepare v4.0.0 (#260)
Co-authored-by: Dan Kanefsky <dan@strange.love>
1 parent 7cbb8c4 commit 6b9b69e

25 files changed

+140
-139
lines changed

‎.changelog/epilogue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
## Previous Changes
44

5-
This changelog has yet to be fully initialized. For previous verions please refer to the release notes for a summary of changes.
5+
This changelog has yet to be fully initialized. For previous versions please refer to the release notes for a summary of changes.

‎.changelog/unreleased/bug-fixes/253-ledger-macos-sonoma.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.changelog/unreleased/features/215-rosetta-support.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Fix simulation tests. ([#252](https://github.com/strangelove-ventures/noble/pull/252))

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Fix Ledger support for macOS Sonoma. ([#253](https://github.com/strangelove-ventures/noble/pull/253))

‎.changelog/unreleased/dependencies/250-bump-ibc.md renamed to ‎.changelog/v4.0.0/dependencies/250-bump-ibc.md

File renamed without changes.

‎.changelog/unreleased/dependencies/250-bump-pfm.md renamed to ‎.changelog/v4.0.0/dependencies/250-bump-pfm.md

File renamed without changes.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Add `x/fiattokenfactory` interface changes required for CCTP. ([#241](https://github.com/strangelove-ventures/noble/pull/241))

‎.changelog/v4.0.0/summary.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
*Nov 6, 2023*
2+
3+
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).
4+
5+
Along with the integration of the CCTP module, the following changes were made.

‎CHANGELOG.md

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,31 @@
11
# CHANGELOG
22

3+
## v4.0.0
4+
5+
*Nov 6, 2023*
6+
7+
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).
8+
9+
Along with the integration of the CCTP module, the following changes were made.
10+
11+
### BUG FIXES
12+
13+
- Fix simulation tests. ([#252](https://github.com/strangelove-ventures/noble/pull/252))
14+
- Fix Ledger support for macOS Sonoma. ([#253](https://github.com/strangelove-ventures/noble/pull/253))
15+
16+
### DEPENDENCIES
17+
18+
- 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))
19+
- 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))
20+
21+
### FEATURES
22+
23+
- Include support for Coinbase's [Rosetta API](https://docs.cloud.coinbase.com/rosetta/docs/welcome). ([#215](https://github.com/strangelove-ventures/noble/pull/215))
24+
25+
### IMPROVEMENTS
26+
27+
- Add `x/fiattokenfactory` interface changes required for CCTP. ([#241](https://github.com/strangelove-ventures/noble/pull/241))
28+
329
## v3.1.0
430

531
*Sep 15, 2023*
@@ -20,5 +46,5 @@ In response to multiple IBC channels expiring on Noble's mainnet network, it was
2046

2147
## Previous Changes
2248

23-
This changelog has yet to be fully initialized. For previous verions please refer to the release notes for a summary of changes.
49+
This changelog has yet to be fully initialized. For previous versions please refer to the release notes for a summary of changes.
2450

‎app/app.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -892,9 +892,8 @@ func (app *App) setupUpgradeHandlers() {
892892
argon.CreateUpgradeHandler(
893893
app.mm,
894894
app.configurator,
895-
app.FiatTokenFactoryKeeper,
896-
app.ParamsKeeper,
897895
app.CCTPKeeper,
896+
app.FiatTokenFactoryKeeper,
898897
),
899898
)
900899

‎app/upgrades/argon/constants.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,3 @@ package argon
22

33
// UpgradeName is the name of this specific software upgrade used on-chain.
44
const UpgradeName = "argon"
5-
6-
// TestnetChainID is the Chain ID of the Noble testnet (Grand).
7-
const TestnetChainID = "grand-1"
8-
9-
// MainnetChainID is the Chain ID of the Noble mainnet.
10-
const MainnetChainID = "noble-1"

‎app/upgrades/argon/upgrade.go

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,49 @@
11
package argon
22

33
import (
4-
"fmt"
5-
64
"cosmossdk.io/math"
75
cctpkeeper "github.com/circlefin/noble-cctp/x/cctp/keeper"
86
cctptypes "github.com/circlefin/noble-cctp/x/cctp/types"
97
sdk "github.com/cosmos/cosmos-sdk/types"
108
"github.com/cosmos/cosmos-sdk/types/module"
11-
upgradeTypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
9+
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
1210
fiattokenfactorykeeper "github.com/strangelove-ventures/noble/x/fiattokenfactory/keeper"
13-
paramauthoritykeeper "github.com/strangelove-ventures/paramauthority/x/params/keeper"
1411
)
1512

1613
func CreateUpgradeHandler(
1714
mm *module.Manager,
1815
configurator module.Configurator,
19-
fiatTFKeeper *fiattokenfactorykeeper.Keeper,
20-
paramauthoritykeeper paramauthoritykeeper.Keeper,
2116
cctpKeeper *cctpkeeper.Keeper,
22-
) upgradeTypes.UpgradeHandler {
23-
return func(ctx sdk.Context, _ upgradeTypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
24-
var cctpAuthority string
25-
paramAuthority := paramauthoritykeeper.GetAuthority(ctx)
26-
if ctx.ChainID() == TestnetChainID {
27-
cctpAuthority = paramAuthority
28-
} else {
29-
owner, ok := fiatTFKeeper.GetOwner(ctx)
30-
if !ok {
31-
return nil, fmt.Errorf("fiat token factory owner not found")
32-
}
33-
34-
cctpAuthority = owner.Address
17+
fiatTokenFactoryKeeper *fiattokenfactorykeeper.Keeper,
18+
) upgradetypes.UpgradeHandler {
19+
return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
20+
vm, err := mm.RunMigrations(ctx, configurator, vm)
21+
if err != nil {
22+
return vm, nil
3523
}
3624

37-
denom := fiatTFKeeper.GetMintingDenom(ctx)
25+
cctpKeeper.SetOwner(ctx, "noble1ye45j5c5gks2r68z6s8k9aehma372r927nuze4")
26+
cctpKeeper.SetAttesterManager(ctx, "noble1ak4d4dsrx5ec37h3qpsm8x6kg39xy0d0l8ptdq")
27+
cctpKeeper.SetPauser(ctx, "noble1cnl6q0c7g3aq8fjgeh9ygy5p2gv83kxqp4pfw4")
28+
cctpKeeper.SetTokenController(ctx, "noble1ye45j5c5gks2r68z6s8k9aehma372r927nuze4")
29+
30+
// The below attesters are obtained from Circle's Iris API.
31+
// https://iris-api.circle.com/v1/publicKeys
32+
cctpKeeper.SetAttester(ctx, cctptypes.Attester{Attester: "0x04702317a335170cb26fef7577eeb5009451f72aca4ac5c03e330f68dd6a0d73728d2047346f216d9f3abc0337e77ed5e3b4995cd60cfa92f523faa29bce34e08b"})
33+
cctpKeeper.SetAttester(ctx, cctptypes.Attester{Attester: "0x0414f25da528fa94f46f081d4be46bcee81cb873297072cfcff0d60737e649d52158bebd0ed79f87959f152e0bb737de80574f79828b21c2b7e8a30b10fd6a56c5"})
34+
35+
denom := fiatTokenFactoryKeeper.GetMintingDenom(ctx)
36+
cctpKeeper.SetPerMessageBurnLimit(ctx, cctptypes.PerMessageBurnLimit{
37+
Denom: denom.Denom,
38+
Amount: math.NewInt(1_000_000_000_000),
39+
})
3840

39-
cctpKeeper.SetOwner(ctx, cctpAuthority)
40-
cctpKeeper.SetAttesterManager(ctx, cctpAuthority)
41-
cctpKeeper.SetPauser(ctx, cctpAuthority)
42-
cctpKeeper.SetTokenController(ctx, cctpAuthority)
43-
cctpKeeper.SetPerMessageBurnLimit(ctx, cctptypes.PerMessageBurnLimit{Denom: denom.Denom, Amount: math.NewInt(99999999)})
4441
cctpKeeper.SetBurningAndMintingPaused(ctx, cctptypes.BurningAndMintingPaused{Paused: false})
4542
cctpKeeper.SetSendingAndReceivingMessagesPaused(ctx, cctptypes.SendingAndReceivingMessagesPaused{Paused: false})
46-
cctpKeeper.SetMaxMessageBodySize(ctx, cctptypes.MaxMessageBodySize{Amount: 8000})
43+
44+
cctpKeeper.SetMaxMessageBodySize(ctx, cctptypes.MaxMessageBodySize{Amount: 8192})
4745
cctpKeeper.SetSignatureThreshold(ctx, cctptypes.SignatureThreshold{Amount: 2})
4846

49-
return mm.RunMigrations(ctx, configurator, vm)
47+
return vm, nil
5048
}
5149
}

‎interchaintest/cctp_deposit_for_burn_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ func TestCCTP_DepositForBurn(t *testing.T) {
7878
require.NoError(t, err, "failed to execute configure minter controller tx")
7979

8080
_, err = nobleValidator.ExecTx(ctx, gw.fiatTfRoles.MinterController.KeyName(),
81-
"fiat-tokenfactory", "configure-minter", gw.fiatTfRoles.Minter.FormattedAddress(), "1000000000000"+denomMetadataDrachma.Base, "-b", "block",
81+
"fiat-tokenfactory", "configure-minter", gw.fiatTfRoles.Minter.FormattedAddress(), "1000000000000"+denomMetadataUsdc.Base, "-b", "block",
8282
)
8383
require.NoError(t, err, "failed to execute configure minter tx")
8484

8585
_, err = nobleValidator.ExecTx(ctx, gw.fiatTfRoles.Minter.KeyName(),
86-
"fiat-tokenfactory", "mint", gw.extraWallets.User.FormattedAddress(), "1000000000000"+denomMetadataDrachma.Base, "-b", "block",
86+
"fiat-tokenfactory", "mint", gw.extraWallets.User.FormattedAddress(), "1000000000000"+denomMetadataUsdc.Base, "-b", "block",
8787
)
8888
require.NoError(t, err, "failed to execute mint to user tx")
8989

@@ -93,7 +93,7 @@ func TestCCTP_DepositForBurn(t *testing.T) {
9393
require.NoError(t, err, "failed to configure cctp minter controller")
9494

9595
_, err = nobleValidator.ExecTx(ctx, gw.fiatTfRoles.MinterController.KeyName(),
96-
"fiat-tokenfactory", "configure-minter", cctptypes.ModuleAddress.String(), "1000000000000"+denomMetadataDrachma.Base, "-b", "block",
96+
"fiat-tokenfactory", "configure-minter", cctptypes.ModuleAddress.String(), "1000000000000"+denomMetadataUsdc.Base, "-b", "block",
9797
)
9898
require.NoError(t, err, "failed to configure cctp minter")
9999

@@ -122,7 +122,7 @@ func TestCCTP_DepositForBurn(t *testing.T) {
122122
From: gw.fiatTfRoles.Owner.FormattedAddress(),
123123
RemoteDomain: 0,
124124
RemoteToken: burnToken,
125-
LocalToken: denomMetadataDrachma.Base,
125+
LocalToken: denomMetadataUsdc.Base,
126126
})
127127

128128
bCtx, bCancel := context.WithTimeout(ctx, 20*time.Second)
@@ -137,7 +137,7 @@ func TestCCTP_DepositForBurn(t *testing.T) {
137137
require.NoError(t, err, "error configuring remote domain")
138138
require.Zero(t, tx.Code, "configuring remote domain failed: %s - %s - %s", tx.Codespace, tx.RawLog, tx.Data)
139139

140-
beforeBurnBal, err := noble.GetBalance(ctx, gw.extraWallets.User.FormattedAddress(), denomMetadataDrachma.Base)
140+
beforeBurnBal, err := noble.GetBalance(ctx, gw.extraWallets.User.FormattedAddress(), denomMetadataUsdc.Base)
141141
require.NoError(t, err)
142142

143143
mintRecipient := make([]byte, 32)
@@ -146,7 +146,7 @@ func TestCCTP_DepositForBurn(t *testing.T) {
146146
depositForBurnNoble := &cctptypes.MsgDepositForBurn{
147147
From: gw.extraWallets.User.FormattedAddress(),
148148
Amount: cosmossdk_io_math.NewInt(1000000),
149-
BurnToken: denomMetadataDrachma.Base,
149+
BurnToken: denomMetadataUsdc.Base,
150150
DestinationDomain: 0,
151151
MintRecipient: mintRecipient,
152152
}
@@ -160,7 +160,7 @@ func TestCCTP_DepositForBurn(t *testing.T) {
160160
require.NoError(t, err, "error broadcasting msgDepositForBurn")
161161
require.Zero(t, tx.Code, "msgDepositForBurn failed: %s - %s - %s", tx.Codespace, tx.RawLog, tx.Data)
162162

163-
afterBurnBal, err := noble.GetBalance(ctx, gw.extraWallets.User.FormattedAddress(), denomMetadataDrachma.Base)
163+
afterBurnBal, err := noble.GetBalance(ctx, gw.extraWallets.User.FormattedAddress(), denomMetadataUsdc.Base)
164164
require.NoError(t, err)
165165

166166
require.Equal(t, afterBurnBal, beforeBurnBal-1000000)
@@ -173,7 +173,7 @@ func TestCCTP_DepositForBurn(t *testing.T) {
173173
depositForBurn, ok := parsedEvent.(*cctptypes.DepositForBurn)
174174
require.True(t, ok)
175175

176-
expectedBurnToken := hex.EncodeToString(crypto.Keccak256([]byte(denomMetadataDrachma.Base)))
176+
expectedBurnToken := hex.EncodeToString(crypto.Keccak256([]byte(denomMetadataUsdc.Base)))
177177

178178
require.Equal(t, uint64(0), depositForBurn.Nonce)
179179
require.Equal(t, expectedBurnToken, depositForBurn.BurnToken)

‎interchaintest/cctp_deposit_for_burn_with_caller_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ func TestCCTP_DepositForBurnWithCaller(t *testing.T) {
7878
require.NoError(t, err, "failed to execute configure minter controller tx")
7979

8080
_, err = nobleValidator.ExecTx(ctx, gw.fiatTfRoles.MinterController.KeyName(),
81-
"fiat-tokenfactory", "configure-minter", gw.fiatTfRoles.Minter.FormattedAddress(), "1000000000000"+denomMetadataDrachma.Base, "-b", "block",
81+
"fiat-tokenfactory", "configure-minter", gw.fiatTfRoles.Minter.FormattedAddress(), "1000000000000"+denomMetadataUsdc.Base, "-b", "block",
8282
)
8383
require.NoError(t, err, "failed to execute configure minter tx")
8484

8585
_, err = nobleValidator.ExecTx(ctx, gw.fiatTfRoles.Minter.KeyName(),
86-
"fiat-tokenfactory", "mint", gw.extraWallets.User.FormattedAddress(), "1000000000000"+denomMetadataDrachma.Base, "-b", "block",
86+
"fiat-tokenfactory", "mint", gw.extraWallets.User.FormattedAddress(), "1000000000000"+denomMetadataUsdc.Base, "-b", "block",
8787
)
8888
require.NoError(t, err, "failed to execute mint to user tx")
8989

@@ -93,7 +93,7 @@ func TestCCTP_DepositForBurnWithCaller(t *testing.T) {
9393
require.NoError(t, err, "failed to configure cctp minter controller")
9494

9595
_, err = nobleValidator.ExecTx(ctx, gw.fiatTfRoles.MinterController.KeyName(),
96-
"fiat-tokenfactory", "configure-minter", cctptypes.ModuleAddress.String(), "1000000000000"+denomMetadataDrachma.Base, "-b", "block",
96+
"fiat-tokenfactory", "configure-minter", cctptypes.ModuleAddress.String(), "1000000000000"+denomMetadataUsdc.Base, "-b", "block",
9797
)
9898
require.NoError(t, err, "failed to configure cctp minter")
9999

@@ -122,7 +122,7 @@ func TestCCTP_DepositForBurnWithCaller(t *testing.T) {
122122
From: gw.fiatTfRoles.Owner.FormattedAddress(),
123123
RemoteDomain: 0,
124124
RemoteToken: burnToken,
125-
LocalToken: denomMetadataDrachma.Base,
125+
LocalToken: denomMetadataUsdc.Base,
126126
})
127127

128128
bCtx, bCancel := context.WithTimeout(ctx, 20*time.Second)
@@ -137,7 +137,7 @@ func TestCCTP_DepositForBurnWithCaller(t *testing.T) {
137137
require.NoError(t, err, "error configuring remote domain")
138138
require.Zero(t, tx.Code, "configuring remote domain failed: %s - %s - %s", tx.Codespace, tx.RawLog, tx.Data)
139139

140-
beforeBurnBal, err := noble.GetBalance(ctx, gw.extraWallets.User.FormattedAddress(), denomMetadataDrachma.Base)
140+
beforeBurnBal, err := noble.GetBalance(ctx, gw.extraWallets.User.FormattedAddress(), denomMetadataUsdc.Base)
141141
require.NoError(t, err)
142142

143143
mintRecipient := make([]byte, 32)
@@ -148,7 +148,7 @@ func TestCCTP_DepositForBurnWithCaller(t *testing.T) {
148148
depositForBurnWithCallerNoble := &cctptypes.MsgDepositForBurnWithCaller{
149149
From: gw.extraWallets.User.FormattedAddress(),
150150
Amount: cosmossdk_io_math.NewInt(1000000),
151-
BurnToken: denomMetadataDrachma.Base,
151+
BurnToken: denomMetadataUsdc.Base,
152152
DestinationDomain: 0,
153153
MintRecipient: mintRecipient,
154154
DestinationCaller: destinationCaller,
@@ -163,7 +163,7 @@ func TestCCTP_DepositForBurnWithCaller(t *testing.T) {
163163
require.NoError(t, err, "error broadcasting msgDepositForBurnWithCaller")
164164
require.Zero(t, tx.Code, "msgDepositForBurnWithCaller failed: %s - %s - %s", tx.Codespace, tx.RawLog, tx.Data)
165165

166-
afterBurnBal, err := noble.GetBalance(ctx, gw.extraWallets.User.FormattedAddress(), denomMetadataDrachma.Base)
166+
afterBurnBal, err := noble.GetBalance(ctx, gw.extraWallets.User.FormattedAddress(), denomMetadataUsdc.Base)
167167
require.NoError(t, err)
168168

169169
require.Equal(t, afterBurnBal, beforeBurnBal-1000000)
@@ -176,7 +176,7 @@ func TestCCTP_DepositForBurnWithCaller(t *testing.T) {
176176
depositForBurn, ok := parsedEvent.(*cctptypes.DepositForBurn)
177177
require.True(t, ok)
178178

179-
expectedBurnToken := hex.EncodeToString(crypto.Keccak256([]byte(denomMetadataDrachma.Base)))
179+
expectedBurnToken := hex.EncodeToString(crypto.Keccak256([]byte(denomMetadataUsdc.Base)))
180180

181181
require.Equal(t, uint64(0), depositForBurn.Nonce)
182182
require.Equal(t, expectedBurnToken, depositForBurn.BurnToken)

‎interchaintest/cctp_receive_message_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func TestCCTP_ReceiveMessage(t *testing.T) {
111111
From: gw.fiatTfRoles.Owner.FormattedAddress(),
112112
RemoteDomain: 0,
113113
RemoteToken: burnToken,
114-
LocalToken: denomMetadataDrachma.Base,
114+
LocalToken: denomMetadataUsdc.Base,
115115
})
116116

117117
bCtx, bCancel := context.WithTimeout(ctx, 20*time.Second)
@@ -128,7 +128,7 @@ func TestCCTP_ReceiveMessage(t *testing.T) {
128128

129129
t.Logf("Submitted add public keys tx: %s", tx.TxHash)
130130

131-
bCtx, bCancel = context.WithTimeout(ctx, 20*time.Second)
131+
_, bCancel = context.WithTimeout(ctx, 20*time.Second)
132132
defer bCancel()
133133

134134
nobleValidator := noble.Validators[0]
@@ -141,7 +141,7 @@ func TestCCTP_ReceiveMessage(t *testing.T) {
141141
require.NoError(t, err, "failed to execute configure minter controller tx")
142142

143143
_, err = nobleValidator.ExecTx(ctx, gw.fiatTfRoles.MinterController.KeyName(),
144-
"fiat-tokenfactory", "configure-minter", cctpModuleAccount, "1000000"+denomMetadataDrachma.Base, "-b", "block",
144+
"fiat-tokenfactory", "configure-minter", cctpModuleAccount, "1000000"+denomMetadataUsdc.Base, "-b", "block",
145145
)
146146
require.NoError(t, err, "failed to execute configure minter tx")
147147

@@ -222,7 +222,7 @@ func TestCCTP_ReceiveMessage(t *testing.T) {
222222

223223
t.Logf("CCTP burn message successfully received: %s", tx.TxHash)
224224

225-
balance, err := noble.GetBalance(ctx, nobleReceiver, denomMetadataDrachma.Base)
225+
balance, err := noble.GetBalance(ctx, nobleReceiver, denomMetadataUsdc.Base)
226226
require.NoError(t, err)
227227

228228
require.Equal(t, int64(1000000), balance)

‎interchaintest/cctp_receive_message_with_caller_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func TestCCTP_ReceiveMessageWithCaller(t *testing.T) {
111111
From: gw.fiatTfRoles.Owner.FormattedAddress(),
112112
RemoteDomain: 0,
113113
RemoteToken: burnToken,
114-
LocalToken: denomMetadataDrachma.Base,
114+
LocalToken: denomMetadataUsdc.Base,
115115
})
116116

117117
bCtx, bCancel := context.WithTimeout(ctx, 20*time.Second)
@@ -128,7 +128,7 @@ func TestCCTP_ReceiveMessageWithCaller(t *testing.T) {
128128

129129
t.Logf("Submitted add public keys tx: %s", tx.TxHash)
130130

131-
bCtx, bCancel = context.WithTimeout(ctx, 20*time.Second)
131+
_, bCancel = context.WithTimeout(ctx, 20*time.Second)
132132
defer bCancel()
133133

134134
nobleValidator := noble.Validators[0]
@@ -141,7 +141,7 @@ func TestCCTP_ReceiveMessageWithCaller(t *testing.T) {
141141
require.NoError(t, err, "failed to execute configure minter controller tx")
142142

143143
_, err = nobleValidator.ExecTx(ctx, gw.fiatTfRoles.MinterController.KeyName(),
144-
"fiat-tokenfactory", "configure-minter", cctpModuleAccount, "1000000"+denomMetadataDrachma.Base, "-b", "block",
144+
"fiat-tokenfactory", "configure-minter", cctpModuleAccount, "1000000"+denomMetadataUsdc.Base, "-b", "block",
145145
)
146146
require.NoError(t, err, "failed to execute configure minter tx")
147147

@@ -223,7 +223,7 @@ func TestCCTP_ReceiveMessageWithCaller(t *testing.T) {
223223

224224
t.Logf("CCTP burn message successfully received: %s", tx.TxHash)
225225

226-
balance, err := noble.GetBalance(ctx, nobleReceiver, denomMetadataDrachma.Base)
226+
balance, err := noble.GetBalance(ctx, nobleReceiver, denomMetadataUsdc.Base)
227227
require.NoError(t, err)
228228

229229
require.Equal(t, int64(1000000), balance)

‎interchaintest/cctp_replace_deposit_for_burn_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func TestCCTP_ReplaceDepositForBurn(t *testing.T) {
119119
From: gw.fiatTfRoles.Owner.FormattedAddress(),
120120
RemoteDomain: 0,
121121
RemoteToken: burnToken,
122-
LocalToken: denomMetadataDrachma.Base,
122+
LocalToken: denomMetadataUsdc.Base,
123123
})
124124

125125
bCtx, bCancel := context.WithTimeout(ctx, 20*time.Second)
@@ -146,7 +146,7 @@ func TestCCTP_ReplaceDepositForBurn(t *testing.T) {
146146
require.NoError(t, err, "failed to execute configure minter controller tx")
147147

148148
_, err = nobleValidator.ExecTx(ctx, gw.fiatTfRoles.MinterController.KeyName(),
149-
"fiat-tokenfactory", "configure-minter", cctpModuleAccount, "1000000"+denomMetadataDrachma.Base, "-b", "block",
149+
"fiat-tokenfactory", "configure-minter", cctpModuleAccount, "1000000"+denomMetadataUsdc.Base, "-b", "block",
150150
)
151151
require.NoError(t, err, "failed to execute configure minter tx")
152152

0 commit comments

Comments
 (0)