osmosis-labs · jonator · Jun 1, 2024 · May 15, 2024 · May 15, 2024 · May 15, 2024
diff --git a/.gitignore b/.gitignore
@@ -12,5 +12,6 @@ src/styles/index.scss
 .turbo
 
 lerna-debug.log
+coverage
 
 tsconfig.tsbuildinfo
diff --git a/.vscode/osmosis-frontend.code-workspace b/.vscode/osmosis-frontend.code-workspace
@@ -16,19 +16,25 @@
       "path": "../packages/proto-codecs/"
     },
     {
-      "path": "../packages/bridge/"
+      "path": "../packages/types/"
     },
     {
-      "path": "../packages/server/"
+      "path": "../packages/tx/"
     },
     {
-      "path": "../packages/stores/"
+      "path": "../packages/trpc/"
     },
     {
-      "path": "../packages/types/"
+      "path": "../packages/utils/"
     },
     {
-      "path": "../packages/utils/"
+      "path": "../packages/bridge/"
+    },
+    {
+      "path": "../packages/stores/"
+    },
+    {
+      "path": "../packages/server/"
     },
     {
       "path": "../packages/web/"

diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 ![osmosis-banner-1200w](https://user-images.githubusercontent.com/4606373/167008669-fb3cafa8-e66e-4cdf-8599-3308039cc58c.png)
 
+> Note: this codebase is currently undergoing a refactor from Keplr's architecture to a tRPC stack to improve performance, maintainability, and development speed. We appreciate your patience as we work through these changes.
+
 ## Overview 💻
 
 Our [frontend](https://app.osmosis.zone) is built with the following tools:
@@ -63,7 +65,7 @@ To develop on the canonical public testnet, run:
 yarn build:testnet && yarn start:testnet
 ```
 
-To develop against a local testnet, such as [localosmosis](https://github.com/osmosis-labs/osmosis/blob/1eb6506297c88dd3acc7d9c0a5f7c4e34ecd1b4e/tests/localosmosis/README.md), modify the .env file:
+To develop against a local testnet, such as [localosmosis](https://github.com/osmosis-labs/osmosis/blob/1eb6506297c88dd3acc7d9c0a5f7c4e34ecd1b4e/tests/localosmosis/README.md), set this in your .env.local file in web package root:
 
 ```bash
 # Osmosis Chain Configuration Overwrite
@@ -97,6 +99,8 @@ Note: our currency registrar checks IBC hashes to see if they can be found via t
 
 ## Releases
 
+> Note: releases are suspended until the refactor is complete. Please avoid importing packages from this repo until further notice.
+
 Release tags are for the published [npm packages](https://www.npmjs.com/org/osmosis-labs), which are every package except for the web package. Updates to the app are released incrementally way via deployments from master branch.
 
 To start the release process:

diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
     ]
   },
   "scripts": {
-    "dev": "turbo dev --concurrency 12",
+    "dev": "turbo dev --concurrency 14",
     "dev:testnet": "dotenv -v NEXT_PUBLIC_IS_TESTNET=true -- yarn dev",
     "start": "turbo start",
     "start:testnet": "dotenv -v NEXT_PUBLIC_IS_TESTNET=true -- yarn start",

diff --git a/packages/bridge/package.json b/packages/bridge/package.json
@@ -16,29 +16,27 @@
   ],
   "license": "Apache-2.0",
   "scripts": {
-    "clean": "rm -rf node_modules; rm -rf build; rm tsconfig.tsbuildinfo",
+    "clean": "rm -rf node_modules; rm -rf build; rm -f tsconfig.tsbuildinfo",
     "build": "tsc",
     "dev": "tsc -w",
     "test": "jest --passWithNoTests",
-    "test:e2e": "yarn with-env is-ci-cli test:e2e:ci test:e2e:dev",
-    "test:e2e:dev": "jest --testMatch '**/__tests_e2e__/?(*.)+(spec|test).[jt]s?(x)' --watch",
-    "test:e2e:ci": "jest --testMatch '**/__tests_e2e__/?(*.)+(spec|test).[jt]s?(x)' --ci",
     "lint": "eslint \"src/**/*.+(js|ts|tsx|json)\" && prettier --check \"src/**/*.+(js|ts|tsx|json)\"",
     "lint:fix": "eslint --fix \"src/**/*.+(js|ts|tsx|json)\" && prettier --write \"src/**/*.+(js|ts|tsx|json)\"",
-    "prepare": "yarn build",
-    "with-env": "dotenv -e ../web/.env -c --"
+    "prepare": "yarn build"
   },
   "dependencies": {
     "@0xsquid/sdk": "^1.14.0",
     "@axelar-network/axelarjs-sdk": "0.16.0",
     "@cosmjs/encoding": "0.32.3",
+    "@cosmjs/proto-signing": "0.32.3",
     "@keplr-wallet/unit": "0.10.24-ibc.go.v7.hot.fix",
     "@osmosis-labs/proto-codecs": "^5.1.0",
+    "@osmosis-labs/server": "^1.0.0",
     "@osmosis-labs/types": "^1.0.0",
+    "@osmosis-labs/tx": "^1.0.0",
     "@osmosis-labs/utils": "^1.0.0",
     "cachified": "^3.5.4",
     "ethers": "^6.8.0",
-    "jest-util": "^29.7.0",
     "long": "^5.2.3",
     "lru-cache": "^10.0.1",
     "web3-utils": "^1.7.4",

diff --git a/packages/bridge/src/axelar/__tests__/axelar-bridge-provider.spec.ts b/packages/bridge/src/axelar/__tests__/axelar-bridge-provider.spec.ts
@@ -53,6 +53,8 @@ describe("AxelarBridgeProvider", () => {
         max: 500,
       }),
       assetLists: MockAssetLists,
+      // not used
+      chainList: [],
       getTimeoutHeight: jest.fn().mockResolvedValue({
         revisionNumber: "1",
         revisionHeight: "1000",

diff --git a/packages/bridge/src/axelar/index.ts b/packages/bridge/src/axelar/index.ts
@@ -35,10 +35,9 @@ import {
   CosmosChainIds_AxelarChainIds,
 } from "./types";
 
-export const axelarProviderId = "Axelar" as const;
-
 export class AxelarBridgeProvider implements BridgeProvider {
-  readonly providerName = axelarProviderId;
+  static readonly ID = "Axelar";
+  readonly providerName = AxelarBridgeProvider.ID;
 
   // initialized via dynamic import
   protected _queryClient: AxelarQueryAPI | null = null;
@@ -72,7 +71,7 @@ export class AxelarBridgeProvider implements BridgeProvider {
     return cachified({
       cache: this.ctx.cache,
       key: JSON.stringify({
-        id: axelarProviderId,
+        id: AxelarBridgeProvider.ID,
         fromAmount,
         fromAsset,
         fromChain,
@@ -106,12 +105,15 @@ export class AxelarBridgeProvider implements BridgeProvider {
           }
 
           const queryClient = await this.getQueryClient();
-          const transferFeeRes = await queryClient.getTransferFee(
-            fromChainAxelarId,
-            toChainAxelarId,
-            fromAsset.sourceDenom,
-            amount as any
-          );
+          const [transferFeeRes, gasCost] = await Promise.all([
+            queryClient.getTransferFee(
+              fromChainAxelarId,
+              toChainAxelarId,
+              fromAsset.sourceDenom,
+              amount as any
+            ),
+            this.estimateGasCost(params),
+          ]);
 
           let transferLimitAmount: string | undefined;
           try {
@@ -125,8 +127,6 @@ export class AxelarBridgeProvider implements BridgeProvider {
             console.warn("Failed to get transfer limit. reason: ", e);
           }
 
-          const gasCost = await this.estimateGasCost(params);
-
           if (!transferFeeRes.fee) {
             throw new BridgeQuoteError([
               {

diff --git a/packages/bridge/src/axelar/transfer-status.ts b/packages/bridge/src/axelar/transfer-status.ts
@@ -7,12 +7,12 @@ import type {
   TransferStatusProvider,
   TransferStatusReceiver,
 } from "../interface";
-import { axelarProviderId } from ".";
+import { AxelarBridgeProvider } from ".";
 import { getTransferStatus } from "./queries";
 
 /** Tracks (polls Axelar endpoint) and reports status updates on Axelar bridge transfers. */
 export class AxelarTransferStatusProvider implements TransferStatusProvider {
-  readonly keyPrefix = axelarProviderId;
+  readonly keyPrefix = AxelarBridgeProvider.ID;
   readonly sourceDisplayName = "Axelar Bridge";
   public statusReceiverDelegate?: TransferStatusReceiver;
 

diff --git a/packages/bridge/src/errors.ts b/packages/bridge/src/errors.ts
@@ -1,4 +1,3 @@
-/** A collection of errors that is itself an error. */
 export class Errors extends Error {
   errors: Array<{
     errorType: string;