fix makefile issue

Makefile

@@ -2,9 +2,9 @@
 ###                             Project Info                                 ###
 ################################################################################
 PROJECT_NAME := 0g-chain# unique namespace for project
-MAIN_ENTRY := ./cmd
 BINARY_NAME := 0gchaind
-DOCKER_IMAGE_NAME := 0glabs/0g-chain
+MAIN_ENTRY := ./cmd/$(BINARY_NAME)
+DOCKER_IMAGE_NAME := 0glabs/$(PROJECT_NAME)
 GO_BIN ?= go
 
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)

cmd/0gchaind/app.go

@@ -1,4 +1,4 @@
-package zgchaind
+package main
 
 import (
 	"errors"

cmd/0gchaind/assert-invariants.go

@@ -1,4 +1,4 @@
-package zgchaind
+package main
 
 import (
 	"encoding/json"

cmd/0gchaind/genaccounts.go

@@ -1,5 +1,5 @@
 // Sourced from https://github.com/evmos/ethermint/blob/main/cmd/ethermintd/genaccounts.go
-package zgchaind
+package main
 
 import (
 	"bufio"

cmd/0gchaind/keys.go

@@ -1,4 +1,4 @@
-package zgchaind
+package main
 
 import (
 	"bufio"

cmd/0gchaind/main.go

@@ -7,14 +7,13 @@ import (
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 
 	"github.com/0glabs/0g-chain/chaincfg"
-	chain "github.com/0glabs/0g-chain/cmd/0gchaind"
 )
 
 func main() {
 	chaincfg.SetSDKConfig().Seal()
 	chaincfg.RegisterDenoms()
 
-	rootCmd := chain.NewRootCmd()
+	rootCmd := NewRootCmd()
 
 	if err := svrcmd.Execute(rootCmd, chaincfg.EnvPrefix, chaincfg.DefaultNodeHome); err != nil {
 		switch e := err.(type) {

cmd/0gchaind/query.go

@@ -1,4 +1,4 @@
-package zgchaind
+package main
 
 import (
 	"github.com/cosmos/cosmos-sdk/client"

cmd/0gchaind/root.go

@@ -1,4 +1,4 @@
-package zgchaind
+package main
 
 import (
 	"fmt"

cmd/0gchaind/shard.go

@@ -1,4 +1,4 @@
-package zgchaind
+package main
 
 import (
 	"fmt"

cmd/0gchaind/status.go

@@ -1,4 +1,4 @@
-package zgchaind
+package main
 
 import (
 	"context"

cmd/0gchaind/tx.go

@@ -1,4 +1,4 @@
-package zgchaind
+package main
 
 import (
 	"github.com/cosmos/cosmos-sdk/client"

localtestnet.sh

@@ -20,11 +20,11 @@ relayerMnemonic="never reject sniff east arctic funny twin feed upper series sta
 # 0xa2F728F997f62F47D4262a70947F6c36885dF9fa
 # kava15tmj37vh7ch504px9fcfglmvx6y9m70646ev8t
 
-DATA=~/.kava
+DATA=~/.0gchain
 # remove any old state and config
 rm -rf $DATA
 
-BINARY=kava
+BINARY=0gchaind
 
 # Create new data directory, overwriting any that alread existed
 chainID="zgchain_8888-1"
@@ -49,37 +49,37 @@ $BINARY config keyring-backend test
 # Create validator keys and add account to genesis
 validatorKeyName="validator"
 printf "$validatorMnemonic\n" | $BINARY keys add $validatorKeyName --recover
-$BINARY add-genesis-account $validatorKeyName 2000000000ukava
+$BINARY add-genesis-account $validatorKeyName 2000000000000000000000neuron
 
 # Create faucet keys and add account to genesis
 faucetKeyName="faucet"
 printf "$faucetMnemonic\n" | $BINARY keys add $faucetKeyName --recover
-$BINARY add-genesis-account $faucetKeyName 1000000000ukava
+$BINARY add-genesis-account $faucetKeyName 1000000000000000000000neuron
 
 evmFaucetKeyName="evm-faucet"
 printf "$evmFaucetMnemonic\n" | $BINARY keys add $evmFaucetKeyName --eth --recover
-$BINARY add-genesis-account $evmFaucetKeyName 1000000000ukava
+$BINARY add-genesis-account $evmFaucetKeyName 1000000000000000000000neuron
 
 userKeyName="user"
 printf "$userMnemonic\n" | $BINARY keys add $userKeyName --eth --recover
-$BINARY add-genesis-account $userKeyName 1000000000ukava,1000000000usdx
+$BINARY add-genesis-account $userKeyName 1000000000000000000000neuron,1000000000usdx
 
 relayerKeyName="relayer"
 printf "$relayerMnemonic\n" | $BINARY keys add $relayerKeyName --eth --recover
-$BINARY add-genesis-account $relayerKeyName 1000000000ukava
+$BINARY add-genesis-account $relayerKeyName 1000000000000000000000neuron
 
-storageContractAcc="kava1l0j9dqdvd3fatfqywhm4y6avrln4jracrfy9hk"
+storageContractAcc="0g1l0j9dqdvd3fatfqywhm4y6avrln4jracrfy9hk"
-$BINARY add-genesis-account $storageContractAcc 1000000000ukava
+$BINARY add-genesis-account $storageContractAcc 1000000000000000000000neuron
 
 # Create a delegation tx for the validator and add to genesis
-$BINARY gentx $validatorKeyName 1000000000ukava --keyring-backend test --chain-id $chainID
+$BINARY gentx $validatorKeyName 1000000000000000000000neuron --keyring-backend test --chain-id $chainID
 $BINARY collect-gentxs
 
 # Replace stake with ukava
-sed -in-place='' 's/stake/ukava/g' $DATA/config/genesis.json
+# sed -in-place='' 's/stake/ukava/g' $DATA/config/genesis.json
 
-# Replace the default evm denom of aphoton with ukava
+# Replace the default evm denom of aphoton with neuron
-sed -in-place='' 's/aphoton/akava/g' $DATA/config/genesis.json
+sed -in-place='' 's/aphoton/neuron/g' $DATA/config/genesis.json
 
 GENESIS=$DATA/config/genesis.json
 TMP_GENESIS=$DATA/config/tmp_genesis.json
@@ -101,17 +101,17 @@ cat $GENESIS | jq '.app_state.evm.params.chain_config.shanghai_block = null' >$T
 cat $GENESIS | jq '.app_state.evm.params.chain_config.cancun_block = null' >$TMP_GENESIS && mv $TMP_GENESIS $GENESIS
 
 # Add earn vault
-cat $GENESIS | jq '.app_state.earn.params.allowed_vaults =  [
+# cat $GENESIS | jq '.app_state.earn.params.allowed_vaults =  [
-    {
+#     {
-        denom: "usdx",
+#         denom: "usdx",
-        strategies: ["STRATEGY_TYPE_HARD"],
+#         strategies: ["STRATEGY_TYPE_HARD"],
-    },
+#     },
-    {
+#     {
-        denom: "bkava",
+#         denom: "bkava",
-        strategies: ["STRATEGY_TYPE_SAVINGS"],
+#         strategies: ["STRATEGY_TYPE_SAVINGS"],
-    }]' >$TMP_GENESIS && mv $TMP_GENESIS $GENESIS
+#     }]' >$TMP_GENESIS && mv $TMP_GENESIS $GENESIS
 
-cat $GENESIS | jq '.app_state.savings.params.supported_denoms = ["bkava-kavavaloper1ffv7nhd3z6sych2qpqkk03ec6hzkmufyz4scd0"]' >$TMP_GENESIS && mv $TMP_GENESIS $GENESIS
+# cat $GENESIS | jq '.app_state.savings.params.supported_denoms = ["bkava-kavavaloper1ffv7nhd3z6sych2qpqkk03ec6hzkmufyz4scd0"]' >$TMP_GENESIS && mv $TMP_GENESIS $GENESIS
 
 
 $BINARY config broadcast-mode sync