Merge branch 'main' into update-sdk47

Makefile

@@ -250,4 +250,4 @@ stop-docker-container:
 
 mocks:
 	@echo "Regenerate mocks..."
-	@go generate ./...
+	@go generate ./...

README.md

@@ -9,6 +9,12 @@ You can check the documentation here: https://docs.neutron.org/
 
 You can check out the build instructions here: https://docs.neutron.org/neutron/build-and-run/overview
 
+## Sync and join the network
+
+```bash
+bash contrib/statesync.bash
+```
+
 ## Examples
 
 You can check out the example contracts here: https://github.com/neutron-org/neutron-contracts

buf.work.yaml

@@ -6,4 +6,4 @@
 version: v1
 directories:
   - proto
-  # - third_party/proto
+  - third_party/proto

contrib/prototools-docker/Dockerfile

@@ -39,7 +39,7 @@ RUN GO111MODULE=on go get \
 
 RUN upx --lzma /usr/local/bin/*
 
-FROM golang:1.17.3-alpine
+FROM golang:1.20.9-alpine
 ENV LD_LIBRARY_PATH=/lib64:/lib
 
 WORKDIR /work

contrib/statesync.bash

@@ -0,0 +1,73 @@
+#!/bin/bash
+# microtick and bitcanna contributed significantly here.
+# Pebbledb state sync script.
+# invoke like: bash contrib/statesync.bash
+
+## USAGE RUNDOWN
+# Not for use on live nodes
+# For use when testing.
+
+set -uxe
+
+# Set Golang environment variables.
+# ! Adapt as required, depending on your system configuration
+#export GOPATH=~/go
+#export PATH=$PATH:~/go/bin
+
+# Install with pebbledb (uncomment for incredible performance)
+#go mod edit -replace github.com/tendermint/tm-db=github.com/baabeetaa/tm-db@pebble
+#go mod tidy
+
+# go install -ldflags '-w -s -X github.com/cosmos/cosmos-sdk/types.DBBackend=pebbledb -X github.com/tendermint/tm-db.ForceSync=1' -tags pebbledb ./...
+
+# install (comment if using pebble for incredible performance)
+go install ./...
+
+
+# go install -ldflags '-w -s -X github.com/cosmos/cosmos-sdk/types.DBBackend=pebbledb -X github.com/tendermint/tm-db.ForceSync=1' -tags pebbledb ./...
+
+# NOTE: ABOVE YOU CAN USE ALTERNATIVE DATABASES, HERE ARE THE EXACT COMMANDS
+# go install -ldflags '-w -s -X github.com/cosmos/cosmos-sdk/types.DBBackend=rocksdb' -tags rocksdb ./...
+# go install -ldflags '-w -s -X github.com/cosmos/cosmos-sdk/types.DBBackend=badgerdb' -tags badgerdb ./...
+# go install -ldflags '-w -s -X github.com/cosmos/cosmos-sdk/types.DBBackend=boltdb' -tags boltdb ./...
+# go install -ldflags '-w -s -X github.com/cosmos/cosmos-sdk/types.DBBackend=pebbledb -X github.com/tendermint/tm-db.ForceSync=1' -tags pebbledb ./...
+
+
+# Initialize chain.
+neutrond init test
+
+# Get Genesis
+wget -O ~/.neutrond/config/genesis.json https://raw.githubusercontent.com/neutron-org/mainnet-assets/main/neutron-1-genesis.json
+
+
+# Get "trust_hash" and "trust_height".
+INTERVAL=100
+LATEST_HEIGHT=$(curl -s https://rpc-kralum.neutron-1.neutron.org/block | jq -r .result.block.header.height)
+BLOCK_HEIGHT=$((LATEST_HEIGHT - INTERVAL))
+TRUST_HASH=$(curl -s "https://rpc-kralum.neutron-1.neutron.org/block?height=$BLOCK_HEIGHT" | jq -r .result.block_id.hash)
+
+# Print out block and transaction hash from which to sync state.
+echo "trust_height: $BLOCK_HEIGHT"
+echo "trust_hash: $TRUST_HASH"
+
+# Export state sync variables.
+export NEUTROND_STATESYNC_ENABLE=true
+export NEUTROND_P2P_MAX_NUM_OUTBOUND_PEERS=500
+export NEUTROND_STATESYNC_RPC_SERVERS="https://rpc-kralum.neutron-1.neutron.org:443,https://rpc-kralum.neutron-1.neutron.org:443"
+export NEUTROND_STATESYNC_TRUST_HEIGHT=$BLOCK_HEIGHT
+export NEUTROND_STATESYNC_TRUST_HASH=$TRUST_HASH
+export NEUTROND_P2P_LADDR=tcp://0.0.0.0:7777
+export NEUTROND_RPC_LADDR=tcp://127.0.0.1:7711
+export NEUTROND_GRPC_ADDRESS=127.0.0.1:7712
+export NEUTROND_GRPC_WEB_ADDRESS=127.0.0.1:8014
+export NEUTROND_API_ADDRESS=tcp://127.0.0.1:8013
+export NEUTROND_NODE=tcp://127.0.0.1:8011
+export NEUTROND_P2P_MAX_NUM_INBOUND_PEERS=500
+export NEUTROND_RPC_PPROF_LADDR=127.0.0.1:6969
+
+# Fetch and set list of seeds from chain registry.
+NEUTROND_P2P_SEEDS=$(curl -s https://raw.githubusercontent.com/cosmos/chain-registry/master/neutron/chain.json | jq -r '[foreach .peers.seeds[] as $item (""; "\($item.id)@\($item.address)")] | join(",")')
+export NEUTROND_P2P_SEEDS
+
+# Start chain.
+neutrond start --x-crisis-skip-assert-invariants --iavl-disable-fastnode false 

network/init-neutrond.sh

@@ -23,6 +23,7 @@ CHAIN_DIR="$BASE_DIR/$CHAINID"
 GENESIS_PATH="$CHAIN_DIR/config/genesis.json"
 
 ADMIN_ADDRESS=$($BINARY keys show demowallet1 -a --home "$CHAIN_DIR" --keyring-backend test)
+SECOND_MULTISIG_ADDRESS=$($BINARY keys show demowallet2 -a --home "$CHAIN_DIR" --keyring-backend test)
 # MAIN_DAO
 DAO_CONTRACT=$CONTRACTS_BINARIES_DIR/cwd_core.wasm
 PRE_PROPOSAL_CONTRACT=$CONTRACTS_BINARIES_DIR/cwd_pre_propose_single.wasm
@@ -33,6 +34,9 @@ PROPOSAL_MULTIPLE_CONTRACT=$CONTRACTS_BINARIES_DIR/cwd_proposal_multiple.wasm
 VOTING_REGISTRY_CONTRACT=$CONTRACTS_BINARIES_DIR/neutron_voting_registry.wasm
 # VAULTS
 NEUTRON_VAULT_CONTRACT=$CONTRACTS_BINARIES_DIR/neutron_vault.wasm
+NEUTRON_INVESTORS_VAULT=$CONTRACTS_BINARIES_DIR/investors_vesting_vault.wasm
+# VESTING
+NEUTRON_VESTING_INVESTORS=$CONTRACTS_BINARIES_DIR/vesting_investors.wasm
 # RESERVE
 RESERVE_CONTRACT=$CONTRACTS_BINARIES_DIR/neutron_reserve.wasm
 DISTRIBUTION_CONTRACT=$CONTRACTS_BINARIES_DIR/neutron_distribution.wasm
@@ -99,6 +103,12 @@ DAO_CORE_LABEL="neutron.core"
 NEUTRON_VAULT_NAME="Neutron Vault"
 NEUTRON_VAULT_DESCRIPTION="Vault to put NTRN tokens to get voting power"
 NEUTRON_VAULT_LABEL="neutron.voting.vaults.neutron"
+NEUTRON_INVESTORS_VAULT_NAME="Neutron Investors Vault"
+NEUTRON_INVESTORS_VAULT_DESCRIPTION="Vault sourcing voting power form investors vesting"
+NEUTRON_INVESTORS_VAULT_LABEL="neutron.voting.vaults.investors"
+
+# VESTING (for tests purposes)
+NEUTRON_VESTING_INVESTORS_LABEL="neutron.vesting.investors"
 
 ## Reserve
 RESERVE_DISTRIBUTION_RATE=0
@@ -148,6 +158,9 @@ PROPOSAL_MULTIPLE_CONTRACT_BINARY_ID=$(store_binary     "$PROPOSAL_MULTIPLE_CONT
 VOTING_REGISTRY_CONTRACT_BINARY_ID=$(store_binary       "$VOTING_REGISTRY_CONTRACT")
 # VAULTS
 NEUTRON_VAULT_CONTRACT_BINARY_ID=$(store_binary         "$NEUTRON_VAULT_CONTRACT")
+NEUTRON_INVESTORS_VAULT_CONTRACT_BINARY_ID=$(store_binary "$NEUTRON_INVESTORS_VAULT")
+# VESTING
+NEUTRON_VESTING_INVESTORS_BINARY_ID=$(store_binary      "$NEUTRON_VESTING_INVESTORS")
 # RESERVE
 DISTRIBUTION_CONTRACT_BINARY_ID=$(store_binary          "$DISTRIBUTION_CONTRACT")
 RESERVE_CONTRACT_BINARY_ID=$(store_binary               "$RESERVE_CONTRACT")
@@ -177,31 +190,35 @@ INSTANCE_ID_COUNTER=1
 
 # VAULTS
 NEUTRON_VAULT_CONTRACT_ADDRESS=$(genaddr                "$NEUTRON_VAULT_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
+NEUTRON_INVESTORS_VAULT_CONTRACT_ADDRESS=$(genaddr      "$NEUTRON_INVESTORS_VAULT_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
+
+# VESTING
+NEUTRON_VESTING_INVESTORS_CONTRACT_ADDRRES=$(genaddr    "$NEUTRON_VESTING_INVESTORS_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 
 # MAIN_DAO
 DAO_CONTRACT_ADDRESS=$(genaddr                          "$DAO_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
+VOTING_REGISTRY_CONTRACT_ADDRESS=$(genaddr              "$VOTING_REGISTRY_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 PROPOSAL_SINGLE_CONTRACT_ADDRESS=$(genaddr              "$PROPOSAL_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 PRE_PROPOSAL_CONTRACT_ADDRESS=$(genaddr                 "$PRE_PROPOSAL_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 PROPOSAL_MULTIPLE_CONTRACT_ADDRESS=$(genaddr            "$PROPOSAL_MULTIPLE_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 PRE_PROPOSAL_MULTIPLE_CONTRACT_ADDRESS=$(genaddr        "$PRE_PROPOSAL_MULTIPLE_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 PROPOSAL_OVERRULE_CONTRACT_ADDRESS=$(genaddr            "$PROPOSAL_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 PRE_PROPOSAL_OVERRULE_CONTRACT_ADDRESS=$(genaddr        "$PRE_PROPOSAL_OVERRULE_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
-VOTING_REGISTRY_CONTRACT_ADDRESS=$(genaddr              "$VOTING_REGISTRY_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 
 # RESERVE
 RESERVE_CONTRACT_ADDRESS=$(genaddr                     "$RESERVE_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 DISTRIBUTION_CONTRACT_ADDRESS=$(genaddr                "$DISTRIBUTION_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 # SUBDAOS
 SECURITY_SUBDAO_CORE_CONTRACT_ADDRESS=$(genaddr        "$SUBDAO_CORE_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
-SECURITY_SUBDAO_PROPOSAL_CONTRACT_ADDRESS=$(genaddr    "$SUBDAO_PROPOSAL_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
-SECURITY_SUBDAO_PRE_PROPOSE_CONTRACT_ADDRESS=$(genaddr "$SUBDAO_PROPOSAL_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 SECURITY_SUBDAO_VOTING_CONTRACT_ADDRESS=$(genaddr      "$CW4_VOTING_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 SECURITY_SUBDAO_GROUP_CONTRACT_ADDRESS=$(genaddr       "$CW4_GROUP_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
+SECURITY_SUBDAO_PROPOSAL_CONTRACT_ADDRESS=$(genaddr    "$SUBDAO_PROPOSAL_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
+SECURITY_SUBDAO_PRE_PROPOSE_CONTRACT_ADDRESS=$(genaddr "$SUBDAO_PROPOSAL_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 GRANTS_SUBDAO_CORE_CONTRACT_ADDRESS=$(genaddr          "$SUBDAO_CORE_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
+GRANTS_SUBDAO_VOTING_CONTRACT_ADDRESS=$(genaddr        "$CW4_VOTING_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 GRANTS_SUBDAO_PROPOSAL_CONTRACT_ADDRESS=$(genaddr      "$SUBDAO_PROPOSAL_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 GRANTS_SUBDAO_PRE_PROPOSE_CONTRACT_ADDRESS=$(genaddr   "$SUBDAO_PRE_PROPOSE_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 GRANTS_SUBDAO_TIMELOCK_CONTRACT_ADDRESS=$(genaddr      "$SUBDAO_TIMELOCK_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
-GRANTS_SUBDAO_VOTING_CONTRACT_ADDRESS=$(genaddr        "$CW4_VOTING_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 GRANTS_SUBDAO_GROUP_CONTRACT_ADDRESS=$(genaddr         "$CW4_GROUP_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ ))
 
 function check_json() {
@@ -339,7 +356,8 @@ PROPOSAL_OVERRULE_INIT_MSG_BASE64=$(json_to_base64 "$PROPOSAL_OVERRULE_INIT_MSG"
 VOTING_REGISTRY_INIT_MSG='{
   "owner": "'"$DAO_CONTRACT_ADDRESS"'",
   "voting_vaults": [
-    "'"$NEUTRON_VAULT_CONTRACT_ADDRESS"'"
+    "'"$NEUTRON_VAULT_CONTRACT_ADDRESS"'",
+    "'"$NEUTRON_INVESTORS_VAULT_CONTRACT_ADDRESS"'"
   ]
 }'
 VOTING_REGISTRY_INIT_MSG_BASE64=$(json_to_base64 "$VOTING_REGISTRY_INIT_MSG")
@@ -410,6 +428,19 @@ NEUTRON_VAULT_INIT='{
   "description":  "'"$NEUTRON_VAULT_DESCRIPTION"'"
 }'
 
+NEUTRON_INVESTORS_VAULT_INIT='{
+     "vesting_contract_address": "'"$NEUTRON_VESTING_INVESTORS_CONTRACT_ADDRRES"'",
+     "owner": "'"$DAO_CONTRACT_ADDRESS"'",
+     "description": "'"$NEUTRON_INVESTORS_VAULT_DESCRIPTION"'",
+     "name": "'"$NEUTRON_INVESTORS_VAULT_NAME"'"
+}'
+
+# VESTING
+NEUTRON_VESTING_INVESTORS_INIT='{
+    "owner": "'"$ADMIN_ADDRESS"'",
+    "token_info_manager": "'"$ADMIN_ADDRESS"'"
+}'
+
 # CW4 MODULES FOR SUBDAOS
 
 CW4_VOTE_INIT_MSG='{
@@ -418,6 +449,10 @@ CW4_VOTE_INIT_MSG='{
     {
       "addr": "'"$ADMIN_ADDRESS"'",
       "weight": 1
+    },
+    {
+      "addr": "'"$SECOND_MULTISIG_ADDRESS"'",
+      "weight": 1
     }
   ]
 }'
@@ -492,12 +527,12 @@ SECURITY_SUBDAO_CORE_INIT_MSG='{
 # GRANTS_SUBDAO
 
 GRANTS_SUBDAO_TIMELOCK_INIT_MSG='{
-  "overrule_pre_propose": "'"$PROPOSAL_OVERRULE_CONTRACT_ADDRESS"'"
+  "overrule_pre_propose": "'"$PRE_PROPOSAL_OVERRULE_CONTRACT_ADDRESS"'"
 }'
 GRANTS_SUBDAO_TIMELOCK_INIT_MSG_BASE64=$(json_to_base64 "$GRANTS_SUBDAO_TIMELOCK_INIT_MSG")
 
 GRANTS_SUBDAO_PRE_PROPOSE_INIT_MSG='{
-  "open_proposal_submission": true,
+  "open_proposal_submission": false,
   "timelock_module_instantiate_info": {
     "admin": {
       "address": {
@@ -534,7 +569,7 @@ GRANTS_SUBDAO_PROPOSAL_INIT_MSG='{
    "close_proposal_on_execution_failure":false,
    "threshold":{
       "absolute_count":{
-         "threshold": "1"
+         "threshold": "2"
       }
    }
 }'
@@ -584,12 +619,14 @@ function init_contract() {
 # The following code is to add contracts instantiations messages to genesis
 # It affects the section of predicting contracts addresses at the beginning of the script
 # If you're to do any changes, please do it consistently in both sections
-init_contract "$NEUTRON_VAULT_CONTRACT_BINARY_ID"   "$NEUTRON_VAULT_INIT"             "$NEUTRON_VAULT_LABEL"
-init_contract "$DAO_CONTRACT_BINARY_ID"             "$DAO_INIT"                       "$DAO_CORE_LABEL"
-init_contract "$RESERVE_CONTRACT_BINARY_ID"         "$RESERVE_INIT"                   "$RESERVE_LABEL"
-init_contract "$DISTRIBUTION_CONTRACT_BINARY_ID"    "$DISTRIBUTION_INIT"              "$DISTRIBUTION_LABEL"
-init_contract "$SUBDAO_CORE_BINARY_ID"              "$SECURITY_SUBDAO_CORE_INIT_MSG"  "$SECURITY_SUBDAO_CORE_LABEL"
-init_contract "$SUBDAO_CORE_BINARY_ID"              "$GRANTS_SUBDAO_CORE_INIT_MSG"    "$GRANTS_SUBDAO_CORE_LABEL"
+init_contract "$NEUTRON_VAULT_CONTRACT_BINARY_ID"            "$NEUTRON_VAULT_INIT"             "$NEUTRON_VAULT_LABEL"
+init_contract "$NEUTRON_INVESTORS_VAULT_CONTRACT_BINARY_ID"  "$NEUTRON_INVESTORS_VAULT_INIT"   "$NEUTRON_INVESTORS_VAULT_LABEL"
+init_contract "$NEUTRON_VESTING_INVESTORS_BINARY_ID"         "$NEUTRON_VESTING_INVESTORS_INIT"  "$NEUTRON_VESTING_INVESTORS_LABEL"
+init_contract "$DAO_CONTRACT_BINARY_ID"                      "$DAO_INIT"                       "$DAO_CORE_LABEL"
+init_contract "$RESERVE_CONTRACT_BINARY_ID"                  "$RESERVE_INIT"                   "$RESERVE_LABEL"
+init_contract "$DISTRIBUTION_CONTRACT_BINARY_ID"             "$DISTRIBUTION_INIT"              "$DISTRIBUTION_LABEL"
+init_contract "$SUBDAO_CORE_BINARY_ID"                       "$SECURITY_SUBDAO_CORE_INIT_MSG"  "$SECURITY_SUBDAO_CORE_LABEL"
+init_contract "$SUBDAO_CORE_BINARY_ID"                       "$GRANTS_SUBDAO_CORE_INIT_MSG"    "$GRANTS_SUBDAO_CORE_LABEL"
 
 ADD_SUBDAOS_MSG='{
   "update_sub_daos": {
@@ -606,9 +643,47 @@ ADD_SUBDAOS_MSG='{
 }'
 check_json "$ADD_SUBDAOS_MSG"
 
+SET_VESTING_TOKEN_MSG='{
+    "set_vesting_token": {
+      "vesting_token": {
+         "native_token": {
+           "denom": "'"$STAKEDENOM"'"
+         }
+      }
+    }
+}'
+
+REGISTER_VESTING_ACCOUNTS_MSG='{
+  "register_vesting_accounts": {
+    "vesting_accounts": [
+      {
+        "address": "'"$ADMIN_ADDRESS"'",
+        "schedules": [
+          {
+            "end_point": {
+              "amount": "1000",
+              "time": 1814821200
+            },
+            "start_point": {
+              "amount": "0",
+              "time": 1720213200
+            }
+          }
+        ]
+      }
+    ]
+  }
+}'
+
 $BINARY add-wasm-message execute "$DAO_CONTRACT_ADDRESS" "$ADD_SUBDAOS_MSG" \
   --run-as "$DAO_CONTRACT_ADDRESS" --home "$CHAIN_DIR"
 
+$BINARY add-wasm-message execute "$NEUTRON_VESTING_INVESTORS_CONTRACT_ADDRRES" "$SET_VESTING_TOKEN_MSG" \
+  --run-as "$ADMIN_ADDRESS" --home "$CHAIN_DIR"
+
+$BINARY add-wasm-message execute "$NEUTRON_VESTING_INVESTORS_CONTRACT_ADDRRES" "$REGISTER_VESTING_ACCOUNTS_MSG" \
+  --amount 1000untrn --run-as "$ADMIN_ADDRESS" --home "$CHAIN_DIR"
+
 function set_genesis_param() {
   param_name=$1
   param_value=$2

proto/buf.lock

@@ -16,18 +16,8 @@ deps:
     repository: gogo-proto
     commit: 5e5b9fdd01804356895f8f79a6f1ddc1
     digest: shake256:0b85da49e2e5f9ebc4806eae058e2f56096ff3b1c59d1fb7c190413dd15f45dd456f0b69ced9059341c80795d2b6c943de15b120a9e0308b499e43e4b5fc2952
-  - remote: buf.build
-    owner: cosmos
-    repository: ibc
-    commit: f6d24a1cded4439f95a8069c4572f08c
-    digest: shake256:af93995752551b1b45d22b636423fb87b58e3688eb19680606d007fb2255970acf434733d7679af2c9af8e42976dc13c0650537555b7fc3ccd2e9df8fd351e45
-  - remote: buf.build
-    owner: cosmos
-    repository: ics23
-    commit: 55085f7c710a45f58fa09947208eb70b
-    digest: shake256:9bf0bc495b5a11c88d163d39ef521bc4b00bc1374a05758c91d82821bdc61f09e8c2c51dda8452529bf80137f34d852561eacbe9550a59015d51cecb0dacb628
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: cc916c31859748a68fd229a3c8d7a2e8
-    digest: shake256:469b049d0eb04203d5272062636c078decefc96fec69739159c25d85349c50c34c7706918a8b216c5c27f76939df48452148cff8c5c3ae77fa6ba5c25c1b8bf8
+    commit: 28151c0d0a1641bf938a7672c500e01d
+    digest: shake256:49215edf8ef57f7863004539deff8834cfb2195113f0b890dd1f67815d9353e28e668019165b9d872395871eeafcbab3ccfdb2b5f11734d3cca95be9e8d139de

proto/buf.yaml

@@ -5,7 +5,6 @@ deps:
   - buf.build/cosmos/cosmos-sdk:v0.47.0
   - buf.build/cosmos/gogo-proto
   - buf.build/googleapis/googleapis
-  - buf.build/cosmos/ibc
 #  - buf.build/osmosis-labs/osmosis
 breaking:
   use:

proto/neutron/contractmanager/genesis.proto

@@ -14,4 +14,4 @@ message GenesisState {
   // List of the contract failures
   repeated Failure failures_list = 2 [ (gogoproto.nullable) = false ];
   // this line is used by starport scaffolding # genesis/proto/state
-}
+}

proto/neutron/contractmanager/query.proto

@@ -16,7 +16,7 @@ service Query {
   rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
     option (google.api.http).get = "/neutron/contractmanager/params";
   }
-  
+
   // Queries a Failure by contract address and failure ID.
   rpc AddressFailure(QueryFailuresRequest) returns (QueryFailuresResponse) {
     option (google.api.http).get = "/neutron/contractmanager/failures/{address}/{failure_id}";
@@ -60,4 +60,4 @@ message QueryFailuresResponse {
   cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }
 
-// this line is used by starport scaffolding # 3
+// this line is used by starport scaffolding # 3

proto/neutron/cron/genesis.proto

@@ -13,4 +13,4 @@ message GenesisState {
   repeated Schedule scheduleList = 2 [ (gogoproto.nullable) = false ];
   Params params = 1 [ (gogoproto.nullable) = false ];
   // this line is used by starport scaffolding # genesis/proto/state
-}
+}

proto/neutron/feeburner/genesis.proto

@@ -12,6 +12,6 @@ option go_package = "github.com/neutron-org/neutron/x/feeburner/types";
 message GenesisState {
   Params params = 1 [ (gogoproto.nullable) = false ];
   TotalBurnedNeutronsAmount total_burned_neutrons_amount = 2
-      [ (gogoproto.nullable) = false ];
+  [ (gogoproto.nullable) = false ];
   // this line is used by starport scaffolding # genesis/proto/state
-}
+}