Merge branch 'stage' into jon/usd-event

osmosis-labs · Sep 19, 2024 · 0556904 · 0556904
2 parents f458010 + c0894d0
commit 0556904
Show file tree

Hide file tree

Showing 161 changed files with 3,914 additions and 1,347 deletions.
diff --git a/.github/workflows/monitoring-claim-orders .yml b/.github/workflows/monitoring-claim-orders .yml
@@ -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:
@@ -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
@@ -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

diff --git a/.github/workflows/pr-notification.yml b/.github/workflows/pr-notification.yml
@@ -0,0 +1,20 @@
+name: PR Notification
+on:
+  pull_request:
+    types: [opened, reopened]
+    branches:
+      - master
+jobs:
+  slack-notification:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Slack Notification
+        uses: 8398a7/action-slack@v3
+        with:
+          status: ${{ job.status }}
+          text: New PR opened to master branch
+          author_name: GitHub Action
+          fields: repo,message,commit,author,action,eventName,ref,workflow
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_ANNOUNCEMENT_WEBHOOK_URL }}
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ packages/web/e2e/keplr-extension-manifest
 # Vim swap files
 .*.swp
 .*.swo
+packages/web/e2e/metamask-extension-manifest/
diff --git a/packages/bridge/src/__tests__/mock-asset-lists.ts b/packages/bridge/src/__tests__/mock-asset-lists.ts
@@ -1445,7 +1445,7 @@ export const MockAssetLists: AssetList[] = [
         sourceDenom: "wmatic-wei",
         coinMinimalDenom:
           "ibc/AB589511ED0DD5FA56171A39978AFBF1371DB986EC1C3526CE138A16377E39BB",
-        symbol: "MATIC",
+        symbol: "POL",
         decimals: 18,
         logoURIs: {
           png: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/polygon/images/matic-purple.png",
@@ -1506,15 +1506,15 @@ export const MockAssetLists: AssetList[] = [
             chainType: "evm",
             chainId: 137,
             address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-            symbol: "MATIC",
+            symbol: "POL",
             decimals: 18,
             logoURIs: {
               png: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/polygon/images/matic-purple.png",
               svg: "https://raw.githubusercontent.com/cosmos/chain-registry/master/_non-cosmos/polygon/images/matic-purple.svg",
             },
           },
         ],
-        variantGroupKey: "MATIC",
+        variantGroupKey: "POL",
         name: "Polygon",
         isAlloyed: false,
         verified: true,

diff --git a/packages/bridge/src/ibc/transfer-status.ts b/packages/bridge/src/ibc/transfer-status.ts
@@ -30,9 +30,9 @@ export class IbcTransferStatusProvider implements TransferStatusProvider {
      * This is not related to the block height IBC timeout on chain, but rather is a catch all
      * fallback to prevent indefinite waiting when there's some unforseen issue
      * getting conclusive statuses from chain(s).
-     * Default: 60 seconds.
+     * Default: 3 minutes.
      */
-    protected readonly connectionTimeoutMs = 60 * 1000
+    protected readonly connectionTimeoutMs = 60 * 1000 * 3
   ) {}
 
   async trackTxStatus(serializedParamsOrHash: string): Promise<void> {

diff --git a/packages/bridge/src/squid/__tests__/mocks.ts b/packages/bridge/src/squid/__tests__/mocks.ts
@@ -1977,7 +1977,7 @@ export const MockChains = [
     chainId: 137,
     nativeCurrency: {
       name: "Polygon",
-      symbol: "MATIC",
+      symbol: "POL",
       decimals: 18,
       icon: "https://raw.githubusercontent.com/axelarnetwork/axelar-docs/main/public/images/chains/polygon.svg",
     },

diff --git a/packages/bridge/src/squid/__tests__/squid-bridge-provider.spec.ts b/packages/bridge/src/squid/__tests__/squid-bridge-provider.spec.ts
@@ -527,7 +527,7 @@ describe("SquidBridgeProvider", () => {
         chainId: 137,
         nativeCurrency: {
           name: "Polygon",
-          symbol: "MATIC",
+          symbol: "POL",
           decimals: 18,
           icon: "https://raw.githubusercontent.com/axelarnetwork/axelar-docs/main/public/images/chains/polygon.svg",
         },

diff --git a/packages/proto-codecs/package.json b/packages/proto-codecs/package.json
@@ -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",

diff --git a/packages/proto-codecs/scripts/generated/package-types.ts b/packages/proto-codecs/scripts/generated/package-types.ts
@@ -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"
@@ -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"
@@ -66,6 +68,7 @@ export type AvailablePackages =
   | "tendermint.abci"
   | "osmosis.lockup"
   | "tendermint.p2p"
+  | "capability.v1"
   | "cosmos.msg.v1"
   | "cosmos_proto"
   | "google.api"

diff --git a/packages/proto-codecs/scripts/get-proto.sh b/packages/proto-codecs/scripts/get-proto.sh
@@ -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"
 
@@ -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
@@ -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

diff --git a/packages/proto-codecs/src/codegen/binary.ts b/packages/proto-codecs/src/codegen/binary.ts
@@ -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.

diff --git a/packages/proto-codecs/src/codegen/cosmos/auth/v1beta1/auth.ts b/packages/proto-codecs/src/codegen/cosmos/auth/v1beta1/auth.ts
@@ -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 {
@@ -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;
   },

diff --git a/packages/proto-codecs/src/codegen/cosmos/base/query/v1beta1/pagination.ts b/packages/proto-codecs/src/codegen/cosmos/base/query/v1beta1/pagination.ts
@@ -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;
@@ -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 {