Skip to content

Commit dc35fb0

Browse files
MaxMillingtonmattuphamcrnbarr93PaddyMcyury-dubinin
authored
Stage -> Master (#3842)
* Mattupham/fe 1067 portfolio v3 update 0 change values to be green and up (#3823) * add threshold updates * Clean up logs * [Limit Orders]: SQS Active Order Query (#3828) * fix: increased cache time and refetch interval for active orders * fix: even longer cache * fix: WIP batch query implementation * fix: longer delay between batches * fix: batch size/timing * fix: vercel max duration * fix: wired in sqs query for active orders * fix: build * fix: filled orders styling * fix: remove claimable orders test data * fix: further reduced queries * feat: moved orders query to passthrough * fix: moved active orders to local router * fix: altered orders cache to be more responsive * chore: post typing fixes for active orders sqs query * fix: reverted unnecessary changes * feat: removed pool restriction on orderbooks * Clean up formatter (#3829) * Clean up formatter * Remove log * update no price data * add pr notification yaml (#3830) Co-authored-by: Michael Millington <> * fix lint issue (#3832) * Handle PricePretty and Lint issue * add search from query param for earn (#3836) * Update search from query param * Do not log subsequent chart interaction events / Handle last event tracking (#3834) * Handle last event tracking * Clean up * Clean up types * Update event properties * Add types for event options * Fix lint * Update MATIC -> POL (#3835) * Update MATIC -> POL * Update tests * feat: feature flag for sqs active orders (#3837) * [Limit Orders]: Fix date display for order history (#3833) * fix: date display for order history * fix: undid feature flag changes * fix: typing issue * [Limit Orders]: Price to Tick Crash Handler (#3838) * fix: price to tick error handling * feat: added swap source to swap amplitude events --------- Co-authored-by: Matt Upham <[email protected]> * Update IBC overrides to use POL (#3839) * fix: date display for active orders from node (#3840) * Mattupham/fe 1077 v26 fe tasks (#3843) * feat: adding ledger support to 1CT * fix: make hash optional for TransactionRow type * Add timeout * Update default timeout height offset * Update OSMOSIS_COMMIT_HASH * Revert "(1CT) Add Ledger Coming Soon Copy (#3554)" This reverts commit 94f041a. * Remove ledger paragraph * Clean up paragraph spacing * Update protos * Temp commit - snapshot of working progress * Update 1ct session allowed functions * get feature flags ready for launch * Clean up for launch * remove log * Fix type issues related to telescope --------- Co-authored-by: ghost <[email protected]> * Less alerts from claim workflow (#3845) * Publish Stage (#3831) (#3846) * Mattupham/fe 1067 portfolio v3 update 0 change values to be green and up (#3823) * add threshold updates * Clean up logs * [Limit Orders]: SQS Active Order Query (#3828) * fix: increased cache time and refetch interval for active orders * fix: even longer cache * fix: WIP batch query implementation * fix: longer delay between batches * fix: batch size/timing * fix: vercel max duration * fix: wired in sqs query for active orders * fix: build * fix: filled orders styling * fix: remove claimable orders test data * fix: further reduced queries * feat: moved orders query to passthrough * fix: moved active orders to local router * fix: altered orders cache to be more responsive * chore: post typing fixes for active orders sqs query * fix: reverted unnecessary changes * feat: removed pool restriction on orderbooks * Clean up formatter (#3829) * Clean up formatter * Remove log * update no price data * add pr notification yaml (#3830) Co-authored-by: Michael Millington <> * fix lint issue (#3832) * Handle PricePretty and Lint issue * add search from query param for earn (#3836) * Update search from query param * Do not log subsequent chart interaction events / Handle last event tracking (#3834) * Handle last event tracking * Clean up * Clean up types * Update event properties * Add types for event options * Fix lint * Update MATIC -> POL (#3835) * Update MATIC -> POL * Update tests * feat: feature flag for sqs active orders (#3837) * [Limit Orders]: Fix date display for order history (#3833) * fix: date display for order history * fix: undid feature flag changes * fix: typing issue * [Limit Orders]: Price to Tick Crash Handler (#3838) * fix: price to tick error handling * feat: added swap source to swap amplitude events --------- * Update IBC overrides to use POL (#3839) --------- Co-authored-by: Jon Ator <[email protected]> Co-authored-by: yakuramori <[email protected]> Co-authored-by: Connor Barr <[email protected]> Co-authored-by: Max Millington <[email protected]> --------- Co-authored-by: Matt Upham <[email protected]> Co-authored-by: Connor Barr <[email protected]> Co-authored-by: ghost <[email protected]> Co-authored-by: yakuramori <[email protected]> Co-authored-by: Jon Ator <[email protected]>
1 parent bd1936c commit dc35fb0

File tree

117 files changed

+3385
-1051
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+3385
-1051
lines changed

‎.github/workflows/monitoring-claim-orders .yml

Lines changed: 1 addition & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Technical job to claim orders created by monitoring
33
on:
44
workflow_dispatch:
55
schedule:
6-
- cron: "*/45 * * * *"
6+
- cron: "19 * * * *"
77

88
jobs:
99
fe-claim1-tests:
@@ -40,40 +40,6 @@ jobs:
4040
with:
4141
name: claim1-test-results
4242
path: packages/web/playwright-report
43-
- name: Send Slack alert if test fails
44-
id: slack
45-
if: failure()
46-
uses: slackapi/[email protected]
47-
with:
48-
payload: |
49-
{
50-
"blocks": [
51-
{
52-
"type": "header",
53-
"text": {
54-
"type": "plain_text",
55-
"text": "🚨 Claim Tests Failure Alert 🚨"
56-
}
57-
},
58-
{
59-
"type": "section",
60-
"text": {
61-
"type": "mrkdwn",
62-
"text": "*Production App URL:* https://app.osmosis.zone"
63-
}
64-
},
65-
{
66-
"type": "section",
67-
"text": {
68-
"type": "mrkdwn",
69-
"text": "Click here to view the run: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|GitHub Actions Run>"
70-
}
71-
}
72-
]
73-
}
74-
env:
75-
SLACK_WEBHOOK_URL: ${{ secrets.SERVER_E2E_TESTS_SLACK_WEBHOOK_URL }}
76-
SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
7743

7844
fe-claim2-tests:
7945
timeout-minutes: 10
@@ -109,40 +75,6 @@ jobs:
10975
with:
11076
name: claim2-test-results
11177
path: packages/web/playwright-report
112-
- name: Send Slack alert if test fails
113-
id: slack
114-
if: failure()
115-
uses: slackapi/[email protected]
116-
with:
117-
payload: |
118-
{
119-
"blocks": [
120-
{
121-
"type": "header",
122-
"text": {
123-
"type": "plain_text",
124-
"text": "🚨 Claim Tests Failure Alert 🚨"
125-
}
126-
},
127-
{
128-
"type": "section",
129-
"text": {
130-
"type": "mrkdwn",
131-
"text": "*Production App URL:* https://app.osmosis.zone"
132-
}
133-
},
134-
{
135-
"type": "section",
136-
"text": {
137-
"type": "mrkdwn",
138-
"text": "Click here to view the run: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|GitHub Actions Run>"
139-
}
140-
}
141-
]
142-
}
143-
env:
144-
SLACK_WEBHOOK_URL: ${{ secrets.SERVER_E2E_TESTS_SLACK_WEBHOOK_URL }}
145-
SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
14678

14779
delete-deployments:
14880
runs-on: ubuntu-latest

‎packages/proto-codecs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
},
4444
"devDependencies": {
4545
"@cosmology/proto-parser": "^1.5.0",
46-
"@cosmology/telescope": "^1.5.1",
46+
"@cosmology/telescope": "^1.8.4",
4747
"@types/node": "^20.14.1",
4848
"regenerator-runtime": "^0.13.11",
4949
"rimraf": "^5.0.0",

‎packages/proto-codecs/scripts/generated/package-types.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export type AvailablePackages =
1111
| "osmosis.gamm.poolmodels.balancer.v1beta1"
1212
| "ibc.applications.interchain_accounts.v1"
1313
| "osmosis.concentratedliquidity.v1beta1"
14+
| "osmosis.cosmwasmpool.v1beta1.model.v3"
1415
| "osmosis.downtimedetector.v1beta1"
1516
| "ibc.lightclients.solomachine.v2"
1617
| "ibc.lightclients.solomachine.v3"
@@ -32,6 +33,7 @@ export type AvailablePackages =
3233
| "osmosis.valsetpref.v1beta1"
3334
| "cosmos.base.query.v1beta1"
3435
| "cosmos.base.store.v1beta1"
36+
| "ibc.lightclients.wasm.v1"
3537
| "osmosis.protorev.v1beta1"
3638
| "cosmos.base.abci.v1beta1"
3739
| "ibc.applications.fee.v1"
@@ -66,6 +68,7 @@ export type AvailablePackages =
6668
| "tendermint.abci"
6769
| "osmosis.lockup"
6870
| "tendermint.p2p"
71+
| "capability.v1"
6972
| "cosmos.msg.v1"
7073
| "cosmos_proto"
7174
| "google.api"

‎packages/proto-codecs/scripts/get-proto.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ GREEN='\033[0;32m' # Green color
66
NC='\033[0m' # No Color
77

88
PROTO_DIR="./chain-proto"
9-
OSMOSIS_COMMIT_HASH="b07e6725f7d97b3321c8165fc1d95a9ab6fa963b"
9+
OSMOSIS_COMMIT_HASH="dd6442421a5643d8702200d6a46a6178160a8c76"
1010

1111
ICS23_COMMIT_HASH="f4deb054b697458e7f0aa353c2f45a365361e895"
1212

@@ -26,9 +26,13 @@ git -C .repos/osmosis checkout $OSMOSIS_COMMIT_HASH
2626

2727

2828
# SDK PROTOS
29-
COSMOS_SDK_VERSION=$(awk -F '=>' '/github.com\/osmosis-labs\/cosmos-sdk/ {print $2}' .repos/osmosis/go.mod | awk '{print $NF}' | tr -d '\n')
29+
# COSMOS_SDK_VERSION=$(awk '/github.com\/cosmos\/cosmos-sdk/ {print $2}' .repos/osmosis/go.mod | tr -d '=> ')
30+
# COSMOS_SDK_VERSION=$(awk -F '=>' '/github.com\/osmosis-labs\/cosmos-sdk/ {print $2}' .repos/osmosis/go.mod | awk '{print $NF}' | tr -d '\n')
31+
COSMOS_SDK_VERSION=v0.50.6-v26-osmo-2
32+
3033
echo -e "${GREEN}COSMOS_SDK_VERSION: $COSMOS_SDK_VERSION${NC}"
3134

35+
# git clone --filter=blob:none --sparse https://github.com/cosmos/cosmos-sdk.git .repos/cosmos-sdk
3236
git clone --filter=blob:none --sparse https://github.com/osmosis-labs/cosmos-sdk.git .repos/cosmos-sdk
3337

3438
# Checkout to Cosmos hash commit
@@ -52,7 +56,8 @@ git -C .repos/ibc-go checkout $IBC_GO_VERSION
5256
# WASMD PROTOS
5357

5458
# Extract the Wasmd version from the go.mod file
55-
WASMD_VERSION=$(awk '/github.com\/osmosis-labs\/wasmd/ {print $4}' .repos/osmosis/go.mod | awk '{print $NF}' | tr -d '\n')
59+
# WASMD_VERSION=$(awk '/github.com\/osmosis-labs\/wasmd/ {print $4}' .repos/osmosis/go.mod | awk '{print $NF}' | tr -d '\n')
60+
WASMD_VERSION=de7db0dc672e7beb201e06e7eb12b2de356ac7c9
5661
echo -e "${GREEN}WASMD_VERSION: $WASMD_VERSION${NC}"
5762

5863
# TROUBLESHOOTING

‎packages/proto-codecs/src/codegen/binary.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//@ts-nocheck
22
/**
3-
* This file and any referenced files were automatically generated by @cosmology/telescope@1.5.1
3+
* This file and any referenced files were automatically generated by @cosmology/telescope@1.8.4
44
* DO NOT MODIFY BY HAND. Instead, download the latest proto files for your chain
5-
* and run the transpile command or yarn proto command to regenerate this bundle.
5+
* and run the transpile command or npm scripts command that is used to regenerate this bundle.
66
*/
77

88
// Copyright (c) 2016, Daniel Wirtz All rights reserved.

‎packages/proto-codecs/src/codegen/cosmos/auth/v1beta1/auth.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,12 @@ export const BaseAccount = {
199199
obj.pub_key = message.pubKey ? Any.toAmino(message.pubKey) : undefined;
200200
obj.account_number =
201201
message.accountNumber !== BigInt(0)
202-
? message.accountNumber.toString()
202+
? (message.accountNumber?.toString)()
203203
: undefined;
204204
obj.sequence =
205-
message.sequence !== BigInt(0) ? message.sequence.toString() : undefined;
205+
message.sequence !== BigInt(0)
206+
? (message.sequence?.toString)()
207+
: undefined;
206208
return obj;
207209
},
208210
fromAminoMsg(object: BaseAccountAminoMsg): BaseAccount {
@@ -460,23 +462,23 @@ export const Params = {
460462
const obj: any = {};
461463
obj.max_memo_characters =
462464
message.maxMemoCharacters !== BigInt(0)
463-
? message.maxMemoCharacters.toString()
465+
? (message.maxMemoCharacters?.toString)()
464466
: undefined;
465467
obj.tx_sig_limit =
466468
message.txSigLimit !== BigInt(0)
467-
? message.txSigLimit.toString()
469+
? (message.txSigLimit?.toString)()
468470
: undefined;
469471
obj.tx_size_cost_per_byte =
470472
message.txSizeCostPerByte !== BigInt(0)
471-
? message.txSizeCostPerByte.toString()
473+
? (message.txSizeCostPerByte?.toString)()
472474
: undefined;
473475
obj.sig_verify_cost_ed25519 =
474476
message.sigVerifyCostEd25519 !== BigInt(0)
475-
? message.sigVerifyCostEd25519.toString()
477+
? (message.sigVerifyCostEd25519?.toString)()
476478
: undefined;
477479
obj.sig_verify_cost_secp256k1 =
478480
message.sigVerifyCostSecp256k1 !== BigInt(0)
479-
? message.sigVerifyCostSecp256k1.toString()
481+
? (message.sigVerifyCostSecp256k1?.toString)()
480482
: undefined;
481483
return obj;
482484
},

‎packages/proto-codecs/src/codegen/cosmos/base/query/v1beta1/pagination.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,9 @@ export const PageRequest = {
272272
const obj: any = {};
273273
obj.key = message.key ? base64FromBytes(message.key) : undefined;
274274
obj.offset =
275-
message.offset !== BigInt(0) ? message.offset.toString() : undefined;
275+
message.offset !== BigInt(0) ? (message.offset?.toString)() : undefined;
276276
obj.limit =
277-
message.limit !== BigInt(0) ? message.limit.toString() : undefined;
277+
message.limit !== BigInt(0) ? (message.limit?.toString)() : undefined;
278278
obj.count_total =
279279
message.countTotal === false ? undefined : message.countTotal;
280280
obj.reverse = message.reverse === false ? undefined : message.reverse;
@@ -368,7 +368,7 @@ export const PageResponse = {
368368
? base64FromBytes(message.nextKey)
369369
: undefined;
370370
obj.total =
371-
message.total !== BigInt(0) ? message.total.toString() : undefined;
371+
message.total !== BigInt(0) ? (message.total?.toString)() : undefined;
372372
return obj;
373373
},
374374
fromAminoMsg(object: PageResponseAminoMsg): PageResponse {

‎packages/proto-codecs/src/codegen/cosmos/bundle.ts

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
11
//@ts-nocheck
2-
import * as _55 from "./auth/v1beta1/auth";
3-
import * as _56 from "./auth/v1beta1/genesis";
4-
import * as _57 from "./bank/v1beta1/authz";
5-
import * as _58 from "./bank/v1beta1/bank";
6-
import * as _59 from "./bank/v1beta1/genesis";
7-
import * as _60 from "./bank/v1beta1/tx";
8-
import * as _111 from "./bank/v1beta1/tx.amino";
9-
import * as _114 from "./bank/v1beta1/tx.registry";
10-
import * as _61 from "./base/query/v1beta1/pagination";
11-
import * as _62 from "./base/v1beta1/coin";
12-
import * as _63 from "./staking/v1beta1/authz";
13-
import * as _64 from "./staking/v1beta1/genesis";
14-
import * as _65 from "./staking/v1beta1/staking";
15-
import * as _66 from "./staking/v1beta1/tx";
16-
import * as _112 from "./staking/v1beta1/tx.amino";
17-
import * as _115 from "./staking/v1beta1/tx.registry";
18-
import * as _67 from "./upgrade/v1beta1/tx";
19-
import * as _113 from "./upgrade/v1beta1/tx.amino";
20-
import * as _116 from "./upgrade/v1beta1/tx.registry";
21-
import * as _68 from "./upgrade/v1beta1/upgrade";
2+
import * as _57 from "./auth/v1beta1/auth";
3+
import * as _58 from "./auth/v1beta1/genesis";
4+
import * as _59 from "./bank/v1beta1/authz";
5+
import * as _60 from "./bank/v1beta1/bank";
6+
import * as _61 from "./bank/v1beta1/genesis";
7+
import * as _62 from "./bank/v1beta1/tx";
8+
import * as _113 from "./bank/v1beta1/tx.amino";
9+
import * as _116 from "./bank/v1beta1/tx.registry";
10+
import * as _63 from "./base/query/v1beta1/pagination";
11+
import * as _64 from "./base/v1beta1/coin";
12+
import * as _65 from "./staking/v1beta1/authz";
13+
import * as _66 from "./staking/v1beta1/genesis";
14+
import * as _67 from "./staking/v1beta1/staking";
15+
import * as _68 from "./staking/v1beta1/tx";
16+
import * as _114 from "./staking/v1beta1/tx.amino";
17+
import * as _117 from "./staking/v1beta1/tx.registry";
18+
import * as _69 from "./upgrade/v1beta1/tx";
19+
import * as _115 from "./upgrade/v1beta1/tx.amino";
20+
import * as _118 from "./upgrade/v1beta1/tx.registry";
21+
import * as _70 from "./upgrade/v1beta1/upgrade";
2222
export namespace cosmos {
2323
export namespace auth {
2424
export const v1beta1 = {
25-
..._55,
26-
..._56,
25+
..._57,
26+
..._58,
2727
};
2828
}
2929
export namespace bank {
3030
export const v1beta1 = {
31-
..._57,
32-
..._58,
3331
..._59,
3432
..._60,
35-
..._111,
36-
..._114,
33+
..._61,
34+
..._62,
35+
..._113,
36+
..._116,
3737
};
3838
}
3939
export namespace base {
4040
export namespace query {
4141
export const v1beta1 = {
42-
..._61,
42+
..._63,
4343
};
4444
}
4545
export const v1beta1 = {
46-
..._62,
46+
..._64,
4747
};
4848
}
4949
export namespace staking {
5050
export const v1beta1 = {
51-
..._63,
52-
..._64,
5351
..._65,
5452
..._66,
55-
..._112,
56-
..._115,
53+
..._67,
54+
..._68,
55+
..._114,
56+
..._117,
5757
};
5858
}
5959
export namespace upgrade {
6060
export const v1beta1 = {
61-
..._67,
62-
..._68,
63-
..._113,
64-
..._116,
61+
..._69,
62+
..._70,
63+
..._115,
64+
..._118,
6565
};
6666
}
6767
}

‎packages/proto-codecs/src/codegen/cosmos/staking/v1beta1/genesis.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ export const LastValidatorPower = {
388388
const obj: any = {};
389389
obj.address = message.address === "" ? undefined : message.address;
390390
obj.power =
391-
message.power !== BigInt(0) ? message.power.toString() : undefined;
391+
message.power !== BigInt(0) ? (message.power?.toString)() : undefined;
392392
return obj;
393393
},
394394
fromAminoMsg(object: LastValidatorPowerAminoMsg): LastValidatorPower {

‎packages/proto-codecs/src/codegen/cosmos/staking/v1beta1/staking.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1501,7 +1501,7 @@ export const Validator = {
15011501
: undefined;
15021502
obj.unbonding_height =
15031503
message.unbondingHeight !== BigInt(0)
1504-
? message.unbondingHeight.toString()
1504+
? (message.unbondingHeight?.toString)()
15051505
: undefined;
15061506
obj.unbonding_time = message.unbondingTime
15071507
? Timestamp.toAmino(toTimestamp(message.unbondingTime))
@@ -2300,7 +2300,7 @@ export const UnbondingDelegationEntry = {
23002300
const obj: any = {};
23012301
obj.creation_height =
23022302
message.creationHeight !== BigInt(0)
2303-
? message.creationHeight.toString()
2303+
? (message.creationHeight?.toString)()
23042304
: undefined;
23052305
obj.completion_time = message.completionTime
23062306
? Timestamp.toAmino(toTimestamp(message.completionTime))
@@ -2447,7 +2447,7 @@ export const RedelegationEntry = {
24472447
const obj: any = {};
24482448
obj.creation_height =
24492449
message.creationHeight !== BigInt(0)
2450-
? message.creationHeight.toString()
2450+
? (message.creationHeight?.toString)()
24512451
: undefined;
24522452
obj.completion_time = message.completionTime
24532453
? Timestamp.toAmino(toTimestamp(message.completionTime))

‎packages/proto-codecs/src/codegen/cosmos/upgrade/v1beta1/upgrade.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ export const Plan = {
338338
? Timestamp.toAmino(toTimestamp(message.time))
339339
: undefined;
340340
obj.height =
341-
message.height !== BigInt(0) ? message.height.toString() : undefined;
341+
message.height !== BigInt(0) ? (message.height?.toString)() : undefined;
342342
obj.info = message.info === "" ? undefined : message.info;
343343
obj.upgraded_client_state = message.upgradedClientState
344344
? Any.toAmino(message.upgradedClientState)
@@ -650,7 +650,7 @@ export const ModuleVersion = {
650650
const obj: any = {};
651651
obj.name = message.name === "" ? undefined : message.name;
652652
obj.version =
653-
message.version !== BigInt(0) ? message.version.toString() : undefined;
653+
message.version !== BigInt(0) ? (message.version?.toString)() : undefined;
654654
return obj;
655655
},
656656
fromAminoMsg(object: ModuleVersionAminoMsg): ModuleVersion {

0 commit comments

Comments
 (0)