Fix changelog unhandled merge conflict (#1772)

* fix: update ledger-cosmos-go v0.13.1 to resolve signing error with cosmos ledger app 2.34.12 (#1770)

* Update ledger-cosmos-go v0.13.1 with cosmos fork update

* Bump cosmos-sdk v0.46.11-kava.2

* Update changelog

* Update cosmos-sdk tag v0.46.11-kava.3

Incorrect kava.2 tag

(cherry picked from commit 39146747ac)

# Conflicts:
#	CHANGELOG.md
#	go.mod
#	go.sum

* Update conflicts in go.mod

* Update changelog

---------

Co-authored-by: drklee3 <derrick@dlee.dev>

.dockerignore

@@ -1,20 +1,9 @@
 out/
 **/node_modules/
 .git/
-.github/
-tests/
-
-ci/
-contracts/
-contrib/
 docs/
-networks/
+tests/
-scratch/
+contracts/
-
-# Ignore build cache directories to avoid
-# errors when addings these to docker images
-build/.cache
-build/.golangci-lint
 
 go.work
 go.work.sum

.github/CODEOWNERS

@@ -1,3 +0,0 @@
-# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
-# Global rule:
-* @rhuairahrighairidh @karzak @pirtleshell @drklee3 @nddeluca @DracoLi @evgeniy-scherbina @sesheffield @boodyvo @lbayas

.github/mergify.yml

@@ -1,101 +0,0 @@
-# Mergify is a Github app that automates workflows.
-# It is used by kava-lab/kava to help automate backporting to previous releases.
-
-# For details on this file, see https://docs.mergify.com/getting-started/#configuration
-# For backport-specific details, see https://docs.mergify.com/actions/backport/#backport
-
-defaults:
-  actions:
-    backport:
-      assignees:
-        - "{{ author }}"
-
-pull_request_rules:
-  # one PR label to rule them all
-  - name: Backport patches to all kava_2222-10 release/* branches
-    conditions:
-      - base=master
-      - label=A:backport/kava_2222-10
-    actions:
-      backport:
-        branches:
-          - release/v0.17.x
-          - release/v0.18.x
-          - release/v0.19.x
-          - release/v0.21.x
-          - release/v0.23.x
-          - release/v0.24.x
-          - release/v0.25.x
-          - release/v0.26.x
-
-  - name: Backport patches to the release/v0.17.x branch
-    conditions:
-      - base=master
-      - label=A:backport/v0.17.x
-    actions:
-      backport:
-        branches:
-          - release/v0.17.x
-
-  - name: Backport patches to the release/v0.18.x branch
-    conditions:
-      - base=master
-      - label=A:backport/v0.18.x
-    actions:
-      backport:
-        branches:
-          - release/v0.18.x
-
-  - name: Backport patches to the release/v0.19.x branch
-    conditions:
-      - base=master
-      - label=A:backport/v0.19.x
-    actions:
-      backport:
-        branches:
-          - release/v0.19.x
-
-  - name: Backport patches to the release/v0.21.x branch
-    conditions:
-      - base=master
-      - label=A:backport/v0.21.x
-    actions:
-      backport:
-        branches:
-          - release/v0.21.x
-
-  - name: Backport patches to the release/v0.23.x branch
-    conditions:
-      - base=master
-      - label=A:backport/v0.23.x
-    actions:
-      backport:
-        branches:
-          - release/v0.23.x
-
-  - name: Backport patches to the release/v0.24.x branch
-    conditions:
-      - base=master
-      - label=A:backport/v0.24.x
-    actions:
-      backport:
-        branches:
-          - release/v0.24.x
-
-  - name: Backport patches to the release/v0.25.x branch
-    conditions:
-      - base=master
-      - label=A:backport/v0.25.x
-    actions:
-      backport:
-        branches:
-          - release/v0.25.x
-
-  - name: Backport patches to the release/v0.26.x branch
-    conditions:
-      - base=master
-      - label=A:backport/v0.26.x
-    actions:
-      backport:
-        branches:
-          - release/v0.26.x

.github/scripts/examples/force-update-module-params.sh

@@ -33,7 +33,7 @@ kava config chain-id "${CHAIN_ID}"
 kava config keyring-backend test
 
 # wait for transactions to be committed per CLI command
-kava config broadcast-mode sync
+kava config broadcast-mode block
 
 # setup god's wallet
 echo "${KAVA_TESTNET_GOD_MNEMONIC}" | kava keys add --recover god
@@ -80,7 +80,7 @@ printf "original evm util module params\n %s" , "$originalEvmUtilParams"
 # change the params of the chain like a god - make it so 🖖🏽
 # make sure to update god committee member permissions for the module
 # and params being updated (see below for example)
-# https://github.com/0glabs/0g-chain/pull/1556/files#diff-0bd6043650c708661f37bbe6fa5b29b52149e0ec0069103c3954168fc9f12612R900-R903
+# https://github.com/Kava-Labs/kava/pull/1556/files#diff-0bd6043650c708661f37bbe6fa5b29b52149e0ec0069103c3954168fc9f12612R900-R903
 kava tx committee submit-proposal 1 "$proposalFileName" --gas 2000000 --gas-prices 0.01ukava --from god -y
 
 # fetch current module params

.github/scripts/install-rocksdb.sh

@@ -7,9 +7,9 @@ sudo apt-get install -y libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev liblz4
 # get rocksdb sources
 git clone https://github.com/facebook/rocksdb.git /home/runner/rocksdb
 
-cd /home/runner/rocksdb || exit 1
+cd /home/runner/rocksdb
 
 git checkout "$ROCKSDB_VERSION"
 
 # install rocksdb locally
-sudo make -j "$(nproc --all)" install-shared && sudo ldconfig
+sudo make -j $(nproc --all) install-shared

.github/scripts/seed-internal-testnet.sh

@@ -1,14 +1,6 @@
 #!/bin/bash
 set -ex
 
-# by sleeping 1 block in between tx's
-# we can emulate the behavior of the
-# the deprecated and now removed (as of Kava 16)
-# broadcast mode of `block` in order to
-# minimize the chance tx's fail due to an
-# account sequence number mismatch
-AVG_SECONDS_BETWEEN_BLOCKS=6.5
-
 # configure kava binary to talk to the desired chain endpoint
 kava config node "${CHAIN_API_URL}"
 kava config chain-id "${CHAIN_ID}"
@@ -17,7 +9,7 @@ kava config chain-id "${CHAIN_ID}"
 kava config keyring-backend test
 
 # wait for transactions to be committed per CLI command
-kava config broadcast-mode sync
+kava config broadcast-mode block
 
 # setup dev wallet
 echo "${DEV_WALLET_MNEMONIC}" | kava keys add --recover dev-wallet
@@ -31,8 +23,6 @@ echo "sweet ocean blush coil mobile ten floor sample nuclear power legend where
 # fund evm-contract-deployer account (using issuance)
 kava tx issuance issue 200000000ukava kava1van3znl6597xgwwh46jgquutnqkwvwszjg04fz --from dev-wallet --gas-prices 0.5ukava -y
 
-sleep $AVG_SECONDS_BETWEEN_BLOCKS
-
 # deploy and fund USDC ERC20 contract
 MULTICHAIN_USDC_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" deploy-erc20 "USD Coin" USDC 6)
 MULTICHAIN_USDC_CONTRACT_ADDRESS=${MULTICHAIN_USDC_CONTRACT_DEPLOY: -42}
@@ -49,7 +39,7 @@ BNB_CONTRACT_ADDRESS=${BNB_CONTRACT_DEPLOY: -42}
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$BNB_CONTRACT_ADDRESS" 0x6767114FFAA17C6439D7AEA480738B982CE63A02 1000000000000
 
 # deploy and fund USDT contract
-MULTICHAIN_USDT_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" deploy-erc20 "Multichain USDT" USDT 6)
+MULTICHAIN_USDT_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" deploy-erc20 "USDT" USDT 6)
 MULTICHAIN_USDT_CONTRACT_ADDRESS=${MULTICHAIN_USDT_CONTRACT_DEPLOY: -42}
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$MULTICHAIN_USDT_CONTRACT_ADDRESS" 0x6767114FFAA17C6439D7AEA480738B982CE63A02 1000000000000
 
@@ -78,35 +68,6 @@ MULTICHAIN_wBTC_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWOR
 MULTICHAIN_wBTC_CONTRACT_ADDRESS=${MULTICHAIN_wBTC_CONTRACT_DEPLOY: -42}
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$MULTICHAIN_wBTC_CONTRACT_ADDRESS" 0x6767114FFAA17C6439D7AEA480738B982CE63A02 100000000000000
 
-# deploy and fund Tether USDT ERC20 contract
-TETHER_USDT_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" deploy-erc20 "USD₮" USD₮ 6)
-TETHER_USDT_CONTRACT_ADDRESS=${TETHER_USDT_CONTRACT_DEPLOY: -42}
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$TETHER_USDT_CONTRACT_ADDRESS" 0x6767114FFAA17C6439D7AEA480738B982CE63A02 1000000000000
-
-# deploy and fund axlBNB ERC20 contract
-AXL_BNB_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" deploy-erc20 "axlBNB" axlBNB 18)
-AXL_BNB_CONTRACT_ADDRESS=${AXL_BNB_CONTRACT_DEPLOY: -42}
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_BNB_CONTRACT_ADDRESS" 0x6767114FFAA17C6439D7AEA480738B982CE63A02 1000000000000000000000
-
-# deploy and fund axlBUSD ERC20 contract
-AXL_BUSD_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" deploy-erc20 "axlBUSD" axlBUSD 18)
-AXL_BUSD_CONTRACT_ADDRESS=${AXL_BUSD_CONTRACT_DEPLOY: -42}
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_BUSD_CONTRACT_ADDRESS" 0x6767114FFAA17C6439D7AEA480738B982CE63A02 1000000000000000000000
-
-# deploy and fund axlXRPB ERC20 contract
-AXL_XRPB_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" deploy-erc20 "axlXRPB" axlXRPB 18)
-AXL_XRPB_CONTRACT_ADDRESS=${AXL_XRPB_CONTRACT_DEPLOY: -42}
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_XRPB_CONTRACT_ADDRESS" 0x6767114FFAA17C6439D7AEA480738B982CE63A02 1000000000000000000000
-
-# deploy and fund axlBTC ERC20 contract
-AXL_BTCB_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" deploy-erc20 "axlBTCB" axlBTCB 18)
-AXL_BTCB_CONTRACT_ADDRESS=${AXL_BTCB_CONTRACT_DEPLOY: -42}
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_BTCB_CONTRACT_ADDRESS" 0x6767114FFAA17C6439D7AEA480738B982CE63A02 1000000000000000000000
-
-# deploy and fund native wBTC ERC20 contract
-WBTC_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" deploy-erc20 "wBTC" wBTC 8)
-WBTC_CONTRACT_ADDRESS=${WBTC_CONTRACT_DEPLOY: -42}
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$WBTC_CONTRACT_ADDRESS" 0x6767114FFAA17C6439D7AEA480738B982CE63A02 100000000000000000
 
 # seed some evm wallets
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_WBTC_CONTRACT_ADDRESS" "$DEV_TEST_WALLET_ADDRESS" 10000000000000
@@ -115,12 +76,6 @@ npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$MULTICHAIN_U
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$wETH_CONTRACT_ADDRESS" "$DEV_TEST_WALLET_ADDRESS" 1000000000000000000000
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_USDC_CONTRACT_ADDRESS" "$DEV_TEST_WALLET_ADDRESS" 100000000000
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$MULTICHAIN_USDT_CONTRACT_ADDRESS" "$DEV_TEST_WALLET_ADDRESS" 100000000000
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$TETHER_USDT_CONTRACT_ADDRESS" "$DEV_TEST_WALLET_ADDRESS" 1000000000000
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_BNB_CONTRACT_ADDRESS" "$DEV_TEST_WALLET_ADDRESS" 1000000000000000000000
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_BUSD_CONTRACT_ADDRESS" "$DEV_TEST_WALLET_ADDRESS" 1000000000000000000000
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_XRPB_CONTRACT_ADDRESS" "$DEV_TEST_WALLET_ADDRESS" 1000000000000000000000
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_BTCB_CONTRACT_ADDRESS" "$DEV_TEST_WALLET_ADDRESS" 1000000000000000000000
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$WBTC_CONTRACT_ADDRESS" "$DEV_TEST_WALLET_ADDRESS" 10000000000000
 # seed webapp E2E whale account
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_WBTC_CONTRACT_ADDRESS" "$WEBAPP_E2E_WHALE_ADDRESS" 100000000000000
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$MULTICHAIN_wBTC_CONTRACT_ADDRESS" "$WEBAPP_E2E_WHALE_ADDRESS" 10000000000000
@@ -128,12 +83,6 @@ npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$MULTICHAIN_U
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$wETH_CONTRACT_ADDRESS" "$WEBAPP_E2E_WHALE_ADDRESS" 10000000000000000000000
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_USDC_CONTRACT_ADDRESS" "$WEBAPP_E2E_WHALE_ADDRESS" 10000000000000
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$MULTICHAIN_USDT_CONTRACT_ADDRESS" "$WEBAPP_E2E_WHALE_ADDRESS" 1000000000000
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$TETHER_USDT_CONTRACT_ADDRESS" "$WEBAPP_E2E_WHALE_ADDRESS" 1000000000000
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_BNB_CONTRACT_ADDRESS" "$WEBAPP_E2E_WHALE_ADDRESS" 10000000000000000000000
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_BUSD_CONTRACT_ADDRESS" "$WEBAPP_E2E_WHALE_ADDRESS" 10000000000000000000000
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_BTCB_CONTRACT_ADDRESS" "$WEBAPP_E2E_WHALE_ADDRESS" 10000000000000000000000
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_XRPB_CONTRACT_ADDRESS" "$WEBAPP_E2E_WHALE_ADDRESS" 10000000000000000000000
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$WBTC_CONTRACT_ADDRESS" "$WBTC_CONTRACT_ADDRESS" 10000000000000
 
 # give dev-wallet enough delegation power to pass proposals by itself
 
@@ -141,30 +90,25 @@ npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$WBTC_CONTRAC
 kava tx issuance issue 6000000000ukava kava1vlpsrmdyuywvaqrv7rx6xga224sqfwz3fyfhwq \
   --from dev-wallet --gas-prices 0.5ukava -y
 
-sleep $AVG_SECONDS_BETWEEN_BLOCKS
-
 # parse space seperated list of validators
 # into bash array
-read -r -a GENESIS_VALIDATOR_ADDRESS_ARRAY <<<"$GENESIS_VALIDATOR_ADDRESSES"
+read -r -a GENESIS_VALIDATOR_ADDRESS_ARRAY <<< "$GENESIS_VALIDATOR_ADDRESSES"
 
 # delegate 300KAVA to each validator
-for validator in "${GENESIS_VALIDATOR_ADDRESS_ARRAY[@]}"; do
+for validator in "${GENESIS_VALIDATOR_ADDRESS_ARRAY[@]}"
+do
   kava tx staking delegate "${validator}" 300000000ukava --from dev-wallet --gas-prices 0.5ukava -y
-  sleep $AVG_SECONDS_BETWEEN_BLOCKS
 done
 
 # create a text proposal
 kava tx gov submit-legacy-proposal --deposit 1000000000ukava --type "Text" --title "Example Proposal" --description "This is an example proposal" --gas auto --gas-adjustment 1.2 --from dev-wallet --gas-prices 0.01ukava -y
 
-sleep $AVG_SECONDS_BETWEEN_BLOCKS
-
 # setup god's wallet
 echo "${KAVA_TESTNET_GOD_MNEMONIC}" | kava keys add --recover god
 
 # create template string for the proposal we want to enact
 # https://kava-labs.atlassian.net/wiki/spaces/ENG/pages/1228537857/Submitting+Governance+Proposals+WIP
-PARAM_CHANGE_PROP_TEMPLATE=$(
+PARAM_CHANGE_PROP_TEMPLATE=$(cat <<'END_HEREDOC'
-  cat <<'END_HEREDOC'
 {
     "@type": "/cosmos.params.v1beta1.ParameterChangeProposal",
     "title": "Set Initial ERC-20 Contracts",
@@ -173,7 +117,7 @@ PARAM_CHANGE_PROP_TEMPLATE=$(
         {
             "subspace": "evmutil",
             "key": "EnabledConversionPairs",
-            "value": "[{\"kava_erc20_address\":\"MULTICHAIN_USDC_CONTRACT_ADDRESS\",\"denom\":\"erc20/multichain/usdc\"},{\"kava_erc20_address\":\"MULTICHAIN_USDT_CONTRACT_ADDRESS\",\"denom\":\"erc20/multichain/usdt\"},{\"kava_erc20_address\":\"MULTICHAIN_wBTC_CONTRACT_ADDRESS\",\"denom\":\"erc20/multichain/wbtc\"},{\"kava_erc20_address\":\"AXL_USDC_CONTRACT_ADDRESS\",\"denom\":\"erc20/axelar/usdc\"},{\"kava_erc20_address\":\"AXL_WBTC_CONTRACT_ADDRESS\",\"denom\":\"erc20/axelar/wbtc\"},{\"kava_erc20_address\":\"wETH_CONTRACT_ADDRESS\",\"denom\":\"erc20/axelar/eth\"},{\"kava_erc20_address\":\"TETHER_USDT_CONTRACT_ADDRESS\",\"denom\":\"erc20/tether/usdt\"},{\"kava_erc20_address\":\"AXL_BNB_CONTRACT_ADDRESS\",\"denom\":\"bnb\"},{\"kava_erc20_address\":\"AXL_BUSD_CONTRACT_ADDRESS\",\"denom\":\"busd\"},{\"kava_erc20_address\":\"AXL_BTCB_CONTRACT_ADDRESS\",\"denom\":\"btcb\"},{\"kava_erc20_address\":\"AXL_XRPB_CONTRACT_ADDRESS\",\"denom\":\"xrpb\"},{\"kava_erc20_address\":\"WBTC_CONTRACT_ADDRESS\",\"denom\":\"erc20/bitgo/wbtc\"}]"
+            "value": "[{\"kava_erc20_address\":\"MULTICHAIN_USDC_CONTRACT_ADDRESS\",\"denom\":\"erc20/multichain/usdc\"},{\"kava_erc20_address\":\"MULTICHAIN_USDT_CONTRACT_ADDRESS\",\"denom\":\"erc20/multichain/usdt\"},{\"kava_erc20_address\":\"MULTICHAIN_wBTC_CONTRACT_ADDRESS\",\"denom\":\"erc20/multichain/wbtc\"},{\"kava_erc20_address\":\"AXL_USDC_CONTRACT_ADDRESS\",\"denom\":\"erc20/axelar/usdc\"},{\"kava_erc20_address\":\"AXL_WBTC_CONTRACT_ADDRESS\",\"denom\":\"erc20/axelar/wbtc\"},{\"kava_erc20_address\":\"wETH_CONTRACT_ADDRESS\",\"denom\":\"erc20/axelar/eth\"}]"
         }
     ]
 }
@@ -189,19 +133,13 @@ finalProposal="${finalProposal/MULTICHAIN_wBTC_CONTRACT_ADDRESS/$MULTICHAIN_wBTC
 finalProposal="${finalProposal/AXL_USDC_CONTRACT_ADDRESS/$AXL_USDC_CONTRACT_ADDRESS}"
 finalProposal="${finalProposal/AXL_WBTC_CONTRACT_ADDRESS/$AXL_WBTC_CONTRACT_ADDRESS}"
 finalProposal="${finalProposal/wETH_CONTRACT_ADDRESS/$wETH_CONTRACT_ADDRESS}"
-finalProposal="${finalProposal/TETHER_USDT_CONTRACT_ADDRESS/$TETHER_USDT_CONTRACT_ADDRESS}"
-finalProposal="${finalProposal/AXL_BNB_CONTRACT_ADDRESS/$AXL_BNB_CONTRACT_ADDRESS}"
-finalProposal="${finalProposal/AXL_BUSD_CONTRACT_ADDRESS/$AXL_BUSD_CONTRACT_ADDRESS}"
-finalProposal="${finalProposal/AXL_BTCB_CONTRACT_ADDRESS/$AXL_BTCB_CONTRACT_ADDRESS}"
-finalProposal="${finalProposal/AXL_XRPB_CONTRACT_ADDRESS/$AXL_XRPB_CONTRACT_ADDRESS}"
-finalProposal="${finalProposal/WBTC_CONTRACT_ADDRESS/$WBTC_CONTRACT_ADDRESS}"
 
 # create unique proposal filename
 proposalFileName="$(date +%s)-proposal.json"
 touch $proposalFileName
 
 # save proposal as file to disk
-echo "$finalProposal" >$proposalFileName
+echo "$finalProposal" > $proposalFileName
 
 # snapshot original module params
 originalEvmUtilParams=$(curl https://api.app.internal.testnet.us-east.production.kava.io/kava/evmutil/v1beta1/params)
@@ -210,41 +148,9 @@ printf "original evm util module params\n %s" , "$originalEvmUtilParams"
 # change the params of the chain like a god - make it so 🖖🏽
 # make sure to update god committee member permissions for the module
 # and params being updated (see below for example)
-# https://github.com/0glabs/0g-chain/pull/1556/files#diff-0bd6043650c708661f37bbe6fa5b29b52149e0ec0069103c3954168fc9f12612R900-R903
+# https://github.com/Kava-Labs/kava/pull/1556/files#diff-0bd6043650c708661f37bbe6fa5b29b52149e0ec0069103c3954168fc9f12612R900-R903
-# committee 1 is the stability committee. on internal testnet, this has only one member.
 kava tx committee submit-proposal 1 "$proposalFileName" --gas 2000000 --gas-prices 0.01ukava --from god -y
 
-sleep $AVG_SECONDS_BETWEEN_BLOCKS
-
-# vote on the proposal. this assumes no other committee proposal has ever been submitted (id=1)
-kava tx committee vote 1 yes --gas 2000000 --gas-prices 0.01ukava --from god -y
-
-sleep $AVG_SECONDS_BETWEEN_BLOCKS
-
 # fetch current module params
 updatedEvmUtilParams=$(curl https://api.app.internal.testnet.us-east.production.kava.io/kava/evmutil/v1beta1/params)
 printf "updated evm util module params\n %s" , "$updatedEvmUtilParams"
-
-# submit a kava token committee proposal
-COMMITTEE_PROP_TEMPLATE=$(
-  cat <<'END_HEREDOC'
-{
-    "@type": "/cosmos.gov.v1beta1.TextProposal",
-    "title": "The next big thing signaling proposal.",
-    "description": "The purpose of this proposal is to signal support/opposition to the next big thing"
-}
-END_HEREDOC
-)
-committeeProposalFileName="$(date +%s)-committee-proposal.json"
-echo "$COMMITTEE_PROP_TEMPLATE" >$committeeProposalFileName
-tokenCommitteeId=4
-kava tx committee submit-proposal "$tokenCommitteeId" "$committeeProposalFileName" --gas auto --gas-adjustment 1.5 --gas-prices 0.01ukava --from god -y
-
-# if adding more cosmos coins -> er20s, ensure that the deployment order below remains the same.
-# convert 1 HARD to an erc20. doing this ensures the contract is deployed.
-kava tx evmutil convert-cosmos-coin-to-erc20 \
-  "$DEV_TEST_WALLET_ADDRESS" \
-  1000000hard \
-  --from dev-wallet --gas 2000000 --gas-prices 0.001ukava -y
-
-sleep $AVG_SECONDS_BETWEEN_BLOCKS

.github/scripts/seed-protonet.sh

@@ -1,14 +1,6 @@
 #!/bin/bash
 set -ex
 
-# by sleeping 1 block in between tx's
-# we can emulate the behavior of the
-# the deprecated and now removed (as of Kava 16)
-# broadcast mode of `block` in order to
-# minimize the chance tx's fail due to an
-# account sequence number mismatch
-AVG_SECONDS_BETWEEN_BLOCKS=6.5
-
 # configure kava binary to talk to the desired chain endpoint
 kava config node "${CHAIN_API_URL}"
 kava config chain-id "${CHAIN_ID}"
@@ -17,7 +9,7 @@ kava config chain-id "${CHAIN_ID}"
 kava config keyring-backend test
 
 # wait for transactions to be committed per CLI command
-kava config broadcast-mode sync
+kava config broadcast-mode block
 
 # setup dev wallet
 echo "${DEV_WALLET_MNEMONIC}" | kava keys add --recover dev-wallet
@@ -31,13 +23,9 @@ echo "sweet ocean blush coil mobile ten floor sample nuclear power legend where
 # fund evm-contract-deployer account (using issuance)
 kava tx issuance issue 200000000ukava kava1van3znl6597xgwwh46jgquutnqkwvwszjg04fz --from dev-wallet --gas-prices 0.5ukava -y
 
-sleep $AVG_SECONDS_BETWEEN_BLOCKS
-
 # fund 5k kava to x/community account
 kava tx community fund-community-pool 5000000000ukava --from dev-wallet --gas-prices 0.5ukava -y
 
-sleep $AVG_SECONDS_BETWEEN_BLOCKS
-
 # deploy and fund USDC ERC20 contract
 MULTICHAIN_USDC_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" deploy-erc20 "USD Coin" USDC 6)
 MULTICHAIN_USDC_CONTRACT_ADDRESS=${MULTICHAIN_USDC_CONTRACT_DEPLOY: -42}
@@ -84,13 +72,13 @@ MULTICHAIN_wBTC_CONTRACT_ADDRESS=${MULTICHAIN_wBTC_CONTRACT_DEPLOY: -42}
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$MULTICHAIN_wBTC_CONTRACT_ADDRESS" 0x6767114FFAA17C6439D7AEA480738B982CE63A02 100000000000000
 
 # seed some evm wallets
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_WBTC_CONTRACT_ADDRESS" "$DEV_TEST_WALLET_ADDRESS" 10000000000000
+npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$wBTC_CONTRACT_ADDRESS" "$DEV_TEST_WALLET_ADDRESS" 10000000000000
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$MULTICHAIN_USDC_CONTRACT_ADDRESS" "$DEV_TEST_WALLET_ADDRESS" 100000000000
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$wETH_CONTRACT_ADDRESS" "$DEV_TEST_WALLET_ADDRESS" 1000000000000000000000
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_USDC_CONTRACT_ADDRESS" "$DEV_TEST_WALLET_ADDRESS" 100000000000
 
 # seed webapp E2E whale account
-npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_WBTC_CONTRACT_ADDRESS" "$WEBAPP_E2E_WHALE_ADDRESS" 100000000000000
+npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$wBTC_CONTRACT_ADDRESS" "$WEBAPP_E2E_WHALE_ADDRESS" 100000000000000
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$MULTICHAIN_USDC_CONTRACT_ADDRESS" "$WEBAPP_E2E_WHALE_ADDRESS" 1000000000000
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$wETH_CONTRACT_ADDRESS" "$WEBAPP_E2E_WHALE_ADDRESS" 10000000000000000000000
 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_USDC_CONTRACT_ADDRESS" "$WEBAPP_E2E_WHALE_ADDRESS" 10000000000000
@@ -101,8 +89,6 @@ npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_USDC_CON
 kava tx issuance issue 6000000000ukava kava1vlpsrmdyuywvaqrv7rx6xga224sqfwz3fyfhwq \
   --from dev-wallet --gas-prices 0.5ukava -y
 
-sleep $AVG_SECONDS_BETWEEN_BLOCKS
-
 # parse space seperated list of validators
 # into bash array
 read -r -a GENESIS_VALIDATOR_ADDRESS_ARRAY <<< "$GENESIS_VALIDATOR_ADDRESSES"
@@ -111,14 +97,11 @@ read -r -a GENESIS_VALIDATOR_ADDRESS_ARRAY <<< "$GENESIS_VALIDATOR_ADDRESSES"
 for validator in "${GENESIS_VALIDATOR_ADDRESS_ARRAY[@]}"
 do
   kava tx staking delegate "${validator}" 300000000ukava --from dev-wallet --gas-prices 0.5ukava -y
-  sleep $AVG_SECONDS_BETWEEN_BLOCKS
 done
 
 # create a text proposal
 kava tx gov submit-legacy-proposal --deposit 1000000000ukava --type "Text" --title "Example Proposal" --description "This is an example proposal" --gas auto --gas-adjustment 1.2 --from dev-wallet --gas-prices 0.01ukava -y
 
-sleep $AVG_SECONDS_BETWEEN_BLOCKS
-
 # setup god's wallet
 echo "${KAVA_TESTNET_GOD_MNEMONIC}" | kava keys add --recover god
 
@@ -164,16 +147,9 @@ printf "original evm util module params\n %s" , "$originalEvmUtilParams"
 # change the params of the chain like a god - make it so 🖖🏽
 # make sure to update god committee member permissions for the module
 # and params being updated (see below for example)
-# https://github.com/0glabs/0g-chain/pull/1556/files#diff-0bd6043650c708661f37bbe6fa5b29b52149e0ec0069103c3954168fc9f12612R900-R903
+# https://github.com/Kava-Labs/kava/pull/1556/files#diff-0bd6043650c708661f37bbe6fa5b29b52149e0ec0069103c3954168fc9f12612R900-R903
 kava tx committee submit-proposal 1 "$proposalFileName" --gas 2000000 --gas-prices 0.01ukava --from god -y
 
-sleep $AVG_SECONDS_BETWEEN_BLOCKS
-
-# vote on the proposal. this assumes no other committee proposal has ever been submitted (id=1)
-kava tx committee vote 1 yes --gas 2000000 --gas-prices 0.01ukava --from god -y
-
-sleep $AVG_SECONDS_BETWEEN_BLOCKS
-
 # fetch current module params
 updatedEvmUtilParams=$(curl https://api.app.internal.testnet.us-east.production.kava.io/kava/evmutil/v1beta1/params)
 printf "updated evm util module params\n %s" , "$updatedEvmUtilParams"

.github/workflows/cd-internal-testnet-manual.yml

@@ -0,0 +1,54 @@
+name: Manual Deployment (Internal Testnet)
+# allow to be triggered manually
+on: workflow_dispatch
+
+jobs:
+  # in order:
+  # enter standby (prevents autoscaling group from killing node during deploy)
+  # stop kava
+  # take ebs + zfs snapshots
+  # download updated binary and genesis
+  # reset application database state (only done on internal testnet)
+  reset-chain-to-zero-state:
+    uses: ./.github/workflows/cd-reset-internal-testnet.yml
+    with:
+      aws-region: us-east-1
+      chain-id: kava_2221-17000
+      ssm-document-name: kava-testnet-internal-node-update
+      playbook-name: reset-internal-testnet-playbook.yml
+      playbook-infrastructure-branch: master
+    secrets: inherit
+
+  # start kava with new binary and genesis state on api, peer and seed nodes, place nodes in service once they start and are synched to live
+  start-chain-api:
+    uses: ./.github/workflows/cd-start-chain.yml
+    with:
+      aws-region: us-east-1
+      chain-id: kava_2221-17000
+      ssm-document-name: kava-testnet-internal-node-update
+      playbook-name: start-chain-api-playbook.yml
+      playbook-infrastructure-branch: master
+    secrets: inherit
+    needs: [reset-chain-to-zero-state]
+
+  # setup test and development accounts and balances, deploy contracts by calling the chain's api
+  seed-chain-state:
+    uses: ./.github/workflows/cd-seed-chain.yml
+    with:
+      chain-api-url: https://rpc.app.internal.testnet.us-east.production.kava.io:443
+      chain-id: kava_2221-17000
+      seed-script-filename: seed-internal-testnet.sh
+      erc20-deployer-network-name: internal_testnet
+      genesis_validator_addresses: "kavavaloper1xcgtffvv2yeqmgs3yz4gv29kgjrj8usxrnrlwp kavavaloper1w66m9hdzwgd6uc8g93zqkcumgwzrpcw958sh3s"
+      kava_version_filepath:  ./ci/env/kava-internal-testnet/KAVA.VERSION
+    secrets: inherit
+    needs: [start-chain-api]
+  post-pipeline-metrics:
+    uses: ./.github/workflows/metric-pipeline.yml
+    if: always() # always run so we metric failures and successes
+    with:
+      aws-region: us-east-1
+      metric-name: kava.deploys.testnet.internal
+      namespace: Kava/ContinuousDeployment
+    secrets: inherit
+    needs: [seed-chain-state]

.github/workflows/cd-internal-testnet.yml

@@ -0,0 +1,60 @@
+name: Continuous Deployment (Internal Testnet)
+# run after every successful CI job of new commits to the master branch
+on:
+  workflow_run:
+    workflows: [Continuous Integration (Kava Master)]
+    types:
+      - completed
+
+jobs:
+  # in order:
+  # enter standby (prevents autoscaling group from killing node during deploy)
+  # stop kava
+  # take ebs + zfs snapshots
+  # download updated binary and genesis
+  # reset application database state (only done on internal testnet)
+  reset-chain-to-zero-state:
+    # only start cd pipeline if last ci run was successful
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    uses: ./.github/workflows/cd-reset-internal-testnet.yml
+    with:
+      aws-region: us-east-1
+      chain-id: kava_2221-17000
+      ssm-document-name: kava-testnet-internal-node-update
+      playbook-name: reset-internal-testnet-playbook.yml
+      playbook-infrastructure-branch: master
+    secrets: inherit
+
+  # start kava with new binary and genesis state on api, peer and seed nodes, place nodes in service once they start and are synched to live
+  start-chain-api:
+    uses: ./.github/workflows/cd-start-chain.yml
+    with:
+      aws-region: us-east-1
+      chain-id: kava_2221-17000
+      ssm-document-name: kava-testnet-internal-node-update
+      playbook-name: start-chain-api-playbook.yml
+      playbook-infrastructure-branch: master
+    secrets: inherit
+    needs: [reset-chain-to-zero-state]
+
+  # setup test and development accounts and balances, deploy contracts by calling the chain's api
+  seed-chain-state:
+    uses: ./.github/workflows/cd-seed-chain.yml
+    with:
+      chain-api-url: https://rpc.app.internal.testnet.us-east.production.kava.io:443
+      chain-id: kava_2221-17000
+      seed-script-filename: seed-internal-testnet.sh
+      erc20-deployer-network-name: internal_testnet
+      genesis_validator_addresses: "kavavaloper1xcgtffvv2yeqmgs3yz4gv29kgjrj8usxrnrlwp kavavaloper1w66m9hdzwgd6uc8g93zqkcumgwzrpcw958sh3s"
+      kava_version_filepath:  ./ci/env/kava-internal-testnet/KAVA.VERSION
+    secrets: inherit
+    needs: [start-chain-api]
+  post-pipeline-metrics:
+    uses: ./.github/workflows/metric-pipeline.yml
+    if: always() # always run so we metric failures and successes
+    with:
+      aws-region: us-east-1
+      metric-name: kava.deploys.testnet.internal
+      namespace: Kava/ContinuousDeployment
+    secrets: inherit
+    needs: [seed-chain-state]

.github/workflows/cd-protonet.yml

@@ -0,0 +1,60 @@
+name: Continuous Deployment (Protonet)
+# run after every successful CI job of new commits to the master branch
+on:
+  workflow_run:
+    workflows: [Continuous Integration (Kava Master)]
+    types:
+      - completed
+
+jobs:
+  # in order:
+  # enter standby (prevents autoscaling group from killing node during deploy)
+  # stop kava
+  # take ebs + zfs snapshots
+  # download updated binary and genesis
+  # reset application database state (only done on internal testnet)
+  reset-chain-to-zero-state:
+    # only start cd pipeline if last ci run was successful
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    uses: ./.github/workflows/cd-reset-internal-testnet.yml
+    with:
+      aws-region: us-east-1
+      chain-id: proto_2221-17000
+      ssm-document-name: kava-testnet-internal-node-update
+      playbook-name: reset-protonet-playbook.yml
+      playbook-infrastructure-branch: master
+    secrets: inherit
+
+  # start kava with new binary and genesis state on api, peer and seed nodes, place nodes in service once they start and are synched to live
+  start-chain-api:
+    uses: ./.github/workflows/cd-start-chain.yml
+    with:
+      aws-region: us-east-1
+      chain-id: proto_2221-17000
+      ssm-document-name: kava-testnet-internal-node-update
+      playbook-name: start-chain-api-playbook.yml
+      playbook-infrastructure-branch: master
+    secrets: inherit
+    needs: [reset-chain-to-zero-state]
+
+  # setup test and development accounts and balances, deploy contracts by calling the chain's api
+  seed-chain-state:
+    uses: ./.github/workflows/cd-seed-chain.yml
+    with:
+      chain-api-url: https://rpc.app.protonet.us-east.production.kava.io:443
+      chain-id: proto_2221-17000
+      seed-script-filename: seed-protonet.sh
+      erc20-deployer-network-name: protonet
+      genesis_validator_addresses: "kavavaloper14w4avgdvqrlpww6l5dhgj4egfn6ln7gmtp7r2m"
+      kava_version_filepath:  ./ci/env/kava-protonet/KAVA.VERSION
+    secrets: inherit
+    needs: [start-chain-api]
+  post-pipeline-metrics:
+    uses: ./.github/workflows/metric-pipeline.yml
+    if: always() # always run so we metric failures and successes
+    with:
+      aws-region: us-east-1
+      metric-name: kava.deploys.testnet.proto
+      namespace: Kava/ContinuousDeployment
+    secrets: inherit
+    needs: [seed-chain-state]

.github/workflows/cd-reset-internal-testnet.yml

@@ -0,0 +1,82 @@
+name: Reset Internal Testnet
+
+on:
+  workflow_call:
+    inputs:
+      chain-id:
+        required: true
+        type: string
+      aws-region:
+        required: true
+        type: string
+      ssm-document-name:
+        required: true
+        type: string
+      playbook-name:
+        required: true
+        type: string
+      playbook-infrastructure-branch:
+        required: true
+        type: string
+    secrets:
+      CI_AWS_KEY_ID:
+        required: true
+      CI_AWS_KEY_SECRET:
+        required: true
+      KAVA_PRIVATE_GITHUB_ACCESS_TOKEN:
+        required: true
+
+# in order:
+# enter standby (prevents autoscaling group from killing node during deploy)
+# stop kava
+# download updated binary and genesis
+# reset application database state (only done on internal testnet)
+jobs:
+  place-chain-nodes-on-standby:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repo from current commit
+        uses: actions/checkout@v3
+      - name: take the chain offline
+        run: bash ${GITHUB_WORKSPACE}/.github/scripts/put-all-chain-nodes-on-standby.sh
+        env:
+          CHAIN_ID: ${{ inputs.chain-id }}
+          AWS_REGION: ${{ inputs.aws-region }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.CI_AWS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_AWS_KEY_SECRET }}
+      - name: checkout infrastructure repo
+        uses: actions/checkout@v3
+        with:
+          repository: Kava-Labs/infrastructure
+          token: ${{ secrets.KAVA_PRIVATE_GITHUB_ACCESS_TOKEN }}
+          path: infrastructure
+          ref: master
+      - name: set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: "1.20"
+          check-latest: true
+          cache: true
+      - name: build kava node updater
+        run: cd infrastructure/cli/kava-node-updater && make install && cd ../../../
+      - name: run reset playbook on all chain nodes
+        run: |
+          kava-node-updater \
+            --debug \
+            --max-retries=2 \
+            --aws-ssm-document-name=$SSM_DOCUMENT_NAME \
+            --infrastructure-git-pointer=$PLAYBOOK_INFRASTRUCTURE_BRANCH \
+            --update-playbook-filename=$PLAYBOOK_NAME \
+            --chain-id=$CHAIN_ID \
+            --max-upgrade-batch-size=0 \
+            --node-states=Standby \
+            --wait-for-node-sync-after-upgrade=false
+        env:
+          SSM_DOCUMENT_NAME: ${{ inputs.ssm-document-name }}
+          PLAYBOOK_NAME: ${{ inputs.playbook-name }}
+          CHAIN_ID: ${{ inputs.chain-id }}
+          AWS_REGION: ${{ inputs.aws-region }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.CI_AWS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_AWS_KEY_SECRET }}
+          AWS_SDK_LOAD_CONFIG: 1
+          PLAYBOOK_INFRASTRUCTURE_BRANCH: ${{ inputs.playbook-infrastructure-branch }}

.github/workflows/cd-seed-chain.yml

@@ -0,0 +1,96 @@
+name: Seed Chain
+
+on:
+  workflow_call:
+    inputs:
+      chain-api-url:
+        required: true
+        type: string
+      chain-id:
+        required: true
+        type: string
+      seed-script-filename:
+        required: true
+        type: string
+      erc20-deployer-network-name:
+        required: true
+        type: string
+      genesis_validator_addresses:
+        required: true
+        type: string
+      kava_version_filepath:
+        required: true
+        type: string
+    secrets:
+      DEV_WALLET_MNEMONIC:
+        required: true
+      KAVA_TESTNET_GOD_MNEMONIC:
+        required: true
+
+jobs:
+  seed-chain-state:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repo from master
+        uses: actions/checkout@v3
+        with:
+         ref: master
+      - name: checkout version of kava used by network
+        run: |
+          git pull -p
+          git checkout $(cat ${KAVA_VERSION_FILEPATH})
+        env:
+            KAVA_VERSION_FILEPATH: ${{ inputs.kava_version_filepath }}
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: "1.20"
+          check-latest: true
+          cache: true
+      - name: build kava binary
+        run: make install
+      - name: checkout go evm tools repo
+        uses: actions/checkout@v3
+        with:
+          repository: ethereum/go-ethereum
+          path: go-ethereum
+          ref: v1.10.26
+      - name: install go evm tools
+        run: |
+          make
+          make devtools
+        working-directory: go-ethereum
+      - name: checkout kava bridge repo for deploying evm contracts
+        uses: actions/checkout@v3
+        with:
+          repository: Kava-Labs/kava-bridge
+          path: kava-bridge
+          ref: main
+      - name: install nodeJS
+        uses: actions/setup-node@v3
+        with:
+          cache: npm
+          node-version: 18
+          cache-dependency-path: kava-bridge/contract/package.json
+      - name: "install ERC20 contract deployment dependencies"
+        run: "npm install"
+        working-directory: kava-bridge/contract
+      - name: compile default erc20 contracts
+        run: make compile-contracts
+        working-directory: kava-bridge
+      - name: download seed script from master
+        run: wget https://raw.githubusercontent.com/Kava-Labs/kava/master/.github/scripts/${SEED_SCRIPT_FILENAME} && chmod +x ${SEED_SCRIPT_FILENAME}
+        working-directory: kava-bridge/contract
+        env:
+            SEED_SCRIPT_FILENAME: ${{ inputs.seed-script-filename }}
+      - name: run seed scripts
+        run: bash ./${SEED_SCRIPT_FILENAME}
+        working-directory: kava-bridge/contract
+        env:
+          CHAIN_API_URL: ${{ inputs.chain-api-url }}
+          CHAIN_ID: ${{ inputs.chain-id }}
+          DEV_WALLET_MNEMONIC: ${{ secrets.DEV_WALLET_MNEMONIC }}
+          KAVA_TESTNET_GOD_MNEMONIC: ${{ secrets.KAVA_TESTNET_GOD_MNEMONIC }}
+          SEED_SCRIPT_FILENAME: ${{ inputs.seed-script-filename }}
+          ERC20_DEPLOYER_NETWORK_NAME: ${{ inputs.erc20-deployer-network-name }}
+          GENESIS_VALIDATOR_ADDRESSES: ${{ inputs.genesis_validator_addresses }}

.github/workflows/cd-start-chain.yml

@@ -0,0 +1,80 @@
+name: Start Chain
+
+on:
+  workflow_call:
+    inputs:
+      chain-id:
+        required: true
+        type: string
+      aws-region:
+        required: true
+        type: string
+      ssm-document-name:
+        required: true
+        type: string
+      playbook-name:
+        required: true
+        type: string
+      playbook-infrastructure-branch:
+        required: true
+        type: string
+    secrets:
+      CI_AWS_KEY_ID:
+        required: true
+      CI_AWS_KEY_SECRET:
+        required: true
+      KAVA_PRIVATE_GITHUB_ACCESS_TOKEN:
+        required: true
+
+jobs:
+  # start kava, allow nodes to start processing requests from users once they are synced to live
+  serve-traffic:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repo from current commit
+        uses: actions/checkout@v3
+      - name: take the chain offline
+        run: bash ${GITHUB_WORKSPACE}/.github/scripts/put-all-chain-nodes-on-standby.sh
+        env:
+          CHAIN_ID: ${{ inputs.chain-id }}
+          AWS_REGION: ${{ inputs.aws-region }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.CI_AWS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_AWS_KEY_SECRET }}
+      - name: checkout infrastructure repo
+        uses: actions/checkout@v3
+        with:
+          repository: Kava-Labs/infrastructure
+          token: ${{ secrets.KAVA_PRIVATE_GITHUB_ACCESS_TOKEN }}
+          path: infrastructure
+          ref: master
+      - name: set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: "1.20"
+          check-latest: true
+          cache: true
+      - name: build kava node updater
+        run: cd infrastructure/cli/kava-node-updater && make install && cd ../../../
+      - name: run start-chain playbook on all chain nodes
+        run: |
+          kava-node-updater \
+            --debug \
+            --max-retries=2 \
+            --aws-ssm-document-name=$SSM_DOCUMENT_NAME \
+            --infrastructure-git-pointer=$PLAYBOOK_INFRASTRUCTURE_BRANCH \
+            --update-playbook-filename=$PLAYBOOK_NAME \
+            --chain-id=$CHAIN_ID \
+            --max-upgrade-batch-size=0 \
+            --node-states=Standby \
+            --wait-for-node-sync-after-upgrade=true
+        env:
+          SSM_DOCUMENT_NAME: ${{ inputs.ssm-document-name }}
+          PLAYBOOK_NAME: ${{ inputs.playbook-name }}
+          CHAIN_ID: ${{ inputs.chain-id }}
+          AWS_REGION: ${{ inputs.aws-region }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.CI_AWS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_AWS_KEY_SECRET }}
+          AWS_SDK_LOAD_CONFIG: 1
+          PLAYBOOK_INFRASTRUCTURE_BRANCH: ${{ inputs.playbook-infrastructure-branch }}
+      - name: bring the chain online
+        run: bash ${GITHUB_WORKSPACE}/.github/scripts/exit-standby-all-chain-nodes.sh

.github/workflows/ci-commit.yml

@@ -0,0 +1,7 @@
+name: Continuous Integration (Commit)
+on:
+  push:
+# run per commit ci checks against this commit
+jobs:
+  lint:
+    uses: ./.github/workflows/ci-lint.yml

.github/workflows/ci-default.yml

@@ -0,0 +1,82 @@
+name: Continuous Integration (Default Checks)
+
+on:
+  workflow_call:
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repo from current commit
+        uses: actions/checkout@v3
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: "1.20"
+          check-latest: true
+          cache: true
+      - name: build application
+        run: make build
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repo from current commit
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: "1.20"
+          check-latest: true
+          cache: true
+      - name: run unit tests
+        run: make test
+      - name: run e2e tests
+        run: make docker-build test-e2e
+  # this is only applicable for PRs based on master. Disabling for this release branch.
+  # validate-internal-testnet-genesis:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: checkout repo from current commit
+  #       uses: actions/checkout@v3
+  #     - name: save version of kava that will be deployed if this pr is merged
+  #       id: kava-version
+  #       run: |
+  #         echo "KAVA_VERSION=$(cat ./ci/env/kava-internal-testnet/KAVA.VERSION)" >> $GITHUB_OUTPUT
+  #     - name: checkout repo from master
+  #       uses: actions/checkout@v3
+  #       with:
+  #         ref: master
+  #     - name: checkout version of kava that will be deployed if this pr is merged
+  #       run: |
+  #         git pull -p
+  #         git checkout $KAVA_VERSION
+  #       env:
+  #         KAVA_VERSION: ${{ steps.kava-version.outputs.KAVA_VERSION }}
+  #     - name: Set up Go
+  #       uses: actions/setup-go@v3
+  #       with:
+  #         go-version: "1.20"
+  #         check-latest: true
+  #         cache: true
+  #     - name: build kava cli
+  #       run: make install
+  #     - name: checkout repo from current commit to validate current branch's genesis
+  #       uses: actions/checkout@v3
+  #     - name: validate testnet genesis
+  #       run: kava validate-genesis ci/env/kava-internal-testnet/genesis.json
+  validate-protonet-genesis:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repo from current commit
+        uses: actions/checkout@v3
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: "1.20"
+          check-latest: true
+          cache: true
+      - name: build kava cli
+        run: make install
+      - name: validate protonet genesis
+        run: kava validate-genesis ci/env/kava-protonet/genesis.json

.github/workflows/ci-docker.yml

@@ -0,0 +1,47 @@
+name: Build & Publish Docker Images
+
+on:
+  workflow_call:
+    inputs:
+      dockerhub-username:
+        required: true
+        type: string
+    secrets:
+      CI_DOCKERHUB_TOKEN:
+        required: true
+
+# runs in ci-master after successful checks
+# you can use images built by this action in future jobs.
+# https://docs.docker.com/build/ci/github-actions/examples/#share-built-image-between-jobs
+jobs:
+  docker:
+    # https://github.com/marketplace/actions/build-and-push-docker-images
+    runs-on: ubuntu-latest
+    steps:
+      # ensure working with latest code
+      - name: Checkout
+        uses: actions/checkout@v3
+      # generate a git commit hash to be used as image tag
+      - name: Generate short hash
+        id: commit-hash
+        run: echo "short=$( git rev-parse --short $GITHUB_SHA )" >> $GITHUB_OUTPUT
+      # qemu is used to emulate different platform architectures
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      # cross-platform build of the image
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      # authenticate for publish to docker hub
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ inputs.dockerhub-username }}
+          password: ${{ secrets.CI_DOCKERHUB_TOKEN }}
+      # publish to docker hub, tag with short git hash
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: kava/kava:${{ steps.commit-hash.outputs.short }},kava/kava:master

.github/workflows/ci-lint.yml

@@ -0,0 +1,17 @@
+name: Lint Checks
+on:
+  workflow_call:
+# run per commit ci checks against this commit
+jobs:
+  proto-lint:
+    uses: ./.github/workflows/proto.yml
+  golangci-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: golangci-lint
+        uses: reviewdog/action-golangci-lint@v2
+        with:
+          github_token: ${{ secrets.github_token }}
+          reporter: github-pr-review
+          golangci_lint_flags: --timeout 10m

.github/workflows/ci-master.yml

@@ -0,0 +1,57 @@
+name: Continuous Integration (Kava Master)
+on:
+  push:
+    # run CI on any push to the master branch
+    branches:
+      - master
+jobs:
+  # run per commit ci checks against master branch
+  lint-checks:
+    uses: ./.github/workflows/ci-lint.yml
+  # run default ci checks against master branch
+  default-checks:
+    uses: ./.github/workflows/ci-default.yml
+  # build and upload versions of kava for use on internal infrastructure
+  # configurations for databases, cpu architectures and operating systems
+  publish-internal:
+    # only run if all checks pass
+    needs: [lint-checks, default-checks]
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repo from current commit
+        uses: actions/checkout@v3
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: "1.20"
+          check-latest: true
+          cache: true
+      - name: set build tag
+        run: echo "BUILD_TAG=$(date +%s)-$(git rev-parse HEAD | cut -c 1-8)" >> $GITHUB_ENV
+      - name: build rocksdb dependency
+        run: bash ${GITHUB_WORKSPACE}/.github/scripts/install-rocksdb.sh
+        env:
+          ROCKSDB_VERSION: v7.10.2
+      - name: Build and upload release artifacts
+        run: bash ${GITHUB_WORKSPACE}/.github/scripts/publish-internal-release-artifacts.sh
+        env:
+          BUILD_TAG: ${{ env.BUILD_TAG }}
+          AWS_REGION: us-east-1
+          AWS_ACCESS_KEY_ID: ${{ secrets.CI_AWS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_AWS_KEY_SECRET }}
+  docker:
+    # only run if all checks pass
+    needs: [lint-checks, default-checks]
+    uses: ./.github/workflows/ci-docker.yml
+    with:
+      dockerhub-username: kavaops
+    secrets: inherit
+  post-pipeline-metrics:
+    uses: ./.github/workflows/metric-pipeline.yml
+    if: always() # always run so we metric failures and successes
+    with:
+      aws-region: us-east-1
+      metric-name: kava.releases.merge
+      namespace: Kava/ContinuousIntegration
+    secrets: inherit
+    needs: [publish-internal]

.github/workflows/ci-pr.yml

@@ -0,0 +1,23 @@
+name: Continuous Integration (PR)
+on:
+  pull_request:
+    # run CI on pull requests to master or a release branch
+    branches:
+      - master
+      - 'release/**'
+      - 'releases/**'
+# run default ci checks against current PR
+jobs:
+  default:
+    uses: ./.github/workflows/ci-default.yml
+  rocksdb:
+    uses: ./.github/workflows/ci-rocksdb-build.yml
+  post-pipeline-metrics:
+    uses: ./.github/workflows/metric-pipeline.yml
+    if: always() # always run so we metric failures and successes
+    with:
+      aws-region: us-east-1
+      metric-name: kava.releases.pr
+      namespace: Kava/ContinuousIntegration
+    secrets: inherit
+    needs: [default]

.github/workflows/ci-rocksdb-build.yml

@@ -0,0 +1,47 @@
+name: Continuous Integration (Rocksdb Build)
+
+env:
+  ROCKSDB_VERSION: v8.1.1
+
+on:
+  workflow_call:
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repo from current commit
+        uses: actions/checkout@v3
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: "1.20"
+          check-latest: true
+          cache: true
+      - name: build rocksdb dependency
+        run: bash ${GITHUB_WORKSPACE}/.github/scripts/install-rocksdb.sh
+      - name: build application
+        run: make build COSMOS_BUILD_OPTIONS=rocksdb
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: install RocksDB dependencies
+        run: sudo apt-get update
+          && sudo apt-get install -y git make gcc libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev libzstd-dev
+      - name: install RocksDB as shared library
+        run: git clone https://github.com/facebook/rocksdb.git
+          && cd rocksdb
+          && git checkout $ROCKSDB_VERSION
+          && sudo make -j$(nproc) install-shared
+          && sudo ldconfig
+      - name: checkout repo from current commit
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: "1.20"
+          check-latest: true
+          cache: true
+      - name: run unit tests
+        run: make test-rocksdb

.github/workflows/metric-pipeline.yml

@@ -0,0 +1,45 @@
+name: Metric Pipeline
+
+on:
+  workflow_call:
+    inputs:
+      aws-region:
+        required: true
+        type: string
+      metric-name:
+        required: true
+        type: string
+      namespace:
+        required: true
+        type: string
+    secrets:
+      CI_AWS_KEY_ID:
+        required: true
+      CI_AWS_KEY_SECRET:
+        required: true
+
+jobs:
+  metric-pipeline-result:
+    runs-on: ubuntu-latest
+    if: always() # always run to capture workflow success or failure
+    steps:
+      # Make sure the secrets are stored in you repo settings
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.CI_AWS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.CI_AWS_KEY_SECRET }}
+          aws-region: ${{ inputs.aws-region }}
+      - name: Calculate Pipleline Success
+        # run this action to get the workflow conclusion
+        # You can get the conclusion via env (env.WORKFLOW_CONCLUSION)
+        # values: neutral, success, skipped, cancelled, timed_out,
+        # action_required, failure
+        uses: technote-space/workflow-conclusion-action@v3
+      - name: Metric Pipleline Success
+        # replace TAG by the latest tag in the repository
+        uses: ros-tooling/action-cloudwatch-metrics@0.0.5
+        with:
+          metric-value: ${{ env.WORKFLOW_CONCLUSION == 'success' }}
+          metric-name: ${{ inputs.metric-name }}
+          namespace: ${{ inputs.namespace }}

.github/workflows/proto.yml

@@ -0,0 +1,26 @@
+name: Protobuf Checks
+
+on:
+  workflow_call:
+
+jobs:
+  check-proto:
+    name: "Check Proto"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version-file: go.mod
+          cache: true
+      - run: go mod download
+      - run: make install-build-deps
+      - run: make check-proto-deps
+      - run: make check-proto-lint
+      - run: make check-proto-format
+      - run: make check-proto-breaking-remote
+      - run: BUF_CHECK_BREAKING_AGAINST_REMOTE="branch=$GITHUB_BASE_REF" make check-proto-breaking-remote
+        if: github.event_name == 'pull_request'
+      - run: make check-proto-gen
+      - run: make check-proto-gen-doc
+      - run: make check-proto-gen-swagger

.github/workflows/upload-release-assets.yml

@@ -1,25 +0,0 @@
-name: Upload Release Assets
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Go
-      uses: actions/setup-go@v4
-      with:
-        go-version: '1.21'
-    - name: Build
-      run: sudo LINK_STATICALLY=true make build-release
-    - name: Rename file
-      run: sudo mv ./out/linux/0gchaind ./out/linux/0gchaind-linux-${{ github.ref_name }}
-    - name: Upload Release Asset
-      uses: softprops/action-gh-release@v2
-      with:
-        files: ./out/linux/0gchaind-linux-${{ github.ref_name }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.ZG_UPLOAD_ASSET }}

.gitignore

@@ -31,9 +31,6 @@ out
 # Ignore build cache dir
 build/.cache
 
-# Ignore make lint cache
-build/.golangci-lint
-
 # Ignore installed binaires
 build/bin
 
@@ -44,13 +41,3 @@ build/linux
 # Go workspace files
 go.work
 go.work.sum
-.build/0gchaind
-.build/da
-
-# runtime
-run
-
-# contracts
-precompiles/interfaces/build
-precompiles/interfaces/node_modules
-precompiles/interfaces/abis

.golangci-version

@@ -1 +0,0 @@
-v1.59

.golangci.yml

@@ -1,130 +0,0 @@
-run:
-  timeout: 20m # set maximum time allowed for the linter to run. If the linting process exceeds this duration, it will be terminated
-  modules-download-mode: readonly # Ensures that modules are not modified during the linting process
-  allow-parallel-runners: true # enables parallel execution of linters to speed up linting process
-
-linters:
-  disable-all: true
-  enable:
-    - asasalint
-    - asciicheck
-    - bidichk
-    - bodyclose
-    - containedctx
-    - contextcheck
-    - decorder
-    - dogsled
-    #    - dupl
-    #    - dupword
-    - durationcheck
-    - errcheck
-    - errchkjson
-    - errname
-    - errorlint
-    #    - exhaustive
-    - exportloopref
-    - funlen
-    - gci
-    - ginkgolinter
-    - gocheckcompilerdirectives
-    #    - gochecknoglobals
-    #    - gochecknoinits
-    - goconst
-    - gocritic
-    - godox
-    - gofmt
-    #    - gofumpt
-    - goheader
-    - goimports
-    - mnd
-    #    - gomodguard
-    - goprintffuncname
-    - gosec
-    - gosimple
-    - govet
-    - grouper
-    - importas
-    - ineffassign
-    #    - interfacebloat
-    - lll
-    - loggercheck
-    - makezero
-    - mirror
-    - misspell
-    - musttag
-    #    - nakedret
-    #    - nestif
-    - nilerr
-    #    - nilnil
-    #    - noctx
-    - nolintlint
-    #    - nonamedreturns
-    - nosprintfhostport
-    - prealloc
-    - predeclared
-    - promlinter
-    #    - reassign
-    - revive
-    - rowserrcheck
-    - staticcheck
-    #    - stylecheck
-    - tagalign
-    #    - testpackage
-    #    - thelper
-    #    - tparallel
-    - typecheck
-    #    - unconvert
-    - unparam
-    - unused
-    #    - usestdlibvars
-    - wastedassign
-    #    - whitespace
-    - wrapcheck
-
-issues:
-  exclude-rules:
-    # Disable funlen for "func Test..." or func (suite *Suite) Test..." type functions
-    # These functions tend to be descriptive and exceed length limits.
-    - source: "^func (\\(.*\\) )?Test"
-      linters:
-        - funlen
-
-linters-settings:
-  errcheck:
-    check-blank: true # check for assignments to the blank identifier '_' when errors are returned
-    check-type-assertions: false # check type assertion
-  errorlint:
-    check-generated: false # disabled linting of generated files
-    default-signifies-exhaustive: false # exhaustive handling of error types
-  exhaustive:
-    default-signifies-exhaustive: false # exhaustive handling of error types
-  gci:
-    sections: # defines the order of import sections
-      - standard
-      - default
-      - localmodule
-  goconst:
-    min-len: 3 # min length for string constants to be checked
-    min-occurrences: 3 # min occurrences of the same constant before it's flagged
-  godox:
-    keywords: # specific keywords to flag for further action
-      - BUG
-      - FIXME
-      - HACK
-  gosec:
-    exclude-generated: true
-  lll:
-    line-length: 120
-  misspell:
-    locale: US
-    ignore-words: expect
-  nolintlint:
-    allow-leading-space: false
-    require-explanation: true
-    require-specific: true
-  prealloc:
-    simple: true # enables simple preallocation checks
-    range-loops: true # enabled preallocation checks in range loops
-    for-loops: false # disables preallocation checks in for loops
-  unparam:
-    check-exported: true # checks exported functions and methods for unused params

.mockery.yaml

@@ -1,16 +0,0 @@
-# Generate EXPECT() methods, type-safe methods to generate call expectations
-with-expecter: true
-
-# Generate mocks in adjacent mocks directory to the interfaces
-dir: "{{.InterfaceDir}}/mocks"
-mockname: "Mock{{.InterfaceName}}"
-outpkg: "mocks"
-filename: "Mock{{.InterfaceName}}.go"
-
-packages:
-  github.com/0glabs/0g-chain/x/precisebank/types:
-    # package-specific config
-    config:
-    interfaces:
-      AccountKeeper:
-      BankKeeper:

.tool-versions

@@ -1,2 +1,2 @@
-golang 1.21.9
+golang 1.20
-nodejs 20.16.0
+nodejs 18.16.0

CHANGELOG.md

@@ -36,75 +36,23 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
 
-## [v0.26.0]
+## [v0.24.2](https://github.com/Kava-Labs/kava/releases/tag/v0.24.2)
-
-### Features
-- (precisebank) [#1906] Add new `x/precisebank` module with bank decimal extension for EVM usage.
-- (cli) [#1922] Add `iavlviewer` CLI command for low-level iavl db debugging.
-
-### Improvements
-- (rocksdb) [#1903] Bump cometbft-db dependency for use with rocksdb v8.10.0
-- (deps) [#1988] Bump cometbft to v0.37.9-kava.1
-
-## [v0.26.0]
-
-### Features
-
-- (cli) [#1785] Add `shard` CLI command to support creating partitions of data for standalone nodes
-- (cdp) [#1818] Add module param and logic for running x/cdp begin blocker every `n` blocks
-- (cli) [#1804] Add `rocksdb compact` command for manual DB compaction of state or blockstore
-- (cosmos-sdk) [#1811] [#1846] Upgrades app to cosmos-sdk v0.47.10 with iavl v1 support
-- (validator-vesting) [#1832] Add grpc query service to replace removed legacy querier
-- (incentive) [#1836] Update x/incentive cli to use grpc query client
-- (ibc) [#1839] Add ibc packet forward middleware for ibc transfers
-- (evmutil) [#1848] Update evm native conversion logic to handle bep3 assets
-
-## [v0.25.0]
-
-### Features
-
-- (community) [#1704] Add module params
-- (community) [#1706] Add disable inflation upgrade
-- (community) [#1745] Enable params update via governance with `MsgUpdateParams`
-- (client) [#1784] Add Kava gRPC client
-
-### Bug Fixes
-
-- (ethermint) [#1788] Fixes issue where tracing a transaction could show it's status as successful when isolated in simulation even if the tx when executed on the chain failed due to an error such as exhausting the block gas meter
-- (evmutil) [#1655] Initialize x/evmutil module account in InitGenesis
-  cosmos ledger app 2.34.12
-
-## State Machine Breaking
-
-- (community) [#1704] Add param to control when inflation will be disabled
-- (community) [#1707] Default staking rewards per second set to `744191`
-- (community) [#1706] Add disable inflation upgrade to begin blocker that updates x/mint and x/kavadist params
-- (community) [#1729] Consolidate community funds from `x/distribution` and `x/kavadist` to `x/community`
-- (community) [#1752] Set `x/distribution` CommunityTax to zero on inflation disable upgrade
-- (community) [#1755] Keep funds in `x/community` in `CommunityPoolLendWithdrawProposal` handler
-- (staking) [#1761] Set validator minimum commission to 5% for all validators under 5%
-
-## [v0.24.3]
 
 ### Bug Fixes
 
 - (deps) [#1770] Bump ledger-cosmos-go to v0.13.1 to resolve signing error with
-- (rocksdb) [#1767] Fix resolution of rocksdb database path introduced in v0.24.2
+  cosmos ledger app 2.34.12
 
-**Note**: There was a bug released as v0.24.2. The tag has been removed and the commit should not be used.
+## [v0.24.1](https://github.com/Kava-Labs/kava/releases/tag/v0.24.1)
-
-## [v0.24.1]
 
 ### Features
-
 - (metrics) [#1668] Adds non-state breaking x/metrics module for custom telemetry.
 - (metrics) [#1669] Add performance timing metrics to all Begin/EndBlockers
 - (community) [#1751] Add `AnnualizedRewards` query endpoint
 
-## [v0.24.0]
+## [v0.24.0](https://github.com/Kava-Labs/kava/releases/tag/v0.24.0)
 
 ### Features
-
 - (evmutil) [#1590] & [#1596] Add allow list param of sdk native denoms that can be transferred to evm
 - (evmutil) [#1591] & [#1596] Configure module to support deploying ERC20KavaWrappedCosmosCoin contracts
 - (evmutil) [#1598] Track deployed ERC20 contract addresses for representing cosmos coins in module state
@@ -115,7 +63,6 @@ Ref: https://keepachangelog.com/en/1.0.0/
 - (evmutil) [#1610] Add new invariant checking that ERC20s are fully backed by sdk.Coins
 
 ### Client Breaking
-
 - (evmutil) [#1603] Renamed error `ErrConversionNotEnabled` to `ErrEVMConversionNotEnabled`
 - (evmutil) [#1604] Renamed event types
   - `convert_erc20_to_coin` -> `convert_evm_erc20_to_coin`
@@ -127,9 +74,9 @@ Ref: https://keepachangelog.com/en/1.0.0/
 - (cli) [#1624] Removes unused, no-op `migrate` CLI command.
 
 ### Bug Fixes
-
 - (cli) [#1624] Fix `assert-invariants` CLI command.
 
+
 ## [v0.23.2]
 
 ### Bug Fixes
@@ -340,32 +287,13 @@ the [changelog](https://github.com/cosmos/cosmos-sdk/blob/v0.38.4/CHANGELOG.md).
 - [#257](https://github.com/Kava-Labs/kava/pulls/257) Include scripts to run
   large-scale simulations remotely using aws-batch
 
-[#1988]: https://github.com/Kava-Labs/kava/pull/1988
-[#1922]: https://github.com/Kava-Labs/kava/pull/1922
-[#1906]: https://github.com/Kava-Labs/kava/pull/1906
-[#1903]: https://github.com/Kava-Labs/kava/pull/1903
-[#1846]: https://github.com/Kava-Labs/kava/pull/1846
-[#1848]: https://github.com/Kava-Labs/kava/pull/1848
-[#1839]: https://github.com/Kava-Labs/kava/pull/1839
-[#1836]: https://github.com/Kava-Labs/kava/pull/1836
-[#1832]: https://github.com/Kava-Labs/kava/pull/1832
-[#1811]: https://github.com/Kava-Labs/kava/pull/1811
-[#1804]: https://github.com/Kava-Labs/kava/pull/1804
-[#1785]: https://github.com/Kava-Labs/kava/pull/1785
-[#1784]: https://github.com/Kava-Labs/kava/pull/1784
 [#1770]: https://github.com/Kava-Labs/kava/pull/1770
 [#1755]: https://github.com/Kava-Labs/kava/pull/1755
 [#1761]: https://github.com/Kava-Labs/kava/pull/1761
 [#1752]: https://github.com/Kava-Labs/kava/pull/1752
 [#1751]: https://github.com/Kava-Labs/kava/pull/1751
-[#1745]: https://github.com/Kava-Labs/kava/pull/1745
-[#1729]: https://github.com/Kava-Labs/kava/pull/1729
-[#1707]: https://github.com/Kava-Labs/kava/pull/1707
-[#1706]: https://github.com/Kava-Labs/kava/pull/1706
-[#1704]: https://github.com/Kava-Labs/kava/pull/1704
-[#1668]: https://github.com/Kava-Labs/kava/pull/1668
 [#1669]: https://github.com/Kava-Labs/kava/pull/1669
-[#1655]: https://github.com/Kava-Labs/kava/pull/1655
+[#1668]: https://github.com/Kava-Labs/kava/pull/1668
 [#1624]: https://github.com/Kava-Labs/kava/pull/1624
 [#1631]: https://github.com/Kava-Labs/kava/pull/1631
 [#1622]: https://github.com/Kava-Labs/kava/pull/1622
@@ -406,13 +334,9 @@ the [changelog](https://github.com/cosmos/cosmos-sdk/blob/v0.38.4/CHANGELOG.md).
 [#750]: https://github.com/Kava-Labs/kava/pull/750
 [#751]: https://github.com/Kava-Labs/kava/pull/751
 [#780]: https://github.com/Kava-Labs/kava/pull/780
-[unreleased]: https://github.com/Kava-Labs/kava/compare/v0.26.0...HEAD
+[unreleased]: https://github.com/Kava-Labs/kava/compare/v0.23.2...HEAD
-[v0.26.0]: https://github.com/Kava-Labs/kava/compare/v0.25.0...v0.26.0
-[v0.25.0]: https://github.com/Kava-Labs/kava/compare/v0.24.3...v0.25.0
-[v0.24.3]: https://github.com/Kava-Labs/kava/compare/v0.24.3...v0.24.1
-[v0.24.1]: https://github.com/Kava-Labs/kava/compare/v0.24.1...v0.24.0
-[v0.24.0]: https://github.com/Kava-Labs/kava/compare/v0.24.0...v0.23.2
 [v0.23.2]: https://github.com/Kava-Labs/kava/compare/v0.23.1...v0.23.2
+[v0.23.1]: https://github.com/Kava-Labs/kava/compare/v0.23.0...v0.23.1
 [v0.23.0]: https://github.com/Kava-Labs/kava/compare/v0.21.1...v0.23.0
 [v0.16.1]: https://github.com/Kava-Labs/kava/compare/v0.16.0...v0.16.1
 [v0.16.0]: https://github.com/Kava-Labs/kava/compare/v0.15.2...v0.16.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21-alpine AS build-env
+FROM golang:1.20-alpine AS build-env
 
 # Set up dependencies
 # bash, jq, curl for debugging
@@ -7,27 +7,9 @@ FROM golang:1.21-alpine AS build-env
 RUN apk add bash git make libc-dev gcc linux-headers eudev-dev jq curl
 
 # Set working directory for the build
-WORKDIR /root/0g-chain
+WORKDIR /root/kava
 # default home directory is /root
 
-# Copy dependency files first to facilitate dependency caching
-COPY ./go.mod ./
-COPY ./go.sum ./
-
-# Download dependencies
-RUN --mount=type=cache,target=/root/.cache/go-build \
-    --mount=type=cache,target=/go/pkg/mod \
-    go version && go mod download
-
-# Cosmwasm - Download correct libwasmvm version
-RUN ARCH=$(uname -m) && WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | sed 's/.* //') && \
-    wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/libwasmvm_muslc.$ARCH.a \
-    -O /lib/libwasmvm.$ARCH.a && \
-    # verify checksum
-    wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/checksums.txt -O /tmp/checksums.txt && \
-    sha256sum /lib/libwasmvm.$ARCH.a | grep $(cat /tmp/checksums.txt | grep libwasmvm_muslc.$ARCH | cut -d ' ' -f 1)
-
-
 # Add source files
 COPY . .
 
@@ -36,12 +18,11 @@ COPY . .
 # Mount go build and mod caches as container caches, persisted between builder invocations
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
-    LINK_STATICALLY=true \
     make install
 
 FROM alpine:3.15
 
 RUN apk add bash jq curl
-COPY --from=build-env /go/bin/0gchaind /bin/0gchaind
+COPY --from=build-env /go/bin/kava /bin/kava
 
-CMD ["0gchaind"]
+CMD ["kava"]

Dockerfile-node

@@ -1,42 +0,0 @@
-FROM --platform=linux/amd64 ubuntu:24.04
-
-# Install dependencies
-RUN apt-get update && \
-    apt-get install -y \
-    git \
-    sudo \
-    wget \
-    jq \
-    make \
-    gcc \
-    unzip && \
-    rm -rf /var/lib/apt/lists/*
-
-# Install Go
-RUN wget https://golang.org/dl/go1.22.5.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzf go1.22.5.linux-amd64.tar.gz && \
-    rm go1.22.5.linux-amd64.tar.gz
-# Set Go environment variables
-ENV GOPATH=/root/go
-ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
-# Create Go workspace directory
-RUN mkdir -p /root/go
-
-WORKDIR /root
-
-# https://docs.0g.ai/0g-doc/run-a-node/validator-node
-RUN git clone -b v0.2.3 https://github.com/0glabs/0g-chain.git
-RUN ./0g-chain/networks/testnet/install.sh
-
-RUN 0gchaind config chain-id zgtendermint_16600-2
-
-RUN 0gchaind init testnetnode --chain-id zgtendermint_16600-2
-
-RUN rm ~/.0gchain/config/genesis.json
-RUN wget -P ~/.0gchain/config https://github.com/0glabs/0g-chain/releases/download/v0.2.3/genesis.json
-
-RUN 0gchaind validate-genesis
-
-RUN sed -i 's|seeds = ""|seeds = "81987895a11f6689ada254c6b57932ab7ed909b6@54.241.167.190:26656,010fb4de28667725a4fef26cdc7f9452cc34b16d@54.176.175.48:26656,e9b4bc203197b62cc7e6a80a64742e752f4210d5@54.193.250.204:26656,68b9145889e7576b652ca68d985826abd46ad660@18.166.164.232:26656"|' $HOME/.0gchain/config/config.toml
-
-ENTRYPOINT ["0gchaind", "start"]

Dockerfile-rocksdb

@@ -1,27 +1,34 @@
-FROM kava/rocksdb:v8.10.1-go1.21 AS kava-builder
+FROM golang:1.20-bullseye AS kava-builder
 
-RUN apt-get update
+# Set up dependencies
+RUN apt-get update \
+    && apt-get install -y git make gcc libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev libzstd-dev \
+    && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /root/0gchain
+# Set working directory for the build
-# Copy dependency files first to facilitate dependency caching
+WORKDIR /root
-COPY ./go.mod ./
+# default home directory is /root
-COPY ./go.sum ./
 
-# Download dependencies
+# install rocksdb
-RUN --mount=type=cache,target=/root/.cache/go-build \
+ARG rocksdb_version=v8.1.1
-    --mount=type=cache,target=/go/pkg/mod \
+ENV ROCKSDB_VERSION=$rocksdb_version
-    go version && go mod download
 
-# Add source files
+RUN git clone https://github.com/facebook/rocksdb.git \
-COPY . .
+    && cd rocksdb \
+    && git checkout $ROCKSDB_VERSION \
+    && make -j$(nproc) install-shared \
+    && ldconfig
 
-ARG 0gchain_database_backend=rocksdb
+# Add source files for kava
-ENV 0GCHAIN_DATABASE_BACKEND=$0gchain_database_backend
+COPY . kava
+
+ARG kava_database_backend=rocksdb
+ENV KAVA_DATABASE_BACKEND=$kava_database_backend
 
 # Mount go build and mod caches as container caches, persisted between builder invocations
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
-    make install COSMOS_BUILD_OPTIONS=$0GCHAIN_DATABASE_BACKEND
+    cd kava && make install COSMOS_BUILD_OPTIONS=$KAVA_DATABASE_BACKEND
 
 
 FROM ubuntu:22.04
@@ -31,10 +38,10 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # copy rocksdb shared objects
-COPY --from=chain-builder /usr/local/lib/ /usr/local/lib/
+COPY --from=kava-builder /usr/local/lib/ /usr/local/lib/
 RUN ldconfig
 
-# copy 0g-chain binary
+# copy kava binary
-COPY --from=chain-builder /go/bin/0gchaind /bin/0gchaind
+COPY --from=kava-builder /go/bin/kava /bin/kava
 
-CMD ["0gchaind"]
+CMD ["kava"]

Dockerfile-rocksdb-base

@@ -1,22 +0,0 @@
-# published to https://hub.docker.com/repository/docker/kava/rocksdb/tags
-# docker buildx build --platform linux/amd64,linux/arm64 -t kava/rocksdb:v8.10.1-go1.21 -f Dockerfile-rocksdb-base . --push
-FROM golang:1.21-bullseye
-
-# Set up dependencies
-RUN apt-get update \
-    && apt-get install -y git make gcc libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev libzstd-dev \
-    && rm -rf /var/lib/apt/lists/*
-
-# Set working directory for the build
-WORKDIR /root
-# default home directory is /root
-
-# install rocksdb
-ARG rocksdb_version=v8.10.0
-ENV ROCKSDB_VERSION=$rocksdb_version
-
-RUN git clone https://github.com/facebook/rocksdb.git \
-    && cd rocksdb \
-    && git checkout $ROCKSDB_VERSION \
-    && make -j$(nproc) install-shared \
-    && ldconfig

Makefile

@@ -1,13 +1,9 @@
 ################################################################################
 ###                             Project Info                                 ###
 ################################################################################
-PROJECT_NAME := 0g-chain# unique namespace for project
+PROJECT_NAME := kava# unique namespace for project
-BINARY_NAME := 0gchaind
+
-MAIN_ENTRY := ./cmd/$(BINARY_NAME)
-DOCKER_IMAGE_NAME := 0glabs/$(PROJECT_NAME)
 GO_BIN ?= go
-ARCH := $(shell uname -m)
-WASMVM_VERSION := $(shell $(GO_BIN) list -m github.com/CosmWasm/wasmvm | sed 's/.* //')
 
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 GIT_COMMIT := $(shell git rev-parse HEAD)
@@ -32,8 +28,8 @@ VERSION := $(GIT_COMMIT_SHORT)
 VERSION_NUMBER := $(VERSION)
 endif
 
-TENDERMINT_VERSION := $(shell $(GO_BIN) list -m github.com/cometbft/cometbft | sed 's:.* ::')
+TENDERMINT_VERSION := $(shell go list -m github.com/tendermint/tendermint | sed 's:.* ::')
-COSMOS_SDK_VERSION := $(shell $(GO_BIN) list -m github.com/cosmos/cosmos-sdk | sed 's:.* ::')
+COSMOS_SDK_VERSION := $(shell go list -m github.com/cosmos/cosmos-sdk | sed 's:.* ::')
 
 .PHONY: print-git-info
 print-git-info:
@@ -41,7 +37,7 @@ print-git-info:
 
 .PHONY: print-version
 print-version:
-	@echo "$(BINARY_NAME) $(VERSION)\ntendermint $(TENDERMINT_VERSION)\ncosmos $(COSMOS_SDK_VERSION)"
+	@echo "kava $(VERSION)\ntendermint $(TENDERMINT_VERSION)\ncosmos $(COSMOS_SDK_VERSION)"
 
 ################################################################################
 ###                             Project Settings                             ###
@@ -49,7 +45,7 @@ print-version:
 LEDGER_ENABLED ?= true
 DOCKER:=docker
 DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf
-HTTPS_GIT := https://github.com/0glabs/0g-chain.git
+HTTPS_GIT := https://github.com/Kava-Labs/kava.git
 
 ################################################################################
 ###                             Machine Info                                 ###
@@ -80,7 +76,7 @@ print-machine-info:
 BUILD_DIR := build# build files
 BIN_DIR := $(BUILD_DIR)/bin# for binary dev dependencies
 BUILD_CACHE_DIR := $(BUILD_DIR)/.cache# caching for non-artifact outputs
-OUT_DIR := ./.build# for artifact intermediates and outputs
+OUT_DIR := out# for artifact intermediates and outputs
 
 ROOT_DIR := $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))# absolute path to root
 export PATH := $(ROOT_DIR)/$(BIN_DIR):$(PATH)# add local bin first in path
@@ -105,8 +101,6 @@ include $(BUILD_DIR)/deps.mk
 include $(BUILD_DIR)/proto.mk
 include $(BUILD_DIR)/proto-deps.mk
 
-include $(BUILD_DIR)/lint.mk
-
 #export GO111MODULE = on
 # process build tags
 build_tags = netgo
@@ -148,12 +142,12 @@ build_tags_comma_sep := $(subst $(whitespace),$(comma),$(build_tags))
 
 # process linker flags
 
-ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=$(PROJECT_NAME) \
+ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=kava \
-		  -X github.com/cosmos/cosmos-sdk/version.AppName=$(PROJECT_NAME) \
+		  -X github.com/cosmos/cosmos-sdk/version.AppName=kava \
 		  -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION_NUMBER) \
 		  -X github.com/cosmos/cosmos-sdk/version.Commit=$(GIT_COMMIT) \
 		  -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" \
-		  -X github.com/cometbft/cometbft/version.TMCoreSemVer=$(TENDERMINT_VERSION)
+		  -X github.com/tendermint/tendermint/version.TMCoreSemVer=$(TENDERMINT_VERSION)
 
 # DB backend selection
 ifeq (cleveldb,$(findstring cleveldb,$(COSMOS_BUILD_OPTIONS)))
@@ -178,10 +172,6 @@ endif
 ifeq (,$(findstring nostrip,$(COSMOS_BUILD_OPTIONS)))
   ldflags += -w -s
 endif
-
-ifeq ($(LINK_STATICALLY),true)
-	ldflags += -linkmode=external -extldflags "-Wl,-z,muldefs -static -lm"
-endif
 ldflags += $(LDFLAGS)
 ldflags := $(strip $(ldflags))
 
@@ -198,40 +188,28 @@ all: install
 
 build: go.sum
 ifeq ($(OS), Windows_NT)
-	$(GO_BIN) build -mod=readonly $(BUILD_FLAGS) -o out/$(shell $(GO_BIN) env GOOS)/$(BINARY_NAME).exe $(MAIN_ENTRY)
+	$(GO_BIN) build -mod=readonly $(BUILD_FLAGS) -o out/$(shell $(GO_BIN) env GOOS)/kava.exe ./cmd/kava
 else
-	$(GO_BIN) build -mod=readonly $(BUILD_FLAGS) -o out/$(shell $(GO_BIN) env GOOS)/$(BINARY_NAME) $(MAIN_ENTRY)
+	$(GO_BIN) build -mod=readonly $(BUILD_FLAGS) -o out/$(shell $(GO_BIN) env GOOS)/kava ./cmd/kava
 endif
 
-build-release: go.sum
-	wget -q https://github.com/CosmWasm/wasmvm/releases/download/$(WASMVM_VERSION)/libwasmvm_muslc.$(ARCH).a -O /lib/libwasmvm.$(ARCH).a
-	$(GO_BIN) build -mod=readonly $(BUILD_FLAGS) -o out/$(shell $(GO_BIN) env GOOS)/$(BINARY_NAME) $(MAIN_ENTRY)
-
 build-linux: go.sum
 	LEDGER_ENABLED=false GOOS=linux GOARCH=amd64 $(MAKE) build
 
-# build on rocksdb-backed kava on macOS with shared libs from brew
-# this assumes you are on macOS & these deps have been installed with brew:
-# rocksdb, snappy, lz4, and zstd
-# use like `make build-rocksdb-brew COSMOS_BUILD_OPTIONS=rocksdb`
-build-rocksdb-brew:
-	export CGO_CFLAGS := -I$(shell brew --prefix rocksdb)/include
-	export CGO_LDFLAGS := -L$(shell brew --prefix rocksdb)/lib -lrocksdb -lstdc++ -lm -lz -L$(shell brew --prefix snappy)/lib -L$(shell brew --prefix lz4)/lib -L$(shell brew --prefix zstd)/lib
-
 install: go.sum
-	$(GO_BIN) install -mod=readonly $(BUILD_FLAGS) $(MAIN_ENTRY)
+	$(GO_BIN) install -mod=readonly $(BUILD_FLAGS) ./cmd/kava
 
 ########################################
 ### Tools & dependencies
 
 go-mod-cache: go.sum
-	@echo "--> Download $(GO_BIN) modules to local cache"
+	@echo "--> Download go modules to local cache"
-	@$(GO_BIN) mod download
+	@go mod download
 PHONY: go-mod-cache
 
 go.sum: go.mod
 	@echo "--> Ensuring dependencies have not been modified"
-	@$(GO_BIN) mod verify
+	@go mod verify
 
 ########################################
 ### Linting
@@ -240,44 +218,50 @@ go.sum: go.mod
 # This tool checks local markdown links as well.
 # Set to exclude riot links as they trigger false positives
 link-check:
-	@$(GO_BIN) get -u github.com/raviqqe/liche@f57a5d1c5be4856454cb26de155a65a4fd856ee3
+	@go get -u github.com/raviqqe/liche@f57a5d1c5be4856454cb26de155a65a4fd856ee3
-	# TODO: replace kava in following line with project name
 	liche -r . --exclude "^http://127.*|^https://riot.im/app*|^http://kava-testnet*|^https://testnet-dex*|^https://kava3.data.kava.io*|^https://ipfs.io*|^https://apps.apple.com*|^https://kava.quicksync.io*"
 
+
+lint:
+	golangci-lint run
+	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" | xargs gofmt -d -s
+	go mod verify
+.PHONY: lint
+
 format:
 	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' | xargs gofmt -w -s
 	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' | xargs misspell -w
 	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' | xargs goimports -w -local github.com/tendermint
 	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' | xargs goimports -w -local github.com/cosmos/cosmos-sdk
-	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' | xargs goimports -w -local github.com/0glabs/0g-chain
+	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' | xargs goimports -w -local github.com/kava-labs/kava
 .PHONY: format
 
 ###############################################################################
 ###                                Localnet                                 ###
 ###############################################################################
 
-# Build docker image and tag as 0glabs/0g-chain:local
+# Build docker image and tag as kava/kava:local
 docker-build:
-	DOCKER_BUILDKIT=1 $(DOCKER) build -t $(DOCKER_IMAGE_NAME):local .
+	DOCKER_BUILDKIT=1 $(DOCKER) build -t kava/kava:local .
 
 docker-build-rocksdb:
-	DOCKER_BUILDKIT=1 $(DOCKER) build -f Dockerfile-rocksdb -t $(DOCKER_IMAGE_NAME):local .
+	DOCKER_BUILDKIT=1 $(DOCKER) build -f Dockerfile-rocksdb -t kava/kava:local .
 
-build-docker-local-0gchain:
+build-docker-local-kava:
 	@$(MAKE) -C networks/local
 
 # Run a 4-node testnet locally
 localnet-start: build-linux localnet-stop
 	@if ! [ -f build/node0/kvd/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/kvd:Z kava/kavanode testnet --v 4 -o . --starting-ip-address 192.168.10.2 --keyring-backend=test ; fi
-	$(DOCKER) compose up -d
+	docker-compose up -d
 
 localnet-stop:
-	$(DOCKER) compose down
+	docker-compose down
 
 # Launch a new single validator chain
 start:
 	./contrib/devnet/init-new-chain.sh
-	$(BINARY_NAME) start
+	kava start
 
 #proto-format:
 #@echo "Formatting Protobuf files"
@@ -292,76 +276,62 @@ start:
 # build dependency needed for cli tests
 test-all: build
 	# basic app tests
-	@$(GO_BIN) test ./app -v
+	@go test ./app -v
 	# basic simulation (seed "4" happens to not unbond all validators before reaching 100 blocks)
-	#@$(GO_BIN) test ./app -run TestFullAppSimulation        -Enabled -Commit -NumBlocks=100 -BlockSize=200 -Seed 4 -v -timeout 24h
+	#@go test ./app -run TestFullAppSimulation        -Enabled -Commit -NumBlocks=100 -BlockSize=200 -Seed 4 -v -timeout 24h
 	# other sim tests
-	#@$(GO_BIN) test ./app -run TestAppImportExport          -Enabled -Commit -NumBlocks=100 -BlockSize=200 -Seed 4 -v -timeout 24h
+	#@go test ./app -run TestAppImportExport          -Enabled -Commit -NumBlocks=100 -BlockSize=200 -Seed 4 -v -timeout 24h
-	#@$(GO_BIN) test ./app -run TestAppSimulationAfterImport -Enabled -Commit -NumBlocks=100 -BlockSize=200 -Seed 4 -v -timeout 24h
+	#@go test ./app -run TestAppSimulationAfterImport -Enabled -Commit -NumBlocks=100 -BlockSize=200 -Seed 4 -v -timeout 24h
 	# AppStateDeterminism does not use Seed flag
-	#@$(GO_BIN) test ./app -run TestAppStateDeterminism      -Enabled -Commit -NumBlocks=100 -BlockSize=200 -Seed 4 -v -timeout 24h
+	#@go test ./app -run TestAppStateDeterminism      -Enabled -Commit -NumBlocks=100 -BlockSize=200 -Seed 4 -v -timeout 24h
 
 # run module tests and short simulations
 test-basic: test
-	@$(GO_BIN) test ./app -run TestFullAppSimulation        -Enabled -Commit -NumBlocks=5 -BlockSize=200 -Seed 4 -v -timeout 2m
+	@go test ./app -run TestFullAppSimulation        -Enabled -Commit -NumBlocks=5 -BlockSize=200 -Seed 4 -v -timeout 2m
 	# other sim tests
-	@$(GO_BIN) test ./app -run TestAppImportExport          -Enabled -Commit -NumBlocks=5 -BlockSize=200 -Seed 4 -v -timeout 2m
+	@go test ./app -run TestAppImportExport          -Enabled -Commit -NumBlocks=5 -BlockSize=200 -Seed 4 -v -timeout 2m
-	@$(GO_BIN) test ./app -run TestAppSimulationAfterImport -Enabled -Commit -NumBlocks=5 -BlockSize=200 -Seed 4 -v -timeout 2m
+	@go test ./app -run TestAppSimulationAfterImport -Enabled -Commit -NumBlocks=5 -BlockSize=200 -Seed 4 -v -timeout 2m
 	@# AppStateDeterminism does not use Seed flag
-	@$(GO_BIN) test ./app -run TestAppStateDeterminism      -Enabled -Commit -NumBlocks=5 -BlockSize=200 -Seed 4 -v -timeout 2m
+	@go test ./app -run TestAppStateDeterminism      -Enabled -Commit -NumBlocks=5 -BlockSize=200 -Seed 4 -v -timeout 2m
 
 # run end-to-end tests (local docker container must be built, see docker-build)
 test-e2e: docker-build
-	$(GO_BIN) test -failfast -count=1 -v ./tests/e2e/...
+	export E2E_KAVA_FUNDED_ACCOUNT_MNEMONIC='tent fitness boat among census primary pipe nose dream glance cave turtle electric fabric jacket shaft easy myself genuine this sibling pulse word unfold'; \
-
+	go test -failfast -count=1 -v ./tests/e2e/...
-# run interchaintest tests (./tests/e2e-ibc)
-test-ibc: docker-build
-	cd tests/e2e-ibc && KAVA_TAG=local $(GO_BIN) test -timeout 10m .
-.PHONY: test-ibc
 
 test:
-	@$(GO_BIN) test $$($(GO_BIN) list ./... | grep -v 'contrib' | grep -v 'tests/e2e')
+	@go test $$(go list ./... | grep -v 'contrib' | grep -v 'tests/e2e')
+
+test-rocksdb:
+	@go test -tags=rocksdb ./cmd/kava/opendb
 
 # Run cli integration tests
-# `-p 4` to use 4 cores, `-tags cli_test` to tell $(GO_BIN) not to ignore the cli package
+# `-p 4` to use 4 cores, `-tags cli_test` to tell go not to ignore the cli package
 # These tests use the `kvd` or `kvcli` binaries in the build dir, or in `$BUILDDIR` if that env var is set.
 test-cli: build
-	@$(GO_BIN) test ./cli_test -tags cli_test -v -p 4
+	@go test ./cli_test -tags cli_test -v -p 4
 
 # Run tests for migration cli command
 test-migrate:
-	@$(GO_BIN) test -v -count=1 ./migrate/...
+	@go test -v -count=1 ./migrate/...
-
-# Use the old Apple linker to workaround broken xcode - https://github.com/golang/go/issues/65169
-ifeq ($(OS_FAMILY),Darwin)
-  FUZZLDFLAGS := -ldflags=-extldflags=-Wl,-ld_classic
-endif
-
-test-fuzz:
-	@$(GO_BIN) test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzMintCoins ./x/precisebank/keeper
-	@$(GO_BIN) test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzBurnCoins ./x/precisebank/keeper
-	@$(GO_BIN) test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzSendCoins ./x/precisebank/keeper
-	@$(GO_BIN) test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzGenesisStateValidate_NonZeroRemainder ./x/precisebank/types
-	@$(GO_BIN) test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzGenesisStateValidate_ZeroRemainder ./x/precisebank/types
 
 # Kick start lots of sims on an AWS cluster.
 # This submits an AWS Batch job to run a lot of sims, each within a docker image. Results are uploaded to S3
 start-remote-sims:
 	# build the image used for running sims in, and tag it
-	docker build -f simulations/Dockerfile -t $(DOCKER_IMAGE_NAME)-sim:master .
+	docker build -f simulations/Dockerfile -t kava/kava-sim:master .
 	# push that image to the hub
-	docker push $(DOCKER_IMAGE_NAME)-sim:master
+	docker push kava/kava-sim:master
 	# submit an array job on AWS Batch, using 1000 seeds, spot instances
 	aws batch submit-job \
 		-—job-name "master-$(VERSION)" \
-		-—job-queue "simulation-1-queue-spot" \
+		-—job-queue “simulation-1-queue-spot" \
 		-—array-properties size=1000 \
-		-—job-definition $(BINARY_NAME)-sim-master \
+		-—job-definition kava-sim-master \
 		-—container-override environment=[{SIM_NAME=master-$(VERSION)}]
 
 update-kvtool:
-	git submodule init || true
+	git submodule update
-	git submodule update --remote
 	cd tests/e2e/kvtool && make install
 
-.PHONY: all build-linux install build test test-cli test-all test-rest test-basic test-fuzz start-remote-sims
+.PHONY: all build-linux install clean build test test-cli test-all test-rest test-basic start-remote-sims

README.md

@@ -1,35 +1,65 @@
-<br />
 <p align="center">
-  <img src="https://framerusercontent.com/images/JJi9BT4FAjp4W63c3jjNz0eezQ.png" alt="Logo" width="140" height="140">
+  <img src="./kava-logo.svg" width="300">
 </p>
-<p align="center">
-    <b><font size="5">0G is limitless scalability</font></b>
-</p>
-<br />
 
-# 0G Chain
+<div align="center">
-Zero Gravity (0G) is the foundational infrastructure for high-performance dapps and chains particularly for AI. 
 
-It efficiently orchestrates utilization of hardware resources such as storage and compute and software assets such as data and models to handle the scale and complexity of AI workloads.
+[![version](https://img.shields.io/github/tag/kava-labs/kava.svg)](https://github.com/kava-labs/kava/releases/latest)
+[![CircleCI](https://circleci.com/gh/Kava-Labs/kava/tree/master.svg?style=shield)](https://circleci.com/gh/Kava-Labs/kava/tree/master)
+[![Go Report Card](https://goreportcard.com/badge/github.com/kava-labs/kava)](https://goreportcard.com/report/github.com/kava-labs/kava)
+[![API Reference](https://godoc.org/github.com/Kava-Labs/kava?status.svg)](https://godoc.org/github.com/Kava-Labs/kava)
+[![GitHub](https://img.shields.io/github/license/kava-labs/kava.svg)](https://github.com/Kava-Labs/kava/blob/master/LICENSE.md)
+[![Twitter Follow](https://img.shields.io/twitter/follow/KAVA_CHAIN.svg?label=Follow&style=social)](https://twitter.com/KAVA_CHAIN)
+[![Discord Chat](https://img.shields.io/discord/704389840614981673.svg)](https://discord.com/invite/kQzh3Uv)
 
-Continue reading [here](https://docs.0g.ai/intro) if you want to learn more about 0G dAIOS and how its various layers enable limitless scalability.
+</div>
 
-## 0G Product Suite
+<div align="center">
-- DA: ultra high-performance data availability layer with KZG and quorum-based DAS
-- Storage: decentralized storage with erasure coding and replication
-- Inference Serving: flexible serving framework for inferences and finetuning
-- Network: high-performance, low-latency, and decentralized network
 
-## Documentation
+### [Telegram](https://t.me/kavalabs) | [Medium](https://medium.com/kava-labs) | [Discord](https://discord.gg/JJYnuCx)
-- If you want to build with 0G's network, DA layer, inference serving, or storage SDK, please refer to the [Build with 0G Documentation](https://docs.0g.ai/build-with-0g/contracts).
 
-- If you want to run a validator node, DA node, or storage node, please refer to the [Run a Node Documentation](https://docs.0g.ai/run-a-node/overview).
+</div>
 
+Reference implementation of Kava, a blockchain for cross-chain DeFi. Built using the [cosmos-sdk](https://github.com/cosmos/cosmos-sdk).
 
-## Support and Additional Resources
+## Mainnet
-We want to do everything we can to help you be successful while working on your contribution and projects. Here you'll find various resources and communities that may help you complete a project or contribute to 0G. 
 
+The current recommended version of the software for mainnet is [v0.24.1](https://github.com/Kava-Labs/kava/releases/tag/v0.24.1). The master branch of this repository often contains considerable development work since the last mainnet release and is __not__ runnable on mainnet.
 
-### Communities
+### Installation and Setup
-- [0G Telegram](https://t.me/web3_0glabs)
+For detailed instructions see [the Kava docs](https://docs.kava.io/docs/participate/validator-node).
-- [0G Discord](https://discord.com/invite/0glabs)
+
+```bash
+git checkout v0.24.1
+make install
+```
+
+End-to-end tests of Kava use a tool for generating networks with different configurations: [kvtool](https://github.com/Kava-Labs/kvtool).
+This is included as a git submodule at [`tests/e2e/kvtool`](tests/e2e/kvtool/).
+When first cloning the repository, if you intend to run the e2e integration tests, you must also
+clone the submodules:
+```bash
+git clone --recurse-submodules https://github.com/Kava-Labs/kava.git
+```
+
+Or, if you have already cloned the repo: `git submodule update --init`
+
+## Testnet
+
+For further information on joining the testnet, head over to the [testnet repo](https://github.com/Kava-Labs/kava-testnets).
+
+## Docs
+
+Kava protocol and client documentation can be found in the [Kava docs](https://docs.kava.io).
+
+If you have technical questions or concerns, ask a developer or community member in the [Kava discord](https://discord.com/invite/kQzh3Uv).
+
+## Security
+
+If you find a security issue, please report it to security [at] kava.io. Depending on the verification and severity, a bug bounty may be available.
+
+## License
+
+Copyright © Kava Labs, Inc. All rights reserved.
+
+Licensed under the [Apache v2 License](LICENSE.md).

app/_sim_test.go

@@ -11,15 +11,15 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	dbm "github.com/cometbft/cometbft-db"
+	abci "github.com/tendermint/tendermint/abci/types"
-	abci "github.com/cometbft/cometbft/abci/types"
+	"github.com/tendermint/tendermint/libs/log"
-	"github.com/cometbft/cometbft/libs/log"
+	dbm "github.com/tendermint/tm-db"
 
-	"cosmossdk.io/simapp"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/simapp"
+	"github.com/cosmos/cosmos-sdk/simapp/helpers"
 	"github.com/cosmos/cosmos-sdk/store"
-	"github.com/cosmos/cosmos-sdk/testutil/sims"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/x/auth"
@@ -32,10 +32,15 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	"github.com/cosmos/cosmos-sdk/x/supply"
 
-	"github.com/0glabs/0g-chain/x/bep3"
+	"github.com/kava-labs/kava/x/auction"
-	"github.com/0glabs/0g-chain/x/committee"
+	"github.com/kava-labs/kava/x/bep3"
-	"github.com/0glabs/0g-chain/x/pricefeed"
+	"github.com/kava-labs/kava/x/cdp"
-	validatorvesting "github.com/0glabs/0g-chain/x/validator-vesting"
+	"github.com/kava-labs/kava/x/committee"
+	"github.com/kava-labs/kava/x/incentive"
+	"github.com/kava-labs/kava/x/kavadist"
+	"github.com/kava-labs/kava/x/pricefeed"
+	"github.com/kava-labs/kava/x/swap"
+	validatorvesting "github.com/kava-labs/kava/x/validator-vesting"
 )
 
 type StoreKeysPrefixes struct {
@@ -275,7 +280,7 @@ func TestAppStateDeterminism(t *testing.T) {
 	config.ExportParamsPath = ""
 	config.OnOperation = false
 	config.AllInvariants = false
-	config.ChainID = sims.SimAppChainID
+	config.ChainID = helpers.SimAppChainID
 
 	numTimesToRunPerSeed := 2
 	appHashList := make([]json.RawMessage, numTimesToRunPerSeed)

app/_simulate_tx_test.go

@@ -8,13 +8,8 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/0glabs/0g-chain/app"
+	"github.com/kava-labs/kava/app"
-	"github.com/0glabs/0g-chain/chaincfg"
 
-	abci "github.com/cometbft/cometbft/abci/types"
-	tmbytes "github.com/cometbft/cometbft/libs/bytes"
-	ctypes "github.com/cometbft/cometbft/rpc/core/types"
-	jsonrpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types"
 	"github.com/cosmos/cosmos-sdk/client/context"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/rest"
@@ -23,6 +18,10 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+	abci "github.com/tendermint/tendermint/abci/types"
+	tmbytes "github.com/tendermint/tendermint/libs/bytes"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
+	jsonrpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
 )
 
 type SimulateRequestTestSuite struct {
@@ -52,9 +51,9 @@ func (suite *SimulateRequestTestSuite) TearDownTest() {
 }
 
 func (suite *SimulateRequestTestSuite) TestSimulateRequest() {
-	fromAddr, err := sdk.AccAddressFromBech32("0g1esagqd83rhqdtpy5sxhklaxgn58k2m3s3mnpea")
+	fromAddr, err := sdk.AccAddressFromBech32("kava1esagqd83rhqdtpy5sxhklaxgn58k2m3s3mnpea")
 	suite.Require().NoError(err)
-	toAddr, err := sdk.AccAddressFromBech32("0g1mq9qxlhze029lm0frzw2xr6hem8c3k9ts54w0w")
+	toAddr, err := sdk.AccAddressFromBech32("kava1mq9qxlhze029lm0frzw2xr6hem8c3k9ts54w0w")
 	suite.Require().NoError(err)
 
 	simRequest := app.SimulateRequest{
@@ -62,11 +61,11 @@ func (suite *SimulateRequestTestSuite) TestSimulateRequest() {
 			bank.MsgSend{
 				FromAddress: fromAddr,
 				ToAddress:   toAddr,
-				Amount:      sdk.NewCoins(chaincfg.MakeCoinForGasDenom(1e6)),
+				Amount:      sdk.NewCoins(sdk.NewCoin("ukava", sdkmath.NewInt(1e6))),
 			},
 		},
 		Fee: auth.StdFee{
-			Amount: sdk.NewCoins(chaincfg.MakeCoinForGasDenom(5e4)),
+			Amount: sdk.NewCoins(sdk.NewCoin("ukava", sdkmath.NewInt(5e4))),
 			Gas:    1e6,
 		},
 		Memo: "test memo",

app/abci_utils.go

@@ -1,341 +0,0 @@
-package app
-
-import (
-	"errors"
-	"fmt"
-
-	abci "github.com/cometbft/cometbft/abci/types"
-	gethtypes "github.com/ethereum/go-ethereum/core/types"
-	evmtypes "github.com/evmos/ethermint/x/evm/types"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/mempool"
-	"github.com/cosmos/cosmos-sdk/x/auth/signing"
-)
-
-type (
-	// GasTx defines the contract that a transaction with a gas limit must implement.
-	GasTx interface {
-		GetGas() uint64
-	}
-
-	// ProposalTxVerifier defines the interface that is implemented by BaseApp,
-	// that any custom ABCI PrepareProposal and ProcessProposal handler can use
-	// to verify a transaction.
-	ProposalTxVerifier interface {
-		PrepareProposalVerifyTx(tx sdk.Tx) ([]byte, error)
-		ProcessProposalVerifyTx(txBz []byte) (sdk.Tx, error)
-	}
-
-	// DefaultProposalHandler defines the default ABCI PrepareProposal and
-	// ProcessProposal handlers.
-	DefaultProposalHandler struct {
-		mempool    mempool.Mempool
-		txVerifier ProposalTxVerifier
-		txSelector TxSelector
-	}
-)
-
-func NewDefaultProposalHandler(mp mempool.Mempool, txVerifier ProposalTxVerifier) *DefaultProposalHandler {
-	return &DefaultProposalHandler{
-		mempool:    mp,
-		txVerifier: txVerifier,
-		txSelector: NewDefaultTxSelector(),
-	}
-}
-
-// SetTxSelector sets the TxSelector function on the DefaultProposalHandler.
-func (h *DefaultProposalHandler) SetTxSelector(ts TxSelector) {
-	h.txSelector = ts
-}
-
-// PrepareProposalHandler returns the default implementation for processing an
-// ABCI proposal. The application's mempool is enumerated and all valid
-// transactions are added to the proposal. Transactions are valid if they:
-//
-// 1) Successfully encode to bytes.
-// 2) Are valid (i.e. pass runTx, AnteHandler only).
-//
-// Enumeration is halted once RequestPrepareProposal.MaxBytes of transactions is
-// reached or the mempool is exhausted.
-//
-// Note:
-//
-// - Step (2) is identical to the validation step performed in
-// DefaultProcessProposal. It is very important that the same validation logic
-// is used in both steps, and applications must ensure that this is the case in
-// non-default handlers.
-//
-// - If no mempool is set or if the mempool is a no-op mempool, the transactions
-// requested from CometBFT will simply be returned, which, by default, are in
-// FIFO order.
-func (h *DefaultProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHandler {
-	return func(ctx sdk.Context, req abci.RequestPrepareProposal) abci.ResponsePrepareProposal {
-		var maxBlockGas uint64
-		if b := ctx.ConsensusParams().Block; b != nil {
-			maxBlockGas = uint64(b.MaxGas)
-		}
-
-		defer h.txSelector.Clear()
-
-		// If the mempool is nil or NoOp we simply return the transactions
-		// requested from CometBFT, which, by default, should be in FIFO order.
-		//
-		// Note, we still need to ensure the transactions returned respect req.MaxTxBytes.
-		_, isNoOp := h.mempool.(mempool.NoOpMempool)
-		if h.mempool == nil || isNoOp {
-			for _, txBz := range req.Txs {
-				// XXX: We pass nil as the memTx because we have no way of decoding the
-				// txBz. We'd need to break (update) the ProposalTxVerifier interface.
-				// As a result, we CANNOT account for block max gas.
-				stop := h.txSelector.SelectTxForProposal(uint64(req.MaxTxBytes), maxBlockGas, nil, txBz)
-				if stop {
-					break
-				}
-			}
-
-			return abci.ResponsePrepareProposal{Txs: h.txSelector.SelectedTxs()}
-		}
-
-		selectedTxsSignersSeqs := make(map[string]uint64)
-		var selectedTxsNums int
-
-		var waitRemoveTxs []sdk.Tx
-
-		mempool.SelectBy(ctx, h.mempool, req.Txs, func(memTx sdk.Tx) bool {
-			sigs, err := memTx.(signing.SigVerifiableTx).GetSignaturesV2()
-			if err != nil {
-				panic(fmt.Errorf("failed to get signatures: %w", err))
-			}
-			// If the signers aren't in selectedTxsSignersSeqs then we haven't seen them before
-			// so we add them and continue given that we don't need to check the sequence.
-			shouldAdd := true
-			txSignersSeqs := make(map[string]uint64)
-			if len(sigs) == 0 {
-				msgs := memTx.GetMsgs()
-				if len(msgs) == 1 {
-					msgEthTx, ok := msgs[0].(*evmtypes.MsgEthereumTx)
-					if ok {
-						ethTx := msgEthTx.AsTransaction()
-						signer := gethtypes.NewEIP2930Signer(ethTx.ChainId())
-						ethSender, err := signer.Sender(ethTx)
-						if err == nil {
-							signer := sdk.AccAddress(ethSender.Bytes()).String()
-							nonce := ethTx.Nonce()
-							seq, ok := selectedTxsSignersSeqs[signer]
-							if !ok {
-								txSignersSeqs[signer] = nonce
-							} else {
-								// If we have seen this signer before in this block, we must make
-								// sure that the current sequence is seq+1; otherwise is invalid
-								// and we skip it.
-								if seq+1 != nonce {
-									shouldAdd = false
-								} else {
-									txSignersSeqs[signer] = nonce
-								}
-							}
-						}
-					}
-				}
-			} else {
-				for _, sig := range sigs {
-					signer := sdk.AccAddress(sig.PubKey.Address()).String()
-					seq, ok := selectedTxsSignersSeqs[signer]
-					if !ok {
-						txSignersSeqs[signer] = sig.Sequence
-						continue
-					}
-
-					// If we have seen this signer before in this block, we must make
-					// sure that the current sequence is seq+1; otherwise is invalid
-					// and we skip it.
-					if seq+1 != sig.Sequence {
-						shouldAdd = false
-						break
-					}
-					txSignersSeqs[signer] = sig.Sequence
-				}
-			}
-
-			if shouldAdd {
-				// NOTE: Since transaction verification was already executed in CheckTx,
-				// which calls mempool.Insert, in theory everything in the pool should be
-				// valid. But some mempool implementations may insert invalid txs, so we
-				// check again.
-				txBz, err := h.txVerifier.PrepareProposalVerifyTx(memTx)
-				if err != nil {
-					waitRemoveTxs = append(waitRemoveTxs, memTx)
-				} else {
-					stop := h.txSelector.SelectTxForProposal(uint64(req.MaxTxBytes), maxBlockGas, memTx, txBz)
-					if stop {
-						return false
-					}
-
-					txsLen := len(h.txSelector.SelectedTxs())
-					for sender, seq := range txSignersSeqs {
-						// If txsLen != selectedTxsNums is true, it means that we've
-						// added a new tx to the selected txs, so we need to update
-						// the sequence of the sender.
-						if txsLen != selectedTxsNums {
-							selectedTxsSignersSeqs[sender] = seq
-						} else if _, ok := selectedTxsSignersSeqs[sender]; !ok {
-							// The transaction hasn't been added but it passed the
-							// verification, so we know that the sequence is correct.
-							// So we set this sender's sequence to seq-1, in order
-							// to avoid unnecessary calls to PrepareProposalVerifyTx.
-							selectedTxsSignersSeqs[sender] = seq - 1
-						}
-					}
-					selectedTxsNums = txsLen
-				}
-			}
-
-			return true
-		})
-
-		for i := range waitRemoveTxs {
-			err := h.mempool.Remove(waitRemoveTxs[i])
-			if err != nil && !errors.Is(err, mempool.ErrTxNotFound) {
-				panic(err)
-			}
-		}
-
-		return abci.ResponsePrepareProposal{Txs: h.txSelector.SelectedTxs()}
-	}
-}
-
-// ProcessProposalHandler returns the default implementation for processing an
-// ABCI proposal. Every transaction in the proposal must pass 2 conditions:
-//
-// 1. The transaction bytes must decode to a valid transaction.
-// 2. The transaction must be valid (i.e. pass runTx, AnteHandler only)
-//
-// If any transaction fails to pass either condition, the proposal is rejected.
-// Note that step (2) is identical to the validation step performed in
-// DefaultPrepareProposal. It is very important that the same validation logic
-// is used in both steps, and applications must ensure that this is the case in
-// non-default handlers.
-func (h *DefaultProposalHandler) ProcessProposalHandler() sdk.ProcessProposalHandler {
-	// If the mempool is nil or NoOp we simply return ACCEPT,
-	// because PrepareProposal may have included txs that could fail verification.
-	_, isNoOp := h.mempool.(mempool.NoOpMempool)
-	if h.mempool == nil || isNoOp {
-		return NoOpProcessProposal()
-	}
-
-	return func(ctx sdk.Context, req abci.RequestProcessProposal) abci.ResponseProcessProposal {
-		var totalTxGas uint64
-
-		var maxBlockGas int64
-		if b := ctx.ConsensusParams().Block; b != nil {
-			maxBlockGas = b.MaxGas
-		}
-
-		for _, txBytes := range req.Txs {
-			tx, err := h.txVerifier.ProcessProposalVerifyTx(txBytes)
-			if err != nil {
-				return abci.ResponseProcessProposal{Status: abci.ResponseProcessProposal_REJECT}
-			}
-
-			if maxBlockGas > 0 {
-				gasTx, ok := tx.(GasTx)
-				if ok {
-					totalTxGas += gasTx.GetGas()
-				}
-
-				if totalTxGas > uint64(maxBlockGas) {
-					return abci.ResponseProcessProposal{Status: abci.ResponseProcessProposal_REJECT}
-				}
-			}
-		}
-
-		return abci.ResponseProcessProposal{Status: abci.ResponseProcessProposal_ACCEPT}
-	}
-}
-
-// NoOpPrepareProposal defines a no-op PrepareProposal handler. It will always
-// return the transactions sent by the client's request.
-func NoOpPrepareProposal() sdk.PrepareProposalHandler {
-	return func(_ sdk.Context, req abci.RequestPrepareProposal) abci.ResponsePrepareProposal {
-		return abci.ResponsePrepareProposal{Txs: req.Txs}
-	}
-}
-
-// NoOpProcessProposal defines a no-op ProcessProposal Handler. It will always
-// return ACCEPT.
-func NoOpProcessProposal() sdk.ProcessProposalHandler {
-	return func(_ sdk.Context, _ abci.RequestProcessProposal) abci.ResponseProcessProposal {
-		return abci.ResponseProcessProposal{Status: abci.ResponseProcessProposal_ACCEPT}
-	}
-}
-
-// TxSelector defines a helper type that assists in selecting transactions during
-// mempool transaction selection in PrepareProposal. It keeps track of the total
-// number of bytes and total gas of the selected transactions. It also keeps
-// track of the selected transactions themselves.
-type TxSelector interface {
-	// SelectedTxs should return a copy of the selected transactions.
-	SelectedTxs() [][]byte
-
-	// Clear should clear the TxSelector, nulling out all relevant fields.
-	Clear()
-
-	// SelectTxForProposal should attempt to select a transaction for inclusion in
-	// a proposal based on inclusion criteria defined by the TxSelector. It must
-	// return <true> if the caller should halt the transaction selection loop
-	// (typically over a mempool) or <false> otherwise.
-	SelectTxForProposal(maxTxBytes, maxBlockGas uint64, memTx sdk.Tx, txBz []byte) bool
-}
-
-type defaultTxSelector struct {
-	totalTxBytes uint64
-	totalTxGas   uint64
-	selectedTxs  [][]byte
-}
-
-func NewDefaultTxSelector() TxSelector {
-	return &defaultTxSelector{}
-}
-
-func (ts *defaultTxSelector) SelectedTxs() [][]byte {
-	txs := make([][]byte, len(ts.selectedTxs))
-	copy(txs, ts.selectedTxs)
-	return txs
-}
-
-func (ts *defaultTxSelector) Clear() {
-	ts.totalTxBytes = 0
-	ts.totalTxGas = 0
-	ts.selectedTxs = nil
-}
-
-func (ts *defaultTxSelector) SelectTxForProposal(maxTxBytes, maxBlockGas uint64, memTx sdk.Tx, txBz []byte) bool {
-	txSize := uint64(len(txBz))
-
-	var txGasLimit uint64
-	if memTx != nil {
-		if gasTx, ok := memTx.(GasTx); ok {
-			txGasLimit = gasTx.GetGas()
-		}
-	}
-
-	// only add the transaction to the proposal if we have enough capacity
-	if (txSize + ts.totalTxBytes) <= maxTxBytes {
-		// If there is a max block gas limit, add the tx only if the limit has
-		// not been met.
-		if maxBlockGas > 0 {
-			if (txGasLimit + ts.totalTxGas) <= maxBlockGas {
-				ts.totalTxGas += txGasLimit
-				ts.totalTxBytes += txSize
-				ts.selectedTxs = append(ts.selectedTxs, txBz)
-			}
-		} else {
-			ts.totalTxBytes += txSize
-			ts.selectedTxs = append(ts.selectedTxs, txBz)
-		}
-	}
-
-	// check if we've reached capacity; if so, we cannot select any more transactions
-	return ts.totalTxBytes >= maxTxBytes || (maxBlockGas > 0 && (ts.totalTxGas >= maxBlockGas))
-}

app/ante/ante.go

@@ -5,16 +5,16 @@ import (
 	"runtime/debug"
 
 	errorsmod "cosmossdk.io/errors"
-	tmlog "github.com/cometbft/cometbft/libs/log"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
 	authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
 	vesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
-	ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
+	ibcante "github.com/cosmos/ibc-go/v6/modules/core/ante"
-	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
+	ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"
 	evmante "github.com/evmos/ethermint/app/ante"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
+	tmlog "github.com/tendermint/tendermint/libs/log"
 )
 
 // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC
@@ -168,7 +168,6 @@ func newEthAnteHandler(options HandlerOptions) sdk.AnteHandler {
 		evmante.NewEthSetUpContextDecorator(options.EvmKeeper), // outermost AnteDecorator. SetUpContext must be called first
 		evmante.NewEthMempoolFeeDecorator(options.EvmKeeper),   // Check eth effective gas price against minimal-gas-prices
 		evmante.NewEthValidateBasicDecorator(options.EvmKeeper),
-		evmante.NewEvmMinGasPriceDecorator(options.EvmKeeper),
 		evmante.NewEthSigVerificationDecorator(options.EvmKeeper),
 		evmante.NewEthAccountVerificationDecorator(options.AccountKeeper, options.EvmKeeper),
 		evmante.NewCanTransferDecorator(options.EvmKeeper),

app/ante/ante_test.go

@@ -7,13 +7,9 @@ import (
 	"time"
 
 	sdkmath "cosmossdk.io/math"
-	tmdb "github.com/cometbft/cometbft-db"
-	abci "github.com/cometbft/cometbft/abci/types"
-	"github.com/cometbft/cometbft/libs/log"
-	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
-	"github.com/cosmos/cosmos-sdk/testutil/sims"
+	"github.com/cosmos/cosmos-sdk/simapp/helpers"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
@@ -21,15 +17,17 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 	"github.com/stretchr/testify/require"
+	abci "github.com/tendermint/tendermint/abci/types"
+	"github.com/tendermint/tendermint/libs/log"
+	tmdb "github.com/tendermint/tm-db"
 
-	"github.com/0glabs/0g-chain/app"
+	"github.com/kava-labs/kava/app"
-	"github.com/0glabs/0g-chain/chaincfg"
+	bep3types "github.com/kava-labs/kava/x/bep3/types"
-	bep3types "github.com/0glabs/0g-chain/x/bep3/types"
+	pricefeedtypes "github.com/kava-labs/kava/x/pricefeed/types"
-	pricefeedtypes "github.com/0glabs/0g-chain/x/pricefeed/types"
 )
 
 func TestMain(m *testing.M) {
-	chaincfg.SetSDKConfig()
+	app.SetSDKConfig()
 	os.Exit(m.Run())
 }
 
@@ -52,26 +50,22 @@ func TestAppAnteHandler_AuthorizedMempool(t *testing.T) {
 
 	tApp := app.TestApp{
 		App: *app.NewApp(
-			chaincfg.DefaultNodeHome,
+			log.NewNopLogger(),
+			tmdb.NewMemDB(),
+			app.DefaultNodeHome,
 			nil,
 			encodingConfig,
 			opts,
-			app.NewBaseApp(
-				log.NewNopLogger(),
-				tmdb.NewMemDB(),
-				encodingConfig,
-				baseapp.SetChainID(app.TestChainId),
-			),
 		),
 	}
 
-	chainID := app.TestChainId
+	chainID := "kavatest_1-1"
 	tApp = tApp.InitializeFromGenesisStatesWithTimeAndChainID(
 		time.Date(1998, 1, 1, 0, 0, 0, 0, time.UTC),
 		chainID,
 		app.NewFundedGenStateWithSameCoins(
 			tApp.AppCodec(),
-			sdk.NewCoins(chaincfg.MakeCoinForGasDenom(1e9)),
+			sdk.NewCoins(sdk.NewInt64Coin("ukava", 1e9)),
 			testAddresses,
 		),
 		newBep3GenStateMulti(tApp.AppCodec(), deputy),
@@ -112,18 +106,18 @@ func TestAppAnteHandler_AuthorizedMempool(t *testing.T) {
 
 	for _, tc := range testcases {
 		t.Run(tc.name, func(t *testing.T) {
-			stdTx, err := sims.GenSignedMockTx(
+			stdTx, err := helpers.GenSignedMockTx(
 				rand.New(rand.NewSource(time.Now().UnixNano())),
 				encodingConfig.TxConfig,
 				[]sdk.Msg{
 					banktypes.NewMsgSend(
 						tc.address,
 						testAddresses[0],
-						sdk.NewCoins(chaincfg.MakeCoinForGasDenom(1_000_000)),
+						sdk.NewCoins(sdk.NewInt64Coin("ukava", 1_000_000)),
 					),
 				},
 				sdk.NewCoins(), // no fee
-				sims.DefaultGenTxGas,
+				helpers.DefaultGenTxGas,
 				chainID,
 				[]uint64{0},
 				[]uint64{0}, // fixed sequence numbers will cause tests to fail sig verification if the same address is used twice
@@ -215,7 +209,7 @@ func TestAppAnteHandler_RejectMsgsInAuthz(t *testing.T) {
 		return msg
 	}
 
-	chainID := app.TestChainId
+	chainID := "kavatest_1-1"
 	encodingConfig := app.MakeEncodingConfig()
 
 	testcases := []struct {
@@ -244,12 +238,12 @@ func TestAppAnteHandler_RejectMsgsInAuthz(t *testing.T) {
 				chainID,
 			)
 
-			stdTx, err := sims.GenSignedMockTx(
+			stdTx, err := helpers.GenSignedMockTx(
 				rand.New(rand.NewSource(time.Now().UnixNano())),
 				encodingConfig.TxConfig,
 				[]sdk.Msg{tc.msg},
 				sdk.NewCoins(), // no fee
-				sims.DefaultGenTxGas,
+				helpers.DefaultGenTxGas,
 				chainID,
 				[]uint64{0},
 				[]uint64{0},

app/ante/authorized_test.go

@@ -5,14 +5,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cosmos/cosmos-sdk/testutil/sims"
+	"github.com/cosmos/cosmos-sdk/simapp/helpers"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/0glabs/0g-chain/app"
+	"github.com/kava-labs/kava/app"
-	"github.com/0glabs/0g-chain/app/ante"
+	"github.com/kava-labs/kava/app/ante"
-	"github.com/0glabs/0g-chain/chaincfg"
 )
 
 var _ sdk.AnteHandler = (&MockAnteHandler{}).AnteHandle
@@ -39,18 +38,18 @@ func TestAuthenticatedMempoolDecorator_AnteHandle_NotCheckTx(t *testing.T) {
 	fetcher := mockAddressFetcher(testAddresses[1:]...)
 
 	decorator := ante.NewAuthenticatedMempoolDecorator(fetcher)
-	tx, err := sims.GenSignedMockTx(
+	tx, err := helpers.GenSignedMockTx(
 		rand.New(rand.NewSource(time.Now().UnixNano())),
 		txConfig,
 		[]sdk.Msg{
 			banktypes.NewMsgSend(
 				testAddresses[0],
 				testAddresses[1],
-				sdk.NewCoins(chaincfg.MakeCoinForGasDenom(100_000_000)),
+				sdk.NewCoins(sdk.NewInt64Coin("ukava", 100_000_000)),
 			),
 		},
 		sdk.NewCoins(), // no fee
-		sims.DefaultGenTxGas,
+		helpers.DefaultGenTxGas,
 		"testing-chain-id",
 		[]uint64{0},
 		[]uint64{0},
@@ -74,23 +73,23 @@ func TestAuthenticatedMempoolDecorator_AnteHandle_Pass(t *testing.T) {
 
 	decorator := ante.NewAuthenticatedMempoolDecorator(fetcher)
 
-	tx, err := sims.GenSignedMockTx(
+	tx, err := helpers.GenSignedMockTx(
 		rand.New(rand.NewSource(time.Now().UnixNano())),
 		txConfig,
 		[]sdk.Msg{
 			banktypes.NewMsgSend(
 				testAddresses[0],
 				testAddresses[1],
-				sdk.NewCoins(chaincfg.MakeCoinForGasDenom(100)),
+				sdk.NewCoins(sdk.NewInt64Coin("ukava", 100_000_000)),
 			),
 			banktypes.NewMsgSend(
 				testAddresses[2],
 				testAddresses[1],
-				sdk.NewCoins(chaincfg.MakeCoinForGasDenom(100)),
+				sdk.NewCoins(sdk.NewInt64Coin("ukava", 100_000_000)),
 			),
 		},
 		sdk.NewCoins(), // no fee
-		sims.DefaultGenTxGas,
+		helpers.DefaultGenTxGas,
 		"testing-chain-id",
 		[]uint64{0, 123},
 		[]uint64{0, 123},
@@ -115,18 +114,18 @@ func TestAuthenticatedMempoolDecorator_AnteHandle_Reject(t *testing.T) {
 
 	decorator := ante.NewAuthenticatedMempoolDecorator(fetcher)
 
-	tx, err := sims.GenSignedMockTx(
+	tx, err := helpers.GenSignedMockTx(
 		rand.New(rand.NewSource(time.Now().UnixNano())),
 		txConfig,
 		[]sdk.Msg{
 			banktypes.NewMsgSend(
 				testAddresses[0],
 				testAddresses[1],
-				sdk.NewCoins(chaincfg.MakeCoinForGasDenom(100)),
+				sdk.NewCoins(sdk.NewInt64Coin("ukava", 100_000_000)),
 			),
 		},
 		sdk.NewCoins(), // no fee
-		sims.DefaultGenTxGas,
+		helpers.DefaultGenTxGas,
 		"testing-chain-id",
 		[]uint64{0},
 		[]uint64{0},

app/ante/authz_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cosmos/cosmos-sdk/testutil/sims"
+	"github.com/cosmos/cosmos-sdk/simapp/helpers"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/authz"
@@ -14,9 +14,8 @@ import (
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/0glabs/0g-chain/app"
+	"github.com/kava-labs/kava/app"
-	"github.com/0glabs/0g-chain/app/ante"
+	"github.com/kava-labs/kava/app/ante"
-	"github.com/0glabs/0g-chain/chaincfg"
 )
 
 func newMsgGrant(granter sdk.AccAddress, grantee sdk.AccAddress, a authz.Authorization, expiration time.Time) *authz.MsgGrant {
@@ -59,7 +58,7 @@ func TestAuthzLimiterDecorator(t *testing.T) {
 				banktypes.NewMsgSend(
 					testAddresses[0],
 					testAddresses[1],
-					sdk.NewCoins(chaincfg.MakeCoinForGasDenom(100e6)),
+					sdk.NewCoins(sdk.NewInt64Coin("ukava", 100e6)),
 				),
 			},
 			checkTx: false,
@@ -129,7 +128,7 @@ func TestAuthzLimiterDecorator(t *testing.T) {
 					[]sdk.Msg{banktypes.NewMsgSend(
 						testAddresses[0],
 						testAddresses[3],
-						sdk.NewCoins(chaincfg.MakeCoinForGasDenom(100e6)),
+						sdk.NewCoins(sdk.NewInt64Coin("ukava", 100e6)),
 					)}),
 			},
 			checkTx: false,
@@ -162,7 +161,7 @@ func TestAuthzLimiterDecorator(t *testing.T) {
 						banktypes.NewMsgSend(
 							testAddresses[0],
 							testAddresses[3],
-							sdk.NewCoins(chaincfg.MakeCoinForGasDenom(100e6)),
+							sdk.NewCoins(sdk.NewInt64Coin("ukava", 100e6)),
 						),
 						&evmtypes.MsgEthereumTx{},
 					},
@@ -213,12 +212,12 @@ func TestAuthzLimiterDecorator(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			tx, err := sims.GenSignedMockTx(
+			tx, err := helpers.GenSignedMockTx(
 				rand.New(rand.NewSource(time.Now().UnixNano())),
 				txConfig,
 				tc.msgs,
 				sdk.NewCoins(),
-				sims.DefaultGenTxGas,
+				helpers.DefaultGenTxGas,
 				"testing-chain-id",
 				[]uint64{0},
 				[]uint64{0},

app/ante/eip712_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
-	"github.com/cosmos/cosmos-sdk/testutil/sims"
+	"github.com/cosmos/cosmos-sdk/simapp/helpers"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
 	"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
@@ -20,11 +20,6 @@ import (
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 
-	abci "github.com/cometbft/cometbft/abci/types"
-	"github.com/cometbft/cometbft/crypto/tmhash"
-	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
-	tmversion "github.com/cometbft/cometbft/proto/tendermint/version"
-	"github.com/cometbft/cometbft/version"
 	"github.com/evmos/ethermint/crypto/ethsecp256k1"
 	"github.com/evmos/ethermint/ethereum/eip712"
 	"github.com/evmos/ethermint/tests"
@@ -32,17 +27,23 @@ import (
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 	feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
 	"github.com/stretchr/testify/suite"
+	abci "github.com/tendermint/tendermint/abci/types"
+	"github.com/tendermint/tendermint/crypto/tmhash"
+	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	tmversion "github.com/tendermint/tendermint/proto/tendermint/version"
+	"github.com/tendermint/tendermint/version"
 
-	"github.com/0glabs/0g-chain/app"
+	"github.com/kava-labs/kava/app"
-	"github.com/0glabs/0g-chain/chaincfg"
+	cdptypes "github.com/kava-labs/kava/x/cdp/types"
-	evmutilkeeper "github.com/0glabs/0g-chain/x/evmutil/keeper"
+	evmutilkeeper "github.com/kava-labs/kava/x/evmutil/keeper"
-	evmutiltestutil "github.com/0glabs/0g-chain/x/evmutil/testutil"
+	evmutiltestutil "github.com/kava-labs/kava/x/evmutil/testutil"
-	evmutiltypes "github.com/0glabs/0g-chain/x/evmutil/types"
+	evmutiltypes "github.com/kava-labs/kava/x/evmutil/types"
-	pricefeedtypes "github.com/0glabs/0g-chain/x/pricefeed/types"
+	hardtypes "github.com/kava-labs/kava/x/hard/types"
+	pricefeedtypes "github.com/kava-labs/kava/x/pricefeed/types"
 )
 
 const (
-	ChainID       = app.TestChainId
+	ChainID       = "kavatest_1-1"
 	USDCCoinDenom = "erc20/usdc"
 	USDCCDPType   = "erc20-usdc"
 )
@@ -137,7 +138,6 @@ func (suite *EIP712TestSuite) createTestEIP712CosmosTxBuilder(
 func (suite *EIP712TestSuite) SetupTest() {
 	tApp := app.NewTestApp()
 	suite.tApp = tApp
-
 	cdc := tApp.AppCodec()
 	suite.evmutilKeeper = tApp.GetEvmutilKeeper()
 
@@ -157,7 +157,7 @@ func (suite *EIP712TestSuite) SetupTest() {
 	// Genesis states
 	evmGs := evmtypes.NewGenesisState(
 		evmtypes.NewParams(
-			chaincfg.EvmDenom,             // evmDenom
+			"akava",                       // evmDenom
 			false,                         // allowedUnprotectedTxs
 			true,                          // enableCreate
 			true,                          // enableCall
@@ -172,6 +172,47 @@ func (suite *EIP712TestSuite) SetupTest() {
 	feemarketGenesis.Params.EnableHeight = 1
 	feemarketGenesis.Params.NoBaseFee = false
 
+	cdpGenState := cdptypes.DefaultGenesisState()
+	cdpGenState.Params.GlobalDebtLimit = sdk.NewInt64Coin("usdx", 53000000000000)
+	cdpGenState.Params.CollateralParams = cdptypes.CollateralParams{
+		{
+			Denom:                            USDCCoinDenom,
+			Type:                             USDCCDPType,
+			LiquidationRatio:                 sdk.MustNewDecFromStr("1.01"),
+			DebtLimit:                        sdk.NewInt64Coin("usdx", 500000000000),
+			StabilityFee:                     sdk.OneDec(),
+			AuctionSize:                      sdkmath.NewIntFromUint64(10000000000),
+			LiquidationPenalty:               sdk.MustNewDecFromStr("0.05"),
+			CheckCollateralizationIndexCount: sdkmath.NewInt(10),
+			KeeperRewardPercentage:           sdk.MustNewDecFromStr("0.01"),
+			SpotMarketID:                     "usdc:usd",
+			LiquidationMarketID:              "usdc:usd:30",
+			ConversionFactor:                 sdkmath.NewInt(18),
+		},
+	}
+
+	hardGenState := hardtypes.DefaultGenesisState()
+	hardGenState.Params.MoneyMarkets = []hardtypes.MoneyMarket{
+		{
+			Denom: "usdx",
+			BorrowLimit: hardtypes.BorrowLimit{
+				HasMaxLimit:  true,
+				MaximumLimit: sdk.MustNewDecFromStr("100000000000"),
+				LoanToValue:  sdk.MustNewDecFromStr("1"),
+			},
+			SpotMarketID:     "usdx:usd",
+			ConversionFactor: sdkmath.NewInt(1_000_000),
+			InterestRateModel: hardtypes.InterestRateModel{
+				BaseRateAPY:    sdk.MustNewDecFromStr("0.05"),
+				BaseMultiplier: sdk.MustNewDecFromStr("2"),
+				Kink:           sdk.MustNewDecFromStr("0.8"),
+				JumpMultiplier: sdk.MustNewDecFromStr("10"),
+			},
+			ReserveFactor:          sdk.MustNewDecFromStr("0.05"),
+			KeeperRewardPercentage: sdk.ZeroDec(),
+		},
+	}
+
 	pricefeedGenState := pricefeedtypes.DefaultGenesisState()
 	pricefeedGenState.Params.Markets = []pricefeedtypes.Market{
 		{
@@ -220,13 +261,15 @@ func (suite *EIP712TestSuite) SetupTest() {
 	genState := app.GenesisState{
 		evmtypes.ModuleName:       cdc.MustMarshalJSON(evmGs),
 		feemarkettypes.ModuleName: cdc.MustMarshalJSON(feemarketGenesis),
+		cdptypes.ModuleName:       cdc.MustMarshalJSON(&cdpGenState),
+		hardtypes.ModuleName:      cdc.MustMarshalJSON(&hardGenState),
 		pricefeedtypes.ModuleName: cdc.MustMarshalJSON(&pricefeedGenState),
 	}
 
-	// funds our test accounts with some gas denom
+	// funds our test accounts with some ukava
 	coinsGenState := app.NewFundedGenStateWithSameCoins(
 		tApp.AppCodec(),
-		sdk.NewCoins(chaincfg.MakeCoinForGasDenom(1e9)),
+		sdk.NewCoins(sdk.NewInt64Coin("ukava", 1e9)),
 		[]sdk.AccAddress{suite.testAddr, suite.testAddr2},
 	)
 
@@ -291,11 +334,6 @@ func (suite *EIP712TestSuite) SetupTest() {
 	)
 	suite.usdcEVMAddr = pair.GetAddress()
 
-	// update consensus params
-	cParams := tApp.GetConsensusParams(suite.ctx)
-	cParams.Block.MaxGas = sims.DefaultGenTxGas * 20
-	tApp.StoreConsensusParams(suite.ctx, cParams)
-
 	// Add a contract to evmutil conversion pair
 	evmutilParams := suite.evmutilKeeper.GetParams(suite.ctx)
 	evmutilParams.EnabledConversionPairs =
@@ -313,17 +351,45 @@ func (suite *EIP712TestSuite) SetupTest() {
 	params := evmKeeper.GetParams(suite.ctx)
 	params.EIP712AllowedMsgs = []evmtypes.EIP712AllowedMsg{
 		{
-			MsgTypeUrl:       "/zgc.evmutil.v1beta1.MsgConvertERC20ToCoin",
+			MsgTypeUrl:       "/kava.evmutil.v1beta1.MsgConvertERC20ToCoin",
 			MsgValueTypeName: "MsgValueEVMConvertERC20ToCoin",
 			ValueTypes: []evmtypes.EIP712MsgAttrType{
 				{Name: "initiator", Type: "string"},
 				{Name: "receiver", Type: "string"},
-				{Name: "zgchain_erc20_address", Type: "string"},
+				{Name: "kava_erc20_address", Type: "string"},
 				{Name: "amount", Type: "string"},
 			},
 		},
 		{
-			MsgTypeUrl:       "/zgc.evmutil.v1beta1.MsgConvertCoinToERC20",
+			MsgTypeUrl:       "/kava.cdp.v1beta1.MsgCreateCDP",
+			MsgValueTypeName: "MsgValueCDPCreate",
+			ValueTypes: []evmtypes.EIP712MsgAttrType{
+				{Name: "sender", Type: "string"},
+				{Name: "collateral", Type: "Coin"},
+				{Name: "principal", Type: "Coin"},
+				{Name: "collateral_type", Type: "string"},
+			},
+		},
+		{
+			MsgTypeUrl:       "/kava.cdp.v1beta1.MsgDeposit",
+			MsgValueTypeName: "MsgValueCDPDeposit",
+			ValueTypes: []evmtypes.EIP712MsgAttrType{
+				{Name: "depositor", Type: "string"},
+				{Name: "owner", Type: "string"},
+				{Name: "collateral", Type: "Coin"},
+				{Name: "collateral_type", Type: "string"},
+			},
+		},
+		{
+			MsgTypeUrl:       "/kava.hard.v1beta1.MsgDeposit",
+			MsgValueTypeName: "MsgValueHardDeposit",
+			ValueTypes: []evmtypes.EIP712MsgAttrType{
+				{Name: "depositor", Type: "string"},
+				{Name: "amount", Type: "Coin[]"},
+			},
+		},
+		{
+			MsgTypeUrl:       "/kava.evmutil.v1beta1.MsgConvertCoinToERC20",
 			MsgValueTypeName: "MsgValueEVMConvertCoinToERC20",
 			ValueTypes: []evmtypes.EIP712MsgAttrType{
 				{Name: "initiator", Type: "string"},
@@ -331,6 +397,23 @@ func (suite *EIP712TestSuite) SetupTest() {
 				{Name: "amount", Type: "Coin"},
 			},
 		},
+		{
+			MsgTypeUrl:       "/kava.cdp.v1beta1.MsgRepayDebt",
+			MsgValueTypeName: "MsgValueCDPRepayDebt",
+			ValueTypes: []evmtypes.EIP712MsgAttrType{
+				{Name: "sender", Type: "string"},
+				{Name: "collateral_type", Type: "string"},
+				{Name: "payment", Type: "Coin"},
+			},
+		},
+		{
+			MsgTypeUrl:       "/kava.hard.v1beta1.MsgWithdraw",
+			MsgValueTypeName: "MsgValueHardWithdraw",
+			ValueTypes: []evmtypes.EIP712MsgAttrType{
+				{Name: "depositor", Type: "string"},
+				{Name: "amount", Type: "Coin[]"},
+			},
+		},
 	}
 	evmKeeper.SetParams(suite.ctx, params)
 
@@ -376,7 +459,7 @@ func (suite *EIP712TestSuite) deployUSDCERC20(app app.TestApp, ctx sdk.Context)
 	suite.tApp.FundModuleAccount(
 		suite.ctx,
 		evmutiltypes.ModuleName,
-		sdk.NewCoins(chaincfg.MakeCoinForGasDenom(0)),
+		sdk.NewCoins(sdk.NewCoin("ukava", sdkmath.NewInt(0))),
 	)
 
 	contractAddr, err := suite.evmutilKeeper.DeployTestMintableERC20Contract(suite.ctx, "USDC", "USDC", uint8(18))
@@ -398,43 +481,40 @@ func (suite *EIP712TestSuite) TestEIP712Tx() {
 		failCheckTx    bool
 		errMsg         string
 	}{
-		// TODO: need fix
-		// {
-		// 	name:           "processes deposit eip712 messages successfully",
-		// 	usdcDepositAmt: 100,
-		// 	usdxToMintAmt:  99,
-		// },
 		{
-			name:           "fails when conversion more erc20 usdc than balance",
+			name:           "processes deposit eip712 messages successfully",
+			usdcDepositAmt: 100,
+			usdxToMintAmt:  99,
+		},
+		{
+			name:           "fails when convertion more erc20 usdc than balance",
 			usdcDepositAmt: 51_000,
 			usdxToMintAmt:  100,
 			errMsg:         "transfer amount exceeds balance",
 		},
-		// TODO: need fix
+		{
-		// {
+			name:           "fails when minting more usdx than allowed",
-		// 	name:           "fails when minting more usdx than allowed",
+			usdcDepositAmt: 100,
-		// 	usdcDepositAmt: 100,
+			usdxToMintAmt:  100,
-		// 	usdxToMintAmt:  100,
+			errMsg:         "proposed collateral ratio is below liquidation ratio",
-		// 	errMsg:         "proposed collateral ratio is below liquidation ratio",
+		},
-		// },
+		{
-		// TODO: need fix
+			name:           "fails when trying to convert usdc for another address",
-		// {
+			usdcDepositAmt: 100,
-		// 	name:           "fails when trying to convert usdc for another address",
+			usdxToMintAmt:  90,
-		// 	usdcDepositAmt: 100,
+			errMsg:         "unauthorized",
-		// 	usdxToMintAmt:  90,
+			failCheckTx:    true,
-		// 	errMsg:         "unauthorized",
+			updateMsgs: func(msgs []sdk.Msg) []sdk.Msg {
-		// 	failCheckTx:    true,
+				convertMsg := evmutiltypes.NewMsgConvertERC20ToCoin(
-		// 	updateMsgs: func(msgs []sdk.Msg) []sdk.Msg {
+					suite.testEVMAddr2,
-		// 		convertMsg := evmutiltypes.NewMsgConvertERC20ToCoin(
+					suite.testAddr,
-		// 			suite.testEVMAddr2,
+					suite.usdcEVMAddr,
-		// 			suite.testAddr,
+					suite.getEVMAmount(100),
-		// 			suite.usdcEVMAddr,
+				)
-		// 			suite.getEVMAmount(100),
+				msgs[0] = &convertMsg
-		// 		)
+				return msgs
-		// 		msgs[0] = &convertMsg
+			},
-		// 		return msgs
+		},
-		// 	},
-		// },
 		{
 			name:           "fails when trying to convert erc20 for non-whitelisted contract",
 			usdcDepositAmt: 100,
@@ -461,7 +541,7 @@ func (suite *EIP712TestSuite) TestEIP712Tx() {
 				var option *codectypes.Any
 				option, _ = codectypes.NewAnyWithValue(&etherminttypes.ExtensionOptionsWeb3Tx{
 					FeePayer:         suite.testAddr.String(),
-					TypedDataChainID: 2221,
+					TypedDataChainID: 1,
 					FeePayerSig:      []byte("sig"),
 				})
 				builder, _ := txBuilder.(authtx.ExtensionOptionsTxBuilder)
@@ -476,7 +556,7 @@ func (suite *EIP712TestSuite) TestEIP712Tx() {
 			errMsg:         "insufficient funds",
 			updateTx: func(txBuilder client.TxBuilder, msgs []sdk.Msg) client.TxBuilder {
 				bk := suite.tApp.GetBankKeeper()
-				gasCoins := bk.GetBalance(suite.ctx, suite.testAddr, chaincfg.GasDenom)
+				gasCoins := bk.GetBalance(suite.ctx, suite.testAddr, "ukava")
 				suite.tApp.GetBankKeeper().SendCoins(suite.ctx, suite.testAddr, suite.testAddr2, sdk.NewCoins(gasCoins))
 				return txBuilder
 			},
@@ -488,9 +568,9 @@ func (suite *EIP712TestSuite) TestEIP712Tx() {
 			failCheckTx:    true,
 			errMsg:         "invalid chain-id",
 			updateTx: func(txBuilder client.TxBuilder, msgs []sdk.Msg) client.TxBuilder {
-				gasAmt := sdk.NewCoins(chaincfg.MakeCoinForGasDenom(20))
+				gasAmt := sdk.NewCoins(sdk.NewCoin("ukava", sdkmath.NewInt(20)))
 				return suite.createTestEIP712CosmosTxBuilder(
-					suite.testAddr, suite.testPrivKey, "kavatest_12-1", uint64(sims.DefaultGenTxGas*10), gasAmt, msgs,
+					suite.testAddr, suite.testPrivKey, "kavatest_12-1", uint64(helpers.DefaultGenTxGas*10), gasAmt, msgs,
 				)
 			},
 		},
@@ -501,9 +581,9 @@ func (suite *EIP712TestSuite) TestEIP712Tx() {
 			failCheckTx:    true,
 			errMsg:         "invalid pubkey",
 			updateTx: func(txBuilder client.TxBuilder, msgs []sdk.Msg) client.TxBuilder {
-				gasAmt := sdk.NewCoins(chaincfg.MakeCoinForGasDenom(20))
+				gasAmt := sdk.NewCoins(sdk.NewCoin("ukava", sdkmath.NewInt(20)))
 				return suite.createTestEIP712CosmosTxBuilder(
-					suite.testAddr2, suite.testPrivKey2, ChainID, uint64(sims.DefaultGenTxGas*10), gasAmt, msgs,
+					suite.testAddr2, suite.testPrivKey2, ChainID, uint64(helpers.DefaultGenTxGas*10), gasAmt, msgs,
 				)
 			},
 		},
@@ -521,17 +601,29 @@ func (suite *EIP712TestSuite) TestEIP712Tx() {
 				suite.usdcEVMAddr,
 				usdcAmt,
 			)
-
+			usdxAmt := sdkmath.NewInt(1_000_000).Mul(sdkmath.NewInt(tc.usdxToMintAmt))
+			mintMsg := cdptypes.NewMsgCreateCDP(
+				suite.testAddr,
+				sdk.NewCoin(USDCCoinDenom, usdcAmt),
+				sdk.NewCoin(cdptypes.DefaultStableDenom, usdxAmt),
+				USDCCDPType,
+			)
+			lendMsg := hardtypes.NewMsgDeposit(
+				suite.testAddr,
+				sdk.NewCoins(sdk.NewCoin(cdptypes.DefaultStableDenom, usdxAmt)),
+			)
 			msgs := []sdk.Msg{
 				&convertMsg,
+				&mintMsg,
+				&lendMsg,
 			}
 			if tc.updateMsgs != nil {
 				msgs = tc.updateMsgs(msgs)
 			}
 
-			gasAmt := sdk.NewCoins(chaincfg.MakeCoinForGasDenom(20))
+			gasAmt := sdk.NewCoins(sdk.NewCoin("ukava", sdkmath.NewInt(20)))
 			txBuilder := suite.createTestEIP712CosmosTxBuilder(
-				suite.testAddr, suite.testPrivKey, ChainID, uint64(sims.DefaultGenTxGas*10), gasAmt, msgs,
+				suite.testAddr, suite.testPrivKey, ChainID, uint64(helpers.DefaultGenTxGas*10), gasAmt, msgs,
 			)
 			if tc.updateTx != nil {
 				txBuilder = tc.updateTx(txBuilder, msgs)
@@ -567,17 +659,17 @@ func (suite *EIP712TestSuite) TestEIP712Tx() {
 				suite.Require().Equal(sdk.ZeroInt(), amt.Amount)
 
 				// validate cdp
-				// cdp, found := suite.tApp.GetCDPKeeper().GetCdpByOwnerAndCollateralType(suite.ctx, suite.testAddr, USDCCDPType)
+				cdp, found := suite.tApp.GetCDPKeeper().GetCdpByOwnerAndCollateralType(suite.ctx, suite.testAddr, USDCCDPType)
-				// suite.Require().True(found)
+				suite.Require().True(found)
-				// suite.Require().Equal(suite.testAddr, cdp.Owner)
+				suite.Require().Equal(suite.testAddr, cdp.Owner)
-				// suite.Require().Equal(sdk.NewCoin(USDCCoinDenom, suite.getEVMAmount(100)), cdp.Collateral)
+				suite.Require().Equal(sdk.NewCoin(USDCCoinDenom, suite.getEVMAmount(100)), cdp.Collateral)
-				// suite.Require().Equal(sdk.NewCoin("usdx", sdkmath.NewInt(99_000_000)), cdp.Principal)
+				suite.Require().Equal(sdk.NewCoin("usdx", sdkmath.NewInt(99_000_000)), cdp.Principal)
 
 				// validate hard
-				// hardDeposit, found := suite.tApp.GetHardKeeper().GetDeposit(suite.ctx, suite.testAddr)
+				hardDeposit, found := suite.tApp.GetHardKeeper().GetDeposit(suite.ctx, suite.testAddr)
-				// suite.Require().True(found)
+				suite.Require().True(found)
-				// suite.Require().Equal(suite.testAddr, hardDeposit.Depositor)
+				suite.Require().Equal(suite.testAddr, hardDeposit.Depositor)
-				// suite.Require().Equal(sdk.NewCoins(sdk.NewCoin("usdx", sdkmath.NewInt(99_000_000))), hardDeposit.Amount)
+				suite.Require().Equal(sdk.NewCoins(sdk.NewCoin("usdx", sdkmath.NewInt(99_000_000))), hardDeposit.Amount)
 			} else {
 				suite.Require().NotEqual(resDeliverTx.Code, uint32(0), resCheckTx.Log)
 				suite.Require().Contains(resDeliverTx.Log, tc.errMsg)
@@ -597,15 +689,27 @@ func (suite *EIP712TestSuite) TestEIP712Tx_DepositAndWithdraw() {
 		suite.usdcEVMAddr,
 		usdcAmt,
 	)
-
+	usdxAmt := sdkmath.NewInt(1_000_000).Mul(sdkmath.NewInt(99))
+	mintMsg := cdptypes.NewMsgCreateCDP(
+		suite.testAddr,
+		sdk.NewCoin(USDCCoinDenom, usdcAmt),
+		sdk.NewCoin(cdptypes.DefaultStableDenom, usdxAmt),
+		USDCCDPType,
+	)
+	lendMsg := hardtypes.NewMsgDeposit(
+		suite.testAddr,
+		sdk.NewCoins(sdk.NewCoin(cdptypes.DefaultStableDenom, usdxAmt)),
+	)
 	depositMsgs := []sdk.Msg{
 		&convertMsg,
+		&mintMsg,
+		&lendMsg,
 	}
 
 	// deliver deposit msg
-	gasAmt := sdk.NewCoins(chaincfg.MakeCoinForGasDenom(20))
+	gasAmt := sdk.NewCoins(sdk.NewCoin("ukava", sdkmath.NewInt(20)))
 	txBuilder := suite.createTestEIP712CosmosTxBuilder(
-		suite.testAddr, suite.testPrivKey, ChainID, uint64(sims.DefaultGenTxGas*10), gasAmt, depositMsgs,
+		suite.testAddr, suite.testPrivKey, ChainID, uint64(helpers.DefaultGenTxGas*10), gasAmt, depositMsgs,
 	)
 	txBytes, err := encodingConfig.TxConfig.TxEncoder()(txBuilder.GetTx())
 	suite.Require().NoError(err)
@@ -617,10 +721,10 @@ func (suite *EIP712TestSuite) TestEIP712Tx_DepositAndWithdraw() {
 	suite.Require().Equal(resDeliverTx.Code, uint32(0), resDeliverTx.Log)
 
 	// validate hard
-	// hardDeposit, found := suite.tApp.GetHardKeeper().GetDeposit(suite.ctx, suite.testAddr)
+	hardDeposit, found := suite.tApp.GetHardKeeper().GetDeposit(suite.ctx, suite.testAddr)
-	// suite.Require().True(found)
+	suite.Require().True(found)
-	// suite.Require().Equal(suite.testAddr, hardDeposit.Depositor)
+	suite.Require().Equal(suite.testAddr, hardDeposit.Depositor)
-	// suite.Require().Equal(sdk.NewCoins(sdk.NewCoin("usdx", sdkmath.NewInt(99_000_000))), hardDeposit.Amount)
+	suite.Require().Equal(sdk.NewCoins(sdk.NewCoin("usdx", sdkmath.NewInt(99_000_000))), hardDeposit.Amount)
 
 	// validate erc20 balance
 	coinBal, err := suite.evmutilKeeper.QueryERC20BalanceOf(suite.ctx, suite.usdcEVMAddr, suite.testEVMAddr)
@@ -633,13 +737,24 @@ func (suite *EIP712TestSuite) TestEIP712Tx_DepositAndWithdraw() {
 		suite.testEVMAddr.String(),
 		sdk.NewCoin(USDCCoinDenom, usdcAmt),
 	)
+	cdpWithdrawMsg := cdptypes.NewMsgRepayDebt(
+		suite.testAddr,
+		USDCCDPType,
+		sdk.NewCoin(cdptypes.DefaultStableDenom, usdxAmt),
+	)
+	hardWithdrawMsg := hardtypes.NewMsgWithdraw(
+		suite.testAddr,
+		sdk.NewCoins(sdk.NewCoin(cdptypes.DefaultStableDenom, usdxAmt)),
+	)
 	withdrawMsgs := []sdk.Msg{
+		&hardWithdrawMsg,
+		&cdpWithdrawMsg,
 		&withdrawConvertMsg,
 	}
 
 	// deliver withdraw msg
 	txBuilder = suite.createTestEIP712CosmosTxBuilder(
-		suite.testAddr, suite.testPrivKey, ChainID, uint64(sims.DefaultGenTxGas*10), gasAmt, withdrawMsgs,
+		suite.testAddr, suite.testPrivKey, ChainID, uint64(helpers.DefaultGenTxGas*10), gasAmt, withdrawMsgs,
 	)
 	txBytes, err = encodingConfig.TxConfig.TxEncoder()(txBuilder.GetTx())
 	suite.Require().NoError(err)
@@ -651,10 +766,10 @@ func (suite *EIP712TestSuite) TestEIP712Tx_DepositAndWithdraw() {
 	suite.Require().Equal(resDeliverTx.Code, uint32(0), resDeliverTx.Log)
 
 	// validate hard & cdp should be repayed
-	// _, found = suite.tApp.GetHardKeeper().GetDeposit(suite.ctx, suite.testAddr)
+	_, found = suite.tApp.GetHardKeeper().GetDeposit(suite.ctx, suite.testAddr)
-	// suite.Require().False(found)
+	suite.Require().False(found)
-	// _, found = suite.tApp.GetCDPKeeper().GetCdpByOwnerAndCollateralType(suite.ctx, suite.testAddr, USDCCDPType)
+	_, found = suite.tApp.GetCDPKeeper().GetCdpByOwnerAndCollateralType(suite.ctx, suite.testAddr, USDCCDPType)
-	// suite.Require().False(found)
+	suite.Require().False(found)
 
 	// validate user cosmos erc20/usd balance
 	bk := suite.tApp.GetBankKeeper()

app/ante/min_gas_filter_test.go

@@ -4,16 +4,15 @@ import (
 	"strings"
 	"testing"
 
-	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
-	tmtime "github.com/cometbft/cometbft/types/time"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	tmtime "github.com/tendermint/tendermint/types/time"
 
-	"github.com/0glabs/0g-chain/app"
+	"github.com/kava-labs/kava/app"
-	"github.com/0glabs/0g-chain/app/ante"
+	"github.com/kava-labs/kava/app/ante"
-	"github.com/0glabs/0g-chain/chaincfg"
 )
 
 func mustParseDecCoins(value string) sdk.DecCoins {
@@ -31,7 +30,7 @@ func TestEvmMinGasFilter(t *testing.T) {
 
 	ctx := tApp.NewContext(true, tmproto.Header{Height: 1, Time: tmtime.Now()})
 	tApp.GetEvmKeeper().SetParams(ctx, evmtypes.Params{
-		EvmDenom: chaincfg.EvmDenom,
+		EvmDenom: "akava",
 	})
 
 	testCases := []struct {
@@ -45,29 +44,29 @@ func TestEvmMinGasFilter(t *testing.T) {
 			mustParseDecCoins(""),
 		},
 		{
-			"zero ua0gi gas price",
+			"zero ukava gas price",
-			mustParseDecCoins("0ua0gi"),
+			mustParseDecCoins("0ukava"),
-			mustParseDecCoins("0ua0gi"),
+			mustParseDecCoins("0ukava"),
 		},
 		{
-			"non-zero ua0gi gas price",
+			"non-zero ukava gas price",
-			mustParseDecCoins("0.001ua0gi"),
+			mustParseDecCoins("0.001ukava"),
-			mustParseDecCoins("0.001ua0gi"),
+			mustParseDecCoins("0.001ukava"),
 		},
 		{
-			"zero ua0gi gas price, min neuron price",
+			"zero ukava gas price, min akava price",
-			mustParseDecCoins("0ua0gi;100000neuron"),
+			mustParseDecCoins("0ukava;100000akava"),
-			mustParseDecCoins("0ua0gi"), // neuron is removed
+			mustParseDecCoins("0ukava"), // akava is removed
 		},
 		{
-			"zero ua0gi gas price, min neuron price, other token",
+			"zero ukava gas price, min akava price, other token",
-			mustParseDecCoins("0ua0gi;100000neuron;0.001other"),
+			mustParseDecCoins("0ukava;100000akava;0.001other"),
-			mustParseDecCoins("0ua0gi;0.001other"), // neuron is removed
+			mustParseDecCoins("0ukava;0.001other"), // akava is removed
 		},
 		{
-			"non-zero ua0gi gas price, min neuron price",
+			"non-zero ukava gas price, min akava price",
-			mustParseDecCoins("0.25ua0gi;100000neuron;0.001other"),
+			mustParseDecCoins("0.25ukava;100000akava;0.001other"),
-			mustParseDecCoins("0.25ua0gi;0.001other"), // neuron is removed
+			mustParseDecCoins("0.25ukava;0.001other"), // akava is removed
 		},
 	}
 

app/ante/vesting.go

@@ -4,6 +4,7 @@ import (
 	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	vesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
 )
 
 var _ sdk.AnteDecorator = VestingAccountDecorator{}
@@ -16,9 +17,9 @@ type VestingAccountDecorator struct {
 func NewVestingAccountDecorator() VestingAccountDecorator {
 	return VestingAccountDecorator{
 		disabledMsgTypeUrls: []string{
-			// sdk.MsgTypeURL(&vesting.MsgCreateVestingAccount{}),
+			sdk.MsgTypeURL(&vesting.MsgCreateVestingAccount{}),
-			// sdk.MsgTypeURL(&vesting.MsgCreatePermanentLockedAccount{}),
+			sdk.MsgTypeURL(&vesting.MsgCreatePermanentLockedAccount{}),
-			// sdk.MsgTypeURL(&vesting.MsgCreatePeriodicVestingAccount{}),
+			sdk.MsgTypeURL(&vesting.MsgCreatePeriodicVestingAccount{}),
 		},
 	}
 }

app/ante/vesting_test.go

@@ -7,14 +7,13 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/cosmos/cosmos-sdk/testutil/sims"
+	"github.com/cosmos/cosmos-sdk/simapp/helpers"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	vesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
-	"github.com/0glabs/0g-chain/app"
+	"github.com/kava-labs/kava/app"
-	"github.com/0glabs/0g-chain/app/ante"
+	"github.com/kava-labs/kava/app/ante"
-	"github.com/0glabs/0g-chain/chaincfg"
 )
 
 func TestVestingMempoolDecorator_MsgCreateVestingAccount_Unauthorized(t *testing.T) {
@@ -34,7 +33,7 @@ func TestVestingMempoolDecorator_MsgCreateVestingAccount_Unauthorized(t *testing
 			"MsgCreateVestingAccount",
 			vesting.NewMsgCreateVestingAccount(
 				testAddresses[0], testAddresses[1],
-				sdk.NewCoins(chaincfg.MakeCoinForGasDenom(100)),
+				sdk.NewCoins(sdk.NewInt64Coin("ukava", 100_000_000)),
 				time.Date(1998, 1, 1, 0, 0, 0, 0, time.UTC).Unix(),
 				false,
 			),
@@ -45,7 +44,7 @@ func TestVestingMempoolDecorator_MsgCreateVestingAccount_Unauthorized(t *testing
 			"MsgCreateVestingAccount",
 			vesting.NewMsgCreatePermanentLockedAccount(
 				testAddresses[0], testAddresses[1],
-				sdk.NewCoins(chaincfg.MakeCoinForGasDenom(100)),
+				sdk.NewCoins(sdk.NewInt64Coin("ukava", 100_000_000)),
 			),
 			true,
 			"MsgTypeURL /cosmos.vesting.v1beta1.MsgCreatePermanentLockedAccount not supported",
@@ -64,7 +63,7 @@ func TestVestingMempoolDecorator_MsgCreateVestingAccount_Unauthorized(t *testing
 			"other messages not affected",
 			banktypes.NewMsgSend(
 				testAddresses[0], testAddresses[1],
-				sdk.NewCoins(chaincfg.MakeCoinForGasDenom(100)),
+				sdk.NewCoins(sdk.NewInt64Coin("ukava", 100_000_000)),
 			),
 			false,
 			"",
@@ -73,14 +72,14 @@ func TestVestingMempoolDecorator_MsgCreateVestingAccount_Unauthorized(t *testing
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			tx, err := sims.GenSignedMockTx(
+			tx, err := helpers.GenSignedMockTx(
 				rand.New(rand.NewSource(time.Now().UnixNano())),
 				txConfig,
 				[]sdk.Msg{
 					tt.msg,
 				},
 				sdk.NewCoins(),
-				sims.DefaultGenTxGas,
+				helpers.DefaultGenTxGas,
 				"testing-chain-id",
 				[]uint64{0},
 				[]uint64{0},

app/app_test.go

@@ -8,54 +8,35 @@ import (
 	"testing"
 	"time"
 
-	"github.com/0glabs/0g-chain/chaincfg"
-	db "github.com/cometbft/cometbft-db"
-	abci "github.com/cometbft/cometbft/abci/types"
-	"github.com/cometbft/cometbft/libs/log"
-	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"
-	"github.com/cosmos/cosmos-sdk/testutil/sims"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
 	vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
-	solomachine "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine"
-	ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	abci "github.com/tendermint/tendermint/abci/types"
+	"github.com/tendermint/tendermint/libs/log"
+	tmtypes "github.com/tendermint/tendermint/types"
+	db "github.com/tendermint/tm-db"
 )
 
 func TestNewApp(t *testing.T) {
-	chaincfg.SetSDKConfig()
+	SetSDKConfig()
 	NewApp(
-		chaincfg.DefaultNodeHome,
+		log.NewTMLogger(log.NewSyncWriter(os.Stdout)),
+		db.NewMemDB(),
+		DefaultNodeHome,
 		nil,
 		MakeEncodingConfig(),
 		DefaultOptions,
-		NewBaseApp(
-			log.NewTMLogger(log.NewSyncWriter(os.Stdout)),
-			db.NewMemDB(),
-			MakeEncodingConfig(),
-			baseapp.SetChainID(TestChainId),
-		),
 	)
 }
 
 func TestExport(t *testing.T) {
-	chaincfg.SetSDKConfig()
+	SetSDKConfig()
 	db := db.NewMemDB()
-	app := NewApp(
+	app := NewApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, DefaultNodeHome, nil, MakeEncodingConfig(), DefaultOptions)
-		chaincfg.DefaultNodeHome,
-		nil,
-		MakeEncodingConfig(),
-		DefaultOptions,
-		NewBaseApp(
-			log.NewTMLogger(log.NewSyncWriter(os.Stdout)),
-			db,
-			MakeEncodingConfig(),
-			baseapp.SetChainID(TestChainId),
-		),
-	)
 
 	genesisState := GenesisStateWithSingleValidator(&TestApp{App: *app}, NewDefaultGenesisState())
 
@@ -64,23 +45,21 @@ func TestExport(t *testing.T) {
 
 	initRequest := abci.RequestInitChain{
 		Time:            time.Date(1998, 1, 1, 0, 0, 0, 0, time.UTC),
-		ChainId:         TestChainId,
+		ChainId:         "kavatest_1-1",
 		InitialHeight:   1,
-		ConsensusParams: sims.DefaultConsensusParams,
+		ConsensusParams: tmtypes.TM2PB.ConsensusParams(tmtypes.DefaultConsensusParams()),
 		Validators:      nil,
 		AppStateBytes:   stateBytes,
 	}
 	app.InitChain(initRequest)
 	app.Commit()
 
-	exportedApp, err := app.ExportAppStateAndValidators(false, []string{}, []string{})
+	exportedApp, err := app.ExportAppStateAndValidators(false, []string{})
 	require.NoError(t, err)
 
 	// Assume each module is exported correctly, so only check modules in genesis are present in export
 	initialModules, err := unmarshalJSONKeys(initRequest.AppStateBytes)
 	require.NoError(t, err)
-	// note ibctm is only registered in the BasicManager and not module manager so can be ignored
-	initialModules = removeIbcTmModule(initialModules)
 	exportedModules, err := unmarshalJSONKeys(exportedApp.AppState)
 	require.NoError(t, err)
 	assert.ElementsMatch(t, initialModules, exportedModules)
@@ -164,13 +143,3 @@ func unmarshalJSONKeys(jsonBytes []byte) ([]string, error) {
 
 	return keys, nil
 }
-
-func removeIbcTmModule(modules []string) []string {
-	var result []string
-	for _, str := range modules {
-		if str != ibctm.ModuleName && str != solomachine.ModuleName {
-			result = append(result, str)
-		}
-	}
-	return result
-}

app/config.go

@@ -0,0 +1,41 @@
+package app
+
+import sdk "github.com/cosmos/cosmos-sdk/types"
+
+const (
+	// Bech32MainPrefix defines the Bech32 prefix for account addresses
+	Bech32MainPrefix = "kava"
+	// Bech32PrefixAccPub defines the Bech32 prefix of an account's public key
+	Bech32PrefixAccPub = Bech32MainPrefix + "pub"
+	// Bech32PrefixValAddr defines the Bech32 prefix of a validator's operator address
+	Bech32PrefixValAddr = Bech32MainPrefix + "val" + "oper"
+	// Bech32PrefixValPub defines the Bech32 prefix of a validator's operator public key
+	Bech32PrefixValPub = Bech32MainPrefix + "val" + "oper" + "pub"
+	// Bech32PrefixConsAddr defines the Bech32 prefix of a consensus node address
+	Bech32PrefixConsAddr = Bech32MainPrefix + "val" + "cons"
+	// Bech32PrefixConsPub defines the Bech32 prefix of a consensus node public key
+	Bech32PrefixConsPub = Bech32MainPrefix + "val" + "cons" + "pub"
+
+	Bip44CoinType = 459 // see https://github.com/satoshilabs/slips/blob/master/slip-0044.md
+)
+
+// SetSDKConfig configures the global config with kava app specific parameters.
+// It does not seal the config to allow modification in tests.
+func SetSDKConfig() *sdk.Config {
+	config := sdk.GetConfig()
+	SetBech32AddressPrefixes(config)
+	SetBip44CoinType(config)
+	return config
+}
+
+// SetBech32AddressPrefixes sets the global prefix to be used when serializing addresses to bech32 strings.
+func SetBech32AddressPrefixes(config *sdk.Config) {
+	config.SetBech32PrefixForAccount(Bech32MainPrefix, Bech32PrefixAccPub)
+	config.SetBech32PrefixForValidator(Bech32PrefixValAddr, Bech32PrefixValPub)
+	config.SetBech32PrefixForConsensusNode(Bech32PrefixConsAddr, Bech32PrefixConsPub)
+}
+
+// SetBip44CoinType sets the global coin type to be used in hierarchical deterministic wallets.
+func SetBip44CoinType(config *sdk.Config) {
+	config.SetCoinType(Bip44CoinType)
+}

app/encoding.go

@@ -3,7 +3,7 @@ package app
 import (
 	enccodec "github.com/evmos/ethermint/encoding/codec"
 
-	"github.com/0glabs/0g-chain/app/params"
+	"github.com/kava-labs/kava/app/params"
 )
 
 // MakeEncodingConfig creates an EncodingConfig and registers the app's types on it.

app/export.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"log"
 
-	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
+	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -14,7 +14,7 @@ import (
 )
 
 // ExportAppStateAndValidators export the state of the app for a genesis file
-func (app *App) ExportAppStateAndValidators(forZeroHeight bool, jailWhiteList []string, modulesToExport []string,
+func (app *App) ExportAppStateAndValidators(forZeroHeight bool, jailWhiteList []string,
 ) (servertypes.ExportedApp, error) {
 	// as if they could withdraw from the start of the next block
 	// block time is not available and defaults to Jan 1st, 0001
@@ -26,7 +26,7 @@ func (app *App) ExportAppStateAndValidators(forZeroHeight bool, jailWhiteList []
 		app.prepForZeroHeightGenesis(ctx, jailWhiteList)
 	}
 
-	genState := app.mm.ExportGenesisForModules(ctx, app.appCodec, modulesToExport)
+	genState := app.mm.ExportGenesis(ctx, app.appCodec)
 	newAppState, err := json.MarshalIndent(genState, "", "  ")
 	if err != nil {
 		return servertypes.ExportedApp{}, err
@@ -42,7 +42,7 @@ func (app *App) ExportAppStateAndValidators(forZeroHeight bool, jailWhiteList []
 
 // prepare for fresh start at zero height
 // NOTE zero height genesis is a temporary feature which will be deprecated
-// in favour of export at a block height
+//      in favour of export at a block height
 func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailWhiteList []string) {
 	applyWhiteList := false
 

app/params/doc.go

@@ -1,11 +1,11 @@
 /*
-Package params defines the simulation parameters for the 0gChain app.
+Package params defines the simulation parameters for the Kava app.
 
 It contains the default weights used for each transaction used on the module's
 simulation. These weights define the chance for a transaction to be simulated at
-any given operation.
+any gived operation.
 
-You can replace the default values for the weights by providing a params.json
+You can repace the default values for the weights by providing a params.json
 file with the weights defined for each of the transaction operations:
 
 	{

app/priority_nonce.go

@@ -1,735 +0,0 @@
-package app
-
-import (
-	"context"
-	"sync"
-
-	"fmt"
-	"math"
-
-	"github.com/huandu/skiplist"
-	"github.com/pkg/errors"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/mempool"
-	"github.com/cosmos/cosmos-sdk/x/auth/signing"
-	gethtypes "github.com/ethereum/go-ethereum/core/types"
-	evmtypes "github.com/evmos/ethermint/x/evm/types"
-)
-
-const MAX_TXS_PRE_SENDER_IN_MEMPOOL int = 48
-
-var (
-	_ mempool.Mempool  = (*PriorityNonceMempool)(nil)
-	_ mempool.Iterator = (*PriorityNonceIterator)(nil)
-
-	errMempoolTxGasPriceTooLow = errors.New("gas price is too low")
-	errMempoolTooManyTxs       = errors.New("tx sender has too many txs in mempool")
-	errMempoolIsFull           = errors.New("mempool is full")
-	errTxInMempool             = errors.New("tx already in mempool")
-)
-
-// PriorityNonceMempool is a mempool implementation that stores txs
-// in a partially ordered set by 2 dimensions: priority, and sender-nonce
-// (sequence number). Internally it uses one priority ordered skip list and one
-// skip list per sender ordered by sender-nonce (sequence number). When there
-// are multiple txs from the same sender, they are not always comparable by
-// priority to other sender txs and must be partially ordered by both sender-nonce
-// and priority.
-type PriorityNonceMempool struct {
-	mtx            sync.Mutex
-	priorityIndex  *skiplist.SkipList
-	priorityCounts map[int64]int
-	senderIndices  map[string]*skiplist.SkipList
-	scores         map[txMeta]txMeta
-	onRead         func(tx sdk.Tx)
-	txReplacement  func(op, np int64, oTx, nTx sdk.Tx) bool
-	maxTx          int
-
-	senderTxCntLock sync.RWMutex
-	counterBySender map[string]int
-	txRecord        map[txMeta]struct{}
-
-	txReplacedCallback func(ctx context.Context, oldTx, newTx *TxInfo)
-}
-
-type PriorityNonceIterator struct {
-	senderCursors map[string]*skiplist.Element
-	nextPriority  int64
-	sender        string
-	priorityNode  *skiplist.Element
-	mempool       *PriorityNonceMempool
-}
-
-// txMeta stores transaction metadata used in indices
-type txMeta struct {
-	// nonce is the sender's sequence number
-	nonce uint64
-	// priority is the transaction's priority
-	priority int64
-	// sender is the transaction's sender
-	sender string
-	// weight is the transaction's weight, used as a tiebreaker for transactions with the same priority
-	weight int64
-	// senderElement is a pointer to the transaction's element in the sender index
-	senderElement *skiplist.Element
-}
-
-// txMetaLess is a comparator for txKeys that first compares priority, then weight,
-// then sender, then nonce, uniquely identifying a transaction.
-//
-// Note, txMetaLess is used as the comparator in the priority index.
-func txMetaLess(a, b any) int {
-	keyA := a.(txMeta)
-	keyB := b.(txMeta)
-	res := skiplist.Int64.Compare(keyA.priority, keyB.priority)
-	if res != 0 {
-		return res
-	}
-
-	// Weight is used as a tiebreaker for transactions with the same priority.
-	// Weight is calculated in a single pass in .Select(...) and so will be 0
-	// on .Insert(...).
-	res = skiplist.Int64.Compare(keyA.weight, keyB.weight)
-	if res != 0 {
-		return res
-	}
-
-	// Because weight will be 0 on .Insert(...), we must also compare sender and
-	// nonce to resolve priority collisions. If we didn't then transactions with
-	// the same priority would overwrite each other in the priority index.
-	res = skiplist.String.Compare(keyA.sender, keyB.sender)
-	if res != 0 {
-		return res
-	}
-
-	return skiplist.Uint64.Compare(keyA.nonce, keyB.nonce)
-}
-
-type PriorityNonceMempoolOption func(*PriorityNonceMempool)
-
-// PriorityNonceWithOnRead sets a callback to be called when a tx is read from
-// the mempool.
-func PriorityNonceWithOnRead(onRead func(tx sdk.Tx)) PriorityNonceMempoolOption {
-	return func(mp *PriorityNonceMempool) {
-		mp.onRead = onRead
-	}
-}
-
-// PriorityNonceWithTxReplacement sets a callback to be called when duplicated
-// transaction nonce detected during mempool insert. An application can define a
-// transaction replacement rule based on tx priority or certain transaction fields.
-func PriorityNonceWithTxReplacement(txReplacementRule func(op, np int64, oTx, nTx sdk.Tx) bool) PriorityNonceMempoolOption {
-	return func(mp *PriorityNonceMempool) {
-		mp.txReplacement = txReplacementRule
-	}
-}
-
-// PriorityNonceWithMaxTx sets the maximum number of transactions allowed in the
-// mempool with the semantics:
-//
-// <0: disabled, `Insert` is a no-op
-// 0: unlimited
-// >0: maximum number of transactions allowed
-func PriorityNonceWithMaxTx(maxTx int) PriorityNonceMempoolOption {
-	return func(mp *PriorityNonceMempool) {
-		mp.maxTx = maxTx
-	}
-}
-
-func PriorityNonceWithTxReplacedCallback(cb func(ctx context.Context, oldTx, newTx *TxInfo)) PriorityNonceMempoolOption {
-	return func(mp *PriorityNonceMempool) {
-		mp.txReplacedCallback = cb
-	}
-}
-
-// DefaultPriorityMempool returns a priorityNonceMempool with no options.
-func DefaultPriorityMempool() mempool.Mempool {
-	return NewPriorityMempool()
-}
-
-// NewPriorityMempool returns the SDK's default mempool implementation which
-// returns txs in a partial order by 2 dimensions; priority, and sender-nonce.
-func NewPriorityMempool(opts ...PriorityNonceMempoolOption) *PriorityNonceMempool {
-	mp := &PriorityNonceMempool{
-		priorityIndex:   skiplist.New(skiplist.LessThanFunc(txMetaLess)),
-		priorityCounts:  make(map[int64]int),
-		senderIndices:   make(map[string]*skiplist.SkipList),
-		scores:          make(map[txMeta]txMeta),
-		counterBySender: make(map[string]int),
-		txRecord:        make(map[txMeta]struct{}),
-	}
-
-	for _, opt := range opts {
-		opt(mp)
-	}
-
-	return mp
-}
-
-// NextSenderTx returns the next transaction for a given sender by nonce order,
-// i.e. the next valid transaction for the sender. If no such transaction exists,
-// nil will be returned.
-func (mp *PriorityNonceMempool) NextSenderTx(sender string) sdk.Tx {
-	senderIndex, ok := mp.senderIndices[sender]
-	if !ok {
-		return nil
-	}
-
-	cursor := senderIndex.Front()
-	return cursor.Value.(sdk.Tx)
-}
-
-// Insert attempts to insert a Tx into the app-side mempool in O(log n) time,
-// returning an error if unsuccessful. Sender and nonce are derived from the
-// transaction's first signature.
-//
-// Transactions are unique by sender and nonce. Inserting a duplicate tx is an
-// O(log n) no-op.
-//
-// Inserting a duplicate tx with a different priority overwrites the existing tx,
-// changing the total order of the mempool.
-func (mp *PriorityNonceMempool) Insert(ctx context.Context, tx sdk.Tx) error {
-	mp.mtx.Lock()
-	defer mp.mtx.Unlock()
-
-	// if mp.maxTx > 0 && mp.CountTx() >= mp.maxTx {
-	// 	return mempool.ErrMempoolTxMaxCapacity
-	// } else
-	if mp.maxTx < 0 {
-		return nil
-	}
-
-	sdkContext := sdk.UnwrapSDKContext(ctx)
-	priority := sdkContext.Priority()
-
-	txInfo, err := extractTxInfo(tx)
-	if err != nil {
-		return err
-	}
-
-	if !mp.canInsert(txInfo.Sender) {
-		return errors.Wrapf(errMempoolTooManyTxs, "[%d@%s]sender has too many txs in mempool", txInfo.Nonce, txInfo.Sender)
-	}
-
-	// init sender index if not exists
-	senderIndex, ok := mp.senderIndices[txInfo.Sender]
-	if !ok {
-		senderIndex = skiplist.New(skiplist.LessThanFunc(func(a, b any) int {
-			return skiplist.Uint64.Compare(b.(txMeta).nonce, a.(txMeta).nonce)
-		}))
-
-		// initialize sender index if not found
-		mp.senderIndices[txInfo.Sender] = senderIndex
-	}
-
-	newKey := txMeta{nonce: txInfo.Nonce, priority: priority, sender: txInfo.Sender}
-
-	// Since mp.priorityIndex is scored by priority, then sender, then nonce, a
-	// changed priority will create a new key, so we must remove the old key and
-	// re-insert it to avoid having the same tx with different priorityIndex indexed
-	// twice in the mempool.
-	//
-	// This O(log n) remove operation is rare and only happens when a tx's priority
-	// changes.
-
-	sk := txMeta{nonce: txInfo.Nonce, sender: txInfo.Sender}
-	if oldScore, txExists := mp.scores[sk]; txExists {
-		if oldScore.priority < priority {
-			oldTx := senderIndex.Get(newKey).Value.(sdk.Tx)
-			return mp.doTxReplace(ctx, newKey, oldScore, oldTx, tx)
-		}
-		return errors.Wrapf(errTxInMempool, "[%d@%s] tx already in mempool", txInfo.Nonce, txInfo.Sender)
-	} else {
-		mempoolSize := mp.priorityIndex.Len()
-		if mempoolSize >= mp.maxTx {
-			lowestPriority := mp.getLowestPriority()
-			// find one to replace
-			if lowestPriority > 0 && priority <= lowestPriority {
-				return errors.Wrapf(errMempoolTxGasPriceTooLow, "[%d@%s]tx with priority %d is too low, current lowest priority is %d", newKey.nonce, newKey.sender, priority, lowestPriority)
-			}
-
-			var maxIndexSize int
-			var lowerPriority int64 = math.MaxInt64
-			var selectedElement *skiplist.Element
-			for sender, index := range mp.senderIndices {
-				indexSize := index.Len()
-				if sender == txInfo.Sender {
-					continue
-				}
-
-				if indexSize > 0 {
-					tail := index.Back()
-					if tail != nil {
-						tailKey := tail.Key().(txMeta)
-						if tailKey.priority < lowerPriority {
-							lowerPriority = tailKey.priority
-							maxIndexSize = indexSize
-							selectedElement = tail
-						} else if tailKey.priority == lowerPriority {
-							if indexSize > maxIndexSize {
-								maxIndexSize = indexSize
-								selectedElement = tail
-							}
-						}
-					}
-				}
-			}
-
-			if selectedElement != nil {
-				key := selectedElement.Key().(txMeta)
-				replacedTx, _ := mp.doRemove(key, true)
-
-				// insert new tx
-				mp.doInsert(newKey, tx, true)
-
-				if mp.txReplacedCallback != nil && replacedTx != nil {
-					sdkContext.Logger().Debug("txn replaced caused by full of mempool", "old", fmt.Sprintf("%d@%s", key.nonce, key.sender), "new", fmt.Sprintf("%d@%s", newKey.nonce, newKey.sender), "mempoolSize", mempoolSize)
-					mp.txReplacedCallback(ctx,
-						&TxInfo{Sender: key.sender, Nonce: key.nonce, Tx: replacedTx},
-						&TxInfo{Sender: newKey.sender, Nonce: newKey.nonce, Tx: tx},
-					)
-				}
-			} else {
-				return errors.Wrapf(errMempoolIsFull, "%d@%s with priority%d", newKey.nonce, newKey.sender, newKey.priority)
-			}
-		} else {
-			mp.doInsert(newKey, tx, true)
-		}
-		return nil
-	}
-}
-
-func (mp *PriorityNonceMempool) doInsert(newKey txMeta, tx sdk.Tx, incrCnt bool) {
-	senderIndex, ok := mp.senderIndices[newKey.sender]
-	if !ok {
-		senderIndex = skiplist.New(skiplist.LessThanFunc(func(a, b any) int {
-			return skiplist.Uint64.Compare(b.(txMeta).nonce, a.(txMeta).nonce)
-		}))
-
-		// initialize sender index if not found
-		mp.senderIndices[newKey.sender] = senderIndex
-	}
-
-	mp.priorityCounts[newKey.priority]++
-	newKey.senderElement = senderIndex.Set(newKey, tx)
-
-	mp.scores[txMeta{nonce: newKey.nonce, sender: newKey.sender}] = txMeta{priority: newKey.priority}
-	mp.priorityIndex.Set(newKey, tx)
-
-	if incrCnt {
-		mp.incrSenderTxCnt(newKey.sender, newKey.nonce)
-	}
-}
-
-func (mp *PriorityNonceMempool) doRemove(oldKey txMeta, decrCnt bool) (sdk.Tx, error) {
-	scoreKey := txMeta{nonce: oldKey.nonce, sender: oldKey.sender}
-	score, ok := mp.scores[scoreKey]
-	if !ok {
-		return nil, errors.Wrapf(mempool.ErrTxNotFound, "%d@%s not found", oldKey.nonce, oldKey.sender)
-	}
-	tk := txMeta{nonce: oldKey.nonce, priority: score.priority, sender: oldKey.sender, weight: score.weight}
-
-	senderTxs, ok := mp.senderIndices[oldKey.sender]
-	if !ok {
-		return nil, fmt.Errorf("%d@%s not found", oldKey.nonce, oldKey.sender)
-	}
-
-	mp.priorityIndex.Remove(tk)
-	removedElem := senderTxs.Remove(tk)
-	delete(mp.scores, scoreKey)
-	mp.priorityCounts[score.priority]--
-
-	if decrCnt {
-		mp.decrSenderTxCnt(oldKey.sender, oldKey.nonce)
-	}
-
-	if removedElem == nil {
-		return nil, mempool.ErrTxNotFound
-	}
-
-	return removedElem.Value.(sdk.Tx), nil
-}
-
-func (mp *PriorityNonceMempool) doTxReplace(ctx context.Context, newMate, oldMate txMeta, oldTx, newTx sdk.Tx) error {
-	if mp.txReplacement != nil && !mp.txReplacement(oldMate.priority, newMate.priority, oldTx, newTx) {
-		return fmt.Errorf(
-			"tx doesn't fit the replacement rule, oldPriority: %v, newPriority: %v, oldTx: %v, newTx: %v",
-			oldMate.priority,
-			newMate.priority,
-			oldTx,
-			newTx,
-		)
-	}
-
-	e := mp.priorityIndex.Remove(txMeta{
-		nonce:    newMate.nonce,
-		sender:   newMate.sender,
-		priority: oldMate.priority,
-		weight:   oldMate.weight,
-	})
-	replacedTx := e.Value.(sdk.Tx)
-	mp.priorityCounts[oldMate.priority]--
-
-	mp.doInsert(newMate, newTx, false)
-
-	if mp.txReplacedCallback != nil && replacedTx != nil {
-		sdkContext := sdk.UnwrapSDKContext(ctx)
-		sdkContext.Logger().Debug("txn update", "txn", fmt.Sprintf("%d@%s", newMate.nonce, newMate.sender), "oldPriority", oldMate.priority, "newPriority", newMate.priority)
-		mp.txReplacedCallback(ctx,
-			&TxInfo{Sender: newMate.sender, Nonce: newMate.nonce, Tx: replacedTx},
-			&TxInfo{Sender: newMate.sender, Nonce: newMate.nonce, Tx: newTx},
-		)
-	}
-
-	return nil
-}
-
-func (i *PriorityNonceIterator) iteratePriority() mempool.Iterator {
-	// beginning of priority iteration
-	if i.priorityNode == nil {
-		i.priorityNode = i.mempool.priorityIndex.Front()
-	} else {
-		i.priorityNode = i.priorityNode.Next()
-	}
-
-	// end of priority iteration
-	if i.priorityNode == nil {
-		return nil
-	}
-
-	i.sender = i.priorityNode.Key().(txMeta).sender
-
-	nextPriorityNode := i.priorityNode.Next()
-	if nextPriorityNode != nil {
-		i.nextPriority = nextPriorityNode.Key().(txMeta).priority
-	} else {
-		i.nextPriority = math.MinInt64
-	}
-
-	return i.Next()
-}
-
-func (i *PriorityNonceIterator) Next() mempool.Iterator {
-	if i.priorityNode == nil {
-		return nil
-	}
-
-	cursor, ok := i.senderCursors[i.sender]
-	if !ok {
-		// beginning of sender iteration
-		cursor = i.mempool.senderIndices[i.sender].Front()
-	} else {
-		// middle of sender iteration
-		cursor = cursor.Next()
-	}
-
-	// end of sender iteration
-	if cursor == nil {
-		return i.iteratePriority()
-	}
-
-	key := cursor.Key().(txMeta)
-
-	// We've reached a transaction with a priority lower than the next highest
-	// priority in the pool.
-	if key.priority < i.nextPriority {
-		return i.iteratePriority()
-	} else if key.priority == i.nextPriority && i.priorityNode.Next() != nil {
-		// Weight is incorporated into the priority index key only (not sender index)
-		// so we must fetch it here from the scores map.
-		weight := i.mempool.scores[txMeta{nonce: key.nonce, sender: key.sender}].weight
-		if weight < i.priorityNode.Next().Key().(txMeta).weight {
-			return i.iteratePriority()
-		}
-	}
-
-	i.senderCursors[i.sender] = cursor
-	return i
-}
-
-func (i *PriorityNonceIterator) Tx() sdk.Tx {
-	return i.senderCursors[i.sender].Value.(sdk.Tx)
-}
-
-// Select returns a set of transactions from the mempool, ordered by priority
-// and sender-nonce in O(n) time. The passed in list of transactions are ignored.
-// This is a readonly operation, the mempool is not modified.
-//
-// The maxBytes parameter defines the maximum number of bytes of transactions to
-// return.
-//
-// NOTE: It is not safe to use this iterator while removing transactions from
-// the underlying mempool.
-func (mp *PriorityNonceMempool) Select(ctx context.Context, txs [][]byte) mempool.Iterator {
-	mp.mtx.Lock()
-	defer mp.mtx.Unlock()
-
-	return mp.doSelect(ctx, txs)
-}
-
-func (mp *PriorityNonceMempool) SelectBy(ctx context.Context, txs [][]byte, callback func(sdk.Tx) bool) {
-	mp.mtx.Lock()
-	defer mp.mtx.Unlock()
-
-	iter := mp.doSelect(ctx, txs)
-	for iter != nil && callback(iter.Tx()) {
-		iter = iter.Next()
-	}
-}
-
-func (mp *PriorityNonceMempool) doSelect(_ context.Context, _ [][]byte) mempool.Iterator {
-	if mp.priorityIndex.Len() == 0 {
-		return nil
-	}
-
-	mp.reorderPriorityTies()
-
-	iterator := &PriorityNonceIterator{
-		mempool:       mp,
-		senderCursors: make(map[string]*skiplist.Element),
-	}
-
-	return iterator.iteratePriority()
-}
-
-func (mp *PriorityNonceMempool) GetSenderUncommittedTxnCount(ctx context.Context, sender string) int {
-	mp.mtx.Lock()
-	defer mp.mtx.Unlock()
-
-	if _, exists := mp.counterBySender[sender]; exists {
-		return mp.counterBySender[sender]
-	}
-	return 0
-}
-
-type reorderKey struct {
-	deleteKey txMeta
-	insertKey txMeta
-	tx        sdk.Tx
-}
-
-func (mp *PriorityNonceMempool) reorderPriorityTies() {
-	node := mp.priorityIndex.Front()
-
-	var reordering []reorderKey
-	for node != nil {
-		key := node.Key().(txMeta)
-		if mp.priorityCounts[key.priority] > 1 {
-			newKey := key
-			newKey.weight = senderWeight(key.senderElement)
-			reordering = append(reordering, reorderKey{deleteKey: key, insertKey: newKey, tx: node.Value.(sdk.Tx)})
-		}
-
-		node = node.Next()
-	}
-
-	for _, k := range reordering {
-		mp.priorityIndex.Remove(k.deleteKey)
-		delete(mp.scores, txMeta{nonce: k.deleteKey.nonce, sender: k.deleteKey.sender})
-		mp.priorityIndex.Set(k.insertKey, k.tx)
-		mp.scores[txMeta{nonce: k.insertKey.nonce, sender: k.insertKey.sender}] = k.insertKey
-	}
-}
-
-// senderWeight returns the weight of a given tx (t) at senderCursor. Weight is
-// defined as the first (nonce-wise) same sender tx with a priority not equal to
-// t. It is used to resolve priority collisions, that is when 2 or more txs from
-// different senders have the same priority.
-func senderWeight(senderCursor *skiplist.Element) int64 {
-	if senderCursor == nil {
-		return 0
-	}
-
-	weight := senderCursor.Key().(txMeta).priority
-	senderCursor = senderCursor.Next()
-	for senderCursor != nil {
-		p := senderCursor.Key().(txMeta).priority
-		if p != weight {
-			weight = p
-		}
-
-		senderCursor = senderCursor.Next()
-	}
-
-	return weight
-}
-
-// CountTx returns the number of transactions in the mempool.
-func (mp *PriorityNonceMempool) CountTx() int {
-	mp.mtx.Lock()
-	defer mp.mtx.Unlock()
-	return mp.priorityIndex.Len()
-}
-
-// Remove removes a transaction from the mempool in O(log n) time, returning an
-// error if unsuccessful.
-func (mp *PriorityNonceMempool) Remove(tx sdk.Tx) error {
-	mp.mtx.Lock()
-	defer mp.mtx.Unlock()
-
-	txInfo, err := extractTxInfo(tx)
-	if err != nil {
-		return err
-	}
-
-	mp.decrSenderTxCnt(txInfo.Sender, txInfo.Nonce)
-
-	scoreKey := txMeta{nonce: txInfo.Nonce, sender: txInfo.Sender}
-	score, ok := mp.scores[scoreKey]
-	if !ok {
-		return mempool.ErrTxNotFound
-	}
-	tk := txMeta{nonce: txInfo.Nonce, priority: score.priority, sender: txInfo.Sender, weight: score.weight}
-
-	senderTxs, ok := mp.senderIndices[txInfo.Sender]
-	if !ok {
-		return fmt.Errorf("sender %s not found", txInfo.Sender)
-	}
-
-	mp.priorityIndex.Remove(tk)
-	senderTxs.Remove(tk)
-	delete(mp.scores, scoreKey)
-	mp.priorityCounts[score.priority]--
-
-	return nil
-}
-
-func (mp *PriorityNonceMempool) getLowestPriority() int64 {
-	if mp.priorityIndex.Len() == 0 {
-		return 0
-	}
-
-	min := int64(math.MaxInt64)
-	for priority, count := range mp.priorityCounts {
-		if count > 0 {
-			if priority < min {
-				min = priority
-			}
-		}
-	}
-
-	return min
-}
-
-func (mp *PriorityNonceMempool) canInsert(sender string) bool {
-	mp.senderTxCntLock.RLock()
-	defer mp.senderTxCntLock.RUnlock()
-
-	if _, exists := mp.counterBySender[sender]; exists {
-		return mp.counterBySender[sender] < MAX_TXS_PRE_SENDER_IN_MEMPOOL
-	}
-
-	return true
-}
-
-func (mp *PriorityNonceMempool) incrSenderTxCnt(sender string, nonce uint64) error {
-	mp.senderTxCntLock.Lock()
-	defer mp.senderTxCntLock.Unlock()
-
-	existsKey := txMeta{nonce: nonce, sender: sender}
-	if _, exists := mp.txRecord[existsKey]; !exists {
-		mp.txRecord[existsKey] = struct{}{}
-
-		if _, exists := mp.counterBySender[sender]; !exists {
-			mp.counterBySender[sender] = 1
-		} else {
-			if mp.counterBySender[sender] < MAX_TXS_PRE_SENDER_IN_MEMPOOL {
-				mp.counterBySender[sender] += 1
-			} else {
-				return fmt.Errorf("tx sender has too many txs in mempool")
-			}
-		}
-	}
-	return nil
-}
-
-func (mp *PriorityNonceMempool) decrSenderTxCnt(sender string, nonce uint64) {
-	mp.senderTxCntLock.Lock()
-	defer mp.senderTxCntLock.Unlock()
-
-	existsKey := txMeta{nonce: nonce, sender: sender}
-	if _, exists := mp.txRecord[existsKey]; exists {
-		delete(mp.txRecord, existsKey)
-
-		if _, exists := mp.counterBySender[sender]; exists {
-			if mp.counterBySender[sender] > 1 {
-				mp.counterBySender[sender] -= 1
-			} else {
-				delete(mp.counterBySender, sender)
-			}
-		}
-	}
-}
-
-func IsEmpty(mempool mempool.Mempool) error {
-	mp := mempool.(*PriorityNonceMempool)
-	if mp.priorityIndex.Len() != 0 {
-		return fmt.Errorf("priorityIndex not empty")
-	}
-
-	var countKeys []int64
-	for k := range mp.priorityCounts {
-		countKeys = append(countKeys, k)
-	}
-
-	for _, k := range countKeys {
-		if mp.priorityCounts[k] != 0 {
-			return fmt.Errorf("priorityCounts not zero at %v, got %v", k, mp.priorityCounts[k])
-		}
-	}
-
-	var senderKeys []string
-	for k := range mp.senderIndices {
-		senderKeys = append(senderKeys, k)
-	}
-
-	for _, k := range senderKeys {
-		if mp.senderIndices[k].Len() != 0 {
-			return fmt.Errorf("senderIndex not empty for sender %v", k)
-		}
-	}
-
-	return nil
-}
-
-type TxInfo struct {
-	Sender string
-	Nonce  uint64
-	Tx     sdk.Tx
-}
-
-func extractTxInfo(tx sdk.Tx) (*TxInfo, error) {
-	var sender string
-	var nonce uint64
-
-	sigs, err := tx.(signing.SigVerifiableTx).GetSignaturesV2()
-	if err != nil {
-		return nil, err
-	}
-
-	if len(sigs) == 0 {
-		msgs := tx.GetMsgs()
-		if len(msgs) != 1 {
-			return nil, fmt.Errorf("tx must have at least one signer")
-		}
-		msgEthTx, ok := msgs[0].(*evmtypes.MsgEthereumTx)
-		if !ok {
-			return nil, fmt.Errorf("tx must have at least one signer")
-		}
-		ethTx := msgEthTx.AsTransaction()
-		signer := gethtypes.NewEIP2930Signer(ethTx.ChainId())
-		ethSender, err := signer.Sender(ethTx)
-		if err != nil {
-			return nil, fmt.Errorf("tx must have at least one signer")
-		}
-		sender = sdk.AccAddress(ethSender.Bytes()).String()
-		nonce = ethTx.Nonce()
-	} else {
-		sig := sigs[0]
-		sender = sdk.AccAddress(sig.PubKey.Address()).String()
-		nonce = sig.Sequence
-	}
-
-	return &TxInfo{Sender: sender, Nonce: nonce, Tx: tx}, nil
-}

app/tally_handler.go

@@ -8,6 +8,10 @@ import (
 	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	earnkeeper "github.com/kava-labs/kava/x/earn/keeper"
+	liquidkeeper "github.com/kava-labs/kava/x/liquid/keeper"
+	liquidtypes "github.com/kava-labs/kava/x/liquid/types"
+	savingskeeper "github.com/kava-labs/kava/x/savings/keeper"
 )
 
 var _ govv1.TallyHandler = TallyHandler{}
@@ -16,16 +20,23 @@ var _ govv1.TallyHandler = TallyHandler{}
 type TallyHandler struct {
 	gk  govkeeper.Keeper
 	stk stakingkeeper.Keeper
+	svk savingskeeper.Keeper
+	ek  earnkeeper.Keeper
+	lk  liquidkeeper.Keeper
 	bk  bankkeeper.Keeper
 }
 
 // NewTallyHandler creates a new tally handler.
 func NewTallyHandler(
-	gk govkeeper.Keeper, stk stakingkeeper.Keeper, bk bankkeeper.Keeper,
+	gk govkeeper.Keeper, stk stakingkeeper.Keeper, svk savingskeeper.Keeper,
+	ek earnkeeper.Keeper, lk liquidkeeper.Keeper, bk bankkeeper.Keeper,
 ) TallyHandler {
 	return TallyHandler{
 		gk:  gk,
 		stk: stk,
+		svk: svk,
+		ek:  ek,
+		lk:  lk,
 		bk:  bk,
 	}
 }
@@ -94,34 +105,34 @@ func (th TallyHandler) Tally(
 		})
 
 		// get voter bkava and update total voting power and results
-		// addrBkava := th.getAddrBkava(ctx, voter).toCoins()
+		addrBkava := th.getAddrBkava(ctx, voter).toCoins()
-		// for _, coin := range addrBkava {
+		for _, coin := range addrBkava {
-		// 	valAddr, err := liquidtypes.ParseLiquidStakingTokenDenom(coin.Denom)
+			valAddr, err := liquidtypes.ParseLiquidStakingTokenDenom(coin.Denom)
-		// 	if err != nil {
+			if err != nil {
-		// 		break
+				break
-		// 	}
+			}
 
-		// 	// reduce delegator shares by the amount of voter bkava for the validator
+			// reduce delegator shares by the amount of voter bkava for the validator
-		// 	valAddrStr := valAddr.String()
+			valAddrStr := valAddr.String()
-		// 	if val, ok := currValidators[valAddrStr]; ok {
+			if val, ok := currValidators[valAddrStr]; ok {
-		// 		val.DelegatorDeductions = val.DelegatorDeductions.Add(sdk.NewDecFromInt(coin.Amount))
+				val.DelegatorDeductions = val.DelegatorDeductions.Add(sdk.NewDecFromInt(coin.Amount))
-		// 		currValidators[valAddrStr] = val
+				currValidators[valAddrStr] = val
-		// 	}
+			}
 
-		// 	// votingPower = amount of ukava coin
+			// votingPower = amount of ukava coin
-		// 	stakedCoins, err := th.lk.GetStakedTokensForDerivatives(ctx, sdk.NewCoins(coin))
+			stakedCoins, err := th.lk.GetStakedTokensForDerivatives(ctx, sdk.NewCoins(coin))
-		// 	if err != nil {
+			if err != nil {
-		// 		// error is returned only if the bkava denom is incorrect, which should never happen here.
+				// error is returned only if the bkava denom is incorrect, which should never happen here.
-		// 		panic(err)
+				panic(err)
-		// 	}
+			}
-		// 	votingPower := sdk.NewDecFromInt(stakedCoins.Amount)
+			votingPower := sdk.NewDecFromInt(stakedCoins.Amount)
 
-		// 	for _, option := range vote.Options {
+			for _, option := range vote.Options {
-		// 		subPower := votingPower.Mul(sdk.MustNewDecFromStr(option.Weight))
+				subPower := votingPower.Mul(sdk.MustNewDecFromStr(option.Weight))
-		// 		results[option.Option] = results[option.Option].Add(subPower)
+				results[option.Option] = results[option.Option].Add(subPower)
-		// 	}
+			}
-		// 	totalVotingPower = totalVotingPower.Add(votingPower)
+			totalVotingPower = totalVotingPower.Add(votingPower)
-		// }
+		}
 
 		th.gk.DeleteVote(ctx, vote.ProposalId, voter)
 		return false
@@ -143,7 +154,7 @@ func (th TallyHandler) Tally(
 		totalVotingPower = totalVotingPower.Add(votingPower)
 	}
 
-	tallyParams := th.gk.GetParams(ctx)
+	tallyParams := th.gk.GetTallyParams(ctx)
 	tallyResults = govv1.NewTallyResultFromMap(results)
 
 	// TODO: Upgrade the spec to cover all of these cases & remove pseudocode.
@@ -155,7 +166,7 @@ func (th TallyHandler) Tally(
 	// If there is not enough quorum of votes, the proposal fails
 	percentVoting := totalVotingPower.Quo(sdk.NewDecFromInt(th.stk.TotalBondedTokens(ctx)))
 	if percentVoting.LT(sdk.MustNewDecFromStr(tallyParams.Quorum)) {
-		return false, tallyParams.BurnVoteQuorum, tallyResults
+		return false, true, tallyResults
 	}
 
 	// If no one votes (everyone abstains), proposal fails
@@ -165,7 +176,7 @@ func (th TallyHandler) Tally(
 
 	// If more than 1/3 of voters veto, proposal fails
 	if results[govv1.OptionNoWithVeto].Quo(totalVotingPower).GT(sdk.MustNewDecFromStr(tallyParams.VetoThreshold)) {
-		return false, tallyParams.BurnVoteVeto, tallyResults
+		return false, true, tallyResults
 	}
 
 	// If more than 1/2 of non-abstaining voters vote Yes, proposal passes
@@ -208,38 +219,38 @@ func (th TallyHandler) getAddrBkava(ctx sdk.Context, addr sdk.AccAddress) bkavaB
 
 // addBkavaFromWallet adds all addr balances of bkava in x/bank.
 func (th TallyHandler) addBkavaFromWallet(ctx sdk.Context, addr sdk.AccAddress, bkava bkavaByDenom) {
-	// coins := th.bk.GetAllBalances(ctx, addr)
+	coins := th.bk.GetAllBalances(ctx, addr)
-	// for _, coin := range coins {
+	for _, coin := range coins {
-	// 	if th.lk.IsDerivativeDenom(ctx, coin.Denom) {
+		if th.lk.IsDerivativeDenom(ctx, coin.Denom) {
-	// 		bkava.add(coin)
+			bkava.add(coin)
-	// 	}
+		}
-	// }
+	}
 }
 
 // addBkavaFromSavings adds all addr deposits of bkava in x/savings.
 func (th TallyHandler) addBkavaFromSavings(ctx sdk.Context, addr sdk.AccAddress, bkava bkavaByDenom) {
-	// deposit, found := th.svk.GetDeposit(ctx, addr)
+	deposit, found := th.svk.GetDeposit(ctx, addr)
-	// if !found {
+	if !found {
-	// 	return
+		return
-	// }
+	}
-	// for _, coin := range deposit.Amount {
+	for _, coin := range deposit.Amount {
-	// 	if th.lk.IsDerivativeDenom(ctx, coin.Denom) {
+		if th.lk.IsDerivativeDenom(ctx, coin.Denom) {
-	// 		bkava.add(coin)
+			bkava.add(coin)
-	// 	}
+		}
-	// }
+	}
 }
 
 // addBkavaFromEarn adds all addr deposits of bkava in x/earn.
 func (th TallyHandler) addBkavaFromEarn(ctx sdk.Context, addr sdk.AccAddress, bkava bkavaByDenom) {
-	// shares, found := th.ek.GetVaultAccountShares(ctx, addr)
+	shares, found := th.ek.GetVaultAccountShares(ctx, addr)
-	// if !found {
+	if !found {
-	// 	return
+		return
-	// }
+	}
-	// for _, share := range shares {
+	for _, share := range shares {
-	// 	if th.lk.IsDerivativeDenom(ctx, share.Denom) {
+		if th.lk.IsDerivativeDenom(ctx, share.Denom) {
-	// 		if coin, err := th.ek.ConvertToAssets(ctx, share); err == nil {
+			if coin, err := th.ek.ConvertToAssets(ctx, share); err == nil {
-	// 			bkava.add(coin)
+				bkava.add(coin)
-	// 		}
+			}
-	// 	}
+		}
-	// }
+	}
 }

app/tally_handler_test.go

@@ -5,7 +5,6 @@ import (
 	"time"
 
 	sdkmath "cosmossdk.io/math"
-	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -16,6 +15,10 @@ import (
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/stretchr/testify/suite"
+	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+
+	earntypes "github.com/kava-labs/kava/x/earn/types"
+	liquidtypes "github.com/kava-labs/kava/x/liquid/types"
 )
 
 // d is an alias for sdk.MustNewDecFromStr
@@ -41,13 +44,15 @@ func (suite *tallyHandlerSuite) SetupTest() {
 	genesisTime := time.Date(1998, 1, 1, 0, 0, 0, 0, time.UTC)
 	suite.ctx = suite.app.NewContext(false, tmproto.Header{Height: 1, Time: genesisTime})
 
-	stakingKeeper := *suite.app.GetStakingKeeper()
+	suite.staking = stakingHelper{suite.app.GetStakingKeeper()}
-	suite.staking = stakingHelper{stakingKeeper}
 	suite.staking.setBondDenom(suite.ctx, "ukava")
 
 	suite.tallier = NewTallyHandler(
 		suite.app.GetGovKeeper(),
-		stakingKeeper,
+		suite.app.GetStakingKeeper(),
+		suite.app.GetSavingsKeeper(),
+		suite.app.GetEarnKeeper(),
+		suite.app.GetLiquidKeeper(),
 		suite.app.GetBankKeeper(),
 	)
 }
@@ -130,7 +135,7 @@ func (suite *tallyHandlerSuite) TestTallyOutcomes() {
 
 		passes, burns, tally := suite.tallier.Tally(suite.ctx, proposal)
 		suite.Falsef(passes, "expected proposal to fail, tally: %v", tally)
-		suite.Truef(burns, "expected deposit to be burned, tally: %v", tally)
+		suite.Truef(burns, "expected desposit to be burned, tally: %v", tally)
 	})
 	suite.Run("VetoedFails", func() {
 		suite.SetupTest()
@@ -145,7 +150,7 @@ func (suite *tallyHandlerSuite) TestTallyOutcomes() {
 
 		passes, burns, tally := suite.tallier.Tally(suite.ctx, proposal)
 		suite.Falsef(passes, "expected proposal to fail, tally: %v", tally)
-		suite.Truef(burns, "expected deposit to be burned, tally: %v", tally)
+		suite.Truef(burns, "expected desposit to be burned, tally: %v", tally)
 	})
 	suite.Run("UnvetoedAndYesAboveThresholdPasses", func() {
 		suite.SetupTest()
@@ -162,7 +167,7 @@ func (suite *tallyHandlerSuite) TestTallyOutcomes() {
 
 		passes, burns, tally := suite.tallier.Tally(suite.ctx, proposal)
 		suite.Truef(passes, "expected proposal to pass, tally: %v", tally)
-		suite.Falsef(burns, "expected deposit to not burn, tally: %v", tally)
+		suite.Falsef(burns, "expected desposit to not burn, tally: %v", tally)
 	})
 	suite.Run("UnvetoedAndYesBelowThresholdFails", func() {
 		suite.SetupTest()
@@ -179,7 +184,7 @@ func (suite *tallyHandlerSuite) TestTallyOutcomes() {
 
 		passes, burns, tally := suite.tallier.Tally(suite.ctx, proposal)
 		suite.Falsef(passes, "expected proposal to pass, tally: %v", tally)
-		suite.Falsef(burns, "expected deposit to not burn, tally: %v", tally)
+		suite.Falsef(burns, "expected desposit to not burn, tally: %v", tally)
 	})
 	suite.Run("NotEnoughStakeFails", func() {
 		suite.SetupTest()
@@ -191,7 +196,7 @@ func (suite *tallyHandlerSuite) TestTallyOutcomes() {
 
 		passes, burns, tally := suite.tallier.Tally(suite.ctx, proposal)
 		suite.Falsef(passes, "expected proposal to pass, tally: %v", tally)
-		suite.Falsef(burns, "expected deposit to not burn, tally: %v", tally)
+		suite.Falsef(burns, "expected desposit to not burn, tally: %v", tally)
 	})
 	suite.Run("UnvetoedAndAllAbstainedFails", func() {
 		suite.SetupTest()
@@ -204,18 +209,17 @@ func (suite *tallyHandlerSuite) TestTallyOutcomes() {
 
 		passes, burns, tally := suite.tallier.Tally(suite.ctx, proposal)
 		suite.Falsef(passes, "expected proposal to pass, tally: %v", tally)
-		suite.Falsef(burns, "expected deposit to not burn, tally: %v", tally)
+		suite.Falsef(burns, "expected desposit to not burn, tally: %v", tally)
 	})
 
 }
 
 func (suite *tallyHandlerSuite) setTallyParams(quorum, threshold, veto sdk.Dec) {
-	params := suite.app.GetGovKeeper().GetParams(suite.ctx)
+	suite.app.GetGovKeeper().SetTallyParams(suite.ctx, govv1.TallyParams{
-	params.Quorum = quorum.String()
+		Quorum:        quorum.String(),
-	params.Threshold = threshold.String()
+		Threshold:     threshold.String(),
-	params.VetoThreshold = veto.String()
+		VetoThreshold: veto.String(),
-	params.BurnVoteQuorum = true
+	})
-	suite.app.GetGovKeeper().SetParams(suite.ctx, params)
 }
 
 func (suite *tallyHandlerSuite) voteOnProposal(
@@ -236,7 +240,7 @@ func (suite *tallyHandlerSuite) voteOnProposal(
 
 func (suite *tallyHandlerSuite) createProposal() govv1.Proposal {
 	gk := suite.app.GetGovKeeper()
-	deposit := gk.GetParams(suite.ctx).MinDeposit
+	deposit := gk.GetDepositParams(suite.ctx).MinDeposit
 	proposer := suite.createAccount(deposit...)
 
 	msg, err := govv1beta1.NewMsgSubmitProposal(
@@ -246,7 +250,7 @@ func (suite *tallyHandlerSuite) createProposal() govv1.Proposal {
 	)
 	suite.Require().NoError(err)
 
-	msgServerv1 := govkeeper.NewMsgServerImpl(&gk)
+	msgServerv1 := govkeeper.NewMsgServerImpl(gk)
 
 	govAcct := gk.GetGovernanceAccount(suite.ctx).GetAddress()
 	msgServer := govkeeper.NewLegacyMsgServerImpl(govAcct.String(), msgServerv1)
@@ -265,40 +269,39 @@ func (suite *tallyHandlerSuite) newBondCoin(amount sdkmath.Int) sdk.Coin {
 }
 
 func (suite *tallyHandlerSuite) allowBKavaEarnDeposits() {
-	// ek := suite.app.GetEarnKeeper()
+	ek := suite.app.GetEarnKeeper()
-	// earnParams := ek.GetParams(suite.ctx)
+	earnParams := ek.GetParams(suite.ctx)
 
-	// vault := earntypes.NewAllowedVault(
+	vault := earntypes.NewAllowedVault(
-	// 	liquidtypes.DefaultDerivativeDenom,
+		liquidtypes.DefaultDerivativeDenom,
-	// 	earntypes.StrategyTypes{earntypes.STRATEGY_TYPE_SAVINGS},
+		earntypes.StrategyTypes{earntypes.STRATEGY_TYPE_SAVINGS},
-	// 	false,
+		false,
-	// 	nil,
+		nil,
-	// )
+	)
 
-	// earnParams.AllowedVaults = append(earnParams.AllowedVaults, vault)
+	earnParams.AllowedVaults = append(earnParams.AllowedVaults, vault)
-	// ek.SetParams(suite.ctx, earnParams)
+	ek.SetParams(suite.ctx, earnParams)
 
-	// sk := suite.app.GetSavingsKeeper()
+	sk := suite.app.GetSavingsKeeper()
-	// savingsParams := sk.GetParams(suite.ctx)
+	savingsParams := sk.GetParams(suite.ctx)
-	// savingsParams.SupportedDenoms = append(savingsParams.SupportedDenoms, liquidtypes.DefaultDerivativeDenom)
+	savingsParams.SupportedDenoms = append(savingsParams.SupportedDenoms, liquidtypes.DefaultDerivativeDenom)
-	// sk.SetParams(suite.ctx, savingsParams)
+	sk.SetParams(suite.ctx, savingsParams)
 }
 
 func (suite *tallyHandlerSuite) earnDeposit(owner sdk.AccAddress, derivative sdk.Coin) {
-	// ek := suite.app.GetEarnKeeper()
+	ek := suite.app.GetEarnKeeper()
 
-	// err := ek.Deposit(suite.ctx, owner, derivative, earntypes.STRATEGY_TYPE_SAVINGS)
+	err := ek.Deposit(suite.ctx, owner, derivative, earntypes.STRATEGY_TYPE_SAVINGS)
-	// suite.Require().NoError(err)
+	suite.Require().NoError(err)
 }
 
 func (suite *tallyHandlerSuite) mintDerivative(owner sdk.AccAddress, validator sdk.ValAddress, amount sdkmath.Int) sdk.Coin {
-	// lk := suite.app.GetLiquidKeeper()
+	lk := suite.app.GetLiquidKeeper()
 
-	// minted, err := lk.MintDerivative(suite.ctx, owner, validator, suite.newBondCoin(amount))
+	minted, err := lk.MintDerivative(suite.ctx, owner, validator, suite.newBondCoin(amount))
-	// suite.Require().NoError(err)
+	suite.Require().NoError(err)
 
-	// return minted
+	return minted
-	return sdk.NewCoin("ukava", amount)
 }
 
 func (suite *tallyHandlerSuite) delegateToNewBondedValidator(delegator sdk.AccAddress, amount sdkmath.Int) stakingtypes.ValidatorI {
@@ -366,7 +369,7 @@ func (h stakingHelper) createUnbondedValidator(ctx sdk.Context, address sdk.ValA
 		return nil, err
 	}
 
-	msgServer := stakingkeeper.NewMsgServerImpl(&h.keeper)
+	msgServer := stakingkeeper.NewMsgServerImpl(h.keeper)
 	_, err = msgServer.CreateValidator(sdk.WrapSDKContext(ctx), msg)
 	if err != nil {
 		return nil, err
@@ -386,7 +389,7 @@ func (h stakingHelper) delegate(ctx sdk.Context, delegator sdk.AccAddress, valid
 		h.newBondCoin(ctx, amount),
 	)
 
-	msgServer := stakingkeeper.NewMsgServerImpl(&h.keeper)
+	msgServer := stakingkeeper.NewMsgServerImpl(h.keeper)
 	_, err := msgServer.Delegate(sdk.WrapSDKContext(ctx), msg)
 	if err != nil {
 		return sdk.Dec{}, err

app/test_builder.go

@@ -13,10 +13,10 @@ import (
 // All methods return the builder so method calls can be chained together.
 //
 // Example:
+//     // create a single account genesis state
+//     builder := NewAuthBankGenesisBuilder().WithSimpleAccount(testUserAddress, testCoins)
+//     genesisState := builder.BuildMarshalled()
 //
-//	// create a single account genesis state
-//	builder := NewAuthBankGenesisBuilder().WithSimpleAccount(testUserAddress, testCoins)
-//	genesisState := builder.BuildMarshalled()
 type AuthBankGenesisBuilder struct {
 	AuthGenesis authtypes.GenesisState
 	BankGenesis banktypes.GenesisState

app/test_common.go

@@ -4,17 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"math/rand"
-	"reflect"
 	"testing"
 	"time"
 
 	sdkmath "cosmossdk.io/math"
-	dasignerskeeper "github.com/0glabs/0g-chain/x/dasigners/v1/keeper"
-	tmdb "github.com/cometbft/cometbft-db"
-	abci "github.com/cometbft/cometbft/abci/types"
-	"github.com/cometbft/cometbft/libs/log"
-	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
-	tmtypes "github.com/cometbft/cometbft/types"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
@@ -22,7 +15,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	"github.com/cosmos/cosmos-sdk/testutil/mock"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
@@ -41,24 +33,36 @@ import (
 	evmkeeper "github.com/evmos/ethermint/x/evm/keeper"
 	feemarketkeeper "github.com/evmos/ethermint/x/feemarket/keeper"
 	"github.com/stretchr/testify/require"
+	abci "github.com/tendermint/tendermint/abci/types"
+	"github.com/tendermint/tendermint/libs/log"
+	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	tmtypes "github.com/tendermint/tendermint/types"
+	tmdb "github.com/tendermint/tm-db"
 
-	"github.com/0glabs/0g-chain/chaincfg"
+	auctionkeeper "github.com/kava-labs/kava/x/auction/keeper"
-	bep3keeper "github.com/0glabs/0g-chain/x/bep3/keeper"
+	bep3keeper "github.com/kava-labs/kava/x/bep3/keeper"
-	committeekeeper "github.com/0glabs/0g-chain/x/committee/keeper"
+	cdpkeeper "github.com/kava-labs/kava/x/cdp/keeper"
-	evmutilkeeper "github.com/0glabs/0g-chain/x/evmutil/keeper"
+	committeekeeper "github.com/kava-labs/kava/x/committee/keeper"
-	issuancekeeper "github.com/0glabs/0g-chain/x/issuance/keeper"
+	communitykeeper "github.com/kava-labs/kava/x/community/keeper"
-	precisebankkeeper "github.com/0glabs/0g-chain/x/precisebank/keeper"
+	earnkeeper "github.com/kava-labs/kava/x/earn/keeper"
-	pricefeedkeeper "github.com/0glabs/0g-chain/x/pricefeed/keeper"
+	evmutilkeeper "github.com/kava-labs/kava/x/evmutil/keeper"
-	wrappeda0gibasekeeper "github.com/0glabs/0g-chain/x/wrapped-a0gi-base/keeper"
+	hardkeeper "github.com/kava-labs/kava/x/hard/keeper"
+	incentivekeeper "github.com/kava-labs/kava/x/incentive/keeper"
+	issuancekeeper "github.com/kava-labs/kava/x/issuance/keeper"
+	kavadistkeeper "github.com/kava-labs/kava/x/kavadist/keeper"
+	liquidkeeper "github.com/kava-labs/kava/x/liquid/keeper"
+	pricefeedkeeper "github.com/kava-labs/kava/x/pricefeed/keeper"
+	routerkeeper "github.com/kava-labs/kava/x/router/keeper"
+	savingskeeper "github.com/kava-labs/kava/x/savings/keeper"
+	swapkeeper "github.com/kava-labs/kava/x/swap/keeper"
 )
 
 var (
 	emptyTime            time.Time
+	testChainID                = "kavatest_1-1"
 	defaultInitialHeight int64 = 1
 )
 
-const TestChainId = "zgchain_8888-1"
-
 // TestApp is a simple wrapper around an App. It exposes internal keepers for use in integration tests.
 // This file also contains test helpers. Ideally they would be in separate package.
 // Basic Usage:
@@ -82,7 +86,7 @@ type TestApp struct {
 //
 // Note, it also sets the sdk config with the app's address prefix, coin type, etc.
 func NewTestApp() TestApp {
-	chaincfg.SetSDKConfig()
+	SetSDKConfig()
 
 	return NewTestAppFromSealed()
 }
@@ -93,44 +97,39 @@ func NewTestAppFromSealed() TestApp {
 
 	encCfg := MakeEncodingConfig()
 
-	bApp := NewBaseApp(log.NewNopLogger(), db, encCfg, baseapp.SetChainID(TestChainId))
+	app := NewApp(log.NewNopLogger(), db, DefaultNodeHome, nil, encCfg, DefaultOptions)
-	app := NewApp(
-		chaincfg.DefaultNodeHome, nil,
-		encCfg, DefaultOptions, bApp,
-	)
 	return TestApp{App: *app}
 }
 
 // nolint
-func (tApp TestApp) GetAccountKeeper() authkeeper.AccountKeeper     { return tApp.accountKeeper }
+func (tApp TestApp) GetAccountKeeper() authkeeper.AccountKeeper { return tApp.accountKeeper }
-func (tApp TestApp) GetBankKeeper() bankkeeper.Keeper               { return tApp.bankKeeper }
+func (tApp TestApp) GetBankKeeper() bankkeeper.Keeper           { return tApp.bankKeeper }
-func (tApp TestApp) GetMintKeeper() mintkeeper.Keeper               { return tApp.mintKeeper }
+func (tApp TestApp) GetMintKeeper() mintkeeper.Keeper           { return tApp.mintKeeper }
-func (tApp TestApp) GetStakingKeeper() *stakingkeeper.Keeper        { return tApp.stakingKeeper }
+func (tApp TestApp) GetStakingKeeper() stakingkeeper.Keeper     { return tApp.stakingKeeper }
-func (tApp TestApp) GetSlashingKeeper() slashingkeeper.Keeper       { return tApp.slashingKeeper }
+func (tApp TestApp) GetSlashingKeeper() slashingkeeper.Keeper   { return tApp.slashingKeeper }
-func (tApp TestApp) GetDistrKeeper() distkeeper.Keeper              { return tApp.distrKeeper }
+func (tApp TestApp) GetDistrKeeper() distkeeper.Keeper          { return tApp.distrKeeper }
-func (tApp TestApp) GetGovKeeper() govkeeper.Keeper                 { return tApp.govKeeper }
+func (tApp TestApp) GetGovKeeper() govkeeper.Keeper             { return tApp.govKeeper }
-func (tApp TestApp) GetCrisisKeeper() crisiskeeper.Keeper           { return tApp.crisisKeeper }
+func (tApp TestApp) GetCrisisKeeper() crisiskeeper.Keeper       { return tApp.crisisKeeper }
-func (tApp TestApp) GetParamsKeeper() paramskeeper.Keeper           { return tApp.paramsKeeper }
+func (tApp TestApp) GetParamsKeeper() paramskeeper.Keeper       { return tApp.paramsKeeper }
-func (tApp TestApp) GetIssuanceKeeper() issuancekeeper.Keeper       { return tApp.issuanceKeeper }
-func (tApp TestApp) GetBep3Keeper() bep3keeper.Keeper               { return tApp.bep3Keeper }
-func (tApp TestApp) GetPriceFeedKeeper() pricefeedkeeper.Keeper     { return tApp.pricefeedKeeper }
-func (tApp TestApp) GetCommitteeKeeper() committeekeeper.Keeper     { return tApp.committeeKeeper }
-func (tApp TestApp) GetEvmutilKeeper() evmutilkeeper.Keeper         { return tApp.evmutilKeeper }
-func (tApp TestApp) GetEvmKeeper() *evmkeeper.Keeper                { return tApp.evmKeeper }
-func (tApp TestApp) GetFeeMarketKeeper() *feemarketkeeper.Keeper    { return tApp.feeMarketKeeper }
-func (tApp TestApp) GetDASignersKeeper() dasignerskeeper.Keeper     { return tApp.dasignersKeeper }
-func (tApp TestApp) GetPrecisebankKeeper() precisebankkeeper.Keeper { return tApp.precisebankKeeper }
-func (tApp TestApp) GetWrappedA0GIBaseKeeper() wrappeda0gibasekeeper.Keeper {
-	return tApp.wrappeda0gibaseKeeper
-}
 
-func (tApp TestApp) GetKVStoreKey(key string) *storetypes.KVStoreKey {
+func (tApp TestApp) GetKavadistKeeper() kavadistkeeper.Keeper   { return tApp.kavadistKeeper }
-	return tApp.keys[key]
+func (tApp TestApp) GetAuctionKeeper() auctionkeeper.Keeper     { return tApp.auctionKeeper }
-}
+func (tApp TestApp) GetIssuanceKeeper() issuancekeeper.Keeper   { return tApp.issuanceKeeper }
-
+func (tApp TestApp) GetBep3Keeper() bep3keeper.Keeper           { return tApp.bep3Keeper }
-func (tApp TestApp) GetBlockedMaccAddrs() map[string]bool {
+func (tApp TestApp) GetPriceFeedKeeper() pricefeedkeeper.Keeper { return tApp.pricefeedKeeper }
-	return tApp.loadBlockedMaccAddrs()
+func (tApp TestApp) GetSwapKeeper() swapkeeper.Keeper           { return tApp.swapKeeper }
-}
+func (tApp TestApp) GetCDPKeeper() cdpkeeper.Keeper             { return tApp.cdpKeeper }
+func (tApp TestApp) GetHardKeeper() hardkeeper.Keeper           { return tApp.hardKeeper }
+func (tApp TestApp) GetCommitteeKeeper() committeekeeper.Keeper { return tApp.committeeKeeper }
+func (tApp TestApp) GetIncentiveKeeper() incentivekeeper.Keeper { return tApp.incentiveKeeper }
+func (tApp TestApp) GetEvmutilKeeper() evmutilkeeper.Keeper     { return tApp.evmutilKeeper }
+func (tApp TestApp) GetEvmKeeper() *evmkeeper.Keeper            { return tApp.evmKeeper }
+func (tApp TestApp) GetSavingsKeeper() savingskeeper.Keeper     { return tApp.savingsKeeper }
+func (tApp TestApp) GetFeeMarketKeeper() feemarketkeeper.Keeper { return tApp.feeMarketKeeper }
+func (tApp TestApp) GetLiquidKeeper() liquidkeeper.Keeper       { return tApp.liquidKeeper }
+func (tApp TestApp) GetEarnKeeper() earnkeeper.Keeper           { return tApp.earnKeeper }
+func (tApp TestApp) GetRouterKeeper() routerkeeper.Keeper       { return tApp.routerKeeper }
+func (tApp TestApp) GetCommunityKeeper() communitykeeper.Keeper { return tApp.communityKeeper }
 
 // LegacyAmino returns the app's amino codec.
 func (app *App) LegacyAmino() *codec.LegacyAmino {
@@ -166,7 +165,7 @@ func GenesisStateWithSingleValidator(
 	balances := []banktypes.Balance{
 		{
 			Address: acc.GetAddress().String(),
-			Coins:   sdk.NewCoins(chaincfg.MakeCoinForGasDenom(100000000000000)),
+			Coins:   sdk.NewCoins(sdk.NewCoin("ukava", sdkmath.NewInt(100000000000000))),
 		},
 	}
 
@@ -229,7 +228,7 @@ func genesisStateWithValSet(
 	}
 	// set validators and delegations
 	currentStakingGenesis := stakingtypes.GetGenesisStateFromAppState(app.appCodec, genesisState)
-	currentStakingGenesis.Params.BondDenom = chaincfg.GasDenom // TODO:
+	currentStakingGenesis.Params.BondDenom = "ukava"
 
 	stakingGenesis := stakingtypes.NewGenesisState(
 		currentStakingGenesis.Params,
@@ -249,13 +248,13 @@ func genesisStateWithValSet(
 
 	for range delegations {
 		// add delegated tokens to total supply
-		totalSupply = totalSupply.Add(chaincfg.MakeCoinForGasDenom(bondAmt))
+		totalSupply = totalSupply.Add(sdk.NewCoin("ukava", bondAmt))
 	}
 
 	// add bonded amount to bonded pool module account
 	balances = append(balances, banktypes.Balance{
 		Address: authtypes.NewModuleAddress(stakingtypes.BondedPoolName).String(),
-		Coins:   sdk.Coins{chaincfg.MakeCoinForGasDenom(bondAmt)},
+		Coins:   sdk.Coins{sdk.NewCoin("ukava", bondAmt)},
 	})
 
 	bankGenesis := banktypes.NewGenesisState(
@@ -263,7 +262,6 @@ func genesisStateWithValSet(
 		balances,
 		totalSupply,
 		currentBankGenesis.DenomMetadata,
-		currentBankGenesis.SendEnabled,
 	)
 
 	// set genesis state
@@ -277,13 +275,13 @@ func genesisStateWithValSet(
 // InitializeFromGenesisStates calls InitChain on the app using the provided genesis states.
 // If any module genesis states are missing, defaults are used.
 func (tApp TestApp) InitializeFromGenesisStates(genesisStates ...GenesisState) TestApp {
-	return tApp.InitializeFromGenesisStatesWithTimeAndChainIDAndHeight(emptyTime, TestChainId, defaultInitialHeight, true, genesisStates...)
+	return tApp.InitializeFromGenesisStatesWithTimeAndChainIDAndHeight(emptyTime, testChainID, defaultInitialHeight, true, genesisStates...)
 }
 
 // InitializeFromGenesisStatesWithTime calls InitChain on the app using the provided genesis states and time.
 // If any module genesis states are missing, defaults are used.
 func (tApp TestApp) InitializeFromGenesisStatesWithTime(genTime time.Time, genesisStates ...GenesisState) TestApp {
-	return tApp.InitializeFromGenesisStatesWithTimeAndChainIDAndHeight(genTime, TestChainId, defaultInitialHeight, true, genesisStates...)
+	return tApp.InitializeFromGenesisStatesWithTimeAndChainIDAndHeight(genTime, testChainID, defaultInitialHeight, true, genesisStates...)
 }
 
 // InitializeFromGenesisStatesWithTimeAndChainID calls InitChain on the app using the provided genesis states, time, and chain id.
@@ -340,8 +338,8 @@ func (tApp TestApp) InitializeFromGenesisStatesWithTimeAndChainIDAndHeight(
 			AppStateBytes: stateBytes,
 			ChainId:       chainID,
 			// Set consensus params, which is needed by x/feemarket
-			ConsensusParams: &tmproto.ConsensusParams{
+			ConsensusParams: &abci.ConsensusParams{
-				Block: &tmproto.BlockParams{
+				Block: &abci.BlockParams{
 					MaxBytes: 200000,
 					MaxGas:   20000000,
 				},
@@ -462,7 +460,21 @@ func (tApp TestApp) CreateNewUnbondedValidator(ctx sdk.Context, valAddress sdk.V
 	return err
 }
 
-// GeneratePrivKeyAddressPairs generates (deterministically) a total of n private keys and addresses.
+func (tApp TestApp) SetInflation(ctx sdk.Context, value sdk.Dec) {
+	mk := tApp.GetMintKeeper()
+
+	mintParams := mk.GetParams(ctx)
+	mintParams.InflationMax = sdk.ZeroDec()
+	mintParams.InflationMin = sdk.ZeroDec()
+
+	if err := mintParams.Validate(); err != nil {
+		panic(err)
+	}
+
+	mk.SetParams(ctx, mintParams)
+}
+
+// GeneratePrivKeyAddressPairsFromRand generates (deterministically) a total of n private keys and addresses.
 func GeneratePrivKeyAddressPairs(n int) (keys []cryptotypes.PrivKey, addrs []sdk.AccAddress) {
 	r := rand.New(rand.NewSource(12345)) // make the generation deterministic
 	keys = make([]cryptotypes.PrivKey, n)
@@ -520,31 +532,3 @@ func NewFundedGenStateWithSameCoinsWithModuleAccount(cdc codec.JSONCodec, coins
 
 	return builder.BuildMarshalled(cdc)
 }
-
-// EventsContains returns an error if the expected event is not in the provided events
-func EventsContains(events sdk.Events, expectedEvent sdk.Event) error {
-	foundMatch := false
-	for _, event := range events {
-		if event.Type == expectedEvent.Type {
-			if reflect.DeepEqual(attrsToMap(expectedEvent.Attributes), attrsToMap(event.Attributes)) {
-				foundMatch = true
-			}
-		}
-	}
-
-	if !foundMatch {
-		return fmt.Errorf("event of type %s not found or did not match", expectedEvent.Type)
-	}
-
-	return nil
-}
-
-func attrsToMap(attrs []abci.EventAttribute) []sdk.Attribute { // new cosmos changed the event attribute type
-	out := []sdk.Attribute{}
-
-	for _, attr := range attrs {
-		out = append(out, sdk.NewAttribute(string(attr.Key), string(attr.Value)))
-	}
-
-	return out
-}

app/upgrades.go

@@ -3,69 +3,249 @@ package app
 import (
 	"fmt"
 
-	wrappeda0gibasetypes "github.com/0glabs/0g-chain/x/wrapped-a0gi-base/types"
+	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
-	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
+
+	evmkeeper "github.com/evmos/ethermint/x/evm/keeper"
+	evmtypes "github.com/evmos/ethermint/x/evm/types"
+
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+	committeekeeper "github.com/kava-labs/kava/x/committee/keeper"
+	committeetypes "github.com/kava-labs/kava/x/committee/types"
+	evmutilkeeper "github.com/kava-labs/kava/x/evmutil/keeper"
+	evmutiltypes "github.com/kava-labs/kava/x/evmutil/types"
 )
 
 const (
-	UpgradeName_Testnet = "v0.5.0"
+	MainnetUpgradeName = "v0.24.0"
+	TestnetUpgradeName = "v0.24.0-alpha.0"
+
+	MainnetAtomDenom = "ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2"
+	TestnetHardDenom = "hard"
+
+	MainnetStabilityCommitteeId = uint64(1)
+	TestnetStabilityCommitteeId = uint64(1)
+)
+
+var (
+	// Committee permission for changing AllowedCosmosDenoms param
+	AllowedParamsChangeAllowedCosmosDenoms = committeetypes.AllowedParamsChange{
+		Subspace: evmutiltypes.ModuleName,
+		Key:      "AllowedCosmosDenoms",
+	}
+
+	// EIP712 allowed message for MsgConvertCosmosCoinToERC20
+	EIP712AllowedMsgConvertCosmosCoinToERC20 = evmtypes.EIP712AllowedMsg{
+		MsgTypeUrl:       "/kava.evmutil.v1beta1.MsgConvertCosmosCoinToERC20",
+		MsgValueTypeName: "MsgConvertCosmosCoinToERC20",
+		ValueTypes: []evmtypes.EIP712MsgAttrType{
+			{
+				Name: "initiator",
+				Type: "string",
+			},
+			{
+				Name: "receiver",
+				Type: "string",
+			},
+			{
+				Name: "amount",
+				Type: "Coin",
+			},
+		},
+		NestedTypes: nil,
+	}
+	// EIP712 allowed message for MsgConvertCosmosCoinFromERC20
+	EIP712AllowedMsgConvertCosmosCoinFromERC20 = evmtypes.EIP712AllowedMsg{
+		MsgTypeUrl:       "/kava.evmutil.v1beta1.MsgConvertCosmosCoinFromERC20",
+		MsgValueTypeName: "MsgConvertCosmosCoinFromERC20",
+		ValueTypes: []evmtypes.EIP712MsgAttrType{
+			{
+				Name: "initiator",
+				Type: "string",
+			},
+			{
+				Name: "receiver",
+				Type: "string",
+			},
+			{
+				Name: "amount",
+				Type: "Coin",
+			},
+		},
+		NestedTypes: nil,
+	}
 )
 
-// RegisterUpgradeHandlers registers the upgrade handlers for the app.
 func (app App) RegisterUpgradeHandlers() {
-	app.upgradeKeeper.SetUpgradeHandler(
+	// register upgrade handler for mainnet
-		UpgradeName_Testnet,
+	app.upgradeKeeper.SetUpgradeHandler(MainnetUpgradeName, MainnetUpgradeHandler(app))
-		upgradeHandler(app, UpgradeName_Testnet),
+
-	)
+	// register upgrade handler for testnet
+	app.upgradeKeeper.SetUpgradeHandler(TestnetUpgradeName, TestnetUpgradeHandler(app))
 
 	upgradeInfo, err := app.upgradeKeeper.ReadUpgradeInfoFromDisk()
 	if err != nil {
 		panic(err)
 	}
 
-	doUpgrade := upgradeInfo.Name == UpgradeName_Testnet
+	doUpgrade := upgradeInfo.Name == MainnetUpgradeName || upgradeInfo.Name == TestnetUpgradeName
-
 	if doUpgrade && !app.upgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
-		storeUpgrades := storetypes.StoreUpgrades{
+		storeUpgrades := storetypes.StoreUpgrades{}
-			Added: []string{
-				wrappeda0gibasetypes.ModuleName,
-			},
-		}
 
 		// configure store loader that checks if version == upgradeHeight and applies store upgrades
 		app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades))
 	}
 }
 
-// upgradeHandler returns an UpgradeHandler for the given upgrade parameters.
+func MainnetUpgradeHandler(app App) upgradetypes.UpgradeHandler {
-func upgradeHandler(
+	return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
-	app App,
+		app.Logger().Info("running mainnet upgrade handler")
-	name string,
-) upgradetypes.UpgradeHandler {
-	return func(
-		ctx sdk.Context,
-		plan upgradetypes.Plan,
-		fromVM module.VersionMap,
-	) (module.VersionMap, error) {
-		logger := app.Logger()
-		logger.Info(fmt.Sprintf("running %s upgrade handler", name))
 
-		// Run migrations for all modules and return new consensus version map.
+		toVM, err := app.mm.RunMigrations(ctx, app.configurator, fromVM)
-		versionMap, err := app.mm.RunMigrations(ctx, app.configurator, fromVM)
 		if err != nil {
-			return nil, err
+			return toVM, err
 		}
 
-		app.mintKeeper.InitGenesis(ctx, app.accountKeeper, &minttypes.GenesisState{
+		app.Logger().Info("initializing allowed_cosmos_denoms param of x/evmutil")
-			BondDenom: "ua0gi",
+		allowedDenoms := []evmutiltypes.AllowedCosmosCoinERC20Token{
-		})
+			{
+				CosmosDenom: MainnetAtomDenom,
+				// erc20 contract metadata
+				Name:     "ATOM",
+				Symbol:   "ATOM",
+				Decimals: 6,
+			},
+		}
+		InitializeEvmutilAllowedCosmosDenoms(ctx, &app.evmutilKeeper, allowedDenoms)
 
-		logger.Info("completed store migrations")
+		app.Logger().Info("allowing cosmos coin conversion messaged in EIP712 signing")
+		AllowEip712SigningForConvertMessages(ctx, app.evmKeeper)
 
-		return versionMap, nil
+		app.Logger().Info("allowing stability committee to update x/evmutil AllowedCosmosDenoms param")
+		AddAllowedCosmosDenomsParamChangeToStabilityCommittee(
+			ctx,
+			app.interfaceRegistry,
+			&app.committeeKeeper,
+			MainnetStabilityCommitteeId,
+		)
+
+		return toVM, nil
 	}
 }
+
+func TestnetUpgradeHandler(app App) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		app.Logger().Info("running testnet upgrade handler")
+
+		toVM, err := app.mm.RunMigrations(ctx, app.configurator, fromVM)
+		if err != nil {
+			return toVM, err
+		}
+
+		app.Logger().Info("initializing allowed_cosmos_denoms param of x/evmutil")
+		// on testnet, IBC is not enabled. we initialize HARD tokens for conversion to EVM.
+		allowedDenoms := []evmutiltypes.AllowedCosmosCoinERC20Token{
+			{
+				CosmosDenom: TestnetHardDenom,
+				// erc20 contract metadata
+				Name:     "HARD",
+				Symbol:   "HARD",
+				Decimals: 6,
+			},
+		}
+		InitializeEvmutilAllowedCosmosDenoms(ctx, &app.evmutilKeeper, allowedDenoms)
+
+		app.Logger().Info("allowing cosmos coin conversion messaged in EIP712 signing")
+		AllowEip712SigningForConvertMessages(ctx, app.evmKeeper)
+
+		app.Logger().Info("allowing stability committee to update x/evmutil AllowedCosmosDenoms param")
+		AddAllowedCosmosDenomsParamChangeToStabilityCommittee(
+			ctx,
+			app.interfaceRegistry,
+			&app.committeeKeeper,
+			TestnetStabilityCommitteeId,
+		)
+
+		return toVM, nil
+	}
+}
+
+// InitializeEvmutilAllowedCosmosDenoms sets the AllowedCosmosDenoms parameter of the x/evmutil module.
+// This new parameter controls what cosmos denoms are allowed to be converted to ERC20 tokens.
+func InitializeEvmutilAllowedCosmosDenoms(
+	ctx sdk.Context,
+	evmutilKeeper *evmutilkeeper.Keeper,
+	allowedCoins []evmutiltypes.AllowedCosmosCoinERC20Token,
+) {
+	params := evmutilKeeper.GetParams(ctx)
+	params.AllowedCosmosDenoms = allowedCoins
+	if err := params.Validate(); err != nil {
+		panic(fmt.Sprintf("x/evmutil params are not valid: %s", err))
+	}
+	evmutilKeeper.SetParams(ctx, params)
+}
+
+// AllowEip712SigningForConvertMessages adds the cosmos coin conversion messages to the
+// allowed message types for EIP712 signing.
+// The newly allowed messages are:
+// - MsgConvertCosmosCoinToERC20
+// - MsgConvertCosmosCoinFromERC20
+func AllowEip712SigningForConvertMessages(ctx sdk.Context, evmKeeper *evmkeeper.Keeper) {
+	params := evmKeeper.GetParams(ctx)
+	params.EIP712AllowedMsgs = append(
+		params.EIP712AllowedMsgs,
+		EIP712AllowedMsgConvertCosmosCoinToERC20,
+		EIP712AllowedMsgConvertCosmosCoinFromERC20,
+	)
+	if err := params.Validate(); err != nil {
+		panic(fmt.Sprintf("x/evm params are not valid: %s", err))
+	}
+	evmKeeper.SetParams(ctx, params)
+}
+
+// AddAllowedCosmosDenomsParamChangeToStabilityCommittee enables the stability committee
+// to update the AllowedCosmosDenoms parameter of x/evmutil.
+func AddAllowedCosmosDenomsParamChangeToStabilityCommittee(
+	ctx sdk.Context,
+	cdc codectypes.InterfaceRegistry,
+	committeeKeeper *committeekeeper.Keeper,
+	committeeId uint64,
+) {
+	// get committee
+	committee, foundCommittee := committeeKeeper.GetCommittee(ctx, committeeId)
+	if !foundCommittee {
+		panic(fmt.Sprintf("expected to find committee with id %d but found none", committeeId))
+	}
+
+	permissions := committee.GetPermissions()
+
+	// find & update the ParamsChangePermission
+	foundPermission := false
+	for i, permission := range permissions {
+		if paramsChangePermission, ok := permission.(*committeetypes.ParamsChangePermission); ok {
+			foundPermission = true
+			paramsChangePermission.AllowedParamsChanges = append(
+				paramsChangePermission.AllowedParamsChanges,
+				AllowedParamsChangeAllowedCosmosDenoms,
+			)
+			permissions[i] = paramsChangePermission
+			break
+		}
+	}
+
+	// error if permission was not found & updated
+	if !foundPermission {
+		panic(fmt.Sprintf("no ParamsChangePermission found on committee with id %d", committeeId))
+	}
+
+	// update permissions
+	committee.SetPermissions(permissions)
+	if err := committee.Validate(); err != nil {
+		panic(fmt.Sprintf("stability committee (id=%d) is invalid: %s", committeeId, err))
+	}
+
+	// save permission changes
+	committeeKeeper.SetCommittee(ctx, committee)
+}

app/upgrades_test.go

@@ -1 +0,0 @@
-package app_test

build/deps.mk

@@ -27,11 +27,10 @@ DIRS := $(BUILD_CACHE_DIR) $(BIN_DIR)
 ################################################################################
 ###                             Tool Versions                                ###
 ################################################################################
-GO_BIN ?= go
+PROTOC_VERSION ?= v21.9
-PROTOC_VERSION ?= v25.1
+BUF_VERSION ?= v1.9.0
-BUF_VERSION ?= v1.28.1
+PROTOC_GEN_GOCOSMOS_VERSION ?= v0.3.1
-PROTOC_GEN_GOCOSMOS_VERSION ?= $(shell $(GO_BIN) list -m -f '{{.Version}}' github.com/cosmos/gogoproto)
+PROTOC_GEN_GRPC_GATEWAY_VERSION ?= $(shell go list -m github.com/grpc-ecosystem/grpc-gateway| sed 's:.* ::')
-PROTOC_GEN_GRPC_GATEWAY_VERSION ?= $(shell $(GO_BIN) list -m github.com/grpc-ecosystem/grpc-gateway| sed 's:.* ::')
 PROTOC_GEN_DOC_VERSION ?= v1.5.1
 SWAGGER_COMBINE_VERSION ?= v1.4.0
 
@@ -68,7 +67,7 @@ $(PROTOC_VERSION_FILE):
 	mkdir -p protoc && cd protoc; \
 	curl -sOL $(PROTOC_DOWNLOAD_URL); \
 	unzip -q $(PROTOC_ARCHIVE_NAME) bin/protoc
-	@cp -f $(BUILD_CACHE_DIR)/protoc/bin/protoc $(BIN_DIR)/protoc
+	@cp $(BUILD_CACHE_DIR)/protoc/bin/protoc $(BIN_DIR)/protoc
 	@rm -rf $(BUILD_CACHE_DIR)/protoc
 
 PROTOC := $(BIN_DIR)/protoc
@@ -93,7 +92,7 @@ $(BUF_VERSION_FILE):
 	mkdir -p buf && cd buf; \
 	curl -sOL $(BUF_DOWNLOAD_URL); \
 	tar -xzf $(BUF_ARCHIVE_NAME) buf/bin/buf
-	@cp -f $(BUILD_CACHE_DIR)/buf/buf/bin/buf $(BIN_DIR)/buf
+	@cp $(BUILD_CACHE_DIR)/buf/buf/bin/buf $(BIN_DIR)/buf
 	@rm -rf $(BUILD_CACHE_DIR)/buf
 
 BUF := $(BIN_DIR)/buf
@@ -113,10 +112,10 @@ $(PROTOC_GEN_GOCOSMOS_VERSION_FILE):
 	@touch $(PROTOC_GEN_GOCOSMOS_VERSION_FILE)
 	@cd $(BUILD_CACHE_DIR); \
 	mkdir -p protoc-gen-gocosmos && cd protoc-gen-gocosmos; \
-	git clone -q https://github.com/cosmos/gogoproto.git; \
+	git clone -q https://github.com/regen-network/cosmos-proto.git; \
-	cd gogoproto; \
+	cd cosmos-proto; \
 	git checkout -q $(PROTOC_GEN_GOCOSMOS_VERSION); \
-	GOBIN=$(ROOT_DIR)/$(BIN_DIR) $(GO_BIN) install ./protoc-gen-gocosmos
+	GOBIN=$(ROOT_DIR)/$(BIN_DIR) go install ./protoc-gen-gocosmos
 	@rm -rf $(BUILD_CACHE_DIR)/protoc-gen-gocosmos
 
 PROTOC_GEN_GOCOSMOS := $(BIN_DIR)/protoc-gen-gocosmos
@@ -139,8 +138,8 @@ $(PROTOC_GEN_GRPC_GATEWAY_VERSION_FILE):
 	git clone -q https://github.com/grpc-ecosystem/grpc-gateway.git; \
 	cd grpc-gateway; \
 	git checkout -q $(PROTOC_GEN_GRPC_GATEWAY_VERSION); \
-	GOBIN=$(ROOT_DIR)/$(BIN_DIR) $(GO_BIN) install ./protoc-gen-grpc-gateway; \
+	GOBIN=$(ROOT_DIR)/$(BIN_DIR) go install ./protoc-gen-grpc-gateway; \
-	GOBIN=$(ROOT_DIR)/$(BIN_DIR) $(GO_BIN) install ./protoc-gen-swagger
+	GOBIN=$(ROOT_DIR)/$(BIN_DIR) go install ./protoc-gen-swagger
 	@rm -rf $(BUILD_CACHE_DIR)/protoc-gen-grpc-gateway
 
 PROTOC_GEN_GRPC_GATEWAY := $(BIN_DIR)/protoc-gen-grpc-gateway
@@ -185,7 +184,7 @@ $(PROTOC_GEN_DOC_VERSION_FILE):
 	mkdir -p protoc-gen-doc && cd protoc-gen-doc; \
 	curl -sOL $(PROTOC_GEN_DOC_DOWNLOAD_URL); \
 	tar -xzf $(PROTOC_GEN_DOC_ARCHIVE_NAME) protoc-gen-doc
-	@cp -f $(BUILD_CACHE_DIR)/protoc-gen-doc/protoc-gen-doc $(BIN_DIR)/protoc-gen-doc
+	@cp $(BUILD_CACHE_DIR)/protoc-gen-doc/protoc-gen-doc $(BIN_DIR)/protoc-gen-doc
 	@rm -rf $(BUILD_CACHE_DIR)/protoc-gen-doc
 
 PROTOC_GEN_DOC := $(BIN_DIR)/protoc-gen-doc

build/lint.mk

@@ -1,45 +0,0 @@
-################################################################################
-###                             Required Variables                           ###
-################################################################################
-ifndef DOCKER
-$(error DOCKER not set)
-endif
-
-ifndef BUILD_DIR
-$(error BUILD_DIR not set)
-endif
-
-################################################################################
-###                             Lint Settings                                ###
-################################################################################
-
-LINT_FROM_REV ?= $(shell git merge-base origin/master HEAD)
-
-GOLANGCI_VERSION ?= $(shell cat .golangci-version)
-GOLANGCI_IMAGE_TAG ?= golangci/golangci-lint:$(GOLANGCI_VERSION)
-
-GOLANGCI_DIR ?= $(CURDIR)/$(BUILD_DIR)/.golangci-lint
-
-GOLANGCI_CACHE_DIR ?= $(GOLANGCI_DIR)/$(GOLANGCI_VERSION)-cache
-GOLANGCI_MOD_CACHE_DIR ?= $(GOLANGCI_DIR)/go-mod
-
-################################################################################
-###                             Lint Target                                  ###
-################################################################################
-
-.PHONY: lint
-lint: $(GOLANGCI_CACHE_DIR) $(GOLANGCI_MOD_CACHE_DIR)
-	@echo "Running lint from rev $(LINT_FROM_REV), use LINT_FROM_REV var to override."
-	$(DOCKER) run -t --rm \
-		-v $(GOLANGCI_CACHE_DIR):/root/.cache \
-		-v $(GOLANGCI_MOD_CACHE_DIR):/go/pkg/mod \
-		-v $(CURDIR):/app \
-		-w /app \
-		$(GOLANGCI_IMAGE_TAG) \
-		golangci-lint run -v --new-from-rev $(LINT_FROM_REV)
-
-$(GOLANGCI_CACHE_DIR):
-	@mkdir -p $@
-
-$(GOLANGCI_MOD_CACHE_DIR):
-	@mkdir -p $@

build/proto-deps.mk

@@ -1,5 +1,4 @@
 RSYNC_BIN ?= rsync
-GO_BIN ?= go
 
 #
 # Versioning for google protobuf dependencies (any, http, etc) and
@@ -14,22 +13,12 @@ PROTOBUF_ANY_DOWNLOAD_URL = https://raw.githubusercontent.com/protocolbuffers/pr
 #
 # Proto dependencies under go.mod
 #
-GOGO_PATH := $(shell $(GO_BIN) list -m -f '{{.Dir}}' github.com/cosmos/gogoproto)
+GOGO_PATH := $(shell go list -m -f '{{.Dir}}' github.com/gogo/protobuf)
-TENDERMINT_PATH := $(shell $(GO_BIN) list -m -f '{{.Dir}}' github.com/cometbft/cometbft)
+TENDERMINT_PATH := $(shell go list -m -f '{{.Dir}}' github.com/tendermint/tendermint)
-COSMOS_PROTO_PATH := $(shell $(GO_BIN) list -m -f '{{.Dir}}' github.com/cosmos/cosmos-proto)
+COSMOS_PROTO_PATH := $(shell go list -m -f '{{.Dir}}' github.com/cosmos/cosmos-proto)
-COSMOS_SDK_PATH := $(shell $(GO_BIN) list -m -f '{{.Dir}}' github.com/cosmos/cosmos-sdk)
+COSMOS_SDK_PATH := $(shell go list -m -f '{{.Dir}}' github.com/cosmos/cosmos-sdk)
-IBC_GO_PATH := $(shell $(GO_BIN) list -m -f '{{.Dir}}' github.com/cosmos/ibc-go/v7)
+IBC_GO_PATH := $(shell go list -m -f '{{.Dir}}' github.com/cosmos/ibc-go/v6)
-ETHERMINT_PATH := $(shell $(GO_BIN) list -m -f '{{.Dir}}' github.com/evmos/ethermint)
+ETHERMINT_PATH := $(shell go list -m -f '{{.Dir}}' github.com/evmos/ethermint)
-
-#
-# ICS23 Proof Proto
-#
-ICS23_VERSION := $(shell $(GO_BIN) list -m -f '{{.Version}}' github.com/cosmos/ics23/go)
-
-ICS23_PROOFS_PROTO_PATH := cosmos/ics23/v1/proofs.proto
-ICS23_PROOFS_PROTO_LOCAL_PATH := third_party/proto/$(ICS23_PROOFS_PROTO_PATH)
-
-ICS23_PROOFS_PROTO_DOWNLOAD_URL := https://raw.githubusercontent.com/cosmos/ics23/go/$(ICS23_VERSION)/proto/$(ICS23_PROOFS_PROTO_PATH)
 
 #
 # Common target directories
@@ -54,21 +43,18 @@ proto-update-deps: check-rsync ## Update all third party proto files
 	@curl -sSL $(PROTOBUF_ANY_DOWNLOAD_URL)/any.proto > $(PROTOBUF_GOOGLE_TYPES)/any.proto
 
 	@mkdir -p client/docs
-	@cp -f $(COSMOS_SDK_PATH)/client/docs/swagger-ui/swagger.yaml client/docs/cosmos-swagger.yml
+	@cp $(COSMOS_SDK_PATH)/client/docs/swagger-ui/swagger.yaml client/docs/cosmos-swagger.yml
-	@cp -f $(IBC_GO_PATH)/docs/client/swagger-ui/swagger.yaml client/docs/ibc-go-swagger.yml
+	@cp $(IBC_GO_PATH)/docs/client/swagger-ui/swagger.yaml client/docs/ibc-go-swagger.yml
-	@cp -f $(ETHERMINT_PATH)/client/docs/swagger-ui/swagger.yaml client/docs/ethermint-swagger.yml
 
 	@mkdir -p $(COSMOS_PROTO_TYPES)
-	@cp -f $(COSMOS_PROTO_PATH)/proto/cosmos_proto/cosmos.proto $(COSMOS_PROTO_TYPES)/cosmos.proto
+	@cp $(COSMOS_PROTO_PATH)/proto/cosmos_proto/cosmos.proto $(COSMOS_PROTO_TYPES)/cosmos.proto
-
-	@mkdir -p $(dir $(ICS23_PROOFS_PROTO_LOCAL_PATH))
-	@curl -sSL $(ICS23_PROOFS_PROTO_DOWNLOAD_URL) > $(ICS23_PROOFS_PROTO_LOCAL_PATH)
 
 	@$(RSYNC_BIN) -r --chmod=Du=rwx,Dgo=rx,Fu=rw,Fgo=r --include "*.proto" --include='*/' --exclude='*' $(GOGO_PATH)/gogoproto third_party/proto
 	@$(RSYNC_BIN) -r --chmod=Du=rwx,Dgo=rx,Fu=rw,Fgo=r --include "*.proto" --include='*/' --exclude='*' $(TENDERMINT_PATH)/proto third_party
 	@$(RSYNC_BIN) -r --chmod=Du=rwx,Dgo=rx,Fu=rw,Fgo=r --include "*.proto" --include='*/' --exclude='*' $(COSMOS_SDK_PATH)/proto third_party
 	@$(RSYNC_BIN) -r --chmod=Du=rwx,Dgo=rx,Fu=rw,Fgo=r --include "*.proto" --include='*/' --exclude='*' $(IBC_GO_PATH)/proto third_party
 	@$(RSYNC_BIN) -r --chmod=Du=rwx,Dgo=rx,Fu=rw,Fgo=r --include "*.proto" --include='*/' --exclude='*' $(ETHERMINT_PATH)/proto third_party
+	@cp -f $(IBC_GO_PATH)/third_party/proto/proofs.proto third_party/proto/proofs.proto
 
 .PHONY: check-proto-deps
 check-proto-deps: proto-update-deps ## Return error code 1 if proto dependencies are not changed

build/proto.mk

@@ -1,13 +1,13 @@
 .PHONY: proto-lint check-proto-lint
 proto-lint check-proto-lint: install-build-deps
 	@echo "Linting proto file"
-	@$(BUF) lint proto
+	@$(BUF) lint
 
 .PHONY: proto-gen
 proto-gen: install-build-deps
 	@echo "Generating go proto files"
 	@$(BUF) generate --template proto/buf.gen.gogo.yaml proto
-	@cp -r out/github.com/0glabs/0g-chain/* ./
+	@cp -r out/github.com/kava-labs/kava/* ./
 	@rm -rf out/github.com
 
 .PHONY: check-proto-gen

chaincfg/coin.go

@@ -1,22 +0,0 @@
-package chaincfg
-
-import (
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
-var (
-	// Bip44CoinType satisfies EIP84. See https://github.com/ethereum/EIPs/issues/84 for more info.
-	Bip44CoinType uint32 = 459 // TODO: need new coin type for 0g-chain (a0gi)
-	// eth = 60
-	// kava = 459 // see https://github.com/satoshilabs/slips/blob/master/slip-0044.md
-	// BIP44HDPath is the default BIP44 HD path used on Ethereum.
-	//BIP44HDPath = ethaccounts.DefaultBaseDerivationPath.String()
-)
-
-// TODO: Implement BIP44CoinType and BIP44HDPath
-// SetBip44CoinType sets the global coin type to be used in hierarchical deterministic wallets.
-func setBip44CoinType(config *sdk.Config) {
-	config.SetCoinType(Bip44CoinType)
-	//config.SetPurpose(sdk.Purpose)            // Shared
-	//config.SetFullFundraiserPath(BIP44HDPath) //nolint: staticcheck
-}

chaincfg/coin_helper.go

@@ -1,57 +0,0 @@
-package chaincfg
-
-import (
-	"fmt"
-	"math/big"
-
-	"cosmossdk.io/math"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/shopspring/decimal"
-)
-
-func toBigInt(amount any) *big.Int {
-	if amount == nil {
-		return big.NewInt(0)
-	}
-	var val *big.Int
-	switch amount.(type) {
-	case int:
-		val = big.NewInt(int64(amount.(int)))
-	case int32:
-		val = big.NewInt(int64(amount.(int32)))
-	case int64:
-		val = big.NewInt(amount.(int64))
-	case string:
-		var ok bool
-		val, ok = new(big.Int).SetString(amount.(string), 0)
-		if !ok {
-			panic(fmt.Sprintf("invalid amount string: %s", amount.(string)))
-		}
-	case math.Int:
-		val = amount.(math.Int).BigInt()
-	case *big.Int:
-		val = amount.(*big.Int)
-	case float64:
-		val = decimal.NewFromFloat(amount.(float64)).BigInt()
-	default:
-		panic(fmt.Sprintf("invalid amount type: %T", amount))
-	}
-
-	return val
-}
-
-func MakeCoinForStandardDenom(amount any) sdk.Coin {
-	return makeCoin(StandardDenom, toBigInt(amount))
-}
-
-func MakeCoinForGasDenom(amount any) sdk.Coin {
-	return makeCoin(GasDenom, toBigInt(amount))
-}
-
-func MakeCoinForEvmDenom(amount any) sdk.Coin {
-	return makeCoin(EvmDenom, toBigInt(amount))
-}
-
-func makeCoin(denom string, amount *big.Int) sdk.Coin {
-	return sdk.NewCoin(denom, math.NewIntFromBigInt(amount))
-}

chaincfg/config.go

@@ -1,17 +0,0 @@
-package chaincfg
-
-import (
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
-const (
-	AppName   = "0gchaind"
-	EnvPrefix = "0GCHAIN"
-)
-
-func SetSDKConfig() *sdk.Config {
-	config := sdk.GetConfig()
-	setBech32Prefixes(config)
-	setBip44CoinType(config)
-	return config
-}

chaincfg/denoms.go

@@ -1,37 +0,0 @@
-package chaincfg
-
-import (
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
-const (
-	StandardDenom = "a0gi"
-
-	GasDenom = "ua0gi"
-
-	EvmDenom = "neuron"
-
-	BondDenom = EvmDenom
-
-	GasDenomUnit = 6
-
-	EvmDenomUnit = 18
-
-	GasDenomConversionMultiplier = 1e12
-	EvmDenomConversionMultiplier = 1e18
-)
-
-// RegisterDenoms registers the base and gas denominations to the SDK.
-func RegisterDenoms() {
-	if err := sdk.RegisterDenom(StandardDenom, sdk.OneDec()); err != nil {
-		panic(err)
-	}
-
-	if err := sdk.RegisterDenom(GasDenom, sdk.NewDecWithPrec(1, GasDenomUnit)); err != nil {
-		panic(err)
-	}
-
-	if err := sdk.RegisterDenom(EvmDenom, sdk.NewDecWithPrec(1, EvmDenomUnit)); err != nil {
-		panic(err)
-	}
-}

chaincfg/denoms_test.go

@@ -1,80 +0,0 @@
-package chaincfg
-
-import (
-	"testing"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestRegisterDenoms(t *testing.T) {
-	RegisterDenoms()
-	tests := []struct {
-		name        string
-		from        sdk.Coin
-		targetDenom string
-		expCoin     sdk.Coin
-		expErr      error
-	}{
-		{
-			"standard to gas",
-			MakeCoinForStandardDenom(99),
-			GasDenom,
-			MakeCoinForGasDenom(99 * (EvmDenomConversionMultiplier / GasDenomConversionMultiplier)),
-			nil,
-		},
-		{
-			"gas to standard",
-			MakeCoinForGasDenom(5e7),
-			StandardDenom,
-			MakeCoinForStandardDenom(50),
-			nil,
-		},
-		{
-			"standard to base",
-			MakeCoinForStandardDenom(22),
-			EvmDenom,
-			MakeCoinForEvmDenom(22 * EvmDenomConversionMultiplier),
-			nil,
-		},
-		{
-			"base to standard",
-			MakeCoinForEvmDenom("97000000000000000000"),
-			StandardDenom,
-			MakeCoinForStandardDenom(97),
-			nil,
-		},
-		{
-			"gas to base",
-			MakeCoinForGasDenom(33),
-			EvmDenom,
-			MakeCoinForEvmDenom(33 * GasDenomConversionMultiplier),
-			nil,
-		},
-		{
-			"base to gas",
-			MakeCoinForEvmDenom("770000000000000"),
-			GasDenom,
-			MakeCoinForGasDenom(770000000000000 / GasDenomConversionMultiplier),
-			nil,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			ret, err := sdk.ConvertCoin(tt.from, tt.targetDenom)
-			if tt.expErr != nil {
-				if err == nil {
-					t.Errorf("expErr is not nil, but got nil")
-					return
-				}
-			} else {
-				if err != nil {
-					t.Errorf("expErr is nil, but got %v", err)
-					return
-				}
-			}
-
-			assert.Equal(t, tt.expCoin, ret)
-		})
-	}
-}

chaincfg/homedir.go

@@ -1,25 +0,0 @@
-package chaincfg
-
-import (
-	stdlog "log"
-	"os"
-	"path/filepath"
-)
-
-const (
-	HomeDirName = ".0gchain"
-)
-
-var (
-	// DefaultNodeHome default home directories for the application daemon
-	DefaultNodeHome string
-)
-
-func init() {
-	userHomeDir, err := os.UserHomeDir()
-	if err != nil {
-		stdlog.Printf("Failed to get home dir %v", err)
-	}
-
-	DefaultNodeHome = filepath.Join(userHomeDir, HomeDirName)
-}

chaincfg/prefix.go

@@ -1,44 +0,0 @@
-package chaincfg
-
-import (
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
-const (
-	// Bech32Prefix defines the Bech32 prefix used for EthAccounts
-	Bech32Prefix = "0g"
-
-	// PrefixAccount is the prefix for account keys
-	PrefixAccount = "acc"
-	// PrefixValidator is the prefix for validator keys
-	PrefixValidator = "val"
-	// PrefixConsensus is the prefix for consensus keys
-	PrefixConsensus = "cons"
-	// PrefixPublic is the prefix for public keys
-	PrefixPublic = "pub"
-	// PrefixOperator is the prefix for operator keys
-	PrefixOperator = "oper"
-
-	// PrefixAddress is the prefix for addresses
-	PrefixAddress = "addr"
-
-	// Bech32PrefixAccAddr defines the Bech32 prefix of an account's address
-	Bech32PrefixAccAddr = Bech32Prefix
-	// Bech32PrefixAccPub defines the Bech32 prefix of an account's public key
-	Bech32PrefixAccPub = Bech32Prefix + PrefixPublic
-	// Bech32PrefixValAddr defines the Bech32 prefix of a validator's operator address
-	Bech32PrefixValAddr = Bech32Prefix + PrefixValidator + PrefixOperator
-	// Bech32PrefixValPub defines the Bech32 prefix of a validator's operator public key
-	Bech32PrefixValPub = Bech32Prefix + PrefixValidator + PrefixOperator + PrefixPublic
-	// Bech32PrefixConsAddr defines the Bech32 prefix of a consensus node address
-	Bech32PrefixConsAddr = Bech32Prefix + PrefixValidator + PrefixConsensus
-	// Bech32PrefixConsPub defines the Bech32 prefix of a consensus node public key
-	Bech32PrefixConsPub = Bech32Prefix + PrefixValidator + PrefixConsensus + PrefixPublic
-)
-
-// setBech32Prefixes sets the global prefixes to be used when serializing addresses and public keys to Bech32 strings.
-func setBech32Prefixes(config *sdk.Config) {
-	config.SetBech32PrefixForAccount(Bech32PrefixAccAddr, Bech32PrefixAccPub)
-	config.SetBech32PrefixForValidator(Bech32PrefixValAddr, Bech32PrefixValPub)
-	config.SetBech32PrefixForConsensusNode(Bech32PrefixConsAddr, Bech32PrefixConsPub)
-}

ci/env/kava-internal-testnet/KAVA.VERSION

@@ -1 +1 @@
-6862cde560c70cb82f7908e6cef22ca223465bd2
+master

ci/env/kava-internal-testnet/genesis.json

@@ -22,8 +22,6 @@
   },
   "app_hash": "",
   "app_state": {
-    "06-solomachine": null,
-    "07-tendermint": null,
     "auction": {
       "next_auction_id": "1",
       "params": {
@@ -507,10 +505,6 @@
         {
           "address": "kava1vlpsrmdyuywvaqrv7rx6xga224sqfwz3fyfhwq",
           "coins": [
-            {
-              "denom": "bnb",
-              "amount": "500000000"
-            },
             {
               "denom": "btcb",
               "amount": "200000000"
@@ -531,10 +525,6 @@
               "denom": "erc20/axelar/wbtc",
               "amount": "1000000000"
             },
-            {
-              "denom": "erc20/bitgo/wbtc",
-              "amount": "200000000"
-            },
             {
               "denom": "erc20/multichain/usdc",
               "amount": "1000000000000000000"
@@ -551,10 +541,6 @@
               "denom": "hard",
               "amount": "1000000000"
             },
-            {
-              "denom": "ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2",
-              "amount": "10000000000"
-            },
             {
               "denom": "swp",
               "amount": "5000000000"
@@ -566,20 +552,12 @@
             {
               "denom": "usdx",
               "amount": "103000000000"
-            },
-            {
-              "denom": "xrpb",
-              "amount": "1000000000000000"
             }
           ]
         },
         {
           "address": "kava1krh7k30pc9rteejpl2zycj0vau58y8c69xkzws",
           "coins": [
-            {
-              "denom": "bnb",
-              "amount": "100000000000000000"
-            },
             {
               "denom": "btcb",
               "amount": "200000000"
@@ -600,14 +578,6 @@
               "denom": "erc20/axelar/wbtc",
               "amount": "1000000000"
             },
-            {
-              "denom": "erc20/bitgo/wbtc",
-              "amount": "200000000"
-            },
-            {
-              "denom": "erc20/tether/usdt",
-              "amount": "100000000000"
-            },
             {
               "denom": "hard",
               "amount": "1000000000"
@@ -623,10 +593,6 @@
             {
               "denom": "usdx",
               "amount": "103000000000"
-            },
-            {
-              "denom": "xrpb",
-              "amount": "103000000000"
             }
           ]
         },
@@ -848,40 +814,56 @@
       "gov_denom": "ukava",
       "params": {
         "circuit_breaker": false,
-        "liquidation_block_interval": 500,
         "collateral_params": [
           {
-            "denom": "bnb",
-            "type": "bnb-a",
-            "liquidation_ratio": "1.500000000000000000",
-            "debt_limit": {
-              "denom": "usdx",
-              "amount": "5000000000000"
-            },
-            "stability_fee": "1.000000000158153904",
             "auction_size": "50000000000",
-            "liquidation_penalty": "0.025000000000000000",
+            "conversion_factor": "8",
-            "spot_market_id": "bnb:usd",
+            "debt_limit": {
+              "amount": "20000000000000",
+              "denom": "usdx"
+            },
+            "denom": "bnb",
             "liquidation_market_id": "bnb:usd:30",
-            "keeper_reward_percentage": "0.010000000000000000",
+            "liquidation_penalty": "0.050000000000000000",
+            "liquidation_ratio": "1.500000000000000000",
+            "keeper_reward_percentage": "0.01",
             "check_collateralization_index_count": "10",
-            "conversion_factor": "8"
+            "spot_market_id": "bnb:usd",
+            "stability_fee": "1.000000000782997700",
+            "type": "bnb-a"
           },
           {
+            "auction_size": "100000000",
+            "conversion_factor": "8",
+            "debt_limit": {
+              "amount": "2000000000000",
+              "denom": "usdx"
+            },
             "denom": "btcb",
-            "type": "btcb-a",
+            "liquidation_market_id": "btc:usd:30",
+            "liquidation_penalty": "0.050000000000000000",
+            "liquidation_ratio": "1.500000000000000000",
+            "keeper_reward_percentage": "0.01",
+            "check_collateralization_index_count": "10",
+            "spot_market_id": "btc:usd",
+            "stability_fee": "1.000000000782997700",
+            "type": "btcb-a"
+          },
+          {
+            "denom": "xrpb",
+            "type": "xrpb-a",
             "liquidation_ratio": "1.500000000000000000",
             "debt_limit": {
               "denom": "usdx",
-              "amount": "10000000000000"
+              "amount": "1000000000000"
             },
-            "stability_fee": "1.000000000782997609",
+            "stability_fee": "1.000000001547125958",
-            "auction_size": "100000000",
+            "auction_size": "100000000000",
-            "liquidation_penalty": "0.025000000000000000",
+            "liquidation_penalty": "0.075000000000000000",
-            "spot_market_id": "btc:usd",
+            "keeper_reward_percentage": "0.01",
-            "liquidation_market_id": "btc:usd:30",
-            "keeper_reward_percentage": "0.010000000000000000",
             "check_collateralization_index_count": "10",
+            "spot_market_id": "xrp:usd",
+            "liquidation_market_id": "xrp:usd:30",
             "conversion_factor": "8"
           },
           {
@@ -890,15 +872,15 @@
             "liquidation_ratio": "1.010000000000000000",
             "debt_limit": {
               "denom": "usdx",
-              "amount": "50000000000000"
+              "amount": "3000000000000"
             },
             "stability_fee": "1.000000000000000000",
             "auction_size": "1000000000000",
-            "liquidation_penalty": "0.025000000000000000",
+            "liquidation_penalty": "0.075000000000000000",
+            "check_collateralization_index_count": "10",
+            "keeper_reward_percentage": "0.01",
             "spot_market_id": "busd:usd",
             "liquidation_market_id": "busd:usd:30",
-            "keeper_reward_percentage": "0.010000000000000000",
-            "check_collateralization_index_count": "10",
             "conversion_factor": "8"
           },
           {
@@ -907,67 +889,135 @@
             "liquidation_ratio": "1.100000000000000000",
             "debt_limit": {
               "denom": "usdx",
-              "amount": "1000000000000"
+              "amount": "3000000000000"
             },
             "stability_fee": "1.000000012857214317",
             "auction_size": "1000000000000",
-            "liquidation_penalty": "0.025000000000000000",
+            "liquidation_penalty": "0.075000000000000000",
+            "check_collateralization_index_count": "10",
+            "keeper_reward_percentage": "0.01",
             "spot_market_id": "busd:usd",
             "liquidation_market_id": "busd:usd:30",
-            "keeper_reward_percentage": "0.010000000000000000",
-            "check_collateralization_index_count": "10",
             "conversion_factor": "8"
           },
           {
-            "denom": "xrpb",
+            "auction_size": "50000000000",
-            "type": "xrpb-a",
+            "conversion_factor": "6",
-            "liquidation_ratio": "1.500000000000000000",
             "debt_limit": {
-              "denom": "usdx",
+              "amount": "2000000000000",
-              "amount": "5000000000000"
+              "denom": "usdx"
             },
-            "stability_fee": "1.000000000782997609",
-            "auction_size": "4000000000000",
-            "liquidation_penalty": "0.025000000000000000",
-            "spot_market_id": "xrp:usd",
-            "liquidation_market_id": "xrp:usd:30",
-            "keeper_reward_percentage": "0.010000000000000000",
-            "check_collateralization_index_count": "10",
-            "conversion_factor": "8"
-          },
-          {
             "denom": "ukava",
-            "type": "ukava-a",
-            "liquidation_ratio": "1.500000000000000000",
-            "debt_limit": {
-              "denom": "usdx",
-              "amount": "250000000000"
-            },
-            "stability_fee": "1.000000000782997609",
-            "auction_size": "5000000000",
-            "liquidation_penalty": "0.025000000000000000",
-            "spot_market_id": "kava:usd",
             "liquidation_market_id": "kava:usd:30",
-            "keeper_reward_percentage": "0.010000000000000000",
+            "liquidation_penalty": "0.050000000000000000",
+            "liquidation_ratio": "1.500000000000000000",
+            "keeper_reward_percentage": "0.01",
             "check_collateralization_index_count": "10",
-            "conversion_factor": "6"
+            "spot_market_id": "kava:usd",
+            "stability_fee": "1.000000000782997700",
+            "type": "ukava-a"
           },
           {
-            "denom": "hard",
+            "auction_size": "50000000000",
-            "type": "hard-a",
+            "conversion_factor": "6",
-            "liquidation_ratio": "1.500000000000000000",
             "debt_limit": {
-              "denom": "usdx",
+              "amount": "2000000000000",
-              "amount": "100000000000"
+              "denom": "usdx"
             },
-            "stability_fee": "1.000000000782997609",
+            "denom": "ibc/C72DE26FFF16DE62BE2784E12229BDF5F4465CE8B10530426D6DB53255FF01B2",
-            "auction_size": "5000000000",
+            "liquidation_market_id": "luna:usd:30",
-            "liquidation_penalty": "0.025000000000000000",
+            "spot_market_id": "luna:usd",
-            "spot_market_id": "hard:usd",
+            "liquidation_penalty": "0.050000000000000000",
-            "liquidation_market_id": "hard:usd:30",
+            "liquidation_ratio": "1.500000000000000000",
-            "keeper_reward_percentage": "0.010000000000000000",
+            "keeper_reward_percentage": "0.01",
             "check_collateralization_index_count": "10",
-            "conversion_factor": "6"
+            "stability_fee": "1.000000000782997700",
+            "type": "luna-a"
+          },
+          {
+            "auction_size": "50000000000",
+            "conversion_factor": "6",
+            "debt_limit": {
+              "amount": "2000000000000",
+              "denom": "usdx"
+            },
+            "denom": "ibc/4129EB76C01ED14052054BB975DE0C6C5010E12FFD9253C20C58BCD828BEE9A5",
+            "liquidation_market_id": "akt:usd:30",
+            "spot_market_id": "akt:usd",
+            "liquidation_penalty": "0.050000000000000000",
+            "liquidation_ratio": "1.500000000000000000",
+            "keeper_reward_percentage": "0.01",
+            "check_collateralization_index_count": "10",
+            "stability_fee": "1.000000000782997700",
+            "type": "akt-a"
+          },
+          {
+            "auction_size": "50000000000",
+            "conversion_factor": "6",
+            "debt_limit": {
+              "amount": "2000000000000",
+              "denom": "usdx"
+            },
+            "denom": "ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518",
+            "liquidation_market_id": "osmo:usd:30",
+            "spot_market_id": "osmo:usd",
+            "liquidation_penalty": "0.050000000000000000",
+            "liquidation_ratio": "1.500000000000000000",
+            "keeper_reward_percentage": "0.01",
+            "check_collateralization_index_count": "10",
+            "stability_fee": "1.000000000782997700",
+            "type": "osmo-a"
+          },
+          {
+            "auction_size": "50000000000",
+            "conversion_factor": "6",
+            "debt_limit": {
+              "amount": "2000000000000",
+              "denom": "usdx"
+            },
+            "denom": "ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2",
+            "liquidation_market_id": "atom:usd:30",
+            "spot_market_id": "atom:usd",
+            "liquidation_penalty": "0.050000000000000000",
+            "liquidation_ratio": "1.500000000000000000",
+            "keeper_reward_percentage": "0.01",
+            "check_collateralization_index_count": "10",
+            "stability_fee": "1.000000000782997700",
+            "type": "atom-a"
+          },
+          {
+            "auction_size": "50000000000",
+            "conversion_factor": "6",
+            "debt_limit": {
+              "amount": "2000000000000",
+              "denom": "usdx"
+            },
+            "denom": "hard",
+            "liquidation_market_id": "hard:usd:30",
+            "liquidation_penalty": "0.050000000000000000",
+            "liquidation_ratio": "1.500000000000000000",
+            "keeper_reward_percentage": "0.01",
+            "check_collateralization_index_count": "10",
+            "spot_market_id": "hard:usd",
+            "stability_fee": "1.000000000782997700",
+            "type": "hard-a"
+          },
+          {
+            "auction_size": "50000000000",
+            "conversion_factor": "6",
+            "debt_limit": {
+              "amount": "2000000000000",
+              "denom": "usdx"
+            },
+            "denom": "swp",
+            "liquidation_market_id": "swp:usd:30",
+            "liquidation_penalty": "0.050000000000000000",
+            "liquidation_ratio": "1.500000000000000000",
+            "keeper_reward_percentage": "0.01",
+            "check_collateralization_index_count": "10",
+            "spot_market_id": "swp:usd",
+            "stability_fee": "1.000000000782997700",
+            "type": "swp-a"
           },
           {
             "denom": "hbtc",
@@ -978,47 +1028,13 @@
               "amount": "10000000000000"
             },
             "stability_fee": "1.000000001547125958",
-            "auction_size": "100000000",
+            "auction_size": "1000000000000",
-            "liquidation_penalty": "0.025000000000000000",
+            "liquidation_penalty": "0.075000000000000000",
+            "check_collateralization_index_count": "10",
+            "keeper_reward_percentage": "0.01",
             "spot_market_id": "btc:usd",
             "liquidation_market_id": "btc:usd:30",
-            "keeper_reward_percentage": "0.010000000000000000",
-            "check_collateralization_index_count": "10",
             "conversion_factor": "8"
-          },
-          {
-            "denom": "swp",
-            "type": "swp-a",
-            "liquidation_ratio": "1.500000000000000000",
-            "debt_limit": {
-              "denom": "usdx",
-              "amount": "10000000"
-            },
-            "stability_fee": "1.000000001547125958",
-            "auction_size": "50000000000",
-            "liquidation_penalty": "0.025000000000000000",
-            "spot_market_id": "swp:usd",
-            "liquidation_market_id": "swp:usd:30",
-            "keeper_reward_percentage": "0.010000000000000000",
-            "check_collateralization_index_count": "10",
-            "conversion_factor": "6"
-          },
-          {
-            "denom": "erc20/tether/usdt",
-            "type": "usdt-a",
-            "liquidation_ratio": "1.010000000000000000",
-            "debt_limit": {
-              "denom": "usdx",
-              "amount": "25000000000000"
-            },
-            "stability_fee": "1.000000000000000000",
-            "auction_size": "100000000000",
-            "liquidation_penalty": "0.025000000000000000",
-            "spot_market_id": "usdt:usd",
-            "liquidation_market_id": "usdt:usd:30",
-            "keeper_reward_percentage": "0.010000000000000000",
-            "check_collateralization_index_count": "10",
-            "conversion_factor": "6"
           }
         ],
         "debt_auction_lot": "10000000000",
@@ -1030,7 +1046,7 @@
           "reference_asset": "usd"
         },
         "global_debt_limit": {
-          "amount": "181200010000000",
+          "amount": "53000000000000",
           "denom": "usdx"
         },
         "surplus_auction_lot": "10000000000",
@@ -1267,15 +1283,7 @@
       "votes": []
     },
     "community": {
-      "params": {
+      "params": {}
-        "upgrade_time_disable_inflation": "2023-11-01T00:00:00Z",
-        "upgrade_time_set_staking_rewards_per_second": "744191",
-        "staking_rewards_per_second": "0"
-      },
-      "staking_rewards_state": {
-        "last_accumulation_time": "0001-01-01T00:00:00Z",
-        "last_truncation_error": "0"
-      }
     },
     "crisis": {
       "constant_fee": {
@@ -1994,132 +2002,6 @@
               }
             ],
             "nested_types": []
-          },
-          {
-            "msg_type_url": "/kava.cdp.v1beta1.MsgCreateCDP",
-            "msg_value_type_name": "MsgValueCdpCreateCDP",
-            "value_types": [
-              {
-                "name": "sender",
-                "type": "string"
-              },
-              {
-                "name": "collateral",
-                "type": "Coin"
-              },
-              {
-                "name": "principal",
-                "type": "Coin"
-              },
-              {
-                "name": "collateral_type",
-                "type": "string"
-              }
-            ],
-            "nested_types": []
-          },
-          {
-            "msg_type_url": "/kava.cdp.v1beta1.MsgDeposit",
-            "msg_value_type_name": "MsgValueCdpDeposit",
-            "value_types": [
-              {
-                "name": "depositor",
-                "type": "string"
-              },
-              {
-                "name": "owner",
-                "type": "string"
-              },
-              {
-                "name": "collateral",
-                "type": "Coin"
-              },
-              {
-                "name": "collateral_type",
-                "type": "string"
-              }
-            ],
-            "nested_types": []
-          },
-          {
-            "msg_type_url": "/kava.cdp.v1beta1.MsgWithdraw",
-            "msg_value_type_name": "MsgValueCdpWithdraw",
-            "value_types": [
-              {
-                "name": "depositor",
-                "type": "string"
-              },
-              {
-                "name": "owner",
-                "type": "string"
-              },
-              {
-                "name": "collateral",
-                "type": "Coin"
-              },
-              {
-                "name": "collateral_type",
-                "type": "string"
-              }
-            ],
-            "nested_types": []
-          },
-          {
-            "msg_type_url": "/kava.cdp.v1beta1.MsgDrawDebt",
-            "msg_value_type_name": "MsgValueCdpDrawDebt",
-            "value_types": [
-              {
-                "name": "sender",
-                "type": "string"
-              },
-              {
-                "name": "collateral_type",
-                "type": "string"
-              },
-              {
-                "name": "principal",
-                "type": "Coin"
-              }
-            ],
-            "nested_types": []
-          },
-          {
-            "msg_type_url": "/kava.cdp.v1beta1.MsgRepayDebt",
-            "msg_value_type_name": "MsgValueCdpRepayDebt",
-            "value_types": [
-              {
-                "name": "sender",
-                "type": "string"
-              },
-              {
-                "name": "collateral_type",
-                "type": "string"
-              },
-              {
-                "name": "payment",
-                "type": "Coin"
-              }
-            ],
-            "nested_types": []
-          },
-          {
-            "msg_type_url": "/kava.committee.v1beta1.MsgVote",
-            "msg_value_type_name": "MsgValueCommitteeVote",
-            "value_types": [
-              {
-                "name": "proposal_id",
-                "type": "uint64"
-              },
-              {
-                "name": "voter",
-                "type": "string"
-              },
-              {
-                "name": "vote_type",
-                "type": "int32"
-              }
-            ],
-            "nested_types": []
           }
         ],
         "allow_unprotected_txs": false
@@ -2136,7 +2018,32 @@
             "decimals": 6
           }
         ],
-        "enabled_conversion_pairs": []
+        "enabled_conversion_pairs": [
+          {
+            "kava_erc20_address": "0xBb304f44b7EFD865361F2AD973d8ebA433893ABC",
+            "denom": "erc20/multichain/usdc"
+          },
+          {
+            "kava_erc20_address": "0xA637F4CECbA91Ad19075bA3d330cd95f694B1707",
+            "denom": "erc20/multichain/usdt"
+          },
+          {
+            "kava_erc20_address": "0x288429bc07B8d030ba418bb30F170327F9fBE502",
+            "denom": "erc20/multichain/wbtc"
+          },
+          {
+            "kava_erc20_address": "0x7a5DBf8e6ac1F6aCCF14f5B4E88b21EAA04c983d",
+            "denom": "erc20/axelar/usdc"
+          },
+          {
+            "kava_erc20_address": "0x7d2Ee2914324d5D4dC33A5c295E720659D5F3fA7",
+            "denom": "erc20/axelar/wbtc"
+          },
+          {
+            "kava_erc20_address": "0x5d6D67a665C9F169B0f9436E05B11108C1606043",
+            "denom": "erc20/axelar/eth"
+          }
+        ]
       }
     },
     "feemarket": {
@@ -2282,27 +2189,22 @@
       "deposits": [],
       "votes": [],
       "proposals": [],
-      "deposit_params": null,
+      "deposit_params": {
-      "voting_params": {
-        "voting_period": "604800s"
-      },
-      "tally_params": null,
-      "params": {
         "min_deposit": [
           {
             "denom": "ukava",
             "amount": "10000000"
           }
         ],
-        "max_deposit_period": "172800s",
+        "max_deposit_period": "172800s"
-        "voting_period": "604800s",
+      },
+      "voting_params": {
+        "voting_period": "600s"
+      },
+      "tally_params": {
         "quorum": "0.334000000000000000",
         "threshold": "0.500000000000000000",
-        "veto_threshold": "0.334000000000000000",
+        "veto_threshold": "0.334000000000000000"
-        "min_initial_deposit_ratio": "0.000000000000000000",
-        "burn_vote_quorum": false,
-        "burn_proposal_deposit_prevote": false,
-        "burn_vote_veto": true
       }
     },
     "hard": {
@@ -2559,42 +2461,6 @@
             },
             "reserve_factor": "0.025000000000000000",
             "keeper_reward_percentage": "0.020000000000000000"
-          },
-          {
-            "denom": "erc20/tether/usdt",
-            "borrow_limit": {
-              "has_max_limit": true,
-              "maximum_limit": "0.000000000000000000",
-              "loan_to_value": "0.000000000000000000"
-            },
-            "spot_market_id": "usdt:usd:30",
-            "conversion_factor": "1000000",
-            "interest_rate_model": {
-              "base_rate_apy": "0.000000000000000000",
-              "base_multiplier": "0.050000000000000000",
-              "kink": "0.800000000000000000",
-              "jump_multiplier": "5.000000000000000000"
-            },
-            "reserve_factor": "0.025000000000000000",
-            "keeper_reward_percentage": "0.020000000000000000"
-          },
-          {
-            "denom": "erc20/bitgo/wbtc",
-            "borrow_limit": {
-              "has_max_limit": true,
-              "maximum_limit": "0.000000000000000000",
-              "loan_to_value": "0.000000000000000000"
-            },
-            "spot_market_id": "btc:usd:30",
-            "conversion_factor": "100000000",
-            "interest_rate_model": {
-              "base_rate_apy": "0.000000000000000000",
-              "base_multiplier": "0.050000000000000000",
-              "kink": "0.800000000000000000",
-              "jump_multiplier": "5.000000000000000000"
-            },
-            "reserve_factor": "0.025000000000000000",
-            "keeper_reward_percentage": "0.020000000000000000"
           }
         ],
         "minimum_borrow_usd_value": "10.000000000000000000"
@@ -2798,30 +2664,6 @@
                 "amount": "787"
               }
             ]
-          },
-          {
-            "active": true,
-            "collateral_type": "erc20/tether/usdt",
-            "start": "2023-06-21T15:00:00Z",
-            "end": "2024-06-21T15:00:00Z",
-            "rewards_per_second": [
-              {
-                "denom": "ukava",
-                "amount": "787"
-              }
-            ]
-          },
-          {
-            "active": true,
-            "collateral_type": "erc20/bitgo/wbtc",
-            "start": "2022-11-11T15:00:00Z",
-            "end": "2025-11-11T15:00:00Z",
-            "rewards_per_second": [
-              {
-                "denom": "ukava",
-                "amount": "787"
-              }
-            ]
           }
         ],
         "hard_borrow_reward_periods": [],
@@ -3258,16 +3100,6 @@
       }
     },
     "params": null,
-    "packetfowardmiddleware": {
-      "params": {
-        "fee_percentage": "0.000000000000000000"
-      },
-      "in_flight_packets": {}
-    },
-    "precisebank": {
-      "balances": [],
-      "remainder": "0"
-    },
     "pricefeed": {
       "params": {
         "markets": [
@@ -3741,7 +3573,6 @@
         }
       ]
     },
-    "router": {},
     "savings": {
       "params": {
         "supported_denoms": [
@@ -3913,8 +3744,7 @@
       "params": {
         "send_enabled": true,
         "receive_enabled": true
-      },
+      }
-      "total_escrowed": []
     },
     "upgrade": {},
     "validatorvesting": null,

ci/env/kava-protonet/genesis.json

@@ -837,7 +837,6 @@
       "gov_denom": "ukava",
       "params": {
         "circuit_breaker": false,
-        "liquidation_block_interval": 500,
         "collateral_params": [
           {
             "auction_size": "50000000000",
@@ -1316,15 +1315,7 @@
       "votes": []
     },
     "community": {
-      "params": {
+      "params": {}
-        "upgrade_time_disable_inflation": "2023-11-01T00:00:00Z",
-        "upgrade_time_set_staking_rewards_per_second": "744191",
-        "staking_rewards_per_second": "0"
-      },
-      "staking_rewards_state": {
-        "last_accumulation_time": "0001-01-01T00:00:00Z",
-        "last_truncation_error": "0"
-      }
     },
     "crisis": {
       "constant_fee": {
@@ -2178,23 +2169,6 @@
         "quorum": "0.334000000000000000",
         "threshold": "0.500000000000000000",
         "veto_threshold": "0.334000000000000000"
-      },
-      "params": {
-        "min_deposit": [
-          {
-            "denom": "ukava",
-            "amount": "10000000"
-          }
-        ],
-        "max_deposit_period": "172800s",
-        "voting_period": "600s",
-        "quorum": "0.334000000000000000",
-        "threshold": "0.500000000000000000",
-        "veto_threshold": "0.334000000000000000",
-        "min_initial_deposit_ratio": "0.000000000000000000",
-        "burn_vote_quorum": false,
-        "burn_proposal_deposit_prevote": false,
-        "burn_vote_veto": true
       }
     },
     "hard": {
@@ -3000,15 +2974,6 @@
       }
     },
     "params": null,
-    "packetfowardmiddleware": {
-      "params": {
-        "fee_percentage": "0.000000000000000000"
-      },
-      "in_flight_packets": {}
-    },
-    "precisebank": {
-      "remainder": "0"
-    },
     "pricefeed": {
       "params": {
         "markets": [

cli_test/cli_test.go

@@ -14,9 +14,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/cometbft/cometbft/crypto/ed25519"
-	tmtypes "github.com/cometbft/cometbft/types"
 	"github.com/stretchr/testify/require"
+	"github.com/tendermint/tendermint/crypto/ed25519"
+	tmtypes "github.com/tendermint/tendermint/types"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/tests"
@@ -62,36 +62,36 @@ func TestKvCLIKeysAddRecover(t *testing.T) {
 
 	exitSuccess, _, _ = f.KeysAddRecover("test-recover", "dentist task convince chimney quality leave banana trade firm crawl eternal easily")
 	require.True(t, exitSuccess)
-	require.Equal(t, "0g1rsjxn2e4dfl3a2qzuzzjvvgjmmate383g9q4cz", f.KeyAddress("test-recover").String())
+	require.Equal(t, "kava1rsjxn2e4dfl3a2qzuzzjvvgjmmate383g9q4cz", f.KeyAddress("test-recover").String())
 
 	// test old bip44 coin type
 	exitSuccess, _, _ = f.KeysAddRecover("test-recover-legacy", "dentist task convince chimney quality leave banana trade firm crawl eternal easily", "--legacy-hd-path")
 	require.True(t, exitSuccess)
-	require.Equal(t, "0g1qcfdf69js922qrdr4yaww3ax7gjml6pd39p8lj", f.KeyAddress("test-recover-legacy").String())
+	require.Equal(t, "kava1qcfdf69js922qrdr4yaww3ax7gjml6pd39p8lj", f.KeyAddress("test-recover-legacy").String())
 
 	// Cleanup testing directories
 	f.Cleanup()
 }
 
-func TestZgChainCLIKeysAddRecoverHDPath(t *testing.T) {
+func TestKavaCLIKeysAddRecoverHDPath(t *testing.T) {
 	t.Parallel()
 	f := InitFixtures(t)
 
 	f.KeysAddRecoverHDPath("test-recoverHD1", "dentist task convince chimney quality leave banana trade firm crawl eternal easily", 0, 0)
-	require.Equal(t, "0g1rsjxn2e4dfl3a2qzuzzjvvgjmmate383g9q4cz", f.KeyAddress("test-recoverHD1").String())
+	require.Equal(t, "kava1rsjxn2e4dfl3a2qzuzzjvvgjmmate383g9q4cz", f.KeyAddress("test-recoverHD1").String())
 
 	f.KeysAddRecoverHDPath("test-recoverH2", "dentist task convince chimney quality leave banana trade firm crawl eternal easily", 1, 5)
-	require.Equal(t, "0g1qpj6nstqn0n5gzcsaezspuhulje6msjq5t8cq5", f.KeyAddress("test-recoverH2").String())
+	require.Equal(t, "kava1qpj6nstqn0n5gzcsaezspuhulje6msjq5t8cq5", f.KeyAddress("test-recoverH2").String())
 
 	f.KeysAddRecoverHDPath("test-recoverH3", "dentist task convince chimney quality leave banana trade firm crawl eternal easily", 1, 17)
-	require.Equal(t, "0g1vayfpstgapt7dmv7074kc3ll8xpf0rlzvh4k08", f.KeyAddress("test-recoverH3").String())
+	require.Equal(t, "kava1vayfpstgapt7dmv7074kc3ll8xpf0rlzvh4k08", f.KeyAddress("test-recoverH3").String())
 
 	f.KeysAddRecoverHDPath("test-recoverH4", "dentist task convince chimney quality leave banana trade firm crawl eternal easily", 2, 17)
-	require.Equal(t, "0g1xvsfnksmhr887skcfrm4pe3va54tkmrtw7wyer", f.KeyAddress("test-recoverH4").String())
+	require.Equal(t, "kava1xvsfnksmhr887skcfrm4pe3va54tkmrtw7wyer", f.KeyAddress("test-recoverH4").String())
 
 	// test old bip44 coin type
 	f.KeysAddRecoverHDPath("test-recoverH5", "dentist task convince chimney quality leave banana trade firm crawl eternal easily", 2, 17, "--legacy-hd-path")
-	require.Equal(t, "0g1v9plmhvyhgxk3th9ydacm7j4z357s3nhhmy0tv", f.KeyAddress("test-recoverH5").String())
+	require.Equal(t, "kava1v9plmhvyhgxk3th9ydacm7j4z357s3nhhmy0tv", f.KeyAddress("test-recoverH5").String())
 
 	exitSuccess, _, _ := f.KeysAddRecover("test-recover-fail", "dentist task convince chimney quality leave banana trade firm crawl eternal easily", "--legacy-hd-path --hd-path 44'/459'/0'/0/0")
 	require.False(t, exitSuccess)
@@ -99,11 +99,11 @@ func TestZgChainCLIKeysAddRecoverHDPath(t *testing.T) {
 	// test -hd-path flag
 	exitSuccess, _, _ = f.KeysAddRecover("test-recoverH6", "dentist task convince chimney quality leave banana trade firm crawl eternal easily", "--hd-path 44'/459'/0'/0/0")
 	require.True(t, exitSuccess)
-	require.Equal(t, "0g1rsjxn2e4dfl3a2qzuzzjvvgjmmate383g9q4cz", f.KeyAddress("test-recoverH6").String())
+	require.Equal(t, "kava1rsjxn2e4dfl3a2qzuzzjvvgjmmate383g9q4cz", f.KeyAddress("test-recoverH6").String())
 
 	exitSuccess, _, _ = f.KeysAddRecover("test-recoverH7", "dentist task convince chimney quality leave banana trade firm crawl eternal easily", "--hd-path 44'/459'/2'/0/17")
 	require.True(t, exitSuccess)
-	require.Equal(t, "0g1xvsfnksmhr887skcfrm4pe3va54tkmrtw7wyer", f.KeyAddress("test-recoverH7").String())
+	require.Equal(t, "kava1xvsfnksmhr887skcfrm4pe3va54tkmrtw7wyer", f.KeyAddress("test-recoverH7").String())
 
 	// Cleanup testing directories
 	f.Cleanup()
@@ -813,7 +813,7 @@ func TestKvCLISubmitCommunityPoolSpendProposal(t *testing.T) {
 }
 
 func TestKvCLIQueryTxPagination(t *testing.T) {
-	// Skip until https://github.com/cometbft/cometbft/issues/4432 has been
+	// Skip until https://github.com/tendermint/tendermint/issues/4432 has been
 	// resolved and included in a release.
 	t.SkipNow()
 

cli_test/test_helpers.go

@@ -13,13 +13,13 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	tmtypes "github.com/cometbft/cometbft/types"
+	tmtypes "github.com/tendermint/tendermint/types"
 
-	"cosmossdk.io/simapp"
 	clientkeys "github.com/cosmos/cosmos-sdk/client/keys"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/crypto/keys"
 	"github.com/cosmos/cosmos-sdk/server"
+	"github.com/cosmos/cosmos-sdk/simapp"
 	"github.com/cosmos/cosmos-sdk/tests"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
@@ -28,7 +28,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/slashing"
 	"github.com/cosmos/cosmos-sdk/x/staking"
 
-	"github.com/0glabs/0g-chain/app"
+	"github.com/kava-labs/kava/app"
 )
 
 const (
@@ -65,7 +65,8 @@ var (
 
 func init() {
 	// set the address prefixes
-	chaincfg.SetSDKConfig()
+	config := sdk.GetConfig()
+	app.SetBech32AddressPrefixes(config)
 	// config.Seal()
 }
 
@@ -91,7 +92,7 @@ type Fixtures struct {
 
 // NewFixtures creates a new instance of Fixtures with many vars set
 func NewFixtures(t *testing.T) *Fixtures {
-	tmpDir, err := ioutil.TempDir("", "0gchain_integration_"+t.Name()+"_")
+	tmpDir, err := ioutil.TempDir("", "kava_integration_"+t.Name()+"_")
 	require.NoError(t, err)
 
 	servAddr, port, err := server.FreeTCPAddr()
@@ -200,9 +201,9 @@ func (f *Fixtures) Flags() string {
 }
 
 //___________________________________________________________________________________
-// 0gchaind
+// kavad
 
-// UnsafeResetAll is 0gchaind unsafe-reset-all
+// UnsafeResetAll is kavad unsafe-reset-all
 func (f *Fixtures) UnsafeResetAll(flags ...string) {
 	cmd := fmt.Sprintf("%s --home=%s unsafe-reset-all", f.KvdBinary, f.KvdHome)
 	executeWrite(f.T, addFlags(cmd, flags))
@@ -210,7 +211,7 @@ func (f *Fixtures) UnsafeResetAll(flags ...string) {
 	require.NoError(f.T, err)
 }
 
-// KvInit is 0gchaind init
+// KvInit is kavad init
 // NOTE: KvInit sets the ChainID for the Fixtures instance
 func (f *Fixtures) KvInit(moniker string, flags ...string) {
 	cmd := fmt.Sprintf("%s init -o --home=%s %s", f.KvdBinary, f.KvdHome, moniker)
@@ -228,25 +229,25 @@ func (f *Fixtures) KvInit(moniker string, flags ...string) {
 	f.ChainID = chainID
 }
 
-// AddGenesisAccount is 0gchaind add-genesis-account
+// AddGenesisAccount is kavad add-genesis-account
 func (f *Fixtures) AddGenesisAccount(address sdk.AccAddress, coins sdk.Coins, flags ...string) {
 	cmd := fmt.Sprintf("%s add-genesis-account %s %s --home=%s --keyring-backend=test", f.KvdBinary, address, coins, f.KvdHome)
 	executeWriteCheckErr(f.T, addFlags(cmd, flags))
 }
 
-// GenTx is 0gchaind gentx
+// GenTx is kavad gentx
 func (f *Fixtures) GenTx(name string, flags ...string) {
 	cmd := fmt.Sprintf("%s gentx --name=%s --home=%s --home-client=%s --keyring-backend=test", f.KvdBinary, name, f.KvdHome, f.KvcliHome)
 	executeWriteCheckErr(f.T, addFlags(cmd, flags))
 }
 
-// CollectGenTxs is 0gchaind collect-gentxs
+// CollectGenTxs is kavad collect-gentxs
 func (f *Fixtures) CollectGenTxs(flags ...string) {
 	cmd := fmt.Sprintf("%s collect-gentxs --home=%s", f.KvdBinary, f.KvdHome)
 	executeWriteCheckErr(f.T, addFlags(cmd, flags))
 }
 
-// GDStart runs 0gchaind start with the appropriate flags and returns a process
+// GDStart runs kavad start with the appropriate flags and returns a process
 func (f *Fixtures) GDStart(flags ...string) *tests.Process {
 	cmd := fmt.Sprintf("%s start --home=%s --rpc.laddr=%v --p2p.laddr=%v --pruning=everything", f.KvdBinary, f.KvdHome, f.RPCAddr, f.P2PAddr)
 	proc := tests.GoExecuteTWithStdout(f.T, addFlags(cmd, flags))
@@ -255,7 +256,7 @@ func (f *Fixtures) GDStart(flags ...string) *tests.Process {
 	return proc
 }
 
-// GDTendermint returns the results of 0gchaind tendermint [query]
+// GDTendermint returns the results of kavad tendermint [query]
 func (f *Fixtures) GDTendermint(query string) string {
 	cmd := fmt.Sprintf("%s tendermint %s --home=%s", f.KvdBinary, query, f.KvdHome)
 	success, stdout, stderr := executeWriteRetStdStreams(f.T, cmd)
@@ -264,7 +265,7 @@ func (f *Fixtures) GDTendermint(query string) string {
 	return strings.TrimSpace(stdout)
 }
 
-// ValidateGenesis runs 0gchaind validate-genesis
+// ValidateGenesis runs kavad validate-genesis
 func (f *Fixtures) ValidateGenesis() {
 	cmd := fmt.Sprintf("%s validate-genesis --home=%s", f.KvdBinary, f.KvdHome)
 	executeWriteCheckErr(f.T, cmd)

client/docs/config.json

@@ -7,7 +7,7 @@
   },
   "externalDocs": {
     "description": "GitHub",
-    "url": "https://github.com/0glabs/0g-chain"
+    "url": "https://github.com/Kava-Labs/kava"
   },
   "host": "api.data.kava.io",
   "schemes": ["https"],
@@ -182,23 +182,6 @@
         ]
       }
     },
-    {
-      "url": "./out/swagger/kava/precisebank/v1/query.swagger.json",
-      "tags": {
-        "rename": {
-          "Query": "Precisebank"
-        }
-      },
-      "operationIds": {
-        "rename": [
-          {
-            "type": "regex",
-            "from": "(.*)",
-            "to": "Precisebank$1"
-          }
-        ]
-      }
-    },
     {
       "url": "./out/swagger/kava/pricefeed/v1beta1/query.swagger.json",
       "tags": {
@@ -250,23 +233,6 @@
         ]
       }
     },
-    {
-      "url": "./out/swagger/kava/community/v1beta1/query.swagger.json",
-      "tags": {
-        "rename": {
-          "Query": "Community"
-        }
-      },
-      "operationIds": {
-        "rename": [
-          {
-            "type": "regex",
-            "from": "(.*)",
-            "to": "Community$1"
-          }
-        ]
-      }
-    },
     {
       "url": "./client/docs/cosmos-swagger.yml",
       "dereference": {
@@ -312,30 +278,6 @@
         ]
       }
     },
-    {
-      "url": "./client/docs/ethermint-swagger.yml",
-      "dereference": {
-        "circular": "ignore"
-      },
-      "tags": {
-        "rename": {
-          "Query": "Ethermint"
-        }
-      },
-      "operationIds": {
-        "rename": [
-          {
-            "type": "regex",
-            "from": "(.*)",
-            "to": "Ethermint$1"
-          }
-        ]
-      },
-      "paths": {
-        "exclude": [
-        ]
-      }
-    },
     {
       "url": "./client/docs/legacy-swagger.yml",
       "dereference": {

client/erc20/MintableBurnableERC20.abi

@@ -1,381 +0,0 @@
-[
-    {
-      "inputs": [
-        {
-          "internalType": "string",
-          "name": "name",
-          "type": "string"
-        },
-        {
-          "internalType": "string",
-          "name": "symbol",
-          "type": "string"
-        },
-        {
-          "internalType": "uint8",
-          "name": "decimals_",
-          "type": "uint8"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "constructor"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Approval",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "previousOwner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "OwnershipTransferred",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Transfer",
-      "type": "event"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "spender",
-          "type": "address"
-        }
-      ],
-      "name": "allowance",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "approve",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "balanceOf",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "burn",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "decimals",
-      "outputs": [
-        {
-          "internalType": "uint8",
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "subtractedValue",
-          "type": "uint256"
-        }
-      ],
-      "name": "decreaseAllowance",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "addedValue",
-          "type": "uint256"
-        }
-      ],
-      "name": "increaseAllowance",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "mint",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "name",
-      "outputs": [
-        {
-          "internalType": "string",
-          "name": "",
-          "type": "string"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "owner",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "renounceOwnership",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "symbol",
-      "outputs": [
-        {
-          "internalType": "string",
-          "name": "",
-          "type": "string"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "totalSupply",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "transfer",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "transferFrom",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "newOwner",
-          "type": "address"
-        }
-      ],
-      "name": "transferOwnership",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-  ]

client/grpc/README.md

@@ -1,74 +0,0 @@
-# Kava gRPC Client
-
-The Kava gRPC client is a tool for making gRPC queries on a Kava chain.
-
-## Features
-
-- Easy-to-use gRPC client for the Kava chain.
-- Access all query clients for Cosmos and Kava modules using `client.Query` (e.g., `client.Query.Bank.Balance`).
-- Utilize utility functions for common queries (e.g., `client.BaseAccount(str)`).
-
-## Usage
-
-### Creating a new client
-
-```go
-package main
-
-import (
-  kavaGrpc "github.com/0glabs/0g-chain/client/grpc"
-)
-grpcUrl := "https://grpc.kava.io:443"
-client, err := kavaGrpc.NewClient(grpcUrl)
-if err != nil {
-  panic(err)
-}
-```
-
-### Making grpc queries
-
-Query clients for both Cosmos and Kava modules are available via `client.Query`.
-
-Example: Query Cosmos module `x/bank` for address balance
-
-```go
-import (
-  banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-)
-
-rsp, err := client.Query.Bank.Balance(context.Background(), &banktypes.QueryBalanceRequest{
-		Address: "kava19rjk5qmmwywnzfccwzyn02jywgpwjqf60afj92",
-		Denom:   "ukava",
-	})
-```
-
-Example: Query Kava module `x/evmutil` for params
-
-```go
-import (
-  evmutiltypes "github.com/0glabs/0g-chain/x/evmutil/types"
-)
-
-rsp, err := client.Query.Evmutil.Params(
-  context.Background(), &evmutiltypes.QueryParamsRequest{},
-)
-```
-
-#### Query Utilities
-
-Utility functions for common queries are available directly on the client.
-
-Example: Util query to get a base account
-
-```go
-kavaAcc := "kava19rjk5qmmwywnzfccwzyn02jywgpwjqf60afj92"
-rsp, err := client.BaseAccount(kavaAcc)
-if err != nil {
-  panic(err)
-}
-fmt.Printf("account sequence for %s: %d\n", kavaAcc, rsp.Sequence)
-```
-
-## Query Tests
-
-To test queries, a Kava node is required. Therefore, the e2e tests for the gRPC client queries can be found in the `tests/e2e` directory. Tests for new utility queries should be added as e2e tests under the `test/e2e` directory.

client/grpc/client.go

@@ -1,50 +0,0 @@
-package grpc
-
-import (
-	"errors"
-
-	"github.com/0glabs/0g-chain/client/grpc/query"
-	"github.com/0glabs/0g-chain/client/grpc/util"
-)
-
-// ZgChainGrpcClient enables the usage of kava grpc query clients and query utils
-type ZgChainGrpcClient struct {
-	config ZgChainGrpcClientConfig
-
-	// Query clients for cosmos and kava modules
-	Query *query.QueryClient
-
-	// Utils for common queries (ie fetch an unpacked BaseAccount)
-	*util.Util
-}
-
-// ZgChainGrpcClientConfig is a configuration struct for a ZgChainGrpcClient
-type ZgChainGrpcClientConfig struct {
-	// note: add future config options here
-}
-
-// NewClient creates a new ZgChainGrpcClient via a grpc url
-func NewClient(grpcUrl string) (*ZgChainGrpcClient, error) {
-	return NewClientWithConfig(grpcUrl, NewDefaultConfig())
-}
-
-// NewClientWithConfig creates a new ZgChainGrpcClient via a grpc url and config
-func NewClientWithConfig(grpcUrl string, config ZgChainGrpcClientConfig) (*ZgChainGrpcClient, error) {
-	if grpcUrl == "" {
-		return nil, errors.New("grpc url cannot be empty")
-	}
-	query, error := query.NewQueryClient(grpcUrl)
-	if error != nil {
-		return nil, error
-	}
-	client := &ZgChainGrpcClient{
-		Query:  query,
-		Util:   util.NewUtil(query),
-		config: config,
-	}
-	return client, nil
-}
-
-func NewDefaultConfig() ZgChainGrpcClientConfig {
-	return ZgChainGrpcClientConfig{}
-}

client/grpc/client_test.go

@@ -1,15 +0,0 @@
-package grpc_test
-
-import (
-	"testing"
-
-	"github.com/0glabs/0g-chain/client/grpc"
-	"github.com/stretchr/testify/require"
-)
-
-func TestNewClient_InvalidEndpoint(t *testing.T) {
-	_, err := grpc.NewClient("invalid-url")
-	require.ErrorContains(t, err, "unknown grpc url scheme")
-	_, err = grpc.NewClient("")
-	require.ErrorContains(t, err, "grpc url cannot be empty")
-}

client/grpc/query/connection.go

@@ -1,52 +0,0 @@
-package query
-
-import (
-	"context"
-	"crypto/tls"
-	"fmt"
-	"net/url"
-
-	"github.com/0glabs/0g-chain/app"
-	"github.com/cosmos/cosmos-sdk/codec"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
-	"google.golang.org/grpc/credentials/insecure"
-)
-
-// newGrpcConnection parses a GRPC endpoint and creates a connection to it
-func newGrpcConnection(ctx context.Context, endpoint string) (*grpc.ClientConn, error) {
-	grpcUrl, err := url.Parse(endpoint)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse grpc connection \"%s\": %v", endpoint, err)
-	}
-
-	var creds credentials.TransportCredentials
-	switch grpcUrl.Scheme {
-	case "http":
-		creds = insecure.NewCredentials()
-	case "https":
-		creds = credentials.NewTLS(&tls.Config{})
-	default:
-		return nil, fmt.Errorf("unknown grpc url scheme: %s", grpcUrl.Scheme)
-	}
-
-	// Ensure the encoding config is set up correctly with the query client
-	// otherwise it will produce panics like:
-	// invalid Go type math.Int for field ...
-	encodingConfig := app.MakeEncodingConfig()
-	protoCodec := codec.NewProtoCodec(encodingConfig.InterfaceRegistry)
-	grpcCodec := protoCodec.GRPCCodec()
-
-	secureOpt := grpc.WithTransportCredentials(creds)
-	grpcConn, err := grpc.DialContext(
-		ctx,
-		grpcUrl.Host,
-		secureOpt,
-		grpc.WithDefaultCallOptions(grpc.ForceCodec(grpcCodec)),
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	return grpcConn, nil
-}

client/grpc/query/doc.go

@@ -1,7 +0,0 @@
-/*
-The query package includes Cosmos and Kava gRPC query clients.
-
-To ensure that the `QueryClient` stays updated, add new module query clients
-to the `QueryClient` whenever new modules with grpc queries are added to the Kava app.
-*/
-package query

client/grpc/query/query.go

@@ -1,108 +0,0 @@
-package query
-
-import (
-	"context"
-
-	"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
-	txtypes "github.com/cosmos/cosmos-sdk/types/tx"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	authz "github.com/cosmos/cosmos-sdk/x/authz"
-	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-	consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
-	disttypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
-	evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
-	govv1types "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
-	govv1beta1types "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
-	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
-	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
-	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
-	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-
-	ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
-	ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
-	evmtypes "github.com/evmos/ethermint/x/evm/types"
-	feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
-
-	bep3types "github.com/0glabs/0g-chain/x/bep3/types"
-	committeetypes "github.com/0glabs/0g-chain/x/committee/types"
-	evmutiltypes "github.com/0glabs/0g-chain/x/evmutil/types"
-	issuancetypes "github.com/0glabs/0g-chain/x/issuance/types"
-	precisebanktypes "github.com/0glabs/0g-chain/x/precisebank/types"
-	pricefeedtypes "github.com/0glabs/0g-chain/x/pricefeed/types"
-)
-
-// QueryClient is a wrapper with all Cosmos and Kava grpc query clients
-type QueryClient struct {
-	// cosmos-sdk query clients
-
-	Tm           tmservice.ServiceClient
-	Tx           txtypes.ServiceClient
-	Auth         authtypes.QueryClient
-	Authz        authz.QueryClient
-	Bank         banktypes.QueryClient
-	Distribution disttypes.QueryClient
-	Evidence     evidencetypes.QueryClient
-	Gov          govv1types.QueryClient
-	GovBeta      govv1beta1types.QueryClient
-	Mint         minttypes.QueryClient
-	Params       paramstypes.QueryClient
-	Slashing     slashingtypes.QueryClient
-	Staking      stakingtypes.QueryClient
-	Upgrade      upgradetypes.QueryClient
-	Consensus    consensustypes.QueryClient
-
-	// 3rd party query clients
-
-	Evm         evmtypes.QueryClient
-	Feemarket   feemarkettypes.QueryClient
-	IbcClient   ibcclienttypes.QueryClient
-	IbcTransfer ibctransfertypes.QueryClient
-
-	// kava module query clients
-
-	Bep3        bep3types.QueryClient
-	Committee   committeetypes.QueryClient
-	Evmutil     evmutiltypes.QueryClient
-	Issuance    issuancetypes.QueryClient
-	Pricefeed   pricefeedtypes.QueryClient
-	Precisebank precisebanktypes.QueryClient
-}
-
-// NewQueryClient creates a new QueryClient and initializes all the module query clients
-func NewQueryClient(grpcEndpoint string) (*QueryClient, error) {
-	conn, err := newGrpcConnection(context.Background(), grpcEndpoint)
-	if err != nil {
-		return &QueryClient{}, err
-	}
-	client := &QueryClient{
-		Tm:           tmservice.NewServiceClient(conn),
-		Tx:           txtypes.NewServiceClient(conn),
-		Auth:         authtypes.NewQueryClient(conn),
-		Authz:        authz.NewQueryClient(conn),
-		Bank:         banktypes.NewQueryClient(conn),
-		Distribution: disttypes.NewQueryClient(conn),
-		Evidence:     evidencetypes.NewQueryClient(conn),
-		Gov:          govv1types.NewQueryClient(conn),
-		GovBeta:      govv1beta1types.NewQueryClient(conn),
-		Mint:         minttypes.NewQueryClient(conn),
-		Params:       paramstypes.NewQueryClient(conn),
-		Slashing:     slashingtypes.NewQueryClient(conn),
-		Staking:      stakingtypes.NewQueryClient(conn),
-		Upgrade:      upgradetypes.NewQueryClient(conn),
-		Consensus:    consensustypes.NewQueryClient(conn),
-
-		Evm:         evmtypes.NewQueryClient(conn),
-		Feemarket:   feemarkettypes.NewQueryClient(conn),
-		IbcClient:   ibcclienttypes.NewQueryClient(conn),
-		IbcTransfer: ibctransfertypes.NewQueryClient(conn),
-
-		Bep3:        bep3types.NewQueryClient(conn),
-		Committee:   committeetypes.NewQueryClient(conn),
-		Evmutil:     evmutiltypes.NewQueryClient(conn),
-		Issuance:    issuancetypes.NewQueryClient(conn),
-		Pricefeed:   pricefeedtypes.NewQueryClient(conn),
-		Precisebank: precisebanktypes.NewQueryClient(conn),
-	}
-	return client, nil
-}

client/grpc/query/query_test.go

@@ -1,64 +0,0 @@
-package query_test
-
-import (
-	"testing"
-
-	"github.com/0glabs/0g-chain/client/grpc/query"
-	"github.com/stretchr/testify/require"
-)
-
-func TestNewQueryClient_InvalidGprc(t *testing.T) {
-	t.Run("valid connection", func(t *testing.T) {
-		conn, err := query.NewQueryClient("http://localhost:1234")
-		require.NoError(t, err)
-		require.NotNil(t, conn)
-	})
-
-	t.Run("non-empty url", func(t *testing.T) {
-		_, err := query.NewQueryClient("")
-		require.ErrorContains(t, err, "unknown grpc url scheme")
-	})
-
-	t.Run("invalid url scheme", func(t *testing.T) {
-		_, err := query.NewQueryClient("ftp://localhost:1234")
-		require.ErrorContains(t, err, "unknown grpc url scheme")
-	})
-}
-
-func TestNewQueryClient_ValidClient(t *testing.T) {
-	t.Run("all clients are created", func(t *testing.T) {
-		client, err := query.NewQueryClient("http://localhost:1234")
-		require.NoError(t, err)
-		require.NotNil(t, client)
-
-		// validate cosmos clients
-		require.NotNil(t, client.Tm)
-		require.NotNil(t, client.Tx)
-		require.NotNil(t, client.Auth)
-		require.NotNil(t, client.Authz)
-		require.NotNil(t, client.Bank)
-		require.NotNil(t, client.Distribution)
-		require.NotNil(t, client.Evidence)
-		require.NotNil(t, client.Gov)
-		require.NotNil(t, client.GovBeta)
-		require.NotNil(t, client.Mint)
-		require.NotNil(t, client.Params)
-		require.NotNil(t, client.Slashing)
-		require.NotNil(t, client.Staking)
-		require.NotNil(t, client.Upgrade)
-		require.NotNil(t, client.Consensus)
-
-		// validate 3rd party clients
-		require.NotNil(t, client.Evm)
-		require.NotNil(t, client.Feemarket)
-		require.NotNil(t, client.IbcClient)
-		require.NotNil(t, client.IbcTransfer)
-
-		// validate kava clients
-		require.NotNil(t, client.Bep3)
-		require.NotNil(t, client.Committee)
-		require.NotNil(t, client.Evmutil)
-		require.NotNil(t, client.Issuance)
-		require.NotNil(t, client.Pricefeed)
-	})
-}

client/grpc/util/account.go

@@ -1,41 +0,0 @@
-package util
-
-import (
-	"context"
-	"fmt"
-
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-)
-
-// Account fetches an account via an address and returns the unpacked account
-func (u *Util) Account(addr string) (authtypes.AccountI, error) {
-	res, err := u.query.Auth.Account(context.Background(), &authtypes.QueryAccountRequest{
-		Address: addr,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("failed to fetch account: %w", err)
-	}
-
-	var acc authtypes.AccountI
-	err = u.encodingConfig.Marshaler.UnpackAny(res.Account, &acc)
-	if err != nil {
-		return nil, fmt.Errorf("failed to unpack account: %w", err)
-	}
-	return acc, nil
-}
-
-// BaseAccount fetches a base account via an address or returns an error if
-// the account is not a base account
-func (u *Util) BaseAccount(addr string) (authtypes.BaseAccount, error) {
-	acc, err := u.Account(addr)
-	if err != nil {
-		return authtypes.BaseAccount{}, err
-	}
-
-	bAcc, ok := acc.(*authtypes.BaseAccount)
-	if !ok {
-		return authtypes.BaseAccount{}, fmt.Errorf("%s is not a base account", addr)
-	}
-
-	return *bAcc, nil
-}

client/grpc/util/doc.go

@@ -1,8 +0,0 @@
-/*
-The util package contains utility functions for the Kava gRPC client.
-
-For example, `account.go` includes account-related query helpers.
-In this file, utilities such as `client.Util.BaseAccount(addr)` is exposed to
-query an account and return an unpacked `BaseAccount` instance.
-*/
-package util

client/grpc/util/util.go

@@ -1,32 +0,0 @@
-package util
-
-import (
-	"context"
-	"strconv"
-
-	grpctypes "github.com/cosmos/cosmos-sdk/types/grpc"
-	"google.golang.org/grpc/metadata"
-
-	"github.com/0glabs/0g-chain/app"
-	"github.com/0glabs/0g-chain/app/params"
-	query "github.com/0glabs/0g-chain/client/grpc/query"
-)
-
-// Util contains utility functions for the Kava gRPC client
-type Util struct {
-	query          *query.QueryClient
-	encodingConfig params.EncodingConfig
-}
-
-// NewUtil creates a new Util instance
-func NewUtil(query *query.QueryClient) *Util {
-	return &Util{
-		query:          query,
-		encodingConfig: app.MakeEncodingConfig(),
-	}
-}
-
-func (u *Util) CtxAtHeight(height int64) context.Context {
-	heightStr := strconv.FormatInt(height, 10)
-	return metadata.AppendToOutgoingContext(context.Background(), grpctypes.GRPCBlockHeightHeader, heightStr)
-}

client/keys.go

@@ -1,14 +1,14 @@
-package main
+package client
 
 import (
 	"bufio"
 
-	"github.com/cometbft/cometbft/libs/cli"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/keys"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/spf13/cobra"
+	"github.com/tendermint/tendermint/libs/cli"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	ethclient "github.com/evmos/ethermint/client"
@@ -18,9 +18,9 @@ import (
 
 var ethFlag = "eth"
 
-// keyCommands registers a sub-tree of commands to interact with
+// KeyCommands registers a sub-tree of commands to interact with
 // local private key storage.
-func keyCommands(defaultNodeHome string) *cobra.Command {
+func KeyCommands(defaultNodeHome string) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "keys",
 		Short: "Manage your application's keys",
@@ -52,13 +52,6 @@ The pass backend requires GnuPG: https://gnupg.org/
 	addCmd := keys.AddKeyCommand()
 	addCmd.Flags().Bool(ethFlag, false, "use default evm coin-type (60) and key signing algorithm (\"eth_secp256k1\")")
 
-	algoFlag := addCmd.Flag(flags.FlagKeyType)
-	algoFlag.DefValue = string(hd.EthSecp256k1Type)
-	err := algoFlag.Value.Set(string(hd.EthSecp256k1Type))
-	if err != nil {
-		panic(err)
-	}
-
 	addCmd.RunE = runAddCmd
 
 	cmd.AddCommand(
@@ -107,7 +100,7 @@ func runAddCmd(cmd *cobra.Command, args []string) error {
 	eth, _ := cmd.Flags().GetBool(ethFlag)
 	if eth {
 		cmd.Print("eth flag specified: using coin-type 60 and signing algorithm eth_secp256k1\n")
-		cmd.Flags().Set(flags.FlagKeyType, string(hd.EthSecp256k1Type))
+		cmd.Flags().Set(flags.FlagKeyAlgorithm, string(hd.EthSecp256k1Type))
 		cmd.Flags().Set("coin-type", "60")
 	}
 

client/rest/rest.go

@@ -13,7 +13,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/cometbft/cometbft/types"
+	"github.com/tendermint/tendermint/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -132,7 +132,7 @@ func (br BaseReq) ValidateBasic(w http.ResponseWriter) bool {
 	return true
 }
 
-// ReadRESTReq reads and unmarshals a Request's body to the BaseReq struct.
+// ReadRESTReq reads and unmarshals a Request's body to the the BaseReq struct.
 // Writes an error response to ResponseWriter and returns false if errors occurred.
 func ReadRESTReq(w http.ResponseWriter, r *http.Request, cdc *codec.LegacyAmino, req interface{}) bool {
 	body, err := io.ReadAll(r.Body)

client/rest/rest_test.go

@@ -12,15 +12,15 @@ import (
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
 
-	simappparams "cosmossdk.io/simapp/params"
-	"github.com/0glabs/0g-chain/client/rest"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/codec"
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
+	simappparams "github.com/cosmos/cosmos-sdk/simapp/params"
 	"github.com/cosmos/cosmos-sdk/types"
+	"github.com/kava-labs/kava/client/rest"
 )
 
 func TestBaseReq_Sanitize(t *testing.T) {

cmd/0gchaind/iavlviewer/data.go

@@ -1,53 +0,0 @@
-package iavlviewer
-
-import (
-	"crypto/sha256"
-	"fmt"
-
-	"github.com/cosmos/iavl"
-	ethermintserver "github.com/evmos/ethermint/server"
-	"github.com/spf13/cobra"
-)
-
-func newDataCmd(opts ethermintserver.StartOptions) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "data <prefix> [version number]",
-		Short: "View all keys, hash, & size of tree.",
-		Args:  cobra.RangeArgs(1, 2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			prefix := args[0]
-			version := 0
-			if len(args) == 2 {
-				var err error
-				version, err = parseVersion(args[1])
-				if err != nil {
-					return err
-				}
-			}
-
-			tree, err := openPrefixTree(opts, cmd, prefix, version)
-			if err != nil {
-				return err
-			}
-
-			printKeys(tree)
-			hash := tree.Hash()
-			fmt.Printf("Hash: %X\n", hash)
-			fmt.Printf("Size: %X\n", tree.Size())
-
-			return nil
-		},
-	}
-
-	return cmd
-}
-
-func printKeys(tree *iavl.MutableTree) {
-	fmt.Println("Printing all keys with hashed values (to detect diff)")
-	tree.Iterate(func(key []byte, value []byte) bool { //nolint:errcheck
-		printKey := parseWeaveKey(key)
-		digest := sha256.Sum256(value)
-		fmt.Printf("  %s\n    %X\n", printKey, digest)
-		return false
-	})
-}

cmd/0gchaind/iavlviewer/hash.go

@@ -1,38 +0,0 @@
-package iavlviewer
-
-import (
-	"fmt"
-
-	ethermintserver "github.com/evmos/ethermint/server"
-	"github.com/spf13/cobra"
-)
-
-func newHashCmd(opts ethermintserver.StartOptions) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "hash <prefix> [version number]",
-		Short: "Print the root hash of the iavl tree.",
-		Args:  cobra.RangeArgs(1, 2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			prefix := args[0]
-			version := 0
-			if len(args) == 2 {
-				var err error
-				version, err = parseVersion(args[1])
-				if err != nil {
-					return err
-				}
-			}
-
-			tree, err := openPrefixTree(opts, cmd, prefix, version)
-			if err != nil {
-				return err
-			}
-
-			fmt.Printf("Hash: %X\n", tree.Hash())
-
-			return nil
-		},
-	}
-
-	return cmd
-}

cmd/0gchaind/iavlviewer/root.go

@@ -1,86 +0,0 @@
-package iavlviewer
-
-import (
-	"fmt"
-	"os"
-	"strconv"
-
-	"cosmossdk.io/log"
-	dbm "github.com/cosmos/cosmos-db"
-	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/server"
-	"github.com/cosmos/cosmos-sdk/store/wrapper"
-	ethermintserver "github.com/evmos/ethermint/server"
-	"github.com/spf13/cobra"
-
-	"github.com/cosmos/iavl"
-	iavldb "github.com/cosmos/iavl/db"
-)
-
-const (
-	DefaultCacheSize int = 10000
-)
-
-func NewCmd(opts ethermintserver.StartOptions) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "iavlviewer <data|hash|shape|versions> <prefix> [version number]",
-		Short: "Output various data, hashes, and calculations for an iavl tree",
-	}
-
-	cmd.AddCommand(newDataCmd(opts))
-	cmd.AddCommand(newHashCmd(opts))
-	cmd.AddCommand(newShapeCmd(opts))
-	cmd.AddCommand(newVersionsCmd(opts))
-
-	return cmd
-}
-
-func parseVersion(arg string) (int, error) {
-	version, err := strconv.Atoi(arg)
-	if err != nil {
-		return 0, fmt.Errorf("invalid version number: '%s'", arg)
-	}
-	return version, nil
-}
-
-func openPrefixTree(opts ethermintserver.StartOptions, cmd *cobra.Command, prefix string, version int) (*iavl.MutableTree, error) {
-	clientCtx := client.GetClientContextFromCmd(cmd)
-	ctx := server.GetServerContextFromCmd(cmd)
-	ctx.Config.SetRoot(clientCtx.HomeDir)
-
-	db, err := opts.DBOpener(ctx.Viper, clientCtx.HomeDir, server.GetAppDBBackend(ctx.Viper))
-	if err != nil {
-		return nil, fmt.Errorf("failed to open database at %s: %s", clientCtx.HomeDir, err)
-	}
-	defer func() {
-		if err := db.Close(); err != nil {
-			ctx.Logger.Error("error closing db", "error", err.Error())
-		}
-	}()
-
-	cosmosdb := wrapper.NewCosmosDB(db)
-
-	tree, err := readTree(cosmosdb, version, []byte(prefix))
-	if err != nil {
-		return nil, fmt.Errorf("failed to read tree with prefix %s: %s", prefix, err)
-	}
-	return tree, nil
-}
-
-// ReadTree loads an iavl tree from the directory
-// If version is 0, load latest, otherwise, load named version
-// The prefix represents which iavl tree you want to read. The iaviwer will always set a prefix.
-func readTree(db dbm.DB, version int, prefix []byte) (*iavl.MutableTree, error) {
-	if len(prefix) != 0 {
-		db = dbm.NewPrefixDB(db, prefix)
-	}
-
-	tree := iavl.NewMutableTree(iavldb.NewWrapper(db), DefaultCacheSize, false, log.NewLogger(os.Stdout))
-	ver, err := tree.LoadVersion(int64(version))
-	if err != nil {
-		return nil, err
-	}
-	fmt.Printf("Latest version: %d\n", ver)
-	fmt.Printf("Got version: %d\n", version)
-	return tree, err
-}

cmd/0gchaind/iavlviewer/shape.go

@@ -1,47 +0,0 @@
-package iavlviewer
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/cosmos/iavl"
-	ethermintserver "github.com/evmos/ethermint/server"
-	"github.com/spf13/cobra"
-)
-
-func newShapeCmd(opts ethermintserver.StartOptions) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "shape <prefix> [version number]",
-		Short: "View shape of iavl tree.",
-		Args:  cobra.RangeArgs(1, 2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			prefix := args[0]
-			version := 0
-			if len(args) == 2 {
-				var err error
-				version, err = parseVersion(args[1])
-				if err != nil {
-					return err
-				}
-			}
-
-			tree, err := openPrefixTree(opts, cmd, prefix, version)
-			if err != nil {
-				return err
-			}
-
-			printShape(tree)
-
-			return nil
-		},
-	}
-
-	return cmd
-}
-
-func printShape(tree *iavl.MutableTree) {
-	// shape := tree.RenderShape("  ", nil)
-	// TODO: handle this error
-	shape, _ := tree.RenderShape("  ", nodeEncoder)
-	fmt.Println(strings.Join(shape, "\n"))
-}