Handle non staking tokens

.github/workflows/buildtest.yaml

@@ -75,7 +75,7 @@ jobs:
     strategy:
       matrix:
         arch: [amd64]
-        targetos: [linux, windows, darwin]
+        targetos: [linux, windows]
         include:
           - targetos: darwin
             arch: arm64

.github/workflows/codeql.yml

@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.21.5
+          go-version: 1.21.7
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3

.github/workflows/golangci.yml

@@ -27,15 +27,15 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.21.x'
           cache: false
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
           # Require: The version of golangci-lint to use.
           # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
           # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
-          version: v1.55.2
+          version: v1.56.1
           args: --timeout 15m
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

.github/workflows/interchaintest.yaml

@@ -55,7 +55,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-push-image
     steps:
-      - name: Set up go 1.21
+      - name: Set up go
         uses: actions/setup-go@v5
         with:
           go-version: "1.21"
@@ -72,7 +72,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-push-image
     steps:
-      - name: Set up go 1.21
+      - name: Set up go
         uses: actions/setup-go@v5
         with:
           go-version: "1.21"
@@ -89,7 +89,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-push-image
     steps:
-      - name: Set up go 1.21
+      - name: Set up go
         uses: actions/setup-go@v5
         with:
           go-version: "1.21"

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21.5-alpine3.18 AS builder
+FROM golang:1.21.7-alpine3.19 AS builder
 RUN apk add --no-cache git musl-dev openssl-dev linux-headers ca-certificates build-base
 
 WORKDIR /src/app/
@@ -22,7 +22,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     LINK_STATICALLY=true make build
 
 # Add to a distroless container
-FROM alpine:3.18
+FROM alpine:3.19
 COPY --from=builder /src/app/build/quicksilverd /usr/local/bin/quicksilverd
 RUN adduser -S -h /quicksilver -D quicksilver -u 1000
 USER quicksilver

Dockerfile.relayer

@@ -1,4 +1,4 @@
-FROM golang:1.21.5-alpine3.18 AS builder
+FROM golang:1.21.7-alpine3.19 AS builder
 RUN apk add --no-cache make git gcc musl-dev openssl-dev linux-headers 
 
 RUN git clone https://github.com/cosmos/relayer --branch v2.1.1 /src/app

Makefile

@@ -130,7 +130,8 @@ BUILD_TARGETS := build install
 
 check_version:
 ifneq ($(GO_MINOR_VERSION),21)
-	@echo "ERROR: Go version 1.21 is required for building Quicksilver. There are consensus breaking changes between binaries compiled with different Go versions."
+	@echo "ERROR: Go version 1.21 is required for building Quicksilver. Detected version: $(GO_MAJOR_VERSION).$(GO_MINOR_VERSION). There are 
+consensus breaking changes between binaries compiled with different Go versions."
 	exit 1
 endif
 

docker-compose.yml

@@ -37,7 +37,7 @@ services:
       - start
     ports:
     - 27657:26657
-    - 23137:1317
+    - 21317:1317
   testzone1-2:
     image: quicksilverzone/testzone:latest
     hostname: testzone1-2
@@ -98,31 +98,27 @@ services:
       - osmosisd
       - start
   hermes:
-    image: quicksilverzone/hermes:v1.5.0
+    image: informalsystems/hermes:v1.8.0
     hostname: hermes
     volumes:
-      - ./data/hermes:/hermes/.hermes
+      - ./data/hermes:/home/hermes/.hermes
     command:
-      - hermes
       - start
     restart: always
-    build:
-      context: .
-      dockerfile: Dockerfile.hermes
   icq:
-    image: quicksilverzone/interchain-queries:v0.9.1
+    image: quicksilverzone/interchain-queries:v0.10.0
     volumes:
       - ./data/icq:/icq/.icq
     command:
-      - interchain-queries
+      - icq-relayer
       - run
     restart: always
   icq2:
-    image: quicksilverzone/interchain-queries:v0.9.1
+    image: quicksilverzone/interchain-queries:v0.10.0
     volumes:
       - ./data/icq2:/icq/.icq
     command:
-      - interchain-queries
+      - icq-relayer
       - run
     restart: always
   relayer:

icq-relayer/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21.5-alpine3.19 as build
+FROM golang:1.21.7-alpine3.19 as build
 
 WORKDIR /src/app
 

proto/Dockerfile

@@ -1,5 +1,5 @@
 FROM bufbuild/buf:latest as BUILDER
-FROM golang:1.21.5-alpine3.18
+FROM golang:1.21.7-alpine3.18
 
 RUN apk add --no-cache \
   nodejs \

scripts/config/hermes.toml

@@ -14,6 +14,7 @@ enabled = true
 enabled = true
 clear_interval = 100
 clear_on_start = true
+tx_confirmation = true
 
 [rest]
 enabled = true
@@ -29,7 +30,7 @@ port = 3001
 id = 'qstest-1'
 rpc_addr = 'http://quicksilver:26657'
 grpc_addr = 'http://quicksilver:9090'
-websocket_addr = 'ws://quicksilver:26657/websocket'
+event_source = { mode = "pull" }
 rpc_timeout = '10s'
 account_prefix = 'quick'
 key_name = 'testkey'
@@ -45,12 +46,14 @@ max_block_time = '10s'
 trusting_period = '3minutes'
 trust_threshold = { numerator = '1', denominator = '3' }
 address_type = { derivation = 'cosmos' }
+trusted_node = true
+sequential_batch_tx = true
 
 [[chains]]
 id = 'lstest-1'
 rpc_addr = 'http://testzone1-1:26657'
 grpc_addr = 'http://testzone1-1:9090'
-websocket_addr = 'ws://testzone1-1:26657/websocket'
+event_source = { mode = "pull" }
 rpc_timeout = '10s'
 account_prefix = 'cosmos'
 key_name = 'testkey'
@@ -66,3 +69,5 @@ max_block_time = '10s'
 trusting_period = '3minutes'
 trust_threshold = { numerator = '1', denominator = '3' }
 address_type = { derivation = 'cosmos' }
+trusted_node = true
+sequential_batch_tx = true

scripts/setup.sh

@@ -266,7 +266,7 @@ $QS1_RUN add-genesis-account ${DEMO_ADDRESS_7} 100000000000uqck
 $QS2_RUN add-genesis-account ${VAL_ADDRESS_6} 100000000000uqck
 $QS3_RUN add-genesis-account ${VAL_ADDRESS_7} 100000000000uqck
 
-$TZ1_1_RUN add-genesis-account ${VAL_ADDRESS_2} 100000000000uatom
+$TZ1_1_RUN add-genesis-account ${VAL_ADDRESS_2} 100000000000uatom,100000000uother
 $TZ1_1_RUN add-genesis-account ${VAL_ADDRESS_3} 100000000000uatom
 $TZ1_1_RUN add-genesis-account ${VAL_ADDRESS_4} 100000000000uatom
 $TZ1_1_RUN add-genesis-account ${VAL_ADDRESS_5} 100000000000uatom
@@ -475,7 +475,7 @@ if [ "$IS_MULTI_ZONE_TEST" = true ]; then
 fi
 
 ## set the 'epoch' epoch to 5m interval
-jq '.app_state.epochs.epochs = [{"identifier": "epoch","start_time": "0001-01-01T00:00:00Z","duration": "240s","current_epoch": "0","current_epoch_start_time": "0001-01-01T00:00:00Z","epoch_counting_started": false,"current_epoch_start_height": "0"}]' ./${CHAIN_DIR}/${CHAINID_0}/config/genesis.json > ./${CHAIN_DIR}/${CHAINID_0}/config/genesis.json.new && mv ./${CHAIN_DIR}/${CHAINID_0}/config/genesis.json{.new,}
+jq '.app_state.epochs.epochs = [{"identifier": "epoch","start_time": "0001-01-01T00:00:00Z","duration": "360s","current_epoch": "0","current_epoch_start_time": "0001-01-01T00:00:00Z","epoch_counting_started": false,"current_epoch_start_height": "0"},{"identifier": "day","start_time": "0001-01-01T00:00:00Z","duration": "120s","current_epoch": "0","current_epoch_start_time": "0001-01-01T00:00:00Z","epoch_counting_started": false,"current_epoch_start_height": "0"}]' ./${CHAIN_DIR}/${CHAINID_0}/config/genesis.json > ./${CHAIN_DIR}/${CHAINID_0}/config/genesis.json.new && mv ./${CHAIN_DIR}/${CHAINID_0}/config/genesis.json{.new,}
 jq '.app_state.interchainstaking.params.deposit_interval = 25' ./${CHAIN_DIR}/${CHAINID_0}/config/genesis.json > ./${CHAIN_DIR}/${CHAINID_0}/config/genesis.json.new && mv ./${CHAIN_DIR}/${CHAINID_0}/config/genesis.json{.new,}
 jq '.app_state.mint.params.epoch_identifier = "epoch"' ./${CHAIN_DIR}/${CHAINID_0}/config/genesis.json > ./${CHAIN_DIR}/${CHAINID_0}/config/genesis.json.new && mv ./${CHAIN_DIR}/${CHAINID_0}/config/genesis.json{.new,}
 jq '.app_state.gov.deposit_params.min_deposit = [{"denom": "uqck", "amount": "100"}]' ./${CHAIN_DIR}/${CHAINID_0}/config/genesis.json > ./${CHAIN_DIR}/${CHAINID_0}/config/genesis.json.new && mv ./${CHAIN_DIR}/${CHAINID_0}/config/genesis.json{.new,}

scripts/simple-test.sh

@@ -108,15 +108,32 @@ while [[ "$PERFORMANCE_ACCOUNT" == "null" ]]; do
   PERFORMANCE_ACCOUNT=$($QS1_EXEC q interchainstaking zones --output=json | jq .zones[0].performance_address.address -r)
 done
 
-$TZ1_1_EXEC tx bank send val2 $PERFORMANCE_ACCOUNT 40000uatom --chain-id $CHAINID_1 -y --keyring-backend=test
+WITHDRAWAL_ACCOUNT=$($QS1_EXEC q interchainstaking zones --output=json | jq .zones[0].withdrawal_address.address -r)
+while [[ "$WITHDRAWAL_ACCOUNT" == "null" ]]; do
+  sleep 2
+  WITHDRAWAL_ACCOUNT=$($QS1_EXEC q interchainstaking zones --output=json | jq .zones[0].withdrawal_address.address -r)
+done
+
+DELEGATE_ACCOUNT=$($QS1_EXEC q interchainstaking zones --output=json | jq .zones[0].delegation_address.address -r)
+while [[ "DELEGATE_ACCOUNT" == "null" ]]; do
+  sleep 2
+  DELEGATE_ACCOUNT=$($QS1_EXEC q interchainstaking zones --output=json | jq .zones[0].delegation_address.address -r)
+done
 
+$TZ1_1_EXEC tx bank send val2 $PERFORMANCE_ACCOUNT 40000uatom --chain-id $CHAINID_1 -y --keyring-backend=test
 sleep 3
 #$TZ1_1_EXEC tx bank send val2 $DEPOSIT_ACCOUNT 10000000${VAL_VALOPER_2}1 --chain-id $CHAINID_1 -y --keyring-backend=test
 #sleep 5
 #$TZ1_2_EXEC tx bank send val3 $DEPOSIT_ACCOUNT 15000000${VAL_VALOPER_3}2 --chain-id $CHAINID_1 -y --keyring-backend=test
 #sleep 5
 $TZ1_1_EXEC tx bank send demowallet2 $DEPOSIT_ACCOUNT 333333uatom --chain-id $CHAINID_1 -y --keyring-backend=test
 sleep 5
+$TZ1_1_EXEC tx bank send val2 $DEPOSIT_ACCOUNT 5000000uother --chain-id $CHAINID_1 -y --keyring-backend=test
+sleep 5
+$TZ1_1_EXEC tx bank send val2 $WITHDRAWAL_ACCOUNT 8000000uother --chain-id $CHAINID_1 -y --keyring-backend=test
+sleep 5
+$TZ1_1_EXEC tx bank send val2 $DELEGATE_ACCOUNT 10000000uother --chain-id $CHAINID_1 -y --keyring-backend=test
+sleep 5
 $TZ1_1_EXEC tx bank send demowallet2 $DEPOSIT_ACCOUNT 20000000uatom --chain-id $CHAINID_1 -y --keyring-backend=test --note MgTUzEjWVVYoDZBarqFL1akb38mxlgTsqdZ/sFxTJBNf+tv6rtckvn3T
 sleep 5
 $TZ1_1_EXEC tx bank send demowallet2 $DEPOSIT_ACCOUNT 33000000uatom --chain-id $CHAINID_1 -y --keyring-backend=test

scripts/vars.sh

@@ -47,7 +47,7 @@ TZ2_2_RUN="docker-compose $DC --ansi never run --rm -T testzone2-2 osmosisd"
 TZ2_3_RUN="docker-compose $DC --ansi never run --rm -T testzone2-3 osmosisd"
 TZ2_4_RUN="docker-compose $DC --ansi never run --rm -T testzone2-4 osmosisd"
 RLY_RUN="docker-compose $DC --ansi never run --rm -T relayer rly"
-HERMES_RUN="docker-compose $DC --ansi never run --rm -T hermes hermes"
+HERMES_RUN="docker-compose $DC --ansi never run --rm -T hermes"
 
 QS1_EXEC="docker-compose $DC --ansi never exec -T quicksilver quicksilverd"
 QS2_EXEC="docker-compose $DC --ansi never exec -T quicksilver2 quicksilverd"
@@ -65,8 +65,8 @@ TZ2_3_EXEC="docker-compose $DC --ansi never exec -T testzone2-3 osmosisd"
 TZ2_4_EXEC="docker-compose $DC --ansi never exec -T testzone2-4 osmosisd"
 RLY_EXEC="docker-compose $DC --ansi never exec -T relayer"
 
-ICQ_RUN="docker-compose $DC --ansi never run --rm -T icq interchain-queries"
-ICQ2_RUN="docker-compose $DC --ansi never run --rm -T icq2 interchain-queries"
+ICQ_RUN="docker-compose $DC --ansi never run --rm -T icq icq-relayer"
+ICQ2_RUN="docker-compose $DC --ansi never run --rm -T icq2 icq-relayer"
 
 VAL_MNEMONIC_1="clock post desk civil pottery foster expand merit dash seminar song memory figure uniform spice circle try happy obvious trash crime hybrid hood cushion"
 VAL_MNEMONIC_2="angry twist harsh drastic left brass behave host shove marriage fall update business leg direct reward object ugly security warm tuna model broccoli choice"

x/interchainstaking/keeper/callbacks.go

@@ -124,12 +124,12 @@
 
 	// decrement waitgroup as we have received back the query
 	// (initially incremented in AfterEpochEnd)
-	err = zone.DecrementWithdrawalWaitgroup()
+	err = zone.DecrementWithdrawalWaitgroup(k.Logger(ctx), 1, "rewards callback")
 	if err != nil {
 		return err
 	}
 
-	k.Logger(ctx).Debug("QueryDelegationRewards callback", "wg", zone.WithdrawalWaitgroup, "delegatorAddress", rewardsQuery.DelegatorAddress, "zone", query.ChainId)
+	k.Logger(ctx).Debug("QueryDelegationRewards callback", "wg", zone.GetWithdrawalWaitgroup(), "delegatorAddress", rewardsQuery.DelegatorAddress, "zone", query.ChainId)
 
 	return k.WithdrawDelegationRewardsForResponse(ctx, &zone, rewardsQuery.DelegatorAddress, args)
 }
@@ -622,7 +622,7 @@
 	}
 
 	k.Logger(ctx).Info("Received balance response for denom", "denom", coin.Denom)
-	err = zone.DecrementWithdrawalWaitgroup()
+	err = zone.DecrementWithdrawalWaitgroup(k.Logger(ctx), 1, "delegationaccountbalance callback")
 	if err != nil {
 		return err
 	}
@@ -642,6 +642,12 @@
 
 	k.SetZone(ctx, &zone)
 
+	// if token is not valid for staking, then send to withdrawal account.
+	if valid, _ := zone.ValidateCoinsForZone(sdk.NewCoins(coin), k.GetValidatorAddressesAsMap(ctx, zone.ChainId)); !valid {
+		k.Logger(ctx).Info("token is not a valid staking token, so sending to withdrawal account for disbursal", "chain", zone.ChainId, "assets", coin)
+		return k.SendToWithdrawal(ctx, &zone, zone.DelegationAddress, sdk.NewCoins(coin))
+	}
+
 	return k.FlushOutstandingDelegations(ctx, &zone, coin)
 }
 
@@ -653,7 +659,9 @@
 	result := banktypes.QueryAllBalancesResponse{}
 	k.cdc.MustUnmarshal(args, &result)
 
-	zone.WithdrawalWaitgroup--
+	if err := zone.DecrementWithdrawalWaitgroup(k.Logger(ctx), 1, "delegationaccountbalances callback"); err != nil {
+		return err
+	}
 
 	addressBytes, err := addressutils.AccAddressFromBech32(zone.DelegationAddress.Address, zone.AccountPrefix)
 	if err != nil {
@@ -677,8 +685,10 @@
 			0,
 		)
 
-		k.Logger(ctx).Info("Emitting balance request for denom", "denom", coin.Denom)
-		zone.WithdrawalWaitgroup++
+		if err = zone.IncrementWithdrawalWaitgroup(k.Logger(ctx), 1, fmt.Sprintf("delegation account balance for %s", coin.Denom)); err != nil {
+			return err
+		}
+		k.Logger(ctx).Info("Emitting balance request for denom", "denom", coin.Denom, "waitgroup", zone.GetWithdrawalWaitgroup())
 	}
 	k.SetZone(ctx, &zone)