Skip to content

feat!: evm (v0.50.13) #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 34 commits into from
Mar 18, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ea03d44
initial simapp impl (no cmds)
Reecepbcups Mar 13, 2025
1f52bd4
cmds initial
Reecepbcups Mar 13, 2025
b3dd604
fixes
Reecepbcups Mar 13, 2025
8705142
fix: sealed config
Reecepbcups Mar 13, 2025
4a39706
working launched evm
Reecepbcups Mar 13, 2025
447b844
more tags, fix deleting a bunch of bApp setup, and removal
Reecepbcups Mar 13, 2025
0adb1b8
fix: spawntag wasm in sim-test
Reecepbcups Mar 13, 2025
451915c
fix: proper key algo
Reecepbcups Mar 13, 2025
d2e220b
refactor: ante to work with evm (initial)
Reecepbcups Mar 13, 2025
d6e8ae2
refactor: proper cosmos ante setup
Reecepbcups Mar 13, 2025
bd78dab
Simplify genesis.go & unit test no-evm
Reecepbcups Mar 13, 2025
6e13e74
use evm IBC wrappers
Reecepbcups Mar 14, 2025
5cdcc7b
proper coinTypes
Reecepbcups Mar 14, 2025
b0f3276
refactor: cleanup test_node scripts to match + replace properly
Reecepbcups Mar 14, 2025
26a6e24
simplify
Reecepbcups Mar 14, 2025
42994ef
support wasmd + evm
Reecepbcups Mar 17, 2025
fae1eab
no evm e2e test
Reecepbcups Mar 17, 2025
eabdf3f
fix: ict cometbft version
Reecepbcups Mar 17, 2025
5405450
fix: ict evm params
Reecepbcups Mar 17, 2025
25503c7
fix: dockerfile --from
Reecepbcups Mar 17, 2025
1cf4549
fix: ict register evm types
Reecepbcups Mar 17, 2025
2c94509
remove e2e for ibc when using EVM (due to Go relayer limitation with …
Reecepbcups Mar 17, 2025
2b13f36
fix: schema
Reecepbcups Mar 17, 2025
4932f92
add `poa` patch for EVM SDK
Reecepbcups Mar 17, 2025
b7cf910
bump to v0.50.13
Reecepbcups Mar 17, 2025
43cbc24
fix: more helpful poa test output
Reecepbcups Mar 17, 2025
b453188
fix: not removing the interfaces
Reecepbcups Mar 17, 2025
06d4218
chore(docs): fix x.com links
Reecepbcups Mar 17, 2025
eda041d
fix: misc finds in review
Reecepbcups Mar 17, 2025
ebf26aa
fix(ci): chain ids
Reecepbcups Mar 17, 2025
b3fc17c
fix: ibc path for ictest with ICS
Reecepbcups Mar 17, 2025
0d4dc3b
proper version
Reecepbcups Mar 18, 2025
803b37b
dont delete
Reecepbcups Mar 18, 2025
883abe3
<!-- markdown-link-check-disable -->
Reecepbcups Mar 18, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
proper coinTypes
  • Loading branch information
Reecepbcups committed Mar 14, 2025
commit 5cdcc7b5f8bb9c669e9ecb16ff4518490df9f196
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ template-poa: install
spawn new myproject --consensus=proof-of-authority --disable evm --debug --no-git --bin=rolld --bech32=roll --denom=uroll --bypass-prompt --log-level=debug

template-ics: install
spawn new myproject --consensus=interchain-security --debug --no-git --bin=rolld --bech32=roll --denom=uroll --bypass-prompt --log-level=debug
spawn new myproject --consensus=interchain-security --disable cosmwasm --debug --no-git --bin=rolld --bech32=roll --denom=uroll --bypass-prompt --log-level=debug


.DEFAULT_GOAL := install
3 changes: 2 additions & 1 deletion simapp/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,8 @@ var (
// DefaultNodeHome default home directories for appd
DefaultNodeHome = os.ExpandEnv("$HOME/") + NodeDir

CoinType uint32 = 118
// CoinType uint32 = 118 // ?spawntag:evm
CoinType uint32 = 60 // spawntag:evm

// BaseDenomUnit = 6 // ?spawntag:evm
BaseDenomUnit int64 = 18 // spawntag:evm
Expand Down
3 changes: 1 addition & 2 deletions simapp/cmd/wasmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ func main() {
func setupSDKConfig() {
config := sdk.GetConfig()
SetBech32Prefixes(config)
// config.SetCoinType(118) // ?spawntag:evm
config.SetCoinType(60) // spawntag;evm
config.SetCoinType(app.CoinType)
config.SetPurpose(44)
config.Seal()
}
Expand Down
3 changes: 2 additions & 1 deletion simapp/interchaintest/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ var (
Bin: Binary,
Bech32Prefix: Bech32,
Denom: Denom,
CoinType: "118",
// CoinType: "118", // ?spawntag:evm
CoinType: "60", // spawntag:evm
GasPrices: "0" + Denom,
TrustingPeriod: "504h",
}
Expand Down
9 changes: 9 additions & 0 deletions spawn/cfg.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@ type NewChainConfig struct {
Logger *slog.Logger
}

func (cfg NewChainConfig) CoinType() uint64 {
if cfg.IsFeatureEnabled(EVM) {
return 60
}
return 118
}

// NodeHome returns the full path to the node home directory
// ex: $HOME/.simapp
func (cfg NewChainConfig) NodeHome() string {
Expand Down Expand Up @@ -324,6 +331,7 @@ func (cfg *NewChainConfig) SetupLocalInterchainJSON() {
SetBlockTime("2000ms").
SetDockerImage(ibc.NewDockerImage(strings.ToLower(cfg.ProjectName), "local", "")).
SetTrustingPeriod("336h").
SetCoinType(int(cfg.CoinType())).
SetHostPortOverride(localictypes.BaseHostPortOverride()).
SetDefaultSDKv47Genesis(2)

Expand Down Expand Up @@ -374,6 +382,7 @@ func (cfg *NewChainConfig) SetupLocalInterchainJSON() {
SetBlockTime("2000ms").
SetDockerImage(ibc.NewDockerImage(strings.ToLower(cfg.ProjectName), "local", "")).
SetTrustingPeriod("336h").
SetCoinType(int(cfg.CoinType())).
SetDefaultSDKv47Genesis(2)

c.SetIBCPaths([]string{}) // clear IBC paths
Expand Down
16 changes: 11 additions & 5 deletions spawn/cfg_registry_schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ const (
DefaultDescription = "A short description of your project"
DefaultChainID = "localchain-1"
DefaultNetworkType = "testnet" // or mainnet
DefaultSlip44CoinType = 118
DefaultChainRegistrySchema = "https://raw.githubusercontent.com/cosmos/chain-registry/master/chain.schema.json"
DefaultChainRegistryAssetsSchema = "https://github.com/cosmos/chain-registry/blob/master/assetlist.schema.json"
DefaultThemeHexColor = "#FF2D00"
Expand All @@ -36,12 +35,19 @@ func (cfg NewChainConfig) ChainRegistryFile() types.ChainRegistryFormat {
if cfg.IsFeatureEnabled(CosmWasm) {
DefaultCosmWasmVersion = "0.50"
}
DefaultConsensus := "tendermint" // TODO: gordian in the future on gen
DefaultConsensus := "tendermint"

keyAlgos := []string{"secp256k1"}
chainType := "cosmos"
if cfg.IsFeatureEnabled(EVM) {
keyAlgos = []string{"eth_secp256k1"}
chainType = "ethereum"
}

return types.ChainRegistryFormat{
Schema: DefaultChainRegistrySchema,
ChainName: cfg.ProjectName,
ChainType: "cosmos",
ChainType: chainType,
Status: "live",
Website: DefaultWebsite,
NetworkType: DefaultNetworkType,
Expand All @@ -50,8 +56,8 @@ func (cfg NewChainConfig) ChainRegistryFile() types.ChainRegistryFormat {
Bech32Prefix: cfg.Bech32Prefix,
DaemonName: cfg.BinDaemon,
NodeHome: cfg.NodeHome(),
KeyAlgos: []string{"secp256k1"},
Slip44: DefaultSlip44CoinType,
KeyAlgos: keyAlgos,
Slip44: int(cfg.CoinType()),
Fees: types.Fees{
FeeTokens: []types.FeeTokens{
{
Expand Down
2 changes: 1 addition & 1 deletion spawn/explorer.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func (cfg NewChainConfig) NewChainExplorerConfig() ChainExplorer {
Api: []Endpoint{NewEndpoint("api.localhost", "http://127.0.0.1:1317")},
Rpc: []Endpoint{NewEndpoint("rpc.localhost", "http://127.0.0.1:26657")},
SdkVersion: "0.50",
CoinType: "118",
CoinType: fmt.Sprintf("%d", cfg.CoinType()),
MinTxFee: "800",
AddrPrefix: cfg.Bech32Prefix,
Logo: logo,
Expand Down