Skip to content

Commit 3603bd0

Browse files
totekitoteki
authored
Merge branch 'main' into robert/token-cache
2 parents 8c87550 + 6c32f68 commit 3603bd0

36 files changed

+385
-384
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,14 @@ jobs:
150150
if: env.GIT_DIFF
151151
- name: Install Starport
152152
run: |
153-
curl https://get.starport.network/starport@v0.19.5! | bash
153+
curl https://get.ignite.com/cli! | bash
154154
if: env.GIT_DIFF
155155
- name: Start Local Network via Starport
156156
run: |
157-
starport chain serve --reset-once -v -c ./starport.ci.yml > starport.out 2>&1 &
157+
/usr/local/bin/ignite chain serve --reset-once -v -c ./starport.ci.yml &
158158
if: env.GIT_DIFF
159159
- name: Test Local Network Liveness
160160
run: |
161-
sleep 2m
162-
./contrib/scripts/test_localnet_liveness.sh 100 5 50 localhost
161+
sleep 1m
162+
./contrib/scripts/test_localnet_liveness.sh 40 5 50 localhost
163163
if: env.GIT_DIFF

‎app/test_helpers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func IntegrationTestNetworkConfig() network.Config {
116116
BaseBorrowRate: sdk.MustNewDecFromStr("0.020000000000000000"),
117117
KinkBorrowRate: sdk.MustNewDecFromStr("0.200000000000000000"),
118118
MaxBorrowRate: sdk.MustNewDecFromStr("1.50000000000000000"),
119-
KinkUtilizationRate: sdk.MustNewDecFromStr("0.200000000000000000"),
119+
KinkUtilization: sdk.MustNewDecFromStr("0.200000000000000000"),
120120
LiquidationIncentive: sdk.MustNewDecFromStr("0.180000000000000000"),
121121
EnableMsgLend: true,
122122
EnableMsgBorrow: true,

‎contrib/scripts/test_localnet_liveness.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,18 @@ if [ -z "$4" ]; then
3030
exit 1
3131
fi
3232

33-
docker_containers=($(docker ps -q -f name=umeed --format='{{.Names}}'))
3433

3534
while [ ${CNT} -lt $ITER ]; do
3635
curr_block=$(curl -s $NODEADDR:26657/status | jq -r '.result.sync_info.latest_block_height')
3736

38-
if [ ! -z ${curr_block} ]; then
39-
echo "Current block: ${curr_block}"
40-
fi
37+
echo "Current block: ${curr_block} iteration: ${CNT}"
4138

4239
if [ ! -z ${curr_block} ] && [ ${curr_block} -gt ${NUMBLOCKS} ]; then
4340
echo "Success: number of blocks reached"
4441
exit 0
4542
fi
4643

44+
((CNT=CNT+1))
4745
sleep $SLEEP
4846
done
4947

‎go.mod‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ require (
1414
github.com/gorilla/mux v1.8.0
1515
github.com/grpc-ecosystem/grpc-gateway v1.16.0
1616
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d
17+
github.com/ignite/cli v0.22.2
1718
github.com/ory/dockertest/v3 v3.9.1
1819
github.com/osmosis-labs/bech32-ibc v0.2.0-rc2
1920
github.com/rs/zerolog v1.27.0
@@ -22,7 +23,6 @@ require (
2223
github.com/spf13/pflag v1.0.5
2324
github.com/spf13/viper v1.12.0
2425
github.com/stretchr/testify v1.7.5
25-
github.com/tendermint/starport v0.19.5
2626
github.com/tendermint/tendermint v0.34.19
2727
github.com/tendermint/tm-db v0.6.7
2828
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd
@@ -45,7 +45,7 @@ require (
4545
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.1.0 // indirect
4646
github.com/Masterminds/semver v1.5.0 // indirect
4747
github.com/Microsoft/go-winio v0.5.2 // indirect
48-
github.com/Microsoft/hcsshim v0.9.1 // indirect
48+
github.com/Microsoft/hcsshim v0.9.2 // indirect
4949
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
5050
github.com/OpenPeeDeeP/depguard v1.1.0 // indirect
5151
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
@@ -72,6 +72,7 @@ require (
7272
github.com/briandowns/spinner v1.11.1 // indirect
7373
github.com/btcsuite/btcd v0.22.0-beta // indirect
7474
github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
75+
github.com/buger/jsonparser v1.1.1 // indirect
7576
github.com/butuzov/ireturn v0.1.1 // indirect
7677
github.com/calmh/randomart v1.1.0 // indirect
7778
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
@@ -89,13 +90,14 @@ require (
8990
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
9091
github.com/coinbase/rosetta-sdk-go v0.7.0 // indirect
9192
github.com/confio/ics23/go v0.7.0 // indirect
92-
github.com/containerd/cgroups v1.0.1 // indirect
93+
github.com/containerd/cgroups v1.0.3 // indirect
9394
github.com/containerd/console v1.0.3 // indirect
94-
github.com/containerd/containerd v1.5.8 // indirect
95+
github.com/containerd/containerd v1.6.2 // indirect
9596
github.com/containerd/continuity v0.3.0 // indirect
9697
github.com/cosmos/btcutil v1.0.4 // indirect
9798
github.com/cosmos/gorocksdb v1.2.0 // indirect
9899
github.com/cosmos/iavl v0.17.3 // indirect
100+
github.com/cosmos/ibc-go/v3 v3.0.0 // indirect
99101
github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect
100102
github.com/cosmos/ledger-go v0.9.2 // indirect
101103
github.com/daixiang0/gci v0.3.3 // indirect
@@ -197,7 +199,7 @@ require (
197199
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
198200
github.com/gtank/merlin v0.1.1 // indirect
199201
github.com/gtank/ristretto255 v0.1.2 // indirect
200-
github.com/hashicorp/errwrap v1.0.0 // indirect
202+
github.com/hashicorp/errwrap v1.1.0 // indirect
201203
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
202204
github.com/hashicorp/go-multierror v1.1.1 // indirect
203205
github.com/hashicorp/go-version v1.4.0 // indirect
@@ -216,7 +218,7 @@ require (
216218
github.com/joho/godotenv v1.3.0 // indirect
217219
github.com/jpillora/ansi v1.0.2 // indirect
218220
github.com/jpillora/backoff v1.0.0 // indirect
219-
github.com/jpillora/chisel v1.7.6 // indirect
221+
github.com/jpillora/chisel v1.7.7 // indirect
220222
github.com/jpillora/requestlog v1.0.0 // indirect
221223
github.com/jpillora/sizestr v1.0.0 // indirect
222224
github.com/julz/importas v0.1.0 // indirect
@@ -256,8 +258,8 @@ require (
256258
github.com/minio/highwayhash v1.0.2 // indirect
257259
github.com/mitchellh/go-homedir v1.1.0 // indirect
258260
github.com/mitchellh/mapstructure v1.5.0 // indirect
259-
github.com/moby/sys/mount v0.3.0 // indirect
260-
github.com/moby/sys/mountinfo v0.5.0 // indirect
261+
github.com/moby/sys/mount v0.3.1 // indirect
262+
github.com/moby/sys/mountinfo v0.6.0 // indirect
261263
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
262264
github.com/moricho/tparallel v0.2.1 // indirect
263265
github.com/mtibben/percent v0.2.1 // indirect
@@ -326,12 +328,14 @@ require (
326328
github.com/subosito/gotenv v1.3.0 // indirect
327329
github.com/sylvia7788/contextcheck v1.0.4 // indirect
328330
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
331+
github.com/takuoki/gocase v1.0.0 // indirect
329332
github.com/tdakkota/asciicheck v0.1.1 // indirect
330333
github.com/tendermint/btcd v0.1.1 // indirect
331334
github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect
332-
github.com/tendermint/flutter/v2 v2.0.3 // indirect
335+
github.com/tendermint/flutter/v2 v2.0.4 // indirect
336+
github.com/tendermint/fundraising v0.3.0 // indirect
333337
github.com/tendermint/go-amino v0.16.0 // indirect
334-
github.com/tendermint/spn v0.1.1-0.20211210094128-4ca78a240c57 // indirect
338+
github.com/tendermint/spn v0.2.1-0.20220610090138-44b136f042c4 // indirect
335339
github.com/tendermint/vue v0.3.5 // indirect
336340
github.com/tetafro/godot v1.4.11 // indirect
337341
github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect

0 commit comments

Comments
 (0)