Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mattupham committed Sep 18, 2024
1 parent bd1936c commit 664c69b
Show file tree
Hide file tree
Showing 118 changed files with 3,389 additions and 1,051 deletions.
70 changes: 1 addition & 69 deletions .github/workflows/monitoring-claim-orders .yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Technical job to claim orders created by monitoring
on:
workflow_dispatch:
schedule:
- cron: "*/45 * * * *"
- cron: "19 * * * *"

jobs:
fe-claim1-tests:
Expand Down Expand Up @@ -40,40 +40,6 @@ jobs:
with:
name: claim1-test-results
path: packages/web/playwright-report
- name: Send Slack alert if test fails
id: slack
if: failure()
uses: slackapi/[email protected]
with:
payload: |
{
"blocks": [
{
"type": "header",
"text": {
"type": "plain_text",
"text": "🚨 Claim Tests Failure Alert 🚨"
}
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "*Production App URL:* https://app.osmosis.zone"
}
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "Click here to view the run: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|GitHub Actions Run>"
}
}
]
}
env:
SLACK_WEBHOOK_URL: ${{ secrets.SERVER_E2E_TESTS_SLACK_WEBHOOK_URL }}
SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK

fe-claim2-tests:
timeout-minutes: 10
Expand Down Expand Up @@ -109,40 +75,6 @@ jobs:
with:
name: claim2-test-results
path: packages/web/playwright-report
- name: Send Slack alert if test fails
id: slack
if: failure()
uses: slackapi/[email protected]
with:
payload: |
{
"blocks": [
{
"type": "header",
"text": {
"type": "plain_text",
"text": "🚨 Claim Tests Failure Alert 🚨"
}
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "*Production App URL:* https://app.osmosis.zone"
}
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "Click here to view the run: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|GitHub Actions Run>"
}
}
]
}
env:
SLACK_WEBHOOK_URL: ${{ secrets.SERVER_E2E_TESTS_SLACK_WEBHOOK_URL }}
SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK

delete-deployments:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion packages/proto-codecs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"devDependencies": {
"@cosmology/proto-parser": "^1.5.0",
"@cosmology/telescope": "^1.5.1",
"@cosmology/telescope": "^1.8.4",
"@types/node": "^20.14.1",
"regenerator-runtime": "^0.13.11",
"rimraf": "^5.0.0",
Expand Down
3 changes: 3 additions & 0 deletions packages/proto-codecs/scripts/generated/package-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export type AvailablePackages =
| "osmosis.gamm.poolmodels.balancer.v1beta1"
| "ibc.applications.interchain_accounts.v1"
| "osmosis.concentratedliquidity.v1beta1"
| "osmosis.cosmwasmpool.v1beta1.model.v3"
| "osmosis.downtimedetector.v1beta1"
| "ibc.lightclients.solomachine.v2"
| "ibc.lightclients.solomachine.v3"
Expand All @@ -32,6 +33,7 @@ export type AvailablePackages =
| "osmosis.valsetpref.v1beta1"
| "cosmos.base.query.v1beta1"
| "cosmos.base.store.v1beta1"
| "ibc.lightclients.wasm.v1"
| "osmosis.protorev.v1beta1"
| "cosmos.base.abci.v1beta1"
| "ibc.applications.fee.v1"
Expand Down Expand Up @@ -66,6 +68,7 @@ export type AvailablePackages =
| "tendermint.abci"
| "osmosis.lockup"
| "tendermint.p2p"
| "capability.v1"
| "cosmos.msg.v1"
| "cosmos_proto"
| "google.api"
Expand Down
11 changes: 8 additions & 3 deletions packages/proto-codecs/scripts/get-proto.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ GREEN='\033[0;32m' # Green color
NC='\033[0m' # No Color

PROTO_DIR="./chain-proto"
OSMOSIS_COMMIT_HASH="b07e6725f7d97b3321c8165fc1d95a9ab6fa963b"
OSMOSIS_COMMIT_HASH="dd6442421a5643d8702200d6a46a6178160a8c76"

ICS23_COMMIT_HASH="f4deb054b697458e7f0aa353c2f45a365361e895"

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


# SDK PROTOS
COSMOS_SDK_VERSION=$(awk -F '=>' '/github.com\/osmosis-labs\/cosmos-sdk/ {print $2}' .repos/osmosis/go.mod | awk '{print $NF}' | tr -d '\n')
# COSMOS_SDK_VERSION=$(awk '/github.com\/cosmos\/cosmos-sdk/ {print $2}' .repos/osmosis/go.mod | tr -d '=> ')
# COSMOS_SDK_VERSION=$(awk -F '=>' '/github.com\/osmosis-labs\/cosmos-sdk/ {print $2}' .repos/osmosis/go.mod | awk '{print $NF}' | tr -d '\n')
COSMOS_SDK_VERSION=v0.50.6-v26-osmo-2

echo -e "${GREEN}COSMOS_SDK_VERSION: $COSMOS_SDK_VERSION${NC}"

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

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

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

# TROUBLESHOOTING
Expand Down
4 changes: 2 additions & 2 deletions packages/proto-codecs/src/codegen/binary.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//@ts-nocheck
/**
* This file and any referenced files were automatically generated by @cosmology/telescope@1.5.1
* This file and any referenced files were automatically generated by @cosmology/telescope@1.8.4
* DO NOT MODIFY BY HAND. Instead, download the latest proto files for your chain
* and run the transpile command or yarn proto command to regenerate this bundle.
* and run the transpile command or npm scripts command that is used to regenerate this bundle.
*/

// Copyright (c) 2016, Daniel Wirtz All rights reserved.
Expand Down
16 changes: 9 additions & 7 deletions packages/proto-codecs/src/codegen/cosmos/auth/v1beta1/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,12 @@ export const BaseAccount = {
obj.pub_key = message.pubKey ? Any.toAmino(message.pubKey) : undefined;
obj.account_number =
message.accountNumber !== BigInt(0)
? message.accountNumber.toString()
? (message.accountNumber?.toString)()
: undefined;
obj.sequence =
message.sequence !== BigInt(0) ? message.sequence.toString() : undefined;
message.sequence !== BigInt(0)
? (message.sequence?.toString)()
: undefined;
return obj;
},
fromAminoMsg(object: BaseAccountAminoMsg): BaseAccount {
Expand Down Expand Up @@ -460,23 +462,23 @@ export const Params = {
const obj: any = {};
obj.max_memo_characters =
message.maxMemoCharacters !== BigInt(0)
? message.maxMemoCharacters.toString()
? (message.maxMemoCharacters?.toString)()
: undefined;
obj.tx_sig_limit =
message.txSigLimit !== BigInt(0)
? message.txSigLimit.toString()
? (message.txSigLimit?.toString)()
: undefined;
obj.tx_size_cost_per_byte =
message.txSizeCostPerByte !== BigInt(0)
? message.txSizeCostPerByte.toString()
? (message.txSizeCostPerByte?.toString)()
: undefined;
obj.sig_verify_cost_ed25519 =
message.sigVerifyCostEd25519 !== BigInt(0)
? message.sigVerifyCostEd25519.toString()
? (message.sigVerifyCostEd25519?.toString)()
: undefined;
obj.sig_verify_cost_secp256k1 =
message.sigVerifyCostSecp256k1 !== BigInt(0)
? message.sigVerifyCostSecp256k1.toString()
? (message.sigVerifyCostSecp256k1?.toString)()
: undefined;
return obj;
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,9 @@ export const PageRequest = {
const obj: any = {};
obj.key = message.key ? base64FromBytes(message.key) : undefined;
obj.offset =
message.offset !== BigInt(0) ? message.offset.toString() : undefined;
message.offset !== BigInt(0) ? (message.offset?.toString)() : undefined;
obj.limit =
message.limit !== BigInt(0) ? message.limit.toString() : undefined;
message.limit !== BigInt(0) ? (message.limit?.toString)() : undefined;
obj.count_total =
message.countTotal === false ? undefined : message.countTotal;
obj.reverse = message.reverse === false ? undefined : message.reverse;
Expand Down Expand Up @@ -368,7 +368,7 @@ export const PageResponse = {
? base64FromBytes(message.nextKey)
: undefined;
obj.total =
message.total !== BigInt(0) ? message.total.toString() : undefined;
message.total !== BigInt(0) ? (message.total?.toString)() : undefined;
return obj;
},
fromAminoMsg(object: PageResponseAminoMsg): PageResponse {
Expand Down
72 changes: 36 additions & 36 deletions packages/proto-codecs/src/codegen/cosmos/bundle.ts
Original file line number Diff line number Diff line change
@@ -1,67 +1,67 @@
//@ts-nocheck
import * as _55 from "./auth/v1beta1/auth";
import * as _56 from "./auth/v1beta1/genesis";
import * as _57 from "./bank/v1beta1/authz";
import * as _58 from "./bank/v1beta1/bank";
import * as _59 from "./bank/v1beta1/genesis";
import * as _60 from "./bank/v1beta1/tx";
import * as _111 from "./bank/v1beta1/tx.amino";
import * as _114 from "./bank/v1beta1/tx.registry";
import * as _61 from "./base/query/v1beta1/pagination";
import * as _62 from "./base/v1beta1/coin";
import * as _63 from "./staking/v1beta1/authz";
import * as _64 from "./staking/v1beta1/genesis";
import * as _65 from "./staking/v1beta1/staking";
import * as _66 from "./staking/v1beta1/tx";
import * as _112 from "./staking/v1beta1/tx.amino";
import * as _115 from "./staking/v1beta1/tx.registry";
import * as _67 from "./upgrade/v1beta1/tx";
import * as _113 from "./upgrade/v1beta1/tx.amino";
import * as _116 from "./upgrade/v1beta1/tx.registry";
import * as _68 from "./upgrade/v1beta1/upgrade";
import * as _57 from "./auth/v1beta1/auth";
import * as _58 from "./auth/v1beta1/genesis";
import * as _59 from "./bank/v1beta1/authz";
import * as _60 from "./bank/v1beta1/bank";
import * as _61 from "./bank/v1beta1/genesis";
import * as _62 from "./bank/v1beta1/tx";
import * as _113 from "./bank/v1beta1/tx.amino";
import * as _116 from "./bank/v1beta1/tx.registry";
import * as _63 from "./base/query/v1beta1/pagination";
import * as _64 from "./base/v1beta1/coin";
import * as _65 from "./staking/v1beta1/authz";
import * as _66 from "./staking/v1beta1/genesis";
import * as _67 from "./staking/v1beta1/staking";
import * as _68 from "./staking/v1beta1/tx";
import * as _114 from "./staking/v1beta1/tx.amino";
import * as _117 from "./staking/v1beta1/tx.registry";
import * as _69 from "./upgrade/v1beta1/tx";
import * as _115 from "./upgrade/v1beta1/tx.amino";
import * as _118 from "./upgrade/v1beta1/tx.registry";
import * as _70 from "./upgrade/v1beta1/upgrade";
export namespace cosmos {
export namespace auth {
export const v1beta1 = {
..._55,
..._56,
..._57,
..._58,
};
}
export namespace bank {
export const v1beta1 = {
..._57,
..._58,
..._59,
..._60,
..._111,
..._114,
..._61,
..._62,
..._113,
..._116,
};
}
export namespace base {
export namespace query {
export const v1beta1 = {
..._61,
..._63,
};
}
export const v1beta1 = {
..._62,
..._64,
};
}
export namespace staking {
export const v1beta1 = {
..._63,
..._64,
..._65,
..._66,
..._112,
..._115,
..._67,
..._68,
..._114,
..._117,
};
}
export namespace upgrade {
export const v1beta1 = {
..._67,
..._68,
..._113,
..._116,
..._69,
..._70,
..._115,
..._118,
};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ export const LastValidatorPower = {
const obj: any = {};
obj.address = message.address === "" ? undefined : message.address;
obj.power =
message.power !== BigInt(0) ? message.power.toString() : undefined;
message.power !== BigInt(0) ? (message.power?.toString)() : undefined;
return obj;
},
fromAminoMsg(object: LastValidatorPowerAminoMsg): LastValidatorPower {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1501,7 +1501,7 @@ export const Validator = {
: undefined;
obj.unbonding_height =
message.unbondingHeight !== BigInt(0)
? message.unbondingHeight.toString()
? (message.unbondingHeight?.toString)()
: undefined;
obj.unbonding_time = message.unbondingTime
? Timestamp.toAmino(toTimestamp(message.unbondingTime))
Expand Down Expand Up @@ -2300,7 +2300,7 @@ export const UnbondingDelegationEntry = {
const obj: any = {};
obj.creation_height =
message.creationHeight !== BigInt(0)
? message.creationHeight.toString()
? (message.creationHeight?.toString)()
: undefined;
obj.completion_time = message.completionTime
? Timestamp.toAmino(toTimestamp(message.completionTime))
Expand Down Expand Up @@ -2447,7 +2447,7 @@ export const RedelegationEntry = {
const obj: any = {};
obj.creation_height =
message.creationHeight !== BigInt(0)
? message.creationHeight.toString()
? (message.creationHeight?.toString)()
: undefined;
obj.completion_time = message.completionTime
? Timestamp.toAmino(toTimestamp(message.completionTime))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ export const Plan = {
? Timestamp.toAmino(toTimestamp(message.time))
: undefined;
obj.height =
message.height !== BigInt(0) ? message.height.toString() : undefined;
message.height !== BigInt(0) ? (message.height?.toString)() : undefined;
obj.info = message.info === "" ? undefined : message.info;
obj.upgraded_client_state = message.upgradedClientState
? Any.toAmino(message.upgradedClientState)
Expand Down Expand Up @@ -650,7 +650,7 @@ export const ModuleVersion = {
const obj: any = {};
obj.name = message.name === "" ? undefined : message.name;
obj.version =
message.version !== BigInt(0) ? message.version.toString() : undefined;
message.version !== BigInt(0) ? (message.version?.toString)() : undefined;
return obj;
},
fromAminoMsg(object: ModuleVersionAminoMsg): ModuleVersion {
Expand Down
Loading

0 comments on commit 664c69b

Please sign in to comment.