Merge branch 'stage' into jon/fe-14-lock-tokens

package.json

@@ -70,7 +70,7 @@
     "prettier": "^2.8.8",
     "ts-jest": "^29.1.2",
     "turbo": "^1.13.3",
-    "typescript": "5.4.3"
+    "typescript": "5.4.5"
   },
   "packageManager": "[email protected]",
   "resolutions": {

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.0",
-    "typescript": "^5.4.3"
+    "typescript": "^5.4.5"
   },
   "lint-staged": {
     "*": [

packages/bridge/src/errors.ts

@@ -51,4 +51,5 @@ export enum BridgeError {
   CreateEVMTxError = "CreateEVMTxError",
   NoQuotesError = "NoQuotesError",
   UnsupportedQuoteError = "UnsupportedQuoteError",
+  InsufficientAmount = "InsufficientAmountError",
 }

packages/bridge/src/ibc/__tests__/ibc-bridge-provider.spec.ts

@@ -0,0 +1,235 @@
+import { Int } from "@keplr-wallet/unit";
+import { estimateGasFee } from "@osmosis-labs/tx";
+import { CacheEntry } from "cachified";
+import { LRUCache } from "lru-cache";
+
+import { MockAssetLists } from "../../__tests__/mock-asset-lists";
+import { MockChains } from "../../__tests__/mock-chains";
+import { BridgeQuoteError } from "../../errors";
+import {
+  BridgeProviderContext,
+  BridgeQuote,
+  GetBridgeQuoteParams,
+} from "../../interface";
+import { IbcBridgeProvider } from "../index";
+
+jest.mock("@osmosis-labs/tx", () => ({
+  estimateGasFee: jest.fn(),
+}));
+
+const mockContext: BridgeProviderContext = {
+  chainList: MockChains,
+  assetLists: MockAssetLists,
+  getTimeoutHeight: jest.fn().mockResolvedValue("1000-1000"),
+  env: "mainnet",
+  cache: new LRUCache<string, CacheEntry>({ max: 10 }),
+};
+
+// deposit of ATOM from Cosmos Hub to Osmosis
+const mockAtomToOsmosis: GetBridgeQuoteParams = {
+  fromChain: {
+    chainId: "cosmoshub-4",
+    chainType: "cosmos",
+  },
+  toChain: {
+    chainId: "osmosis-1",
+    chainType: "cosmos",
+  },
+  fromAsset: {
+    address: "uatom",
+    sourceDenom: "uatom",
+    denom: "ATOM",
+    decimals: 6,
+  },
+  toAsset: {
+    address:
+      "ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2",
+    sourceDenom: "uatom",
+    denom: "ATOM",
+    decimals: 6,
+  },
+  fromAmount: "1000000", // 1 ATOM
+  fromAddress: "osmo1...",
+  toAddress: "cosmos1...",
+};
+
+const mockAtomFromOsmosis: GetBridgeQuoteParams = {
+  fromChain: {
+    chainId: "osmosis-1",
+    chainType: "cosmos",
+  },
+  toChain: {
+    chainId: "cosmoshub-4",
+    chainType: "cosmos",
+  },
+  fromAsset: {
+    address:
+      "ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2",
+    sourceDenom: "uatom",
+    denom: "ATOM",
+    decimals: 6,
+  },
+  toAsset: {
+    address: "uatom",
+    sourceDenom: "uatom",
+    denom: "ATOM",
+    decimals: 6,
+  },
+  fromAmount: "1000000", // 1 ATOM
+  fromAddress: "osmo1...",
+  toAddress: "cosmos1...",
+};
+
+describe("IbcBridgeProvider", () => {
+  let provider: IbcBridgeProvider;
+
+  beforeEach(() => {
+    provider = new IbcBridgeProvider(mockContext);
+    jest.clearAllMocks();
+  });
+
+  it("should throw an error if fromChain or toChain is not cosmos", async () => {
+    const invalidParams: GetBridgeQuoteParams = {
+      ...mockAtomToOsmosis,
+      fromChain: { chainId: 1, chainType: "evm" },
+    };
+    await expect(provider.getQuote(invalidParams)).rejects.toThrow(
+      BridgeQuoteError
+    );
+  });
+
+  it("should throw an error if gas cost exceeds transfer amount", async () => {
+    (estimateGasFee as jest.Mock).mockResolvedValue({
+      amount: [
+        {
+          amount: new Int(mockAtomFromOsmosis.fromAmount)
+            .add(new Int(100))
+            .toString(),
+          denom: "uatom",
+          isNeededForTx: true,
+        },
+      ],
+    });
+
+    await expect(provider.getQuote(mockAtomToOsmosis)).rejects.toThrow(
+      BridgeQuoteError
+    );
+  });
+
+  it("should return a valid BridgeQuote", async () => {
+    (estimateGasFee as jest.Mock).mockResolvedValue({
+      amount: [{ amount: "5000", denom: "uatom", isNeededForTx: true }],
+    });
+
+    const quote: BridgeQuote = await provider.getQuote(mockAtomToOsmosis);
+
+    expect(quote).toHaveProperty("input");
+    expect(quote).toHaveProperty("expectedOutput");
+    expect(quote).toHaveProperty("fromChain");
+    expect(quote.fromChain.chainId).toBe(mockAtomToOsmosis.fromChain.chainId);
+    expect(quote).toHaveProperty("toChain");
+    expect(quote.toChain.chainId).toBe(mockAtomToOsmosis.toChain.chainId);
+    expect(quote).toHaveProperty("transferFee");
+    expect(quote.transferFee.amount).toBe("0");
+    expect(quote).toHaveProperty("estimatedTime");
+    expect(quote).toHaveProperty("estimatedGasFee");
+    expect(quote).toHaveProperty("estimatedGasFee");
+    expect(quote.estimatedGasFee!.amount).toBe("5000");
+    expect(quote).toHaveProperty("transactionRequest");
+  });
+
+  it("should calculate the correct toAmount when gas fee is needed for tx", async () => {
+    (estimateGasFee as jest.Mock).mockResolvedValue({
+      amount: [{ amount: "5000", denom: "uatom", isNeededForTx: true }],
+    });
+
+    const quote: BridgeQuote = await provider.getQuote(mockAtomToOsmosis);
+
+    expect(quote.expectedOutput.amount).toBe(
+      new Int(mockAtomToOsmosis.fromAmount).sub(new Int("5000")).toString()
+    );
+  });
+
+  it("should calculate the correct toAmount when gas fee is not needed for tx", async () => {
+    (estimateGasFee as jest.Mock).mockResolvedValue({
+      amount: [{ amount: "5000", denom: "uatom", isNeededForTx: false }],
+    });
+
+    const quote: BridgeQuote = await provider.getQuote(mockAtomToOsmosis);
+
+    expect(quote.expectedOutput.amount).toBe(mockAtomToOsmosis.fromAmount);
+  });
+
+  describe("getIbcSource", () => {
+    // extend class to access protected method
+    class ExtendedIbcBridgeProvider extends IbcBridgeProvider {
+      public getIbcSourcePublic(params: GetBridgeQuoteParams): {
+        sourceChannel: string;
+        sourcePort: string;
+        sourceDenom: string;
+      } {
+        return this.getIbcSource(params);
+      }
+    }
+
+    let provider: ExtendedIbcBridgeProvider;
+
+    beforeEach(() => {
+      provider = new ExtendedIbcBridgeProvider(mockContext);
+    });
+
+    it("should return the correct channel, port and denom for transfer from source", () => {
+      const result = provider.getIbcSourcePublic(mockAtomFromOsmosis);
+
+      expect(result.sourceChannel).toBe("channel-0");
+      expect(result.sourcePort).toBe("transfer");
+      expect(result.sourceDenom).toBe(
+        "ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2"
+      );
+    });
+
+    it("should return the correct channel, port and denom for transfer from counterparty", () => {
+      const result = provider.getIbcSourcePublic(mockAtomToOsmosis);
+
+      expect(result.sourceChannel).toBe("channel-141");
+      expect(result.sourcePort).toBe("transfer");
+      expect(result.sourceDenom).toBe("uatom");
+    });
+
+    it("should throw if asset not found", () => {
+      const invalidParams: GetBridgeQuoteParams = {
+        ...mockAtomToOsmosis,
+        toAsset: {
+          ...mockAtomToOsmosis.toAsset,
+          sourceDenom: "not-found",
+        },
+        fromAsset: {
+          ...mockAtomToOsmosis.fromAsset,
+          sourceDenom: "not-found",
+        },
+      };
+
+      expect(() => provider.getIbcSourcePublic(invalidParams)).toThrow(
+        BridgeQuoteError
+      );
+    });
+
+    it("should throw if there's no transfer method", () => {
+      const invalidParams: GetBridgeQuoteParams = {
+        ...mockAtomToOsmosis,
+        toAsset: {
+          ...mockAtomToOsmosis.toAsset,
+          sourceDenom: "uosmo",
+        },
+        fromAsset: {
+          ...mockAtomToOsmosis.fromAsset,
+          sourceDenom: "uosmo",
+        },
+      };
+
+      expect(() => provider.getIbcSourcePublic(invalidParams)).toThrow(
+        BridgeQuoteError
+      );
+    });
+  });
+});

packages/bridge/src/ibc/index.ts

@@ -66,6 +66,15 @@ export class IbcBridgeProvider implements BridgeProvider {
       ? new Int(params.fromAmount).sub(new Int(gasFee.amount)).toString()
       : params.fromAmount;
 
+    if (new Int(toAmount).lte(new Int(0))) {
+      throw new BridgeQuoteError([
+        {
+          errorType: BridgeError.InsufficientAmount,
+          message: "Insufficient amount for fees",
+        },
+      ]);
+    }
+
     return {
       input: {
         amount: params.fromAmount,

packages/proto-codecs/package.json

@@ -44,7 +44,7 @@
   "devDependencies": {
     "@cosmology/proto-parser": "^1.5.0",
     "@cosmology/telescope": "^1.5.1",
-    "@types/node": "^18.16.3",
+    "@types/node": "^20.14.1",
     "regenerator-runtime": "^0.13.11",
     "rimraf": "^5.0.0",
     "tsx": "^4.6.2"

packages/server/package.json

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

packages/server/src/queries/complex/assets/__tests__/categories.spec.ts

@@ -1,4 +1,4 @@
-import dayjs from "../../../../utils/dayjs";
+import { dayjs } from "../../../../utils/dayjs";
 import { AssetLists } from "../../../__tests__/mock-asset-lists";
 import { isAssetInCategories } from "../categories";
 

packages/server/src/queries/complex/assets/categories.ts

@@ -3,7 +3,7 @@ import cachified, { CacheEntry } from "cachified";
 import { LRUCache } from "lru-cache";
 
 import { DEFAULT_LRU_OPTIONS } from "../../../utils";
-import dayjs from "../../../utils/dayjs";
+import { dayjs } from "../../../utils/dayjs";
 import { queryUpcomingAssets } from "../../github";
 
 /** Filters an asset for whether it is included in the given list of categories. */

packages/server/src/queries/complex/assets/price/historical.ts

@@ -2,7 +2,7 @@ import cachified, { CacheEntry } from "cachified";
 import { LRUCache } from "lru-cache";
 
 import { DEFAULT_LRU_OPTIONS } from "../../../../utils/cache";
-import dayjs from "../../../../utils/dayjs";
+import { dayjs } from "../../../../utils/dayjs";
 import { queryMarketChart } from "../../../coingecko";
 import {
   queryTokenHistoricalChart,

packages/server/src/queries/complex/earn/strategies.ts

@@ -17,7 +17,7 @@ import {
 } from "../../../queries/data-services/earn";
 import { queryOsmosisCMS } from "../../../queries/github";
 import { DEFAULT_LRU_OPTIONS } from "../../../utils/cache";
-import dayjs from "../../../utils/dayjs";
+import { dayjs } from "../../../utils/dayjs";
 import { captureIfError } from "../../../utils/error";
 import { type Asset, getAsset } from "../assets";
 import { DEFAULT_VS_CURRENCY } from "../assets/config";

packages/server/src/queries/complex/osmosis/lockup.ts

@@ -1,7 +1,7 @@
 import { Chain } from "@osmosis-labs/types";
 import { Duration } from "dayjs/plugin/duration";
 
-import dayjs from "../../../utils/dayjs";
+import { dayjs } from "../../../utils/dayjs";
 import { queryAccountLockedLongerDuration } from "../../osmosis/lockup";
 
 export type UserLock = {

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

@@ -2,7 +2,7 @@ import { CoinPretty, PricePretty, RatePretty } from "@keplr-wallet/unit";
 import { AssetList, Chain } from "@osmosis-labs/types";
 import type { Duration } from "dayjs/plugin/duration";
 
-import dayjs from "../../../utils/dayjs";
+import { dayjs } from "../../../utils/dayjs";
 import { captureErrorAndReturn } from "../../../utils/error";
 import { querySyntheticLockupsByLockId } from "../../osmosis/lockup";
 import {

packages/server/src/utils/dayjs.ts

@@ -5,5 +5,4 @@ import duration from "dayjs/plugin/duration";
 
 dayjs.extend(duration);
 
-// eslint-disable-next-line import/no-default-export
-export default dayjs;
+export { dayjs };

packages/trpc/package.json

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

packages/trpc/src/api.ts

@@ -18,7 +18,7 @@ import { trpcMiddleware } from "./middleware";
 /**
  * Pass asset lists and chain list to be used cas context in backend service.
  */
-export type CreateContextOptions = {
+type CreateContextOptions = {
   assetLists: AssetList[];
   chainList: Chain[];
 };

packages/tx/package.json

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