Repository: osmosis-labs/osmosis
Pull request #5301 (2023-05-25 07:19:23)

Use IBC apps repo for AsyncICQ 
<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
v                               ✰  Thanks for creating a PR! ✰    
v    Before smashing the submit button please review the checkboxes.
v    If a checkbox is n/a - please still include it but + a little note why
v    If your PR doesn't close an issue, that's OK!  Just remove the Closes: #XXX line!
☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >  -->

closes  #5258

## What is the purpose of the change

Use IBC apps for async icq

## Testing and Verifying

No tests required, same module as before just new repo

## Documentation and Release Note

  - [ ] Does this pull request introduce a new feature or user-facing behavior changes? No
  - [ ] Changelog entry added to `Unreleased` section of `CHANGELOG.md`? No need

Where is the change documented? 
  - [ ] Specification (`x/{module}/README.md`)
  - [ ] Osmosis documentation site
  - [ ] Code comments?
  - [x] N/A


Patch:
diff --git a/Makefile b/Makefile
index d03ac729d..2718226ee 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ COMMIT := $(shell git log -1 --format='%H')
 LEDGER_ENABLED ?= true
 SDK_PACK := $(shell go list -m github.com/cosmos/cosmos-sdk | sed  's/ /\@/g')
 GO_VERSION := $(shell cat go.mod | grep -E 'go [0-9].[0-9]+' | cut -d ' ' -f 2)
-GO_MODULE := $(shell cat go.mod | grep module | cut -d ' ' -f 2)
+GO_MODULE := $(shell cat go.mod | grep "module " | cut -d ' ' -f 2)
 BUILDDIR ?= $(CURDIR)/build
 DOCKER := $(shell which docker)
 E2E_UPGRADE_VERSION := "v16"
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
index e584b4910..e2656ba7c 100644
--- a/app/keepers/keepers.go
+++ b/app/keepers/keepers.go
@@ -33,8 +33,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/upgrade"
 	upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-	icq "github.com/strangelove-ventures/async-icq/v4"
-	icqtypes "github.com/strangelove-ventures/async-icq/v4/types"
+	icq "github.com/cosmos/ibc-apps/modules/async-icq/v4"
+	icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v4/types"
 
 	downtimedetector "github.com/osmosis-labs/osmosis/v15/x/downtime-detector"
 	downtimetypes "github.com/osmosis-labs/osmosis/v15/x/downtime-detector/types"
@@ -48,6 +48,7 @@ import (
 	ibchookskeeper "github.com/osmosis-labs/osmosis/x/ibc-hooks/keeper"
 	ibchookstypes "github.com/osmosis-labs/osmosis/x/ibc-hooks/types"
 
+	icqkeeper "github.com/cosmos/ibc-apps/modules/async-icq/v4/keeper"
 	icahost "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host"
 	icahostkeeper "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/keeper"
 	icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types"
@@ -58,7 +59,6 @@ import (
 	porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types"
 	ibchost "github.com/cosmos/ibc-go/v4/modules/core/24-host"
 	ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
-	icqkeeper "github.com/strangelove-ventures/async-icq/v4/keeper"
 
 	packetforward "github.com/strangelove-ventures/packet-forward-middleware/v4/router"
 	packetforwardkeeper "github.com/strangelove-ventures/packet-forward-middleware/v4/router/keeper"
@@ -276,7 +276,7 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
 		appKeepers.IBCKeeper.ChannelKeeper,
 		&appKeepers.IBCKeeper.PortKeeper,
 		appKeepers.ScopedICQKeeper,
-		NewQuerierWrapper(bApp),
+		bApp.GRPCQueryRouter(),
 	)
 	appKeepers.ICQKeeper = &icqKeeper
 
diff --git a/app/keepers/modules.go b/app/keepers/modules.go
index c87775784..c89e91564 100644
--- a/app/keepers/modules.go
+++ b/app/keepers/modules.go
@@ -26,8 +26,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	"github.com/cosmos/cosmos-sdk/x/upgrade"
 	upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
+	icq "github.com/cosmos/ibc-apps/modules/async-icq/v4"
 	ica "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts"
-	icq "github.com/strangelove-ventures/async-icq/v4"
 
 	_ "github.com/osmosis-labs/osmosis/v15/client/docs/statik"
 	clclient "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/client"
diff --git a/app/modules.go b/app/modules.go
index 4cdcca6b1..d4088f142 100644
--- a/app/modules.go
+++ b/app/modules.go
@@ -5,7 +5,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
-	icq "github.com/strangelove-ventures/async-icq/v4"
+	icq "github.com/cosmos/ibc-apps/modules/async-icq/v4"
 
 	ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
 	ibc "github.com/cosmos/ibc-go/v4/modules/core"
@@ -20,7 +20,7 @@ import (
 	ica "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts"
 	icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types"
 
-	icqtypes "github.com/strangelove-ventures/async-icq/v4/types"
+	icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v4/types"
 
 	downtimemodule "github.com/osmosis-labs/osmosis/v15/x/downtime-detector/module"
 	downtimetypes "github.com/osmosis-labs/osmosis/v15/x/downtime-detector/types"
diff --git a/app/upgrades/v15/constants.go b/app/upgrades/v15/constants.go
index 351396832..a59f959fe 100644
--- a/app/upgrades/v15/constants.go
+++ b/app/upgrades/v15/constants.go
@@ -2,7 +2,7 @@ package v15
 
 import (
 	store "github.com/cosmos/cosmos-sdk/store/types"
-	icqtypes "github.com/strangelove-ventures/async-icq/v4/types"
+	icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v4/types"
 	packetforwardtypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types"
 
 	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
diff --git a/app/upgrades/v15/upgrades.go b/app/upgrades/v15/upgrades.go
index 3c4e59443..fb62156e2 100644
--- a/app/upgrades/v15/upgrades.go
+++ b/app/upgrades/v15/upgrades.go
@@ -12,8 +12,8 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-	icqkeeper "github.com/strangelove-ventures/async-icq/v4/keeper"
-	icqtypes "github.com/strangelove-ventures/async-icq/v4/types"
+	icqkeeper "github.com/cosmos/ibc-apps/modules/async-icq/v4/keeper"
+	icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v4/types"
 
 	"github.com/osmosis-labs/osmosis/v15/wasmbinding"
 	ibcratelimit "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit"
diff --git a/go.mod b/go.mod
index 39bc772c6..3a3b9522f 100644
--- a/go.mod
+++ b/go.mod
@@ -8,6 +8,7 @@ require (
 	github.com/cosmos/cosmos-proto v1.0.0-beta.2
 	github.com/cosmos/cosmos-sdk v0.47.2
 	github.com/cosmos/go-bip39 v1.0.0
+	github.com/cosmos/ibc-apps/modules/async-icq/v4 v4.0.0-20230524151648-c02fa46c2860
 	github.com/cosmos/ibc-go/v4 v4.3.0
 	github.com/gogo/protobuf v1.3.3
 	github.com/golang/mock v1.6.0
@@ -29,7 +30,6 @@ require (
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.15.0
-	github.com/strangelove-ventures/async-icq/v4 v4.0.0-rc0
 	github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.5
 	github.com/stretchr/testify v1.8.3
 	github.com/tendermint/tendermint v0.34.26
@@ -106,7 +106,7 @@ require (
 	github.com/bombsimon/wsl/v3 v3.4.0 // indirect
 	github.com/breml/bidichk v0.2.4 // indirect
 	github.com/breml/errchkjson v0.3.1 // indirect
-	github.com/btcsuite/btcd v0.22.2 // indirect
+	github.com/btcsuite/btcd v0.22.3 // indirect
 	github.com/butuzov/ireturn v0.1.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
@@ -329,5 +329,4 @@ replace (
 	github.com/tendermint/tendermint => github.com/informalsystems/tendermint v0.34.24
 	// use grpc compatible with cosmos protobufs
 	google.golang.org/grpc => google.golang.org/grpc v1.33.2
-
 )
diff --git a/go.sum b/go.sum
index 20a2215dc..df7c571ee 100644
--- a/go.sum
+++ b/go.sum
@@ -166,8 +166,8 @@ github.com/btcsuite/btcd v0.0.0-20190315201642-aa6e0f35703c/go.mod h1:DrZx5ec/dm
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btcd v0.21.0-beta.0.20201114000516-e9c7a5ac6401/go.mod h1:Sv4JPQ3/M+teHz9Bo5jBpkNcP0x6r7rdihlNL/7tTAs=
 github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y=
-github.com/btcsuite/btcd v0.22.2 h1:vBZ+lGGd1XubpOWO67ITJpAEsICWhA0YzqkcpkgNBfo=
-github.com/btcsuite/btcd v0.22.2/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y=
+github.com/btcsuite/btcd v0.22.3 h1:kYNaWFvOw6xvqP0vR20RP1Zq1DVMBxEO8QN5d1/EfNg=
+github.com/btcsuite/btcd v0.22.3/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y=
 github.com/btcsuite/btcd/btcec/v2 v2.1.2/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
 github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
@@ -252,6 +252,8 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4
 github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw=
 github.com/cosmos/iavl v0.19.4 h1:t82sN+Y0WeqxDLJRSpNd8YFX5URIrT+p8n6oJbJ2Dok=
 github.com/cosmos/iavl v0.19.4/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw=
+github.com/cosmos/ibc-apps/modules/async-icq/v4 v4.0.0-20230524151648-c02fa46c2860 h1:25/KpA4WJqdFjKFsa3VEL0ctWRovkEsqIn2phCAi9v0=
+github.com/cosmos/ibc-apps/modules/async-icq/v4 v4.0.0-20230524151648-c02fa46c2860/go.mod h1:X/dLZ6QxTImzno7qvD6huLhh6ZZBcRt2URn4YCLcXFY=
 github.com/cosmos/ibc-go/v4 v4.3.0 h1:yOzVsyZzsv4XPBux8gq+D0LhZn45yGWKjvT+6Vyo5no=
 github.com/cosmos/ibc-go/v4 v4.3.0/go.mod h1:CcLvIoi9NNtIbNsxs4KjBGjYhlwqtsmXy1AKARKiMzQ=
 github.com/cosmos/interchain-accounts v0.2.6 h1:TV2M2g1/Rb9MCNw1YePdBKE0rcEczNj1RGHT+2iRYas=
@@ -1135,8 +1137,6 @@ github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRk
 github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
 github.com/stbenjam/no-sprintf-host-port v0.1.1 h1:tYugd/yrm1O0dV+ThCbaKZh195Dfm07ysF0U6JQXczc=
 github.com/stbenjam/no-sprintf-host-port v0.1.1/go.mod h1:TLhvtIvONRzdmkFiio4O8LHsN9N74I+PhRquPsxpL0I=
-github.com/strangelove-ventures/async-icq/v4 v4.0.0-rc0 h1:foE/5O2/XiqGsdTKx3R0BTfKgW9KnUYyQLZt0WFSesE=
-github.com/strangelove-ventures/async-icq/v4 v4.0.0-rc0/go.mod h1:thzXHoaK1MgPDCjN7Rp9A/VcHA4cmjQpKCtVNt2O2xk=
 github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.5 h1:KKUqeGhVBK38+1LwThC8IeIcsJZ6COX5kvhiJroFqCM=
 github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.5/go.mod h1:4zAtg449/JISRmf+sbmqolqSLP+QJBh+EtWkWtt/AKE=
 github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
diff --git a/proto/osmosis/concentrated-liquidity/query.proto b/proto/osmosis/concentrated-liquidity/query.proto
index e3d0c779c..f034cd25f 100644
--- a/proto/osmosis/concentrated-liquidity/query.proto
+++ b/proto/osmosis/concentrated-liquidity/query.proto
@@ -118,11 +118,7 @@ message TickLiquidityNet {
     (gogoproto.moretags) = "yaml:\"liquidity_net\"",
     (gogoproto.nullable) = false
   ];
-  string tick_index = 2 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
-    (gogoproto.moretags) = "yaml:\"tick\"",
-    (gogoproto.nullable) = false
-  ];
+  int64 tick_index = 2 [ (gogoproto.moretags) = "yaml:\"tick_index\"" ];
 }
 
 message LiquidityDepthWithRange {
diff --git a/x/concentrated-liquidity/client/queryproto/query.pb.go b/x/concentrated-liquidity/client/queryproto/query.pb.go
index b70b96ecb..ccacad5c0 100644
--- a/x/concentrated-liquidity/client/queryproto/query.pb.go
+++ b/x/concentrated-liquidity/client/queryproto/query.pb.go
@@ -405,7 +405,7 @@ func (m *ParamsResponse) GetParams() types1.Params {
 
 type TickLiquidityNet struct {
 	LiquidityNet github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=liquidity_net,json=liquidityNet,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"liquidity_net" yaml:"liquidity_net"`
-	TickIndex    github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=tick_index,json=tickIndex,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"tick_index" yaml:"tick"`
+	TickIndex    int64                                  `protobuf:"varint,2,opt,name=tick_index,json=tickIndex,proto3" json:"tick_index,omitempty" yaml:"tick_index"`
 }
 
 func (m *TickLiquidityNet) Reset()         { *m = TickLiquidityNet{} }
@@ -441,6 +441,13 @@ func (m *TickLiquidityNet) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_TickLiquidityNet proto.InternalMessageInfo
 
+func (m *TickLiquidityNet) GetTickIndex() int64 {
+	if m != nil {
+		return m.TickIndex
+	}
+	return 0
+}
+
 type LiquidityDepthWithRange struct {
 	LiquidityAmount github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=liquidity_amount,json=liquidityAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"liquidity_amount" yaml:"liquidity_net"`
 	LowerTick       github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=lower_tick,json=lowerTick,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"lower_tick" yaml:"tick"`
@@ -919,97 +926,97 @@ func init() {
 }
 
 var fileDescriptor_5c83e18b11fd607d = []byte{
-	// 1434 bytes of a gzipped FileDescriptorProto
+	// 1437 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4f, 0x6f, 0x1b, 0x45,
 	0x14, 0xcf, 0x3a, 0x4d, 0x5a, 0x4f, 0xe2, 0xfe, 0x99, 0x38, 0x34, 0x75, 0x5b, 0xbb, 0x0c, 0x6a,
 	0x89, 0xda, 0x66, 0x57, 0x6d, 0x13, 0x55, 0xf4, 0x0f, 0x28, 0x76, 0x48, 0x65, 0x8a, 0x42, 0x58,
 	0x11, 0x90, 0x10, 0xd2, 0x6a, 0xbd, 0x3b, 0x71, 0x46, 0xb1, 0x67, 0x9c, 0xdd, 0xd9, 0xb6, 0x16,
-	0xe2, 0x42, 0x85, 0xc4, 0xad, 0x48, 0x7c, 0x08, 0x38, 0x70, 0xe4, 0x33, 0xa0, 0xc2, 0x01, 0x55,
-	0xe2, 0x82, 0x90, 0x30, 0xd0, 0x72, 0xe3, 0x66, 0xbe, 0x00, 0xda, 0xd9, 0x99, 0xdd, 0xb5, 0xeb,
-	0x28, 0x76, 0x12, 0x4e, 0xde, 0xd9, 0xf7, 0xde, 0xef, 0xf7, 0x7e, 0x6f, 0xdf, 0xfc, 0x33, 0xb8,
-	0xcc, 0xfc, 0x26, 0xf3, 0x89, 0x6f, 0x38, 0x8c, 0x3a, 0x98, 0x72, 0xcf, 0xe6, 0xd8, 0x5d, 0x68,
-	0x90, 0x9d, 0x80, 0xb8, 0x84, 0xb7, 0x8d, 0x9d, 0x00, 0x7b, 0x6d, 0xbd, 0xe5, 0x31, 0xce, 0xe0,
-	0x45, 0xe9, 0xab, 0xa7, 0x7d, 0x63, 0x57, 0xfd, 0xc1, 0xb5, 0x1a, 0xe6, 0xf6, 0xb5, 0x42, 0xbe,
-	0xce, 0xea, 0x4c, 0x44, 0x18, 0xe1, 0x53, 0x14, 0x5c, 0xb8, 0xb2, 0x07, 0x51, 0xcb, 0xf6, 0xec,
-	0xa6, 0x2f, 0x9d, 0x8b, 0x8e, 0xf0, 0x36, 0x6a, 0xb6, 0x8f, 0x0d, 0x89, 0x6b, 0x38, 0x8c, 0x50,
-	0x69, 0xbf, 0x9c, 0xb6, 0x8b, 0x14, 0x63, 0xaf, 0x96, 0x5d, 0x27, 0xd4, 0xe6, 0x84, 0x29, 0xdf,
-	0x73, 0x75, 0xc6, 0xea, 0x0d, 0x6c, 0xd8, 0x2d, 0x62, 0xd8, 0x94, 0x32, 0x2e, 0x8c, 0x8a, 0xe9,
-	0x8c, 0xb4, 0x8a, 0x51, 0x2d, 0xd8, 0x34, 0x6c, 0xda, 0x56, 0xa6, 0x88, 0xc4, 0x8a, 0xa4, 0x44,
-	0x03, 0x69, 0x2a, 0xf5, 0x47, 0x71, 0xd2, 0xc4, 0x3e, 0xb7, 0x9b, 0x2d, 0x25, 0xa0, 0xdf, 0xc1,
-	0x0d, 0xbc, 0x74, 0x52, 0x0b, 0x7b, 0x55, 0x83, 0xf9, 0x24, 0x71, 0x47, 0x3b, 0x20, 0xbf, 0xe1,
-	0x63, 0x6f, 0x5d, 0xbe, 0xf5, 0x4d, 0xbc, 0x13, 0x60, 0x9f, 0xc3, 0xab, 0xe0, 0xa8, 0xed, 0xba,
-	0x1e, 0xf6, 0xfd, 0x39, 0xed, 0x82, 0x36, 0x9f, 0x2d, 0xc3, 0x6e, 0xa7, 0x74, 0xbc, 0x6d, 0x37,
-	0x1b, 0xb7, 0x90, 0x34, 0x20, 0x53, 0xb9, 0xc0, 0x2b, 0xe0, 0x68, 0x8b, 0xb1, 0x86, 0x45, 0xdc,
-	0xb9, 0xcc, 0x05, 0x6d, 0xfe, 0x48, 0xda, 0x5b, 0x1a, 0x90, 0x39, 0x19, 0x3e, 0x55, 0x5d, 0xf4,
-	0xa5, 0x06, 0x66, 0xfb, 0x38, 0xfd, 0x16, 0xa3, 0x3e, 0x86, 0x0c, 0x64, 0x55, 0x7a, 0x21, 0xed,
-	0xf8, 0xfc, 0xd4, 0xf5, 0xfb, 0xfa, 0x50, 0xad, 0xa1, 0x2b, 0xb0, 0x8f, 0x08, 0xdf, 0xda, 0xa0,
-	0x2e, 0xf6, 0x1a, 0x6d, 0x42, 0xeb, 0xcb, 0xbe, 0x8f, 0x79, 0xd9, 0xc3, 0xf6, 0xb6, 0xcb, 0x1e,
-	0xd2, 0xf2, 0x91, 0xa7, 0x9d, 0xd2, 0x98, 0x99, 0x70, 0xa0, 0x35, 0x30, 0xa3, 0x02, 0xcb, 0xed,
-	0xaa, 0xab, 0xc4, 0xdf, 0x04, 0x53, 0xca, 0x27, 0x94, 0xa4, 0x09, 0x49, 0xaf, 0x74, 0x3b, 0x25,
-	0xa8, 0x24, 0xc5, 0x46, 0x64, 0x02, 0x35, 0xaa, 0xba, 0xe8, 0x0b, 0x0d, 0xe4, 0x7b, 0x01, 0xa5,
-	0xb2, 0x26, 0x38, 0xa6, 0xdc, 0x04, 0xdc, 0xff, 0x22, 0x2c, 0xa6, 0x40, 0x1f, 0x82, 0xe9, 0x75,
-	0xc6, 0x1a, 0xf1, 0xd7, 0x5c, 0x05, 0x20, 0xe9, 0x5e, 0xf1, 0x89, 0xa6, 0xae, 0x5f, 0xd2, 0x65,
-	0xe3, 0x85, 0xad, 0xae, 0x47, 0xb3, 0x31, 0x26, 0xb5, 0xeb, 0x58, 0xc6, 0x9a, 0xa9, 0x48, 0xf4,
-	0x44, 0x03, 0x39, 0x09, 0x2c, 0x85, 0x2d, 0x81, 0x89, 0xf0, 0xb3, 0xaa, 0xcf, 0x95, 0xd7, 0xa3,
-	0xf6, 0xd4, 0x55, 0x7b, 0xea, 0xcb, 0xb4, 0x5d, 0xce, 0xfe, 0xf4, 0xfd, 0xc2, 0x44, 0x18, 0x57,
-	0x35, 0x23, 0x6f, 0x78, 0x6f, 0x40, 0x42, 0xaf, 0xef, 0x99, 0x50, 0xc4, 0xd9, 0x93, 0xd1, 0x09,
-	0x90, 0x5b, 0x17, 0xf3, 0x5b, 0xa6, 0x8b, 0x36, 0xc0, 0x71, 0xf5, 0x42, 0xa6, 0x58, 0x01, 0x93,
-	0xd1, 0x12, 0x20, 0x2b, 0x7f, 0x71, 0x8f, 0xca, 0x47, 0xe1, 0xb2, 0xa6, 0x32, 0x14, 0xfd, 0xae,
-	0x81, 0x93, 0x1f, 0x10, 0x67, 0xfb, 0x5d, 0xe5, 0xb6, 0x86, 0x39, 0xdc, 0x06, 0xb9, 0x38, 0xcc,
-	0xa2, 0x98, 0xcb, 0xa9, 0xb2, 0x1a, 0x46, 0xfe, 0xd6, 0x29, 0x5d, 0xaa, 0x13, 0xbe, 0x15, 0xd4,
-	0x74, 0x87, 0x35, 0xe5, 0x24, 0x97, 0x3f, 0x0b, 0xbe, 0xbb, 0x6d, 0xf0, 0x76, 0x0b, 0xfb, 0xfa,
-	0x0a, 0x76, 0xba, 0x9d, 0x52, 0x3e, 0xea, 0xab, 0x1e, 0x30, 0x64, 0x4e, 0x37, 0xd2, 0x64, 0x9f,
-	0x00, 0xc0, 0x89, 0xb3, 0x6d, 0x11, 0xea, 0xe2, 0x47, 0xa2, 0x64, 0xd9, 0xf2, 0xdd, 0x11, 0x98,
-	0xaa, 0x94, 0x77, 0x3b, 0xa5, 0xa9, 0x88, 0x29, 0x44, 0x42, 0x66, 0x36, 0xfc, 0xa9, 0x86, 0x78,
-	0xe8, 0x69, 0x06, 0x9c, 0x8e, 0xb5, 0xad, 0xe0, 0x16, 0xdf, 0x0a, 0x1b, 0xce, 0xb4, 0x69, 0x1d,
-	0xc3, 0x1d, 0x70, 0x32, 0xc9, 0xcc, 0x6e, 0xb2, 0x80, 0x1e, 0xb6, 0xd2, 0x13, 0xf1, 0x78, 0x59,
-	0xc0, 0x87, 0x62, 0x1b, 0xec, 0x21, 0xf6, 0xac, 0x30, 0xc3, 0x43, 0x12, 0x2b, 0x00, 0xc3, 0x6f,
-	0x18, 0xa2, 0x07, 0xad, 0x96, 0x42, 0x1f, 0x3f, 0x14, 0x74, 0x01, 0x18, 0xa2, 0xa3, 0x3f, 0x32,
-	0xa0, 0x98, 0x6e, 0x93, 0x2a, 0x5d, 0x21, 0x1e, 0x76, 0xc2, 0x76, 0x55, 0xf3, 0x31, 0xb5, 0x5e,
-	0x6a, 0x7b, 0xad, 0x97, 0x50, 0x07, 0xc7, 0x38, 0xdb, 0xc6, 0xd4, 0x22, 0x54, 0x56, 0x62, 0xa6,
-	0xdb, 0x29, 0x9d, 0x90, 0xec, 0xd2, 0x82, 0xcc, 0xa3, 0xe2, 0xb1, 0x4a, 0xe1, 0x22, 0x00, 0x3e,
-	0xb7, 0x3d, 0x9e, 0xa8, 0x1b, 0x2f, 0xcf, 0x76, 0x3b, 0xa5, 0x53, 0x51, 0x44, 0x62, 0x43, 0x66,
-	0x56, 0x0c, 0x44, 0x4d, 0xde, 0x00, 0xd3, 0x81, 0x8f, 0x2d, 0x27, 0x90, 0x55, 0x39, 0x72, 0x41,
-	0x9b, 0x3f, 0x56, 0x3e, 0xdd, 0xed, 0x94, 0x66, 0xa2, 0xb8, 0xb4, 0x15, 0x99, 0x20, 0xf0, 0x71,
-	0x25, 0x88, 0xca, 0xb9, 0x08, 0x40, 0x8d, 0x05, 0xd4, 0x8d, 0x02, 0x27, 0xfa, 0x09, 0x13, 0x1b,
-	0x32, 0xb3, 0x62, 0x90, 0x26, 0xa4, 0xcc, 0x12, 0xef, 0xe6, 0x26, 0x07, 0x11, 0x2a, 0x6b, 0x44,
-	0xb8, 0xc6, 0xca, 0x62, 0xf0, 0x4d, 0x06, 0x94, 0x76, 0xad, 0xb0, 0x9c, 0xf5, 0x5b, 0xe9, 0xa6,
-	0x75, 0xc3, 0x86, 0x56, 0x6b, 0xd4, 0xcd, 0x21, 0x57, 0xde, 0xfe, 0xe9, 0x2e, 0x57, 0x84, 0xa4,
-	0x57, 0xc5, 0x34, 0xf1, 0xe1, 0xab, 0x60, 0xda, 0x09, 0x3c, 0x0f, 0x53, 0x9e, 0x74, 0xeb, 0xb8,
-	0x39, 0x25, 0xdf, 0x09, 0xad, 0x0f, 0xc1, 0x29, 0xe5, 0x12, 0x47, 0xcb, 0xbe, 0x7b, 0x67, 0xe4,
-	0x29, 0x34, 0x17, 0x95, 0xe7, 0x25, 0x40, 0x64, 0x9e, 0x94, 0xef, 0xe2, 0xac, 0xd1, 0x7d, 0x70,
-	0x2e, 0x1e, 0xac, 0x47, 0xfd, 0x29, 0xe6, 0xf4, 0x7e, 0x1a, 0x11, 0x3d, 0xd6, 0xc0, 0xf9, 0x5d,
-	0xd0, 0x64, 0xd1, 0x6b, 0x20, 0x9b, 0xe8, 0x8b, 0xaa, 0xfd, 0xe6, 0x90, 0xd5, 0xde, 0x65, 0xf1,
-	0x51, 0x7b, 0x76, 0xa2, 0xf2, 0x3d, 0x90, 0xaf, 0x34, 0x6c, 0xd2, 0xb4, 0x6b, 0x0d, 0xbc, 0x8a,
-	0xb1, 0x7f, 0xe0, 0x4d, 0xfb, 0x11, 0x98, 0xed, 0x03, 0x94, 0x6a, 0x2c, 0x70, 0xdc, 0x51, 0x06,
-	0x6b, 0x13, 0x63, 0xd5, 0x40, 0x67, 0x7a, 0x36, 0x2a, 0x25, 0xa0, 0xc2, 0x08, 0x2d, 0x9f, 0x0f,
-	0xb3, 0xed, 0x76, 0x4a, 0xb3, 0xf2, 0x1b, 0xf5, 0x84, 0x23, 0x33, 0xe7, 0xa4, 0x89, 0xd0, 0x06,
-	0x28, 0xc4, 0xcc, 0x55, 0x51, 0x1c, 0xf2, 0xe0, 0x10, 0x04, 0x3d, 0xce, 0x80, 0xb3, 0x03, 0x71,
-	0xa5, 0xae, 0x1d, 0x90, 0x4f, 0x12, 0x23, 0xb1, 0x7d, 0x6f, 0x75, 0xaf, 0x49, 0x75, 0x67, 0xfb,
-	0xd5, 0x25, 0x20, 0xc8, 0x9c, 0x71, 0x5e, 0xa6, 0x0e, 0x29, 0x37, 0x99, 0xb7, 0x89, 0x09, 0xc7,
-	0x6e, 0x9a, 0x32, 0x33, 0x22, 0xe5, 0x20, 0x10, 0x64, 0xce, 0xc4, 0xaf, 0x13, 0xca, 0xeb, 0x4f,
-	0x72, 0x60, 0xe2, 0xfd, 0xf0, 0x10, 0x01, 0xbf, 0xd5, 0x80, 0x38, 0x7d, 0xf8, 0xf0, 0xc6, 0xd0,
-	0x87, 0xae, 0xe4, 0xf0, 0x54, 0x58, 0x1c, 0x2d, 0x28, 0x2a, 0x32, 0x5a, 0xfc, 0xfc, 0x97, 0xbf,
-	0xbf, 0xce, 0xe8, 0xf0, 0xaa, 0x31, 0xe8, 0x40, 0x9e, 0x9c, 0xc7, 0xe3, 0xdb, 0x85, 0x48, 0xf0,
-	0x3b, 0x0d, 0x4c, 0x46, 0xe7, 0x0f, 0x38, 0x34, 0x6d, 0xfa, 0xf8, 0x53, 0x58, 0x1a, 0x31, 0x4a,
-	0x66, 0xbb, 0x24, 0xb2, 0x35, 0xe0, 0xc2, 0xb0, 0xd9, 0x46, 0x39, 0xfe, 0xac, 0x81, 0x5c, 0xcf,
-	0x51, 0x1e, 0xde, 0x1e, 0x92, 0x7f, 0xd0, 0xa5, 0xa3, 0x70, 0x67, 0x7f, 0xc1, 0x52, 0x43, 0x59,
-	0x68, 0xb8, 0x03, 0x6f, 0x0d, 0x5d, 0x71, 0x89, 0x60, 0x7c, 0x2a, 0xef, 0x31, 0x9f, 0xc1, 0x7f,
-	0x34, 0x30, 0x3b, 0x70, 0x89, 0x83, 0x95, 0x51, 0xd7, 0xb1, 0x01, 0xcb, 0x6d, 0x61, 0xe5, 0x60,
-	0x20, 0x52, 0xe8, 0x3d, 0x21, 0x74, 0x19, 0xbe, 0x35, 0xa4, 0xd0, 0x64, 0x1f, 0x54, 0x67, 0x1e,
-	0xcb, 0x13, 0x9a, 0xfe, 0xd5, 0x52, 0x87, 0xbe, 0xde, 0x7d, 0x14, 0xbe, 0x3d, 0x6a, 0xaa, 0x03,
-	0x4f, 0x3a, 0x85, 0xd5, 0x83, 0xc2, 0x48, 0xcd, 0x55, 0xa1, 0xb9, 0x02, 0x97, 0x47, 0xd6, 0x4c,
-	0x31, 0xb7, 0x08, 0xb5, 0xdc, 0x58, 0xd9, 0x8f, 0x1a, 0xc8, 0xf5, 0x2c, 0xf8, 0x43, 0x37, 0xed,
-	0xa0, 0x7d, 0x67, 0xe8, 0xa6, 0x1d, 0xb8, 0xc7, 0xa0, 0xbb, 0x42, 0xd7, 0x4d, 0xb8, 0x34, 0xa4,
-	0xae, 0xde, 0x1d, 0x05, 0xfe, 0xa5, 0x81, 0x99, 0x01, 0x4b, 0x3d, 0x5c, 0x1e, 0x35, 0xa9, 0x97,
-	0xb6, 0x9f, 0x42, 0xf9, 0x20, 0x10, 0x52, 0x5d, 0x45, 0xa8, 0xbb, 0x0b, 0x6f, 0x8f, 0xac, 0x2e,
-	0x59, 0xde, 0xe1, 0x0f, 0x5a, 0x78, 0x9b, 0x4d, 0x2e, 0xd5, 0xf0, 0xd6, 0x88, 0x57, 0xe7, 0xd4,
-	0xd5, 0xbe, 0x70, 0x7b, 0x5f, 0xb1, 0xfb, 0xfc, 0x58, 0xf1, 0x0e, 0x5d, 0x6b, 0x5b, 0xc4, 0x2d,
-	0x6f, 0x3d, 0x7d, 0x5e, 0xd4, 0x9e, 0x3d, 0x2f, 0x6a, 0x7f, 0x3e, 0x2f, 0x6a, 0x5f, 0xbd, 0x28,
-	0x8e, 0x3d, 0x7b, 0x51, 0x1c, 0xfb, 0xf5, 0x45, 0x71, 0xec, 0xe3, 0xb5, 0xd4, 0xe1, 0x4f, 0x42,
-	0x2f, 0x34, 0xec, 0x9a, 0x1f, 0xf3, 0x3c, 0xb8, 0xb6, 0x64, 0x3c, 0xda, 0xed, 0x2f, 0x1d, 0xa7,
-	0x41, 0x30, 0xe5, 0xd1, 0xbf, 0x55, 0xd1, 0xbd, 0x7b, 0x52, 0xfc, 0xdc, 0xf8, 0x2f, 0x00, 0x00,
-	0xff, 0xff, 0xad, 0x5e, 0x43, 0x48, 0x84, 0x13, 0x00, 0x00,
+	0xe2, 0x42, 0x85, 0xc4, 0xad, 0x48, 0x7c, 0x08, 0x38, 0x70, 0x84, 0xaf, 0x80, 0x0a, 0x07, 0x54,
+	0x89, 0x0b, 0xe2, 0x60, 0xa0, 0xe5, 0xc6, 0xcd, 0x7c, 0x01, 0xb4, 0xb3, 0x33, 0xbb, 0x6b, 0xd7,
+	0x51, 0xec, 0x24, 0x9c, 0xbc, 0x33, 0xef, 0xcf, 0xef, 0xfd, 0xde, 0xbc, 0x99, 0x79, 0x63, 0x70,
+	0x99, 0xf9, 0x4d, 0xe6, 0x13, 0xdf, 0x70, 0x18, 0x75, 0x30, 0xe5, 0x9e, 0xcd, 0xb1, 0xbb, 0xd0,
+	0x20, 0x3b, 0x01, 0x71, 0x09, 0x6f, 0x1b, 0x3b, 0x01, 0xf6, 0xda, 0x7a, 0xcb, 0x63, 0x9c, 0xc1,
+	0x8b, 0x52, 0x57, 0x4f, 0xeb, 0xc6, 0xaa, 0xfa, 0x83, 0x6b, 0x35, 0xcc, 0xed, 0x6b, 0x85, 0x7c,
+	0x9d, 0xd5, 0x99, 0xb0, 0x30, 0xc2, 0xaf, 0xc8, 0xb8, 0x70, 0x65, 0x0f, 0xa0, 0x96, 0xed, 0xd9,
+	0x4d, 0x5f, 0x2a, 0x17, 0x1d, 0xa1, 0x6d, 0xd4, 0x6c, 0x1f, 0x1b, 0xd2, 0xaf, 0xe1, 0x30, 0x42,
+	0xa5, 0xfc, 0x72, 0x5a, 0x2e, 0x42, 0x8c, 0xb5, 0x5a, 0x76, 0x9d, 0x50, 0x9b, 0x13, 0xa6, 0x74,
+	0xcf, 0xd5, 0x19, 0xab, 0x37, 0xb0, 0x61, 0xb7, 0x88, 0x61, 0x53, 0xca, 0xb8, 0x10, 0x2a, 0xa4,
+	0x33, 0x52, 0x2a, 0x46, 0xb5, 0x60, 0xd3, 0xb0, 0x69, 0x5b, 0x89, 0x22, 0x10, 0x2b, 0xa2, 0x12,
+	0x0d, 0xa4, 0xa8, 0xd4, 0x6f, 0xc5, 0x49, 0x13, 0xfb, 0xdc, 0x6e, 0xb6, 0x14, 0x81, 0x7e, 0x05,
+	0x37, 0xf0, 0xd2, 0x41, 0x2d, 0xec, 0x95, 0x0d, 0xe6, 0x93, 0x44, 0x1d, 0xed, 0x80, 0xfc, 0x86,
+	0x8f, 0xbd, 0x75, 0x39, 0xeb, 0x9b, 0x78, 0x27, 0xc0, 0x3e, 0x87, 0x57, 0xc1, 0x51, 0xdb, 0x75,
+	0x3d, 0xec, 0xfb, 0x73, 0xda, 0x05, 0x6d, 0x3e, 0x5b, 0x86, 0xdd, 0x4e, 0xe9, 0x78, 0xdb, 0x6e,
+	0x36, 0x6e, 0x21, 0x29, 0x40, 0xa6, 0x52, 0x81, 0x57, 0xc0, 0xd1, 0x16, 0x63, 0x0d, 0x8b, 0xb8,
+	0x73, 0x99, 0x0b, 0xda, 0xfc, 0x91, 0xb4, 0xb6, 0x14, 0x20, 0x73, 0x32, 0xfc, 0xaa, 0xba, 0xe8,
+	0x4b, 0x0d, 0xcc, 0xf6, 0x61, 0xfa, 0x2d, 0x46, 0x7d, 0x0c, 0x19, 0xc8, 0xaa, 0xf0, 0x42, 0xd8,
+	0xf1, 0xf9, 0xa9, 0xeb, 0xf7, 0xf5, 0xa1, 0x4a, 0x43, 0x57, 0xce, 0x3e, 0x22, 0x7c, 0x6b, 0x83,
+	0xba, 0xd8, 0x6b, 0xb4, 0x09, 0xad, 0x2f, 0xfb, 0x3e, 0xe6, 0x65, 0x0f, 0xdb, 0xdb, 0x2e, 0x7b,
+	0x48, 0xcb, 0x47, 0x9e, 0x76, 0x4a, 0x63, 0x66, 0x82, 0x81, 0xd6, 0xc0, 0x8c, 0x32, 0x2c, 0xb7,
+	0xab, 0xae, 0x22, 0x7f, 0x13, 0x4c, 0x29, 0x9d, 0x90, 0x92, 0x26, 0x28, 0xbd, 0xd2, 0xed, 0x94,
+	0xa0, 0xa2, 0x14, 0x0b, 0x91, 0x09, 0xd4, 0xa8, 0xea, 0xa2, 0x2f, 0x34, 0x90, 0xef, 0x75, 0x28,
+	0x99, 0x35, 0xc1, 0x31, 0xa5, 0x26, 0xdc, 0xfd, 0x2f, 0xc4, 0x62, 0x08, 0xf4, 0x21, 0x98, 0x5e,
+	0x67, 0xac, 0x11, 0xaf, 0xe6, 0x2a, 0x00, 0x49, 0xf5, 0x8a, 0x25, 0x9a, 0xba, 0x7e, 0x49, 0x97,
+	0x85, 0x17, 0x96, 0xba, 0x1e, 0xed, 0xc6, 0x18, 0xd4, 0xae, 0x63, 0x69, 0x6b, 0xa6, 0x2c, 0xd1,
+	0x13, 0x0d, 0xe4, 0xa4, 0x63, 0x49, 0x6c, 0x09, 0x4c, 0x84, 0xcb, 0xaa, 0x96, 0x2b, 0xaf, 0x47,
+	0xe5, 0xa9, 0xab, 0xf2, 0xd4, 0x97, 0x69, 0xbb, 0x9c, 0xfd, 0xf9, 0xfb, 0x85, 0x89, 0xd0, 0xae,
+	0x6a, 0x46, 0xda, 0xf0, 0xde, 0x80, 0x80, 0x5e, 0xdf, 0x33, 0xa0, 0x08, 0xb3, 0x27, 0xa2, 0x13,
+	0x20, 0xb7, 0x2e, 0xf6, 0xb7, 0x0c, 0x17, 0x6d, 0x80, 0xe3, 0x6a, 0x42, 0x86, 0x58, 0x01, 0x93,
+	0xd1, 0x11, 0x20, 0x33, 0x7f, 0x71, 0x8f, 0xcc, 0x47, 0xe6, 0x32, 0xa7, 0xd2, 0x14, 0xfd, 0xa0,
+	0x81, 0x93, 0x1f, 0x10, 0x67, 0xfb, 0x5d, 0xa5, 0xb6, 0x86, 0x39, 0xdc, 0x06, 0xb9, 0xd8, 0xcc,
+	0xa2, 0x98, 0xcb, 0xad, 0xb2, 0x1a, 0x5a, 0xfe, 0xde, 0x29, 0x5d, 0xaa, 0x13, 0xbe, 0x15, 0xd4,
+	0x74, 0x87, 0x35, 0xe5, 0x26, 0x97, 0x3f, 0x0b, 0xbe, 0xbb, 0x6d, 0xf0, 0x76, 0x0b, 0xfb, 0xfa,
+	0x0a, 0x76, 0xba, 0x9d, 0x52, 0x3e, 0xaa, 0xab, 0x1e, 0x67, 0xc8, 0x9c, 0x6e, 0xa4, 0xc1, 0x16,
+	0x01, 0xe0, 0xc4, 0xd9, 0xb6, 0x08, 0x75, 0xf1, 0x23, 0x91, 0xb2, 0xf1, 0xf2, 0x6c, 0xb7, 0x53,
+	0x3a, 0x15, 0xd9, 0x26, 0x32, 0x64, 0x66, 0xc3, 0x41, 0x55, 0x7c, 0x3f, 0xcd, 0x80, 0xd3, 0x71,
+	0xcc, 0x2b, 0xb8, 0xc5, 0xb7, 0xc2, 0x42, 0x32, 0x6d, 0x5a, 0xc7, 0x70, 0x07, 0x9c, 0x4c, 0x10,
+	0xed, 0x26, 0x0b, 0xe8, 0x61, 0x33, 0x38, 0x11, 0x8f, 0x97, 0x85, 0x7b, 0xf8, 0x09, 0x00, 0x0d,
+	0xf6, 0x10, 0x7b, 0x56, 0x18, 0xa1, 0x20, 0x91, 0x2d, 0xdf, 0x1d, 0x01, 0xac, 0x4a, 0x79, 0xb7,
+	0x53, 0x9a, 0x4a, 0x28, 0x23, 0x33, 0x2b, 0x1c, 0x86, 0x6b, 0x13, 0x7a, 0x0f, 0x5a, 0x2d, 0xe5,
+	0x7d, 0xfc, 0x50, 0xbc, 0x0b, 0x87, 0xa1, 0x77, 0xf4, 0x47, 0x06, 0x14, 0xd3, 0xcb, 0x5f, 0xa5,
+	0x2b, 0xc4, 0xc3, 0x4e, 0x58, 0x86, 0x6a, 0x9f, 0xa5, 0xce, 0x41, 0x6d, 0xaf, 0x73, 0x10, 0xea,
+	0xe0, 0x18, 0x67, 0xdb, 0x98, 0x5a, 0x84, 0xca, 0x4c, 0xcc, 0x74, 0x3b, 0xa5, 0x13, 0x12, 0x5d,
+	0x4a, 0x90, 0x79, 0x54, 0x7c, 0x56, 0x69, 0x58, 0x00, 0x3e, 0xb7, 0x3d, 0x9e, 0xb0, 0xeb, 0x29,
+	0x80, 0x44, 0x86, 0xcc, 0xac, 0x18, 0x88, 0x9c, 0xbc, 0x01, 0xa6, 0x03, 0x1f, 0x5b, 0x4e, 0x20,
+	0xb3, 0x72, 0xe4, 0x82, 0x36, 0x7f, 0xac, 0x7c, 0xba, 0xdb, 0x29, 0xcd, 0x44, 0x76, 0x69, 0x29,
+	0x32, 0x41, 0xe0, 0xe3, 0x4a, 0x10, 0xa5, 0x73, 0x11, 0x80, 0x1a, 0x0b, 0xa8, 0x1b, 0x19, 0x4e,
+	0xf4, 0x03, 0x26, 0x32, 0x64, 0x66, 0xc5, 0x20, 0x0d, 0x48, 0x99, 0x25, 0xe6, 0xe6, 0x26, 0x07,
+	0x01, 0x2a, 0x69, 0x04, 0xb8, 0xc6, 0xca, 0x62, 0xf0, 0x4d, 0x06, 0x94, 0x76, 0xcd, 0xb0, 0xdc,
+	0xcd, 0x5b, 0xe9, 0xa2, 0x75, 0xc3, 0x82, 0x56, 0x67, 0xcf, 0xcd, 0x21, 0x4f, 0xd4, 0xfe, 0x6d,
+	0x2c, 0x77, 0x7a, 0x52, 0xab, 0x62, 0x9b, 0xf8, 0xf0, 0x55, 0x30, 0xed, 0x04, 0x9e, 0x87, 0x29,
+	0x4f, 0xaa, 0x75, 0xdc, 0x9c, 0x92, 0x73, 0x82, 0xeb, 0x43, 0x70, 0x4a, 0xa9, 0xc4, 0xd6, 0xb2,
+	0xee, 0xde, 0x19, 0x79, 0x0b, 0xcd, 0x45, 0xe9, 0x79, 0xc9, 0x21, 0x32, 0x4f, 0xca, 0xb9, 0x38,
+	0x6a, 0x74, 0x1f, 0x9c, 0x8b, 0x07, 0xeb, 0x51, 0x7d, 0x8a, 0x3d, 0xbd, 0x9f, 0x42, 0x44, 0x8f,
+	0x35, 0x70, 0x7e, 0x17, 0x6f, 0x32, 0xe9, 0x35, 0x90, 0x4d, 0xf8, 0x45, 0xd9, 0x7e, 0x73, 0xc8,
+	0x6c, 0xef, 0x72, 0xf8, 0xa8, 0xbb, 0x38, 0x61, 0xf9, 0x1e, 0xc8, 0x57, 0x1a, 0x36, 0x69, 0xda,
+	0xb5, 0x06, 0x5e, 0xc5, 0xd8, 0x3f, 0xf0, 0x65, 0xfc, 0x08, 0xcc, 0xf6, 0x39, 0x94, 0x6c, 0x2c,
+	0x70, 0xdc, 0x51, 0x02, 0x6b, 0x13, 0x63, 0x55, 0x40, 0x67, 0x7a, 0x2e, 0x20, 0x45, 0xa0, 0xc2,
+	0x08, 0x2d, 0x9f, 0x0f, 0xa3, 0xed, 0x76, 0x4a, 0xb3, 0x72, 0x8d, 0x7a, 0xcc, 0x91, 0x99, 0x73,
+	0xd2, 0x40, 0x68, 0x03, 0x14, 0x62, 0xe4, 0xaa, 0x48, 0x0e, 0x79, 0x70, 0x08, 0x84, 0x1e, 0x67,
+	0xc0, 0xd9, 0x81, 0x7e, 0x25, 0xaf, 0x1d, 0x90, 0x4f, 0x02, 0x23, 0xb1, 0x7c, 0x6f, 0x76, 0xaf,
+	0x49, 0x76, 0x67, 0xfb, 0xd9, 0x25, 0x4e, 0x90, 0x39, 0xe3, 0xbc, 0x0c, 0x1d, 0x42, 0x6e, 0x32,
+	0x6f, 0x13, 0x13, 0x8e, 0xdd, 0x34, 0x64, 0x66, 0x44, 0xc8, 0x41, 0x4e, 0x90, 0x39, 0x13, 0x4f,
+	0x27, 0x90, 0xd7, 0x9f, 0xe4, 0xc0, 0xc4, 0xfb, 0x61, 0x73, 0x00, 0xbf, 0xd5, 0x80, 0xe8, 0x2a,
+	0x7c, 0x78, 0x63, 0xe8, 0x66, 0x2a, 0x69, 0x8a, 0x0a, 0x8b, 0xa3, 0x19, 0x45, 0x49, 0x46, 0x8b,
+	0x9f, 0xff, 0xfa, 0xf7, 0xd7, 0x19, 0x1d, 0x5e, 0x35, 0x06, 0x35, 0xda, 0x49, 0x9f, 0x1d, 0xbf,
+	0x1a, 0x44, 0x80, 0xdf, 0x69, 0x60, 0x32, 0xea, 0x2b, 0xe0, 0xd0, 0xb0, 0xe9, 0xb6, 0xa6, 0xb0,
+	0x34, 0xa2, 0x95, 0x8c, 0x76, 0x49, 0x44, 0x6b, 0xc0, 0x85, 0x61, 0xa3, 0x8d, 0x62, 0xfc, 0x45,
+	0x03, 0xb9, 0x9e, 0x16, 0x1d, 0xde, 0x1e, 0x12, 0x7f, 0xd0, 0x63, 0xa2, 0x70, 0x67, 0x7f, 0xc6,
+	0x92, 0x43, 0x59, 0x70, 0xb8, 0x03, 0x6f, 0x0d, 0x9d, 0x71, 0xe9, 0xc1, 0xf8, 0x54, 0xbe, 0x4f,
+	0x3e, 0x83, 0xff, 0x68, 0x60, 0x76, 0xe0, 0x11, 0x07, 0x2b, 0xa3, 0x9e, 0x63, 0x03, 0x8e, 0xdb,
+	0xc2, 0xca, 0xc1, 0x9c, 0x48, 0xa2, 0xf7, 0x04, 0xd1, 0x65, 0xf8, 0xd6, 0x90, 0x44, 0x93, 0x7b,
+	0x50, 0xf5, 0x3c, 0x96, 0x27, 0x38, 0xfd, 0xab, 0xa5, 0x9a, 0xbe, 0xde, 0x7b, 0x14, 0xbe, 0x3d,
+	0x6a, 0xa8, 0x03, 0x3b, 0x9d, 0xc2, 0xea, 0x41, 0xdd, 0x48, 0xce, 0x55, 0xc1, 0xb9, 0x02, 0x97,
+	0x47, 0xe6, 0x4c, 0x31, 0xb7, 0x08, 0xb5, 0xdc, 0x98, 0xd9, 0x4f, 0x1a, 0xc8, 0xf5, 0x1c, 0xf8,
+	0x43, 0x17, 0xed, 0xa0, 0x7b, 0x67, 0xe8, 0xa2, 0x1d, 0x78, 0xc7, 0xa0, 0xbb, 0x82, 0xd7, 0x4d,
+	0xb8, 0x34, 0x24, 0xaf, 0xde, 0x1b, 0x05, 0xfe, 0xa5, 0x81, 0x99, 0x01, 0x47, 0x3d, 0x5c, 0x1e,
+	0x35, 0xa8, 0x97, 0xae, 0x9f, 0x42, 0xf9, 0x20, 0x2e, 0x24, 0xbb, 0x8a, 0x60, 0x77, 0x17, 0xde,
+	0x1e, 0x99, 0x5d, 0x72, 0xbc, 0xc3, 0x1f, 0xb5, 0xf0, 0x95, 0x9a, 0x3c, 0x96, 0xe1, 0xad, 0x11,
+	0x9f, 0xc4, 0xa9, 0x27, 0x7b, 0xe1, 0xf6, 0xbe, 0x6c, 0xf7, 0xb9, 0x58, 0xf1, 0x0d, 0x5d, 0x6b,
+	0x5b, 0xc4, 0x2d, 0x6f, 0x3d, 0x7d, 0x5e, 0xd4, 0x9e, 0x3d, 0x2f, 0x6a, 0x7f, 0x3e, 0x2f, 0x6a,
+	0x5f, 0xbd, 0x28, 0x8e, 0x3d, 0x7b, 0x51, 0x1c, 0xfb, 0xed, 0x45, 0x71, 0xec, 0xe3, 0xb5, 0x54,
+	0xf3, 0x27, 0x5d, 0x2f, 0x34, 0xec, 0x9a, 0x1f, 0xe3, 0x3c, 0xb8, 0xb6, 0x64, 0x3c, 0xda, 0xed,
+	0xaf, 0x1a, 0xa7, 0x41, 0x30, 0xe5, 0xd1, 0xbf, 0x50, 0xd1, 0x7b, 0x7a, 0x52, 0xfc, 0xdc, 0xf8,
+	0x2f, 0x00, 0x00, 0xff, 0xff, 0xd3, 0x45, 0x0f, 0x91, 0x5c, 0x13, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1663,16 +1670,11 @@ func (m *TickLiquidityNet) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	{
-		size := m.TickIndex.Size()
-		i -= size
-		if _, err := m.TickIndex.MarshalTo(dAtA[i:]); err != nil {
-			return 0, err
-		}
-		i = encodeVarintQuery(dAtA, i, uint64(size))
+	if m.TickIndex != 0 {
+		i = encodeVarintQuery(dAtA, i, uint64(m.TickIndex))
+		i--
+		dAtA[i] = 0x10
 	}
-	i--
-	dAtA[i] = 0x12
 	{
 		size := m.LiquidityNet.Size()
 		i -= size
@@ -2190,8 +2192,9 @@ func (m *TickLiquidityNet) Size() (n int) {
 	_ = l
 	l = m.LiquidityNet.Size()
 	n += 1 + l + sovQuery(uint64(l))
-	l = m.TickIndex.Size()
-	n += 1 + l + sovQuery(uint64(l))
+	if m.TickIndex != 0 {
+		n += 1 + sovQuery(uint64(m.TickIndex))
+	}
 	return n
 }
 
@@ -3091,10 +3094,10 @@ func (m *TickLiquidityNet) Unmarshal(dAtA []byte) error {
 			}
 			iNdEx = postIndex
 		case 2:
-			if wireType != 2 {
+			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field TickIndex", wireType)
 			}
-			var stringLen uint64
+			m.TickIndex = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowQuery
@@ -3104,26 +3107,11 @@ func (m *TickLiquidityNet) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
+				m.TickIndex |= int64(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthQuery
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthQuery
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if err := m.TickIndex.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipQuery(dAtA[iNdEx:])
diff --git a/x/concentrated-liquidity/tick.go b/x/concentrated-liquidity/tick.go
index 19c35bcef..c996405fe 100644
--- a/x/concentrated-liquidity/tick.go
+++ b/x/concentrated-liquidity/tick.go
@@ -414,15 +414,14 @@ func (k Keeper) GetTickLiquidityNetInDirection(ctx sdk.Context, poolId uint64, t
 			return []queryproto.TickLiquidityNet{}, err
 		}
 
-		tickStruct := model.TickInfo{}
-		err = proto.Unmarshal(iterator.Value(), &tickStruct)
+		tickStruct, err := ParseTickFromBz(iterator.Value())
 		if err != nil {
 			return []queryproto.TickLiquidityNet{}, err
 		}
 
 		liquidityDepth := queryproto.TickLiquidityNet{
 			LiquidityNet: tickStruct.LiquidityNet,
-			TickIndex:    sdk.NewInt(tickIndex),
+			TickIndex:    tickIndex,
 		}
 		liquidityDepths = append(liquidityDepths, liquidityDepth)
 	}


Test patch:
diff --git a/app/upgrades/v15/export_test.go b/app/upgrades/v15/export_test.go
index 2b5d2f4f7..1d145c42c 100644
--- a/app/upgrades/v15/export_test.go
+++ b/app/upgrades/v15/export_test.go
@@ -4,7 +4,7 @@ import (
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
-	icqkeeper "github.com/strangelove-ventures/async-icq/v4/keeper"
+	icqkeeper "github.com/cosmos/ibc-apps/modules/async-icq/v4/keeper"
 
 	ibcratelimit "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit"
 
diff --git a/tests/cl-genesis-positions/go.mod b/tests/cl-genesis-positions/go.mod
index 69ed58afe..3a3336554 100644
--- a/tests/cl-genesis-positions/go.mod
+++ b/tests/cl-genesis-positions/go.mod
@@ -118,7 +118,6 @@ require (
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/spf13/viper v1.15.0 // indirect
-	github.com/strangelove-ventures/async-icq/v4 v4.0.0-rc0 // indirect
 	github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.5 // indirect
 	github.com/stretchr/testify v1.8.3 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
diff --git a/x/concentrated-liquidity/tick_test.go b/x/concentrated-liquidity/tick_test.go
index d16374f05..bd0354316 100644
--- a/x/concentrated-liquidity/tick_test.go
+++ b/x/concentrated-liquidity/tick_test.go
@@ -842,7 +842,7 @@ func (s *KeeperTestSuite) TestGetTickLiquidityNetInDirection() {
 			expectedLiquidityDepths: []queryproto.TickLiquidityNet{
 				{
 					LiquidityNet: sdk.NewDec(10),
-					TickIndex:    sdk.NewInt(DefaultMinTick),
+					TickIndex:    DefaultMinTick,
 				},
 			},
 		},
@@ -859,7 +859,7 @@ func (s *KeeperTestSuite) TestGetTickLiquidityNetInDirection() {
 			expectedLiquidityDepths: []queryproto.TickLiquidityNet{
 				{
 					LiquidityNet: sdk.NewDec(-10),
-					TickIndex:    sdk.NewInt(DefaultMaxTick),
+					TickIndex:    DefaultMaxTick,
 				},
 			},
 		},
@@ -878,7 +878,7 @@ func (s *KeeperTestSuite) TestGetTickLiquidityNetInDirection() {
 			expectedLiquidityDepths: []queryproto.TickLiquidityNet{
 				{
 					LiquidityNet: sdk.NewDec(10),
-					TickIndex:    sdk.NewInt(DefaultMinTick),
+					TickIndex:    DefaultMinTick,
 				},
 			},
 		},
@@ -897,15 +897,15 @@ func (s *KeeperTestSuite) TestGetTickLiquidityNetInDirection() {
 			expectedLiquidityDepths: []queryproto.TickLiquidityNet{
 				{
 					LiquidityNet: sdk.NewDec(20),
-					TickIndex:    sdk.NewInt(5),
+					TickIndex:    5,
 				},
 				{
 					LiquidityNet: sdk.NewDec(-20),
-					TickIndex:    sdk.NewInt(10),
+					TickIndex:    10,
 				},
 				{
 					LiquidityNet: sdk.NewDec(-10),
-					TickIndex:    sdk.NewInt(DefaultMaxTick),
+					TickIndex:    DefaultMaxTick,
 				},
 			},
 		},
@@ -924,7 +924,7 @@ func (s *KeeperTestSuite) TestGetTickLiquidityNetInDirection() {
 			expectedLiquidityDepths: []queryproto.TickLiquidityNet{
 				{
 					LiquidityNet: sdk.NewDec(20),
-					TickIndex:    sdk.NewInt(-10),
+					TickIndex:    -10,
 				},
 			},
 		},
@@ -955,7 +955,7 @@ func (s *KeeperTestSuite) TestGetTickLiquidityNetInDirection() {
 			expectedLiquidityDepths: []queryproto.TickLiquidityNet{
 				{
 					LiquidityNet: sdk.NewDec(-20),
-					TickIndex:    sdk.NewInt(10),
+					TickIndex:    10,
 				},
 			},
 		},
@@ -976,11 +976,11 @@ func (s *KeeperTestSuite) TestGetTickLiquidityNetInDirection() {
 			expectedLiquidityDepths: []queryproto.TickLiquidityNet{
 				{
 					LiquidityNet: sdk.NewDec(20),
-					TickIndex:    sdk.NewInt(-5),
+					TickIndex:    -5,
 				},
 				{
 					LiquidityNet: sdk.NewDec(10),
-					TickIndex:    sdk.NewInt(DefaultMinTick),
+					TickIndex:    DefaultMinTick,
 				},
 			},
 		},
@@ -1001,19 +1001,19 @@ func (s *KeeperTestSuite) TestGetTickLiquidityNetInDirection() {
 			expectedLiquidityDepths: []queryproto.TickLiquidityNet{
 				{
 					LiquidityNet: sdk.NewDec(40),
-					TickIndex:    sdk.NewInt(2),
+					TickIndex:    2,
 				},
 				{
 					LiquidityNet: sdk.NewDec(-20),
-					TickIndex:    sdk.NewInt(5),
+					TickIndex:    5,
 				},
 				{
 					LiquidityNet: sdk.NewDec(-40),
-					TickIndex:    sdk.NewInt(10),
+					TickIndex:    10,
 				},
 				{
 					LiquidityNet: sdk.NewDec(-10),
-					TickIndex:    sdk.NewInt(DefaultMaxTick),
+					TickIndex:    DefaultMaxTick,
 				},
 			},
 		},
@@ -1032,7 +1032,7 @@ func (s *KeeperTestSuite) TestGetTickLiquidityNetInDirection() {
 			expectedLiquidityDepths: []queryproto.TickLiquidityNet{
 				{
 					LiquidityNet: sdk.NewDec(20),
-					TickIndex:    sdk.NewInt(-10),
+					TickIndex:    -10,
 				},
 			},
 		},
@@ -1051,7 +1051,7 @@ func (s *KeeperTestSuite) TestGetTickLiquidityNetInDirection() {
 			expectedLiquidityDepths: []queryproto.TickLiquidityNet{
 				{
 					LiquidityNet: sdk.NewDec(20),
-					TickIndex:    sdk.NewInt(-10),
+					TickIndex:    -10,
 				},
 			},
 		},
@@ -1070,7 +1070,7 @@ func (s *KeeperTestSuite) TestGetTickLiquidityNetInDirection() {
 			expectedLiquidityDepths: []queryproto.TickLiquidityNet{
 				{
 					LiquidityNet: sdk.NewDec(-20),
-					TickIndex:    sdk.NewInt(10),
+					TickIndex:    10,
 				},
 			},
 		},
@@ -1089,7 +1089,7 @@ func (s *KeeperTestSuite) TestGetTickLiquidityNetInDirection() {
 			expectedLiquidityDepths: []queryproto.TickLiquidityNet{
 				{
 					LiquidityNet: sdk.NewDec(-20),
-					TickIndex:    sdk.NewInt(10),
+					TickIndex:    10,
 				},
 			},
 		},