From 0ec64c93783d97761558f8917b2083b9e8bce6db Mon Sep 17 00:00:00 2001 From: Adam Robert Turman <67024033+adamrturman@users.noreply.github.com> Date: Mon, 5 Jun 2023 18:37:00 -0500 Subject: [PATCH] axlwBTC Lend money market (#1613) * clean up naming around axlwBTC reenable lend money market assign incentives * Update .github/scripts/seed-protonet.sh * alphabetical order of denoms * alphabetical order of denoms * alphabetical order of denoms pt 3 * alphabetical order of denoms --- .../examples/force-update-module-params.sh | 6 +-- .github/scripts/seed-internal-testnet.sh | 16 ++++---- .github/scripts/seed-protonet.sh | 12 +++--- ci/env/kava-internal-testnet/genesis.json | 38 ++++++++++++++----- ci/env/kava-protonet/genesis.json | 24 ++++++------ 5 files changed, 57 insertions(+), 39 deletions(-) diff --git a/.github/scripts/examples/force-update-module-params.sh b/.github/scripts/examples/force-update-module-params.sh index 89b914fa..f8022e9d 100755 --- a/.github/scripts/examples/force-update-module-params.sh +++ b/.github/scripts/examples/force-update-module-params.sh @@ -19,7 +19,7 @@ MULTICHAIN_wBTC_CONTRACT_ADDRESS=0x288429bc07B8d030ba418bb30F170327F9fBE502 MULTICHAIN_USDC_CONTRACT_ADDRESS=0xBb304f44b7EFD865361F2AD973d8ebA433893ABC MULTICHAIN_USDT_CONTRACT_ADDRESS=0xA637F4CECbA91Ad19075bA3d330cd95f694B1707 AXL_USDC_CONTRACT_ADDRESS=0x7a5DBf8e6ac1F6aCCF14f5B4E88b21EAA04c983d -wBTC_CONTRACT_ADDRESS=0x7d2Ee2914324d5D4dC33A5c295E720659D5F3fA7 +AXL_WBTC_CONTRACT_ADDRESS=0x7d2Ee2914324d5D4dC33A5c295E720659D5F3fA7 wETH_CONTRACT_ADDRESS=0x5d6D67a665C9F169B0f9436E05B11108C1606043 ######## EXAMPLE VALUES ######### @@ -49,7 +49,7 @@ PARAM_CHANGE_PROP_TEMPLATE=$(cat <<'END_HEREDOC' { "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/btc\"},{\"kava_erc20_address\":\"AXL_USDC_CONTRACT_ADDRESS\",\"denom\":\"erc20/axelar/usdc\"},{\"kava_erc20_address\":\"wBTC_CONTRACT_ADDRESS\",\"denom\":\"erc20/axelar/btc\"},{\"kava_erc20_address\":\"wETH_CONTRACT_ADDRESS\",\"denom\":\"erc20/axelar/eth\"}]" + "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/btc\"},{\"kava_erc20_address\":\"AXL_USDC_CONTRACT_ADDRESS\",\"denom\":\"erc20/axelar/usdc\"},{\"kava_erc20_address\":\"wBTC_CONTRACT_ADDRESS\",\"denom\":\"erc20/axelar/wbtc\"},{\"kava_erc20_address\":\"wETH_CONTRACT_ADDRESS\",\"denom\":\"erc20/axelar/eth\"}]" } ] } @@ -63,7 +63,7 @@ finalProposal="${finalProposal/MULTICHAIN_USDC_CONTRACT_ADDRESS/$MULTICHAIN_USDC finalProposal="${finalProposal/MULTICHAIN_USDT_CONTRACT_ADDRESS/$MULTICHAIN_USDT_CONTRACT_ADDRESS}" finalProposal="${finalProposal/MULTICHAIN_wBTC_CONTRACT_ADDRESS/$MULTICHAIN_wBTC_CONTRACT_ADDRESS}" finalProposal="${finalProposal/AXL_USDC_CONTRACT_ADDRESS/$AXL_USDC_CONTRACT_ADDRESS}" -finalProposal="${finalProposal/wBTC_CONTRACT_ADDRESS/$wBTC_CONTRACT_ADDRESS}" +finalProposal="${finalProposal/AXL_WBTC_CONTRACT_ADDRESS/$wBTC_CONTRACT_ADDRESS}" finalProposal="${finalProposal/wETH_CONTRACT_ADDRESS/$wETH_CONTRACT_ADDRESS}" # create unique proposal filename diff --git a/.github/scripts/seed-internal-testnet.sh b/.github/scripts/seed-internal-testnet.sh index e9f91f49..c3c4d7c2 100755 --- a/.github/scripts/seed-internal-testnet.sh +++ b/.github/scripts/seed-internal-testnet.sh @@ -48,10 +48,10 @@ DAI_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" dep DAI_CONTRACT_ADDRESS=${DAI_CONTRACT_DEPLOY: -42} npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$DAI_CONTRACT_ADDRESS" 0x6767114FFAA17C6439D7AEA480738B982CE63A02 1000000000000 -# deploy and fund wBTC ERC20 contract -wBTC_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" deploy-erc20 "Wrapped BTC" BTC 8) -wBTC_CONTRACT_ADDRESS=${wBTC_CONTRACT_DEPLOY: -42} -npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$wBTC_CONTRACT_ADDRESS" 0x6767114FFAA17C6439D7AEA480738B982CE63A02 100000000000000 +# deploy and fund axlwBTC ERC20 contract +AXL_WBTC_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" deploy-erc20 "Wrapped BTC" BTC 8) +AXL_WBTC_CONTRACT_ADDRESS=${wBTC_CONTRACT_DEPLOY: -42} +npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_WBTC_CONTRACT_ADDRESS" 0x6767114FFAA17C6439D7AEA480738B982CE63A02 100000000000000 # deploy and fund wETH ERC20 contract wETH_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" deploy-erc20 "Wrapped wETH" ETH 18) @@ -70,14 +70,14 @@ npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$MULTICHAIN_w # seed some evm wallets -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 "$AXL_WBTC_CONTRACT_ADDRESS" "$DEV_TEST_WALLET_ADDRESS" 10000000000000 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$MULTICHAIN_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 npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$MULTICHAIN_USDT_CONTRACT_ADDRESS" "$DEV_TEST_WALLET_ADDRESS" 100000000000 # seed webapp E2E whale account -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 "$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 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 @@ -117,7 +117,7 @@ PARAM_CHANGE_PROP_TEMPLATE=$(cat <<'END_HEREDOC' { "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/btc\"},{\"kava_erc20_address\":\"AXL_USDC_CONTRACT_ADDRESS\",\"denom\":\"erc20/axelar/usdc\"},{\"kava_erc20_address\":\"wBTC_CONTRACT_ADDRESS\",\"denom\":\"erc20/axelar/btc\"},{\"kava_erc20_address\":\"wETH_CONTRACT_ADDRESS\",\"denom\":\"erc20/axelar/eth\"}]" + "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\"}]" } ] } @@ -131,7 +131,7 @@ finalProposal="${finalProposal/MULTICHAIN_USDC_CONTRACT_ADDRESS/$MULTICHAIN_USDC finalProposal="${finalProposal/MULTICHAIN_USDT_CONTRACT_ADDRESS/$MULTICHAIN_USDT_CONTRACT_ADDRESS}" finalProposal="${finalProposal/MULTICHAIN_wBTC_CONTRACT_ADDRESS/$MULTICHAIN_wBTC_CONTRACT_ADDRESS}" finalProposal="${finalProposal/AXL_USDC_CONTRACT_ADDRESS/$AXL_USDC_CONTRACT_ADDRESS}" -finalProposal="${finalProposal/wBTC_CONTRACT_ADDRESS/$wBTC_CONTRACT_ADDRESS}" +finalProposal="${finalProposal/AXL_WBTC_CONTRACT_ADDRESS/$wBTC_CONTRACT_ADDRESS}" finalProposal="${finalProposal/wETH_CONTRACT_ADDRESS/$wETH_CONTRACT_ADDRESS}" # create unique proposal filename diff --git a/.github/scripts/seed-protonet.sh b/.github/scripts/seed-protonet.sh index 2077591b..55c087bc 100755 --- a/.github/scripts/seed-protonet.sh +++ b/.github/scripts/seed-protonet.sh @@ -51,10 +51,10 @@ DAI_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" dep DAI_CONTRACT_ADDRESS=${DAI_CONTRACT_DEPLOY: -42} npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$DAI_CONTRACT_ADDRESS" 0x6767114FFAA17C6439D7AEA480738B982CE63A02 1000000000000 -# deploy and fund wBTC ERC20 contract -wBTC_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" deploy-erc20 "Wrapped BTC" BTC 8) -wBTC_CONTRACT_ADDRESS=${wBTC_CONTRACT_DEPLOY: -42} -npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$wBTC_CONTRACT_ADDRESS" 0x6767114FFAA17C6439D7AEA480738B982CE63A02 100000000000000 +# deploy and fund axlwBTC ERC20 contract +AXL_WBTC_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" deploy-erc20 "Wrapped BTC" BTC 8) +AXL_WBTC_CONTRACT_ADDRESS=${AXL_WBTC_CONTRACT_DEPLOY: -42} +npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" mint-erc20 "$AXL_WBTC_CONTRACT_ADDRESS" 0x6767114FFAA17C6439D7AEA480738B982CE63A02 100000000000000 # deploy and fund wETH ERC20 contract wETH_CONTRACT_DEPLOY=$(npx hardhat --network "${ERC20_DEPLOYER_NETWORK_NAME}" deploy-erc20 "Wrapped wETH" ETH 18) @@ -116,7 +116,7 @@ PARAM_CHANGE_PROP_TEMPLATE=$(cat <<'END_HEREDOC' { "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/btc\"},{\"kava_erc20_address\":\"AXL_USDC_CONTRACT_ADDRESS\",\"denom\":\"erc20/axelar/usdc\"},{\"kava_erc20_address\":\"wBTC_CONTRACT_ADDRESS\",\"denom\":\"erc20/axelar/btc\"},{\"kava_erc20_address\":\"wETH_CONTRACT_ADDRESS\",\"denom\":\"erc20/axelar/eth\"}]" + "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/btc\"},{\"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\"}]" } ] } @@ -130,7 +130,7 @@ finalProposal="${finalProposal/MULTICHAIN_USDC_CONTRACT_ADDRESS/$MULTICHAIN_USDC finalProposal="${finalProposal/MULTICHAIN_USDT_CONTRACT_ADDRESS/$MULTICHAIN_USDT_CONTRACT_ADDRESS}" finalProposal="${finalProposal/MULTICHAIN_wBTC_CONTRACT_ADDRESS/$MULTICHAIN_wBTC_CONTRACT_ADDRESS}" finalProposal="${finalProposal/AXL_USDC_CONTRACT_ADDRESS/$AXL_USDC_CONTRACT_ADDRESS}" -finalProposal="${finalProposal/wBTC_CONTRACT_ADDRESS/$wBTC_CONTRACT_ADDRESS}" +finalProposal="${finalProposal/AXL_WBTC_CONTRACT_ADDRESS/$wBTC_CONTRACT_ADDRESS}" finalProposal="${finalProposal/wETH_CONTRACT_ADDRESS/$wETH_CONTRACT_ADDRESS}" # create unique proposal filename diff --git a/ci/env/kava-internal-testnet/genesis.json b/ci/env/kava-internal-testnet/genesis.json index 3fc5f812..eb0a5dc7 100644 --- a/ci/env/kava-internal-testnet/genesis.json +++ b/ci/env/kava-internal-testnet/genesis.json @@ -513,10 +513,6 @@ "denom": "busd", "amount": "1000000000000000" }, - { - "denom": "erc20/axelar/btc", - "amount": "1000000000" - }, { "denom": "erc20/axelar/eth", "amount": "1000000000000000000" @@ -525,6 +521,10 @@ "denom": "erc20/axelar/usdc", "amount": "10000000000" }, + { + "denom": "erc20/axelar/wbtc", + "amount": "1000000000" + }, { "denom": "erc20/multichain/usdc", "amount": "1000000000000000000" @@ -566,10 +566,6 @@ "denom": "busd", "amount": "1000000000000000" }, - { - "denom": "erc20/axelar/btc", - "amount": "1000000000" - }, { "denom": "erc20/axelar/eth", "amount": "1000000000000000000" @@ -578,6 +574,10 @@ "denom": "erc20/axelar/usdc", "amount": "10000000000" }, + { + "denom": "erc20/axelar/wbtc", + "amount": "1000000000" + }, { "denom": "hard", "amount": "1000000000" @@ -1992,7 +1992,7 @@ }, { "kava_erc20_address": "0x7d2Ee2914324d5D4dC33A5c295E720659D5F3fA7", - "denom": "erc20/axelar/btc" + "denom": "erc20/axelar/wbtc" }, { "kava_erc20_address": "0x5d6D67a665C9F169B0f9436E05B11108C1606043", @@ -2201,6 +2201,24 @@ "reserve_factor": "0.025000000000000000", "keeper_reward_percentage": "0.020000000000000000" }, + { + "denom": "erc20/axelar/wbtc", + "borrow_limit": { + "has_max_limit": true, + "maximum_limit": "0.000000000000000000", + "loan_to_value": "0.000000000000000000" + }, + "spot_market_id": "btc: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/multichain/wbtc", "borrow_limit": { @@ -2556,7 +2574,7 @@ }, { "active": true, - "collateral_type": "erc20/axelar/btc", + "collateral_type": "erc20/axelar/wbtc", "start": "2022-11-11T15:00:00Z", "end": "2024-11-11T15:00:00Z", "rewards_per_second": [ diff --git a/ci/env/kava-protonet/genesis.json b/ci/env/kava-protonet/genesis.json index c3a15430..26bef994 100644 --- a/ci/env/kava-protonet/genesis.json +++ b/ci/env/kava-protonet/genesis.json @@ -458,7 +458,7 @@ "grantee": "kava10d07y265gmmuvt4z0w9aw880jnsr700jxh8cq5", "granter": "kava17d2wax0zhjrrecvaszuyxdf5wcu5a0p4qlx3t5" } - ] + ] }, "bank": { "params": { @@ -542,10 +542,6 @@ "denom": "busd", "amount": "1000000000000000" }, - { - "denom": "erc20/axelar/btc", - "amount": "1000000000" - }, { "denom": "erc20/axelar/eth", "amount": "1000000000000000000" @@ -554,6 +550,10 @@ "denom": "erc20/axelar/usdc", "amount": "10000000000" }, + { + "denom": "erc20/axelar/wbtc", + "amount": "1000000000" + }, { "denom": "hard", "amount": "1000000000" @@ -648,10 +648,6 @@ "denom": "busd", "amount": "1000000000000000" }, - { - "denom": "erc20/axelar/btc", - "amount": "1000000000" - }, { "denom": "erc20/axelar/eth", "amount": "1000000000000000000" @@ -660,6 +656,10 @@ "denom": "erc20/axelar/usdc", "amount": "10000000000" }, + { + "denom": "erc20/axelar/wbtc", + "amount": "1000000000" + }, { "denom": "hard", "amount": "1000000000" @@ -2016,7 +2016,7 @@ }, { "kava_erc20_address": "0x7d2Ee2914324d5D4dC33A5c295E720659D5F3fA7", - "denom": "erc20/axelar/btc" + "denom": "erc20/axelar/wbtc" }, { "kava_erc20_address": "0x5d6D67a665C9F169B0f9436E05B11108C1606043", @@ -2166,7 +2166,7 @@ "keeper_reward_percentage": "0.020000000000000000" }, { - "denom": "erc20/axelar/btc", + "denom": "erc20/axelar/wbtc", "borrow_limit": { "has_max_limit": true, "maximum_limit": "0.000000000000000000", @@ -2484,7 +2484,7 @@ }, { "active": true, - "collateral_type": "erc20/axelar/btc", + "collateral_type": "erc20/axelar/wbtc", "start": "2022-11-11T15:00:00Z", "end": "2024-11-11T15:00:00Z", "rewards_per_second": [