Merge pull request #3863 from osmosis-labs/stage

Stage -> Master

.github/workflows/monitoring-limit-geo-e2e-tests.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   fe-trade-eu-tests:
-    timeout-minutes: 10
+    timeout-minutes: 12
     name: prod-fe-trade-eu-tests
     runs-on: macos-latest
     steps:
@@ -33,7 +33,7 @@ jobs:
           TEST_PROXY: "http://138.68.112.16:8888"
           TEST_PROXY_USERNAME: ${{ secrets.TEST_PROXY_USERNAME }}
           TEST_PROXY_PASSWORD: ${{ secrets.TEST_PROXY_PASSWORD }}
-          PRIVATE_KEY: ${{ secrets.TEST_PRIVATE_KEY_2 }}
+          PRIVATE_KEY: ${{ secrets.TEST_PRIVATE_KEY_1 }}
           USE_TEST_PROXY: "use"
         run: |
           cd packages/web
@@ -74,7 +74,7 @@ jobs:
           SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
 
   fe-trade-sg-tests:
-    timeout-minutes: 10
+    timeout-minutes: 12
     name: prod-fe-trade-sg-tests
     runs-on: macos-latest
     steps:
@@ -143,7 +143,6 @@ jobs:
   fe-trade-us-tests:
     timeout-minutes: 10
     name: prod-fe-trade-us-tests
-    needs: fe-trade-eu-tests
     runs-on: macos-latest
     steps:
       - name: Check out repository
@@ -165,7 +164,7 @@ jobs:
       - name: Run Swap tests in US
         env:
           BASE_URL: "https://app.osmosis.zone"
-          PRIVATE_KEY: ${{ secrets.TEST_PRIVATE_KEY_1 }}
+          PRIVATE_KEY: ${{ secrets.TEST_PRIVATE_KEY_3 }}
         run: |
           cd packages/web
           npx playwright test monitoring --timeout 180000
@@ -188,7 +187,7 @@ jobs:
                   "type": "header",
                   "text": {
                     "type": "plain_text",
-                    "text": "🚨 Synthetic SG Prod Trade Monitoring Tests Failure Alert 🚨"
+                    "text": "🚨 Synthetic US Prod Trade Monitoring Tests Failure Alert 🚨"
                   }
                 },
                 {

.github/workflows/monitoring-swap-geo-e2e-tests.yml

@@ -177,7 +177,6 @@ jobs:
   fe-swap-sg-tests:
     timeout-minutes: 15
     name: prod-fe-swap-sg-tests
-    needs: fe-swap-eu-tests
     runs-on: macos-latest
     steps:
       - name: Echo IP
@@ -204,7 +203,7 @@ jobs:
           TEST_PROXY: "http://139.59.218.19:8888"
           TEST_PROXY_USERNAME: ${{ secrets.TEST_PROXY_USERNAME }}
           TEST_PROXY_PASSWORD: ${{ secrets.TEST_PROXY_PASSWORD }}
-          PRIVATE_KEY: ${{ secrets.TEST_PRIVATE_KEY_2 }}
+          PRIVATE_KEY: ${{ secrets.TEST_PRIVATE_KEY_3 }}
           USE_TEST_PROXY: "use"
         run: |
           cd packages/web

packages/server/src/queries/complex/pools/index.ts

@@ -19,6 +19,8 @@ const allPooltypes = [
 ] as const;
 export type PoolType = (typeof allPooltypes)[number];
 
+const FILTERABLE_IDS = IS_TESTNET ? [] : ["2159"];
+
 // PoolMarketMetrics is a partial type that contains the market metrics of a pool.
 type PoolMarketMetrics = Partial<{
   volume7dUsd: PricePretty;
@@ -92,6 +94,8 @@ export async function getPools(
 ): Promise<Pool[]> {
   let pools = await poolProvider(params);
 
+  pools = pools.filter((pool) => !FILTERABLE_IDS.includes(pool.id)); // Filter out ids in FILTERABLE_IDS
+
   if (params?.types) {
     pools = pools.filter(({ type }) =>
       params?.types ? params.types.includes(type) : true

packages/stores/src/account/amino-converters.ts

@@ -3,6 +3,10 @@ import type {
   MsgWithdrawPosition,
   MsgWithdrawPositionAmino,
 } from "@osmosis-labs/proto-codecs/build/codegen/osmosis/concentratedliquidity/v1beta1/tx";
+import type {
+  MsgBeginUnlocking,
+  MsgBeginUnlockingAmino,
+} from "@osmosis-labs/proto-codecs/build/codegen/osmosis/lockup/tx";
 import type { MsgTransfer } from "cosmjs-types/ibc/applications/transfer/v1/tx";
 import Long from "long";
 
@@ -89,6 +93,19 @@ export async function getAminoConverters() {
           return obj;
         },
       },
+      "/osmosis.lockup.MsgBeginUnlocking": {
+        ...originalOsmosisAminoConverters["/osmosis.lockup.MsgBeginUnlocking"],
+        toAmino(message: MsgBeginUnlocking): MsgBeginUnlockingAmino {
+          const obj =
+            originalOsmosisAminoConverters[
+              "/osmosis.lockup.MsgBeginUnlocking"
+            ].toAmino(message);
+          if (obj.coins?.length === 0) {
+            delete obj.coins;
+          }
+          return obj;
+        },
+      },
     };
 
     const ibcAminoConverters: Record<