feat: community pool spend for 0.47.5

White-Whale-Defi-Platform · Jan 25, 2024 · 9fda52b · 9fda52b
1 parent 473898b
commit 9fda52b
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 21 deletions.
diff --git a/scripts/create-community-pool-spend-msg.sh b/scripts/create-community-pool-spend-msg.sh
@@ -1,4 +1,4 @@
-BINARY=migalood
+BINARY=${1:-migalood}
 CONTINUE=${CONTINUE:-"false"}
 HOME_DIR=$(pwd)/mytestnet
 SCRIPTS_FOLDER=$(pwd)/scripts
@@ -17,28 +17,42 @@ COMMUNITY_POOL_AMOUNT=1000000000
 $BINARY tx distribution fund-community-pool $COMMUNITY_POOL_AMOUNT$DENOM  --from $KEY --keyring-backend $KEYRING --chain-id $CHAIN_ID --home $HOME_DIR -y
 
 ## Show receipient balance before proposal.
+test1_addr=$($BINARY keys show $KEY1 -a --keyring-backend $KEYRING --home $HOME_DIR)
 recipient=$($BINARY keys show $KEY2 -a --keyring-backend $KEYRING --home $HOME_DIR)
 
 PRE_AMOUNT=$($BINARY query bank balances $recipient --chain-id $CHAIN_ID --home $HOME_DIR -o json | jq -r ".balances[0].amount")
 echo "Recipient: $recipient"
 echo "Pre receipient amount: $PRE_AMOUNT"
 
-## Test1 Create a community pool spend message, receipient is test2
-AMOUNT_REQUEST=$COMMUNITY_POOL_AMOUNT$DENOM
+
+AMOUNT_REQUEST=$COMMUNITY_POOL_AMOUNT
 proposal_file=$SCRIPTS_FOLDER/proposal.json
 cat << EOF > $proposal_file
 {
-  "title": "Community Spend: Chihuahua ... ",
-  "description": "This proposal is to request funds for ...",
-  "recipient": "$recipient",
-  "amount": "$AMOUNT_REQUEST",
+  "title": "Community Spend: Chihuhua...",
+  "metadata": "ipfs link: ..",
+  "summary": "This proposal is to request funds for ...",
+  "messages": [
+    {
+      "@type": "/cosmos.distribution.v1beta1.MsgCommunityPoolSpend",
+      "authority": "$test1_addr",
+      "recipient": "$recipient",
+      "amount": [
+        {
+          "denom": "$DENOM",
+          "amount": "$AMOUNT_REQUEST"
+        }
+      ]
+    }
+  ],
   "deposit": "25000000000$DENOM"
 }
 EOF
 
+
 echo "Proposal file: $proposal_file"
 sleep 3
-$BINARY tx gov submit-legacy-proposal community-pool-spend $proposal_file --from test1  --keyring-backend test --chain-id $CHAIN_ID --home $HOME_DIR -y
+$BINARY tx gov submit-proposal $proposal_file --from test1  --keyring-backend test --chain-id $CHAIN_ID --home $HOME_DIR -y
 
 
 ## Validator vote yes 

diff --git a/scripts/local_node.sh → scripts/local-node.sh b/scripts/local_node.sh → scripts/local-node.sh
@@ -11,7 +11,7 @@ if [ "$CONTINUE" == "true" ]; then
 fi
 
 rm -rf mytestnet
-pkill migalood
+pkill $BINARY
 
 # check DENOM is set. If not, set to uwhale
 DENOM=${2:-uwhale}
@@ -57,9 +57,9 @@ $BINARY keys add $KEY1 --keyring-backend $KEYRING --home $HOME_DIR
 $BINARY keys add $KEY2 --keyring-backend $KEYRING --home $HOME_DIR
 
 # Allocate genesis accounts (cosmos formatted addresses)
-$BINARY add-genesis-account $KEY "1000000000000${DENOM}" --keyring-backend $KEYRING --home $HOME_DIR
-$BINARY add-genesis-account $KEY1 "1000000000000${DENOM}" --keyring-backend $KEYRING --home $HOME_DIR
-$BINARY add-genesis-account $KEY2 "1000000000000${DENOM}" --keyring-backend $KEYRING --home $HOME_DIR
+$BINARY genesis add-genesis-account $KEY "1000000000000${DENOM}" --keyring-backend $KEYRING --home $HOME_DIR
+$BINARY genesis add-genesis-account $KEY1 "1000000000000${DENOM}" --keyring-backend $KEYRING --home $HOME_DIR
+$BINARY genesis add-genesis-account $KEY2 "1000000000000${DENOM}" --keyring-backend $KEYRING --home $HOME_DIR
 
 update_test_genesis '.app_state["gov"]["voting_params"]["voting_period"]="20s"'
 update_test_genesis '.app_state["mint"]["params"]["mint_denom"]="'$DENOM'"'
@@ -73,12 +73,12 @@ $SED_BINARY -i 's/swagger = false/swagger = true/' $HOME_DIR/config/app.toml
 $SED_BINARY -i -e 's/enabled-unsafe-cors = false/enabled-unsafe-cors = true/g' $HOME_DIR/config/app.toml
 
 # Sign genesis transaction
-$BINARY gentx $KEY "1000000${DENOM}" --commission-rate=$COMMISSION_RATE --commission-max-rate=$COMMISSION_MAX_RATE --keyring-backend $KEYRING --chain-id $CHAIN_ID --home $HOME_DIR
+$BINARY genesis gentx $KEY "1000000${DENOM}" --commission-rate=$COMMISSION_RATE --commission-max-rate=$COMMISSION_MAX_RATE --keyring-backend $KEYRING --chain-id $CHAIN_ID --home $HOME_DIR
 
 # Collect genesis tx
-$BINARY collect-gentxs --home $HOME_DIR
+$BINARY genesis collect-gentxs --home $HOME_DIR
 
 # Run this to ensure everything worked and that the genesis file is setup correctly
-$BINARY validate-genesis --home $HOME_DIR
+$BINARY genesis validate-genesis --home $HOME_DIR
 
-$BINARY start --home $HOME_DIR
+$BINARY start --minimum-gas-prices="0$DENOM" --home $HOME_DIR
diff --git a/scripts/proposal.json b/scripts/proposal.json
@@ -1,7 +1,19 @@
 {
-  "title": "Community Spend: Chihuahua ... ",
-  "description": "This proposal is to request funds for ...",
-  "recipient": "migaloo1zz74g4e8mf75d7fjx8ct78k3k7vnrdc98tvy3z",
-  "amount": "1000000000uwhale",
-  "deposit": "25000000000uwhale"
+  "title": "Community Spend: Chihuhua...",
+  "metadata": "ipfs link: ..",
+  "summary": "This proposal is to request funds for ...",
+  "messages": [
+    {
+      "@type": "/cosmos.distribution.v1beta1.MsgCommunityPoolSpend",
+      "authority": "chihuahua1xcgxj7rt0xjhapvw5jcktl7ra8pjvrnjl9whkf",
+      "recipient": "chihuahua1pr9hw78fryxcjk7z6aev3pwe5lfmza6uzsx57q",
+      "amount": [
+        {
+          "denom": "uchihuahua",
+          "amount": "1000000000"
+        }
+      ]
+    }
+  ],
+  "deposit": "25000000000uchihuahua"
 }