Merge pull request #3904 from osmosis-labs/stage

stage -> master Oct 23, 2024
osmosis-labs · Oct 23, 2024 · eab0df4 · eab0df4
2 parents c2fa93e + 50b9fcf
commit eab0df4
Show file tree

Hide file tree

Showing 93 changed files with 5,297 additions and 1,366 deletions.
diff --git a/package.json b/package.json
@@ -30,6 +30,7 @@
     "publish:libs": "lerna publish",
     "machine-translate": "inlang machine translate -f --project ./project.inlang && yarn lint:fix",
     "lint:workspace": "npx sherif@latest --ignore-package ./packages/keplr-hooks --ignore-package ./packages/keplr-stores",
+    "lint:workspace:fix": "yarn lint:workspace -f",
     "postinstall": "yarn lint:workspace"
   },
   "pre-commit": [

diff --git a/packages/bridge/package.json b/packages/bridge/package.json
@@ -37,8 +37,10 @@
     "@osmosis-labs/utils": "^1.0.0",
     "base-x": "^5.0.0",
     "cachified": "^3.5.4",
+    "launchdarkly-node-client-sdk": "^3.3.0",
     "long": "^5.2.3",
     "lru-cache": "^10.0.1",
+    "nomic-bitcoin": "^4.2.0",
     "viem": "^2.21.19",
     "zod": "^3.22.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
@@ -96,7 +96,7 @@ describe("AxelarBridgeProvider", () => {
       .spyOn(provider, "getAssetTransferClient")
       .mockResolvedValue(mockDepositClient as unknown as AxelarAssetTransfer);
 
-    const depositAddress = await provider.getDepositAddress({
+    const depositAddress = await provider.getAxelarDepositAddress({
       fromChain: { chainId: 1, chainName: "Ethereum", chainType: "evm" },
       toChain: {
         chainId: "osmosis-1",
@@ -122,7 +122,7 @@ describe("AxelarBridgeProvider", () => {
 
   it("should throw an error for unsupported chains", async () => {
     await expect(
-      provider.getDepositAddress({
+      provider.getAxelarDepositAddress({
         fromChain: {
           chainId: 989898989898,
           chainName: "Unsupported",
@@ -336,23 +336,27 @@ describe("AxelarBridgeProvider", () => {
 
     expect(transaction).toEqual({
       type: "cosmos",
-      msgTypeUrl: "/ibc.applications.transfer.v1.MsgTransfer",
-      msg: {
-        receiver: "0x1234567890abcdef1234567890abcdef12345678",
-        sender: "cosmos1...",
-        sourceChannel: "channel-208",
-        sourcePort: "transfer",
-        timeoutHeight: {
-          revisionHeight: "1000",
-          revisionNumber: "1",
-        },
-        timeoutTimestamp: "0",
-        token: {
-          amount: "1000000",
-          denom:
-            "ibc/D189335C6E4A68B513C10AB227BF1C1D38C746766278BA3EEB4FB14124F1D858",
+      msgs: [
+        {
+          typeUrl: "/ibc.applications.transfer.v1.MsgTransfer",
+          value: {
+            receiver: "0x1234567890abcdef1234567890abcdef12345678",
+            sender: "cosmos1...",
+            sourceChannel: "channel-208",
+            sourcePort: "transfer",
+            timeoutHeight: {
+              revisionHeight: "1000",
+              revisionNumber: "1",
+            },
+            timeoutTimestamp: "0",
+            token: {
+              amount: "1000000",
+              denom:
+                "ibc/D189335C6E4A68B513C10AB227BF1C1D38C746766278BA3EEB4FB14124F1D858",
+            },
+          },
         },
-      },
+      ],
     });
   });
 
@@ -515,6 +519,7 @@ describe("AxelarBridgeProvider", () => {
             "ibc/D189335C6E4A68B513C10AB227BF1C1D38C746766278BA3EEB4FB14124F1D858",
           decimals: 6,
         },
+        direction: "deposit",
       });
 
       expect(sourceVariants).toEqual([
@@ -526,6 +531,7 @@ describe("AxelarBridgeProvider", () => {
           coinGeckoId: "usd-coin",
           decimals: 6,
           denom: "USDC",
+          transferTypes: ["quote"],
         },
       ]);
     });
@@ -542,6 +548,7 @@ describe("AxelarBridgeProvider", () => {
             "ibc/EA1D43981D5C9A1C4AAEA9C23BB1D4FA126BA9BC7020A25E0AE4AA841EA25DC5",
           decimals: 6,
         },
+        direction: "deposit",
       });
 
       expect(sourceVariants).toEqual([
@@ -553,6 +560,7 @@ describe("AxelarBridgeProvider", () => {
           coinGeckoId: "weth",
           decimals: 18,
           denom: "WETH",
+          transferTypes: ["quote"],
         },
         {
           // this is the denom accepted by Axelar APIs
@@ -563,6 +571,7 @@ describe("AxelarBridgeProvider", () => {
           coinGeckoId: "weth",
           decimals: 18,
           denom: "ETH",
+          transferTypes: ["quote"],
         },
       ]);
     });

diff --git a/packages/bridge/src/axelar/index.ts b/packages/bridge/src/axelar/index.ts
@@ -26,11 +26,11 @@ import {
   BridgeAsset,
   BridgeChain,
   BridgeCoin,
-  BridgeDepositAddress,
   BridgeExternalUrl,
   BridgeProvider,
   BridgeProviderContext,
   BridgeQuote,
+  BridgeSupportedAsset,
   BridgeTransactionRequest,
   CosmosBridgeTransactionRequest,
   EvmBridgeTransactionRequest,
@@ -39,7 +39,7 @@ import {
   GetBridgeSupportedAssetsParams,
   GetDepositAddressParams,
 } from "../interface";
-import { BridgeAssetMap } from "../utils";
+import { BridgeAssetMap } from "../utils/asset";
 import { getAxelarAssets, getAxelarChains } from "./queries";
 
 export class AxelarBridgeProvider implements BridgeProvider {
@@ -227,7 +227,9 @@ export class AxelarBridgeProvider implements BridgeProvider {
   async getSupportedAssets({
     chain,
     asset,
-  }: GetBridgeSupportedAssetsParams): Promise<(BridgeChain & BridgeAsset)[]> {
+  }: GetBridgeSupportedAssetsParams): Promise<
+    (BridgeChain & BridgeSupportedAsset)[]
+  > {
     try {
       // get origin axelar asset info from given toAsset
       const [axelarAssets, axelarChains] = await Promise.all([
@@ -272,7 +274,9 @@ export class AxelarBridgeProvider implements BridgeProvider {
             axelarChainId
         );
 
-      const foundVariants = new BridgeAssetMap<BridgeChain & BridgeAsset>();
+      const foundVariants = new BridgeAssetMap<
+        BridgeChain & BridgeSupportedAsset
+      >();
 
       // return just origin asset and the unwrapped version for now, but
       // can return other axl-versions later if wanted
@@ -320,6 +324,7 @@ export class AxelarBridgeProvider implements BridgeProvider {
         axelarSourceAsset.denom,
         {
           ...chainInfo,
+          transferTypes: ["quote"],
           chainName: axelarChain.name,
           denom: addressAsset.symbol,
           address: assetAddress,
@@ -350,6 +355,7 @@ export class AxelarBridgeProvider implements BridgeProvider {
             address: NativeEVMTokenConstantAddress,
             decimals: axelarChain.native_token.decimals,
             coinGeckoId: axelarSourceAsset.coingecko_id,
+            transferTypes: ["quote"],
           }
         );
       }
@@ -418,14 +424,11 @@ export class AxelarBridgeProvider implements BridgeProvider {
       chainId: params.fromChain.chainId.toString(),
       chainList: this.ctx.chainList,
       body: {
-        messages: [
-          (
-            await this.getProtoRegistry()
-          ).encodeAsAny({
-            typeUrl: transactionData.msgTypeUrl,
-            value: transactionData.msg,
-          }),
-        ],
+        messages: await Promise.all(
+          transactionData.msgs.map(async (msg) =>
+            (await this.getProtoRegistry()).encodeAsAny(msg)
+          )
+        ),
       },
       bech32Address: params.fromAddress,
       fallbackGasLimit: makeIBCTransferMsg.gas,
@@ -521,7 +524,7 @@ export class AxelarBridgeProvider implements BridgeProvider {
   }): Promise<EvmBridgeTransactionRequest> {
     const { depositAddress } = simulated
       ? { depositAddress: fromAddress }
-      : await this.getDepositAddress({
+      : await this.getAxelarDepositAddress({
           fromChain,
           toChain,
           fromAsset,
@@ -563,7 +566,7 @@ export class AxelarBridgeProvider implements BridgeProvider {
     try {
       const { depositAddress } = simulated
         ? { depositAddress: fromAddress }
-        : await this.getDepositAddress({
+        : await this.getAxelarDepositAddress({
             fromChain,
             toChain,
             fromAsset,
@@ -611,8 +614,7 @@ export class AxelarBridgeProvider implements BridgeProvider {
 
       return {
         type: "cosmos",
-        msgTypeUrl: typeUrl,
-        msg,
+        msgs: [{ typeUrl, value: msg }],
       };
     } catch (e) {
       const error = e as Error | BridgeQuoteError;
@@ -629,13 +631,13 @@ export class AxelarBridgeProvider implements BridgeProvider {
     }
   }
 
-  async getDepositAddress({
+  async getAxelarDepositAddress({
     fromChain,
     toChain,
     fromAsset,
     toAsset,
     toAddress,
-  }: GetDepositAddressParams): Promise<BridgeDepositAddress> {
+  }: GetDepositAddressParams) {
     const fromChainAxelarId = await this.getAxelarChainId(fromChain);
     const toChainAxelarId = await this.getAxelarChainId(toChain);
     const autoUnwrapIntoNative =
@@ -649,7 +651,7 @@ export class AxelarBridgeProvider implements BridgeProvider {
         fromAsset.address
       }/${Boolean(autoUnwrapIntoNative)}`,
       ttl: process.env.NODE_ENV === "test" ? -1 : 30 * 60 * 1000, // 30 minutes
-      getFreshValue: async (): Promise<BridgeDepositAddress> => {
+      getFreshValue: async () => {
         const [depositClient, toAssetAxelarId] = await Promise.all([
           this.getAssetTransferClient(),
           this.getAxelarAssetId(fromChain, fromAsset),

diff --git a/packages/bridge/src/ibc/__tests__/ibc-bridge-provider.spec.ts b/packages/bridge/src/ibc/__tests__/ibc-bridge-provider.spec.ts
@@ -271,6 +271,7 @@ describe("IbcBridgeProvider", () => {
             "ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2",
           decimals: 6,
         },
+        direction: "deposit",
       });
 
       expect(supportedAssets).toEqual([
@@ -280,6 +281,7 @@ describe("IbcBridgeProvider", () => {
           denom: "ATOM",
           address: "uatom",
           decimals: 6,
+          transferTypes: ["quote"],
         },
       ]);
     });