Skip to content

Commit da692b5

Browse files
committed
refac: move testnet chainid to 560000
1 parent af45152 commit da692b5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+73
-77
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ localnet-build:
472472

473473
# Start a 4-node testnet locally
474474
localnet-start: localnet-stop localnet-build
475-
@if ! [ -f build/node0/$(HETU_BINARY)/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/hetu:Z hetu/node "./hetud testnet init-files --v 4 -o /hetu --keyring-backend=test --starting-ip-address 192.167.0.2 --chain-id hetu_9000-1"; fi
475+
@if ! [ -f build/node0/$(HETU_BINARY)/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/hetu:Z hetu/node "./hetud testnet init-files --v 4 -o /hetu --keyring-backend=test --starting-ip-address 192.167.0.2 --chain-id hetu_560000-1"; fi
476476
docker-compose up -d
477477

478478
# Stop testnet

app/ante/evm/ante_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ func (suite *AnteTestSuite) TestAnteHandler() {
548548
from := acc.GetAddress()
549549
gas := uint64(200000)
550550
amount := sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, sdkmath.NewInt(100*int64(gas))))
551-
txBuilder, err := suite.CreateTestEIP712TxBuilderMsgSend(from, privKey, "evmos_9002-1", gas, amount)
551+
txBuilder, err := suite.CreateTestEIP712TxBuilderMsgSend(from, privKey, "hetu_560002-1", gas, amount)
552552
suite.Require().NoError(err)
553553
return txBuilder.GetTx()
554554
}, false, false, false,
@@ -572,7 +572,7 @@ func (suite *AnteTestSuite) TestAnteHandler() {
572572
from := acc.GetAddress()
573573
gas := uint64(200000)
574574
amount := sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, sdkmath.NewInt(100*int64(gas))))
575-
txBuilder, err := suite.CreateTestEIP712TxBuilderMsgSend(from, privKey, "evmos_9001-1", gas, amount)
575+
txBuilder, err := suite.CreateTestEIP712TxBuilderMsgSend(from, privKey, "hetu_560001-1", gas, amount)
576576
suite.Require().NoError(err)
577577
return txBuilder.GetTx()
578578
}, false, false, false,
@@ -766,7 +766,7 @@ func (suite *AnteTestSuite) TestAnteHandler() {
766766
privKeys,
767767
signing.SignMode_SIGN_MODE_LEGACY_AMINO_JSON,
768768
msg,
769-
"evmos_9005-1",
769+
"hetu_560005-1",
770770
2000000,
771771
"mixed",
772772
)

app/ante/evm/fee_checker_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func (m MockEVMKeeper) GetParams(_ sdk.Context) evmtypes.Params {
3737
}
3838

3939
func (m MockEVMKeeper) ChainID() *big.Int {
40-
return big.NewInt(9000)
40+
return big.NewInt(560000)
4141
}
4242

4343
func TestSDKTxFeeChecker(t *testing.T) {

app/ethtest_helper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func EthSetupWithDB(isCheckTx bool, patchGenesis func(*Evmos, simapp.GenesisStat
9393
// Initialize the chain
9494
app.InitChain(
9595
&abci.RequestInitChain{
96-
ChainId: "evmos_9000-1",
96+
ChainId: "hetu_560000-1",
9797
Validators: []abci.ValidatorUpdate{},
9898
ConsensusParams: DefaultConsensusParams,
9999
AppStateBytes: stateBytes,

client/debug/debug.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func LegacyEIP712Cmd() *cobra.Command {
150150
return &cobra.Command{
151151
Use: "legacy-eip712 [file]",
152152
Short: "Output types of legacy eip712 typed data according to the given transaction",
153-
Example: fmt.Sprintf(`$ %s debug legacy-eip712 tx.json --chain-id hetud_9000-1`, version.AppName),
153+
Example: fmt.Sprintf(`$ %s debug legacy-eip712 tx.json --chain-id hetud_560000-1`, version.AppName),
154154
Args: cobra.ExactArgs(1),
155155
RunE: func(cmd *cobra.Command, args []string) error {
156156
clientCtx, err := client.GetClientTxContext(cmd)

cmd/hetud/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func InitCmd(mbm module.BasicManager, defaultNodeHome string) *cobra.Command {
113113

114114
chainID, _ := cmd.Flags().GetString(flags.FlagChainID)
115115
if chainID == "" {
116-
chainID = fmt.Sprintf("hetu_9000-%v", tmrand.Str(6))
116+
chainID = fmt.Sprintf("hetu_56000-%v", tmrand.Str(6))
117117
}
118118

119119
// Get bip39 mnemonic

cmd/hetud/migrate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func MigrateGenesisCmd() *cobra.Command {
5656
Short: "Migrate genesis to a specified target version",
5757
Long: "Migrate the source genesis into the target version and print to STDOUT.",
5858
Example: fmt.Sprintf(
59-
"%s migrate v3 /path/to/genesis.json --chain-id=hetu_9001-2 --genesis-time=2022-04-01T17:00:00Z",
59+
"%s migrate v3 /path/to/genesis.json --chain-id=hetu_560001-2 --genesis-time=2022-04-01T17:00:00Z",
6060
version.AppName,
6161
),
6262
Args: cobra.ExactArgs(2),

ethereum/eip712/preprocess_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func TestLedgerPreprocessing(t *testing.T) {
6868
require.True(t, len(hasExtOptsTx.GetExtensionOptions()) == 1)
6969

7070
expectedExt := types.ExtensionOptionsWeb3Tx{
71-
TypedDataChainID: 9000,
71+
TypedDataChainID: 560000,
7272
FeePayer: feePayerAddress,
7373
FeePayerSig: tc.expectedSignatureBytes,
7474
}

ibc/testing/chain.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
)
4242

4343
// ChainIDPrefix defines the default chain ID prefix for Evmos test chains
44-
var ChainIDPrefix = "evmos_9000-"
44+
var ChainIDPrefix = "hetu_560000-"
4545

4646
func init() {
4747
ibcgotesting.ChainIDPrefix = ChainIDPrefix

init.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ rem 3. add path C:\msys64\mingw64\bin
99
rem C:\msys64\usr\bin
1010

1111
set KEY="dev0"
12-
set CHAINID="hetu_9000-1"
12+
set CHAINID="hetu_560000-1"
1313
set MONIKER="localtestnet"
1414
set KEYRING="test"
1515
set KEYALGO="eth_secp256k1"

0 commit comments

Comments
 (0)