Publish Stage

.github/workflows/jest-tests.yml

@@ -33,4 +33,4 @@ jobs:
         run: yarn install --frozen-lockfile
 
       - name: Run ${{ matrix.package }} tests
-        run: yarn test --filter=${{ matrix.package }}
+        run: yarn test --filter=@osmosis-labs/${{ matrix.package }}

.github/workflows/lint-and-check-format.yml

@@ -31,4 +31,4 @@ jobs:
         run: yarn install --frozen-lockfile
 
       - name: Lint ${{ matrix.package }} package
-        run: yarn lint --filter=${{ matrix.package }}
+        run: yarn lint --filter=@osmosis-labs/${{ matrix.package }}

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

@@ -16,7 +16,7 @@ jobs:
           echo "matrix={\"include\":[{ \"base-url\":\"https://app.osmosis.zone\", \"server-url\":\"https://sqs.osmosis.zone\", \"env\": \"production\", \"timeseries-url\":\"https://stage-proxy-data-api.osmosis-labs.workers.dev\"}, { \"base-url\":\"https://stage.osmosis.zone\", \"server-url\":\"https://sqs.stage.osmosis.zone\", \"env\": \"staging\", \"timeseries-url\":\"https://stage-proxy-data-api.osmosis-labs.workers.dev\"}]}" >> "$GITHUB_OUTPUT"
 
   server-e2e-tests:
-    name: ${{ matrix.env }}
+    name: ${{ matrix.env }}-server-tests
     needs: setup-matrix
     runs-on: ubuntu-latest
     strategy:
@@ -47,7 +47,7 @@ jobs:
 
       - name: Run Tests
         id: tests
-        run: yarn test:e2e --filter=server
+        run: yarn test:e2e --filter=@osmosis-labs/server
         env:
           NEXT_PUBLIC_SIDECAR_BASE_URL: ${{ matrix.server-url }}
           NEXT_PUBLIC_TIMESERIES_DATA_URL: ${{ matrix.timeseries-url }}
@@ -90,7 +90,7 @@ jobs:
           SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
 
   fe-quote-tests:
-    name: ${{ matrix.env }}
+    name: ${{ matrix.env }}-quote-tests
     needs: setup-matrix
     runs-on: ubuntu-latest
     strategy:

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

@@ -13,13 +13,13 @@ jobs:
     steps:
       - id: set-matrix
         run: |
-          echo "matrix={\"include\":[{\"test-proxy\":\"use\", \"server-url\":\"http://138.68.112.16:8888\", \"env\": \"production-fra1\"}, {\"test-proxy\":\"use\", \"server-url\":\"http://139.59.218.19:8888\", \"env\": \"production-sgp1\"}, {\"test-proxy\":\"no\", \"server-url\":\"http://139.59.218.19:8888\", \"env\": \"production-usa1\"}]}" >> "$GITHUB_OUTPUT"
+          echo "matrix={\"include\":[{\"test-proxy\":\"use\", \"server-url\":\"http://138.68.112.16:8888\", \"env\": \"prod-fra1\"}, {\"test-proxy\":\"use\", \"server-url\":\"http://139.59.218.19:8888\", \"env\": \"prod-sgp1\"}, {\"test-proxy\":\"no\", \"server-url\":\"http://139.59.218.19:8888\", \"env\": \"prod-usa1\"}]}" >> "$GITHUB_OUTPUT"
 
   fe-quote-tests:
-    timeout-minutes: 10
+    timeout-minutes: 15
     name: ${{ matrix.env }}-fe-quote-tests
     needs: setup-matrix
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
@@ -49,6 +49,7 @@ jobs:
           TEST_PROXY_USERNAME: ${{secrets.TEST_PROXY_USERNAME}}
           TEST_PROXY_PASSWORD: ${{secrets.TEST_PROXY_PASSWORD}}
           USE_TEST_PROXY: ${{ matrix.test-proxy }}
+          USE_TRADE: ${{ matrix.test-proxy }}
         run: |
           cd packages/web
           npx playwright test select pools
@@ -62,7 +63,7 @@ jobs:
 
   fe-swap-us-tests:
     timeout-minutes: 10
-    name: fe-swap-us-tests
+    name: prod-fe-swap-us-tests
     runs-on: macos-latest
     steps:
       - name: Echo IP
@@ -87,6 +88,7 @@ jobs:
         env:
           BASE_URL: "https://app.osmosis.zone"
           PRIVATE_KEY_S: ${{ secrets.TEST_PRIVATE_KEY_1 }}
+          USE_TRADE: "no"
         run: |
           cd packages/web
           npx playwright test -g "Test Swap Stables feature"
@@ -104,20 +106,19 @@ jobs:
         with:
           payload: |
             {
-              "text": "🚨 Synthetic Geo Monitoring Tests Failure Alert 🚨",
               "blocks": [
                 {
                   "type": "header",
                   "text": {
                     "type": "plain_text",
-                    "text": "Synthetic Geo Monitoring Tests Failure"
+                    "text": "🚨 Synthetic Geo Swap Monitoring Tests Failure Alert 🚨"
                   }
                 },
                 {
                   "type": "section",
                   "text": {
                     "type": "mrkdwn",
-                    "text": "*Environment:* production\n*App URL:* https://app.osmosis.zone"
+                    "text": "*Production App URL:* https://app.osmosis.zone"
                   }
                 },
                 {
@@ -134,8 +135,8 @@ jobs:
           SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
 
   fe-swap-eu-tests:
-    timeout-minutes: 10
-    name: fe-swap-eu-tests
+    timeout-minutes: 15
+    name: prod-fe-swap-eu-tests
     needs: fe-swap-us-tests
     runs-on: macos-latest
     steps:
@@ -157,14 +158,15 @@ jobs:
       - name: Install Playwright
         run: |
           yarn --cwd packages/web install --frozen-lockfile && npx playwright install --with-deps chromium
-      - name: Run Swap tests in US
+      - name: Run Swap tests in EU
         env:
           BASE_URL: "https://app.osmosis.zone"
           TEST_PROXY: "http://138.68.112.16:8888"
           TEST_PROXY_USERNAME: ${{ secrets.TEST_PROXY_USERNAME }}
           TEST_PROXY_PASSWORD: ${{ secrets.TEST_PROXY_PASSWORD }}
           PRIVATE_KEY_S: ${{ secrets.TEST_PRIVATE_KEY_1 }}
-          USE_TEST_PROXY: "true"
+          USE_TEST_PROXY: "use"
+          USE_TRADE: "use"
         run: |
           cd packages/web
           npx playwright test -g "Test Swap Stables feature"
@@ -177,8 +179,8 @@ jobs:
           path: packages/web/playwright-report
 
   fe-swap-sg-tests:
-    timeout-minutes: 10
-    name: fe-swap-sg-tests
+    timeout-minutes: 15
+    name: prod-fe-swap-sg-tests
     needs: fe-swap-us-tests
     runs-on: macos-latest
     steps:
@@ -200,14 +202,15 @@ jobs:
       - name: Install Playwright
         run: |
           yarn --cwd packages/web install --frozen-lockfile && npx playwright install --with-deps chromium
-      - name: Run Swap tests in US
+      - name: Run Swap tests in SG
         env:
           BASE_URL: "https://app.osmosis.zone"
           TEST_PROXY: "http://139.59.218.19:8888"
           TEST_PROXY_USERNAME: ${{ secrets.TEST_PROXY_USERNAME }}
           TEST_PROXY_PASSWORD: ${{ secrets.TEST_PROXY_PASSWORD }}
           PRIVATE_KEY_S: ${{ secrets.TEST_PRIVATE_KEY_2 }}
-          USE_TEST_PROXY: "true"
+          USE_TEST_PROXY: "use"
+          USE_TRADE: "use"
         run: |
           cd packages/web
           npx playwright test -g "Test Swap Stables feature"
@@ -219,11 +222,91 @@ jobs:
           name: sg-swap-test-results
           path: packages/web/playwright-report
 
+  fe-trade-eu-tests:
+    timeout-minutes: 10
+    name: prod-fe-trade-eu-tests
+    runs-on: macos-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+      - name: Cache dependencies
+        uses: actions/cache@v4
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.OS }}-20.x-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.OS }}-20.x-
+      - name: Install Playwright
+        run: |
+          yarn --cwd packages/web install --frozen-lockfile && npx playwright install --with-deps chromium
+      - name: Run Swap tests in EU
+        env:
+          BASE_URL: "https://app.osmosis.zone"
+          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 }}
+          USE_TEST_PROXY: "use"
+        run: |
+          cd packages/web
+          npx playwright test monitoring --timeout 180000
+      - name: upload monitoring test results
+        if: failure()
+        id: monitoring-test-results
+        uses: actions/upload-artifact@v4
+        with:
+          name: eu-trade-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": "🚨 Synthetic EU Trade Monitoring 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
     if: always()
     needs:
-      [fe-quote-tests, fe-swap-us-tests, fe-swap-sg-tests, fe-swap-eu-tests]
+      [
+        fe-quote-tests,
+        fe-swap-us-tests,
+        fe-swap-sg-tests,
+        fe-swap-eu-tests,
+        fe-trade-eu-tests,
+      ]
     steps:
       - name: Delete Previous deployments
         uses: actions/github-script@v7

.github/workflows/server-e2e-tests.yml

@@ -52,7 +52,7 @@ jobs:
 
       - name: Run Tests
         id: tests
-        run: yarn test:e2e --filter=server
+        run: yarn test:e2e --filter=@osmosis-labs/server
         env:
           NEXT_PUBLIC_SIDECAR_BASE_URL: ${{ matrix.server-url }}
           NEXT_PUBLIC_TIMESERIES_DATA_URL: ${{ matrix.timeseries-url }}

.gitignore

@@ -16,3 +16,11 @@ coverage
 
 tsconfig.tsbuildinfo
 packages/web/e2e/keplr-extension-manifest
+
+# Vim backup, undo files
+*.orig
+*~
+
+# Vim swap files
+.*.swp
+.*.swo

.vscode/settings.json

@@ -14,5 +14,6 @@
   "typescript.tsdk": "node_modules/typescript/lib",
   "search.exclude": {
     "build/": true
-  }
+  },
+  "cSpell.words": ["opentelemetry"]
 }

package.json

@@ -69,8 +69,8 @@
     "pre-commit": "^1.2.2",
     "prettier": "^2.8.8",
     "ts-jest": "^29.1.2",
-    "turbo": "^1.13.3",
-    "typescript": "^5.4.5"
+    "turbo": "^2.0.14",
+    "typescript": "5.4.5"
   },
   "packageManager": "[email protected]",
   "resolutions": {
@@ -82,4 +82,4 @@
     "@keplr-wallet/types": "0.10.24-ibc.go.v7.hot.fix",
     "@keplr-wallet/unit": "0.10.24-ibc.go.v7.hot.fix"
   }
-}
+}

packages/bridge/package.json

@@ -46,7 +46,7 @@
     "@types/jest-in-case": "^1.0.6",
     "jest-in-case": "^1.0.2",
     "ts-jest": "^29.1.2",
-    "typescript": "^5.4.5"
+    "typescript": "5.4.5"
   },
   "lint-staged": {
     "*": [