@katanaperps/katana-perps-sdk 1.0.0 → 1.0.1

package/dist/bridge/config.d.ts

@@ -1,5 +1,5 @@
 import { BridgeTarget } from '#types/enums/request';
-export declare const BridgeTargetsArray: ("katana.katana" | "stargate.berachain" | "stargate.arbitrum" | "stargate.aurora" | "stargate.avalanche" | "stargate.base" | "stargate.bnb" | "stargate.ethereum" | "stargate.optimism" | "stargate.rari" | "stargate.scroll" | "stargate.taiko")[];
+export declare const BridgeTargetsArray: ("katana.katana" | "stargate.arbitrum" | "stargate.aurora" | "stargate.avalanche" | "stargate.base" | "stargate.berachain" | "stargate.ethereum" | "stargate.optimism" | "stargate.rari" | "stargate.scroll" | "stargate.taiko")[];
 /**
  * TODO_IKON - These configs need to be completed in some areas and should be confirmed as valid
  *
@@ -9,9 +9,10 @@ export declare const BridgeTargetsArray: ("katana.katana" | "stargate.berachain"
  */
 export declare const BridgeConfig: {
     readonly settings: {
-        readonly addManagedAccountExtraGas: 300000;
+        readonly addManagedAccountComposeGasLimit: 650000;
+        readonly depositComposeGasLimit: 350000;
         readonly depositSourceChainGasLimit: 450000;
-        readonly stargateBridgeForwarderGasLimit: 450000;
+        readonly stargateBridgeForwarderGasLimit: 1200000;
         readonly localBridgeTarget: "katana.katana";
     };
     readonly mainnet: {
@@ -19,17 +20,9 @@ export declare const BridgeConfig: {
             readonly target: "katana.katana";
             readonly evmChainId: 747474;
             readonly layerZeroEndpointId: 30375;
-            readonly layerzeroOFTAddress: "0x0000000000000000000000000000000000000000";
+            readonly layerzeroOFTAddress: "0x807275727Dd3E640c5F2b5DE7d1eC72B4Dd293C0";
             readonly tokenDecimals: 6;
-            readonly usdcAddress: "0x203a662b0bd271a6ed5a60edfbd04bfce608fd36";
-        };
-        readonly "stargate.berachain": {
-            readonly target: "stargate.berachain";
-            readonly evmChainId: 80094;
-            readonly layerZeroEndpointId: 30362;
-            readonly layerzeroOFTAddress: "0xAF54BE5B6eEc24d6BFACf1cce4eaF680A8239398";
-            readonly tokenDecimals: 6;
-            readonly usdcAddress: "0x549943e04f40284185054145c6E4e9568C1D3241";
+            readonly usdcAddress: "0x203A662b0BD271A6ed5a60EdFbd04bFce608FD36";
         };
         readonly "stargate.arbitrum": {
             readonly target: "stargate.arbitrum";
@@ -63,19 +56,20 @@ export declare const BridgeConfig: {
             readonly tokenDecimals: 6;
             readonly usdcAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913";
         };
-        readonly "stargate.bnb": {
-            readonly target: "stargate.bnb";
-            readonly evmChainId: 56;
-            readonly layerZeroEndpointId: 30102;
-            readonly layerzeroOFTAddress: "0x962Bd449E630b0d928f308Ce63f1A21F02576057";
-            readonly tokenDecimals: 18;
-            readonly usdcAddress: "0x8AC76a51cc950d9822D68b83fE1Ad97B32Cd580d";
+        readonly "stargate.berachain": {
+            readonly target: "stargate.berachain";
+            readonly evmChainId: 80094;
+            readonly layerZeroEndpointId: 30362;
+            readonly layerzeroOFTAddress: "0xAF54BE5B6eEc24d6BFACf1cce4eaF680A8239398";
+            readonly tokenDecimals: 6;
+            readonly usdcAddress: "0x549943e04f40284185054145c6E4e9568C1D3241";
         };
         readonly "stargate.ethereum": {
             readonly target: "stargate.ethereum";
             readonly evmChainId: 1;
             readonly layerZeroEndpointId: 30101;
-            readonly layerzeroOFTAddress: "0xc026395860Db2d07ee33e05fE50ed7bD583189C7";
+            readonly layerzeroOFTAddress: "0xb5bADA33542a05395d504a25885e02503A957Bb3";
+            readonly layerZeroVaultComposerSyncAddress: "0x75B4cA53d62cd4274ACBce30487A74de87f0D661";
             readonly tokenDecimals: 6;
             readonly usdcAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48";
         };
@@ -116,19 +110,11 @@ export declare const BridgeConfig: {
         readonly "katana.katana": {
             readonly target: "katana.katana";
             readonly isSupported: true;
-            readonly evmChainId: 64002;
-            readonly layerZeroEndpointId: 40282;
-            readonly layerzeroOFTAddress: "0x54a04EfABCBd81A0488E4a9Ad22264E04A48329B";
+            readonly evmChainId: 737373;
+            readonly layerZeroEndpointId: -1;
+            readonly layerzeroOFTAddress: "0x0000000000000000000000000000000000000000";
             readonly tokenDecimals: 6;
-            readonly usdcAddress: "0x54a04EfABCBd81A0488E4a9Ad22264E04A48329B";
-        };
-        readonly "stargate.berachain": {
-            readonly target: "stargate.berachain";
-            readonly evmChainId: 11155111;
-            readonly layerZeroEndpointId: 40161;
-            readonly layerzeroOFTAddress: "0x21F1caDDBED3Cd50e6B30644459BFB80c367076c";
-            readonly tokenDecimals: 6;
-            readonly usdcAddress: "0x2F6F07CDcf3588944Bf4C42aC74ff24bF56e7590";
+            readonly usdcAddress: "0xc2a4C310F2512A17Ac0047cf871aCAed3E62bB4B";
         };
         readonly "stargate.arbitrum": {
             readonly target: "stargate.arbitrum";
@@ -138,18 +124,19 @@ export declare const BridgeConfig: {
             readonly tokenDecimals: 6;
             readonly usdcAddress: "0x3253a335E7bFfB4790Aa4C25C4250d206E9b9773";
         };
+        readonly "stargate.ethereum": {
+            readonly target: "stargate.ethereum";
+            readonly evmChainId: 11155111;
+            readonly layerZeroEndpointId: 40161;
+            readonly layerzeroOFTAddress: "0x0000000000000000000000000000000000000000";
+            readonly layerZeroVaultComposerSync: "0x0000000000000000000000000000000000000000";
+            readonly tokenDecimals: 6;
+            readonly usdcAddress: "0x2F6F07CDcf3588944Bf4C42aC74ff24bF56e7590";
+        };
     };
 };
 export declare const BridgeConfigByLayerZeroEndpointId: {
     mainnet: {
-        30362: {
-            readonly target: "stargate.berachain";
-            readonly evmChainId: 80094;
-            readonly layerZeroEndpointId: 30362;
-            readonly layerzeroOFTAddress: "0xAF54BE5B6eEc24d6BFACf1cce4eaF680A8239398";
-            readonly tokenDecimals: 6;
-            readonly usdcAddress: "0x549943e04f40284185054145c6E4e9568C1D3241";
-        };
         30110: {
             readonly target: "stargate.arbitrum";
             readonly evmChainId: 42161;
@@ -182,19 +169,20 @@ export declare const BridgeConfigByLayerZeroEndpointId: {
             readonly tokenDecimals: 6;
             readonly usdcAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913";
         };
-        30102: {
-            readonly target: "stargate.bnb";
-            readonly evmChainId: 56;
-            readonly layerZeroEndpointId: 30102;
-            readonly layerzeroOFTAddress: "0x962Bd449E630b0d928f308Ce63f1A21F02576057";
-            readonly tokenDecimals: 18;
-            readonly usdcAddress: "0x8AC76a51cc950d9822D68b83fE1Ad97B32Cd580d";
+        30362: {
+            readonly target: "stargate.berachain";
+            readonly evmChainId: 80094;
+            readonly layerZeroEndpointId: 30362;
+            readonly layerzeroOFTAddress: "0xAF54BE5B6eEc24d6BFACf1cce4eaF680A8239398";
+            readonly tokenDecimals: 6;
+            readonly usdcAddress: "0x549943e04f40284185054145c6E4e9568C1D3241";
         };
         30101: {
             readonly target: "stargate.ethereum";
             readonly evmChainId: 1;
             readonly layerZeroEndpointId: 30101;
-            readonly layerzeroOFTAddress: "0xc026395860Db2d07ee33e05fE50ed7bD583189C7";
+            readonly layerzeroOFTAddress: "0xb5bADA33542a05395d504a25885e02503A957Bb3";
+            readonly layerZeroVaultComposerSyncAddress: "0x75B4cA53d62cd4274ACBce30487A74de87f0D661";
             readonly tokenDecimals: 6;
             readonly usdcAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48";
         };
@@ -232,14 +220,6 @@ export declare const BridgeConfigByLayerZeroEndpointId: {
         };
     };
     testnet: {
-        40161: {
-            readonly target: "stargate.berachain";
-            readonly evmChainId: 11155111;
-            readonly layerZeroEndpointId: 40161;
-            readonly layerzeroOFTAddress: "0x21F1caDDBED3Cd50e6B30644459BFB80c367076c";
-            readonly tokenDecimals: 6;
-            readonly usdcAddress: "0x2F6F07CDcf3588944Bf4C42aC74ff24bF56e7590";
-        };
         40231: {
             readonly target: "stargate.arbitrum";
             readonly evmChainId: 421614;
@@ -248,6 +228,15 @@ export declare const BridgeConfigByLayerZeroEndpointId: {
             readonly tokenDecimals: 6;
             readonly usdcAddress: "0x3253a335E7bFfB4790Aa4C25C4250d206E9b9773";
         };
+        30101: {
+            readonly target: "stargate.ethereum";
+            readonly evmChainId: 1;
+            readonly layerZeroEndpointId: 30101;
+            readonly layerzeroOFTAddress: "0xb5bADA33542a05395d504a25885e02503A957Bb3";
+            readonly layerZeroVaultComposerSyncAddress: "0x75B4cA53d62cd4274ACBce30487A74de87f0D661";
+            readonly tokenDecimals: 6;
+            readonly usdcAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48";
+        };
     };
 };
 /**

package/dist/bridge/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/bridge/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,eAAO,MAAM,kBAAkB,qPAA8B,CAAC;AAE9D;;;;;;GAMG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6Kf,CAAC;AAEX,eAAO,MAAM,iCAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiC7C,CAAC;AAEF;;;;;;;GAOG;AAEH,wBAAgB,mBAAmB,CAEjC,KAAK,EAAE,GAAG,GACT,KAAK,IAAI,YAAY,CAEvB"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/bridge/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,eAAO,MAAM,kBAAkB,oOAA8B,CAAC;AAE9D;;;;;;GAMG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwKf,CAAC;AAEX,eAAO,MAAM,iCAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6B7C,CAAC;AAEF;;;;;;;GAOG;AAEH,wBAAgB,mBAAmB,CAEjC,KAAK,EAAE,GAAG,GACT,KAAK,IAAI,YAAY,CAEvB"}

package/dist/bridge/config.js

@@ -12,9 +12,10 @@ exports.BridgeTargetsArray = Object.values(request_1.BridgeTarget);
  */
 exports.BridgeConfig = {
     settings: {
-        addManagedAccountExtraGas: 300_000,
+        addManagedAccountComposeGasLimit: 650_000,
+        depositComposeGasLimit: 350_000,
         depositSourceChainGasLimit: 450_000,
-        stargateBridgeForwarderGasLimit: 450_000,
+        stargateBridgeForwarderGasLimit: 1_200_000,
         localBridgeTarget: request_1.BridgeTarget.KATANA_KATANA,
     },
     mainnet: {
@@ -23,22 +24,11 @@ exports.BridgeConfig = {
             // https://docs.layerzero.network/v2/deployments/deployed-contracts?chains=katana
             evmChainId: 747474,
             layerZeroEndpointId: 30375,
-            // No USDC OFT currently supported on Katana
-            layerzeroOFTAddress: '0x0000000000000000000000000000000000000000',
+            // OFTAdapter https://github.com/agglayer/vault-bridge/tree/ab1c49f1ba3a8632657856e4be6a6b351043ed69/broadcast#mainnet
+            layerzeroOFTAddress: '0x807275727Dd3E640c5F2b5DE7d1eC72B4Dd293C0',
             // vbUSDC
             tokenDecimals: 6,
-            usdcAddress: '0x203a662b0bd271a6ed5a60edfbd04bfce608fd36',
-        },
-        [request_1.BridgeTarget.LAYERZERO_BERACHAIN]: {
-            target: request_1.BridgeTarget.LAYERZERO_BERACHAIN,
-            // https://docs.layerzero.network/v2/deployments/deployed-contracts?chains=bera
-            evmChainId: 80094,
-            layerZeroEndpointId: 30362,
-            // https://stargateprotocol.gitbook.io/stargate/v2-developer-docs/technical-reference/mainnet-contracts#berachain
-            layerzeroOFTAddress: '0xAF54BE5B6eEc24d6BFACf1cce4eaF680A8239398',
-            // https://stargateprotocol.gitbook.io/stargate/v2-developer-docs/technical-reference/v2-supported-networks-and-assets#bera
-            tokenDecimals: 6,
-            usdcAddress: '0x549943e04f40284185054145c6E4e9568C1D3241',
+            usdcAddress: '0x203A662b0BD271A6ed5a60EdFbd04bFce608FD36',
         },
         [request_1.BridgeTarget.STARGATE_ARBITRUM]: {
             target: request_1.BridgeTarget.STARGATE_ARBITRUM,
@@ -84,24 +74,25 @@ exports.BridgeConfig = {
             tokenDecimals: 6,
             usdcAddress: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
         },
-        [request_1.BridgeTarget.STARGATE_BNB]: {
-            target: request_1.BridgeTarget.STARGATE_BNB,
-            // https://docs.layerzero.network/v2/deployments/deployed-contracts?chains=bnb
-            evmChainId: 56,
-            layerZeroEndpointId: 30102,
-            // https://stargateprotocol.gitbook.io/stargate/v/v2-developer-docs/technical-reference/mainnet-contracts#bnb-chain
-            layerzeroOFTAddress: '0x962Bd449E630b0d928f308Ce63f1A21F02576057',
-            // https://stargateprotocol.gitbook.io/stargate/v2-developer-docs/technical-reference/v2-supported-networks-and-assets#bnb
-            tokenDecimals: 18,
-            usdcAddress: '0x8AC76a51cc950d9822D68b83fE1Ad97B32Cd580d',
+        [request_1.BridgeTarget.STARGATE_BERACHAIN]: {
+            target: request_1.BridgeTarget.STARGATE_BERACHAIN,
+            evmChainId: 80094,
+            // https://docs.layerzero.network/v2/developers/evm/technical-reference/deployed-contracts#bera
+            layerZeroEndpointId: 30362,
+            // https://stargateprotocol.gitbook.io/stargate/v/v2-developer-docs/technical-reference/mainnet-contracts#berachain
+            layerzeroOFTAddress: '0xAF54BE5B6eEc24d6BFACf1cce4eaF680A8239398',
+            // https://stargateprotocol.gitbook.io/stargate/v2-developer-docs/technical-reference/v2-supported-networks-and-assets#bera
+            tokenDecimals: 6,
+            usdcAddress: '0x549943e04f40284185054145c6E4e9568C1D3241',
         },
         [request_1.BridgeTarget.STARGATE_ETHEREUM]: {
             target: request_1.BridgeTarget.STARGATE_ETHEREUM,
             // https://docs.layerzero.network/v2/deployments/deployed-contracts?chains=ethereum
             evmChainId: 1,
             layerZeroEndpointId: 30101,
-            // https://stargateprotocol.gitbook.io/stargate/v2-developer-docs/technical-reference/mainnet-contracts#ethereum
-            layerzeroOFTAddress: '0xc026395860Db2d07ee33e05fE50ed7bD583189C7',
+            // vbUSDC OFTAdapter https://github.com/agglayer/vault-bridge/tree/main/broadcast#mainnet
+            layerzeroOFTAddress: '0xb5bADA33542a05395d504a25885e02503A957Bb3',
+            layerZeroVaultComposerSyncAddress: '0x75B4cA53d62cd4274ACBce30487A74de87f0D661',
             // https://stargateprotocol.gitbook.io/stargate/v2-developer-docs/technical-reference/v2-supported-networks-and-assets#ethereum
             tokenDecimals: 6,
             usdcAddress: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
@@ -155,22 +146,14 @@ exports.BridgeConfig = {
         [request_1.BridgeTarget.KATANA_KATANA]: {
             target: request_1.BridgeTarget.KATANA_KATANA,
             isSupported: true,
-            evmChainId: 64002,
-            layerZeroEndpointId: 40282,
-            layerzeroOFTAddress: '0x54a04EfABCBd81A0488E4a9Ad22264E04A48329B',
-            tokenDecimals: 6,
-            usdcAddress: '0x54a04EfABCBd81A0488E4a9Ad22264E04A48329B',
-        },
-        [request_1.BridgeTarget.LAYERZERO_BERACHAIN]: {
-            target: request_1.BridgeTarget.LAYERZERO_BERACHAIN,
-            // TODO There is currently no testnet for Berachain so we are using
-            // Sepolia as a substitute for testing purposes
-            // https://docs.layerzero.network/v2/deployments/deployed-contracts?chains=sepolia
-            evmChainId: 11155111,
-            layerZeroEndpointId: 40161,
-            layerzeroOFTAddress: '0x21F1caDDBED3Cd50e6B30644459BFB80c367076c',
+            evmChainId: 737373,
+            // No LZ connection yet on Bokuto testnet
+            layerZeroEndpointId: -1,
+            // No OFT currently supported on Bokuto testnet
+            layerzeroOFTAddress: '0x0000000000000000000000000000000000000000',
             tokenDecimals: 6,
-            usdcAddress: '0x2F6F07CDcf3588944Bf4C42aC74ff24bF56e7590',
+            // vbUSDC
+            usdcAddress: '0xc2a4C310F2512A17Ac0047cf871aCAed3E62bB4B',
         },
         [request_1.BridgeTarget.STARGATE_ARBITRUM]: {
             target: request_1.BridgeTarget.STARGATE_ARBITRUM,
@@ -182,17 +165,26 @@ exports.BridgeConfig = {
             tokenDecimals: 6,
             usdcAddress: '0x3253a335E7bFfB4790Aa4C25C4250d206E9b9773',
         },
+        [request_1.BridgeTarget.STARGATE_ETHEREUM]: {
+            target: request_1.BridgeTarget.STARGATE_ETHEREUM,
+            // https://docs.layerzero.network/v2/deployments/deployed-contracts?chains=sepolia
+            evmChainId: 11155111,
+            layerZeroEndpointId: 40161,
+            // No OFT currently supported on Sepolia testnet
+            layerzeroOFTAddress: '0x0000000000000000000000000000000000000000',
+            layerZeroVaultComposerSync: '0x0000000000000000000000000000000000000000',
+            tokenDecimals: 6,
+            usdcAddress: '0x2F6F07CDcf3588944Bf4C42aC74ff24bF56e7590',
+        },
     },
 };
 exports.BridgeConfigByLayerZeroEndpointId = {
     mainnet: {
-        [exports.BridgeConfig.mainnet[request_1.BridgeTarget.LAYERZERO_BERACHAIN]
-            .layerZeroEndpointId]: exports.BridgeConfig.mainnet[request_1.BridgeTarget.LAYERZERO_BERACHAIN],
         [exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_ARBITRUM].layerZeroEndpointId]: exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_ARBITRUM],
         [exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_AURORA].layerZeroEndpointId]: exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_AURORA],
         [exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_AVALANCHE].layerZeroEndpointId]: exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_AVALANCHE],
         [exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_BASE].layerZeroEndpointId]: exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_BASE],
-        [exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_BNB].layerZeroEndpointId]: exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_BNB],
+        [exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_BERACHAIN].layerZeroEndpointId]: exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_BERACHAIN],
         [exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_ETHEREUM].layerZeroEndpointId]: exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_ETHEREUM],
         [exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_OPTIMISM].layerZeroEndpointId]: exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_OPTIMISM],
         [exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_RARI].layerZeroEndpointId]: exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_RARI],
@@ -200,9 +192,8 @@ exports.BridgeConfigByLayerZeroEndpointId = {
         [exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_TAIKO].layerZeroEndpointId]: exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_TAIKO],
     },
     testnet: {
-        [exports.BridgeConfig.testnet[request_1.BridgeTarget.LAYERZERO_BERACHAIN]
-            .layerZeroEndpointId]: exports.BridgeConfig.testnet[request_1.BridgeTarget.LAYERZERO_BERACHAIN],
         [exports.BridgeConfig.testnet[request_1.BridgeTarget.STARGATE_ARBITRUM].layerZeroEndpointId]: exports.BridgeConfig.testnet[request_1.BridgeTarget.STARGATE_ARBITRUM],
+        [exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_ETHEREUM].layerZeroEndpointId]: exports.BridgeConfig.mainnet[request_1.BridgeTarget.STARGATE_ETHEREUM],
     },
 };
 /**

package/dist/bridge/deposit.d.ts

@@ -88,16 +88,36 @@ export declare function decodeDepositBridgeAdapterPayload(payload: EncodedDeposi
  * Deposit funds cross-chain into the Exchange using a LayerZero OFT or Stargate
  */
 export declare function depositViaBridge(parameters: AddManagedAccountParameters | DepositToManagedAccountParameters | DepositToWalletParameters, providers: {
-    berachain: ethers.Provider;
+    ethereum: ethers.Provider;
     sourceChain: ethers.Provider;
-}, sourceSigner: ethers.Signer, sandbox: boolean, extraRequestParams?: Pick<TransactionRequest, 'nonce'>): Promise<string>;
+}, sourceSigner: ethers.Signer, sandbox: boolean, extraRequestParams?: Pick<TransactionRequest, 'nonce'>, 
+/** Let software wallet show estimate to the user. Even on expected TX failure. */
+ignoreEstimateError?: boolean): Promise<string>;
+/**
+ * Deposit funds cross-chain into the Exchange using a LayerZero OFT or Stargate
+ */
+export declare function depositViaVaultComposerSync(parameters: AddManagedAccountParameters | DepositToManagedAccountParameters | DepositToWalletParameters, providers: {
+    ethereum: ethers.Provider;
+    sourceChain: ethers.Provider;
+}, sourceSigner: ethers.Signer, sandbox: boolean, extraRequestParams?: Pick<TransactionRequest, 'nonce'>, 
+/** Let software wallet show estimate to the user. Even on expected TX failure. */
+ignoreEstimateError?: boolean): Promise<string>;
+/**
+ * Deposit funds cross-chain into the Exchange using a LayerZero OFT or Stargate
+ */
+export declare function depositViaForwarder(parameters: AddManagedAccountParameters | DepositToManagedAccountParameters | DepositToWalletParameters, providers: {
+    ethereum: ethers.Provider;
+    sourceChain: ethers.Provider;
+}, sourceSigner: ethers.Signer, sandbox: boolean, extraRequestParams?: Pick<TransactionRequest, 'nonce'>, 
+/** Let software wallet show estimate to the user. Even on expected TX failure. */
+ignoreEstimateError?: boolean): Promise<string>;
 export declare function encodeDepositBridgeAdapterPayload(sourceConfig: ReturnType<typeof getBridgeTargetConfig>, parameters: AddManagedAccountParameters | DepositToManagedAccountParameters | DepositToWalletParameters): EncodedDepositBridgeAdapterPayload;
 export declare function encodeFixedIncomeVaultConfigurationFields(configurationFields: FixedIncomeVaultConfigurationFields): string;
 /**
  * Estimate native gas fee needed to deposit USDC cross-chain into the Exchange
  */
 export declare function estimateDepositFees(parameters: AddManagedAccountParameters | DepositToManagedAccountParameters | DepositToWalletParameters, providers: {
-    berachain: ethers.Provider;
+    ethereum: ethers.Provider;
     sourceChain: ethers.Provider;
 }, sandbox: boolean): Promise<{
     gasFee: bigint;

package/dist/bridge/deposit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deposit.d.ts","sourceRoot":"","sources":["../../src/bridge/deposit.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deposit.d.ts","sourceRoot":"","sources":["../../src/bridge/deposit.ts"],"names":[],"mappings":"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"}

package/dist/bridge/deposit.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDestinationWallet = exports.estimateDepositFees = exports.encodeFixedIncomeVaultConfigurationFields = exports.encodeDepositBridgeAdapterPayload = exports.depositViaBridge = exports.decodeDepositBridgeAdapterPayload = exports.decodeDepositBridgeAdapterPayloadType = exports.depositBridgeAdapterPayloadLengths = exports.fixedIncomeVaultConfigurationFieldsLength = exports.DepositBridgeAdapterPayloadType = void 0;
+exports.getDestinationWallet = exports.estimateDepositFees = exports.encodeFixedIncomeVaultConfigurationFields = exports.encodeDepositBridgeAdapterPayload = exports.depositViaForwarder = exports.depositViaVaultComposerSync = exports.depositViaBridge = exports.decodeDepositBridgeAdapterPayload = exports.decodeDepositBridgeAdapterPayloadType = exports.depositBridgeAdapterPayloadLengths = exports.fixedIncomeVaultConfigurationFieldsLength = exports.DepositBridgeAdapterPayloadType = void 0;
 const tslib_1 = require("tslib");
 const bignumber_js_1 = tslib_1.__importDefault(require("bignumber.js"));
 const ethers_1 = require("ethers");
@@ -64,25 +64,88 @@ exports.decodeDepositBridgeAdapterPayload = decodeDepositBridgeAdapterPayload;
 /**
  * Deposit funds cross-chain into the Exchange using a LayerZero OFT or Stargate
  */
-async function depositViaBridge(parameters, providers, sourceSigner, sandbox, extraRequestParams) {
-    const [{ sendParam, sourceConfig }, { gasFee }] = await Promise.all(parameters.sourceBridgeTarget === request_1.BridgeTarget.LAYERZERO_BERACHAIN ?
-        [
-            getDepositFromBerachainSendParamAndSourceConfig(parameters, sandbox),
-            estimateDepositFromBerachainFees(parameters, providers, sandbox),
-        ]
-        : [
-            getDepositViaForwarderSendParamAndSourceConfig(parameters, providers, sandbox),
-            estimateDepositViaForwarderFees(parameters, providers, sandbox),
-        ]);
+async function depositViaBridge(parameters, providers, sourceSigner, sandbox, extraRequestParams, 
+/** Let software wallet show estimate to the user. Even on expected TX failure. */
+ignoreEstimateError) {
+    return parameters.sourceBridgeTarget === request_1.BridgeTarget.STARGATE_ETHEREUM ?
+        depositViaVaultComposerSync(parameters, providers, sourceSigner, sandbox, extraRequestParams, ignoreEstimateError)
+        : depositViaForwarder(parameters, providers, sourceSigner, sandbox, extraRequestParams, ignoreEstimateError);
+}
+exports.depositViaBridge = depositViaBridge;
+/**
+ * Deposit funds cross-chain into the Exchange using a LayerZero OFT or Stargate
+ */
+async function depositViaVaultComposerSync(parameters, providers, sourceSigner, sandbox, extraRequestParams, 
+/** Let software wallet show estimate to the user. Even on expected TX failure. */
+ignoreEstimateError) {
+    const [{ sendParam, sourceConfig }, { gasFee }] = await Promise.all([
+        getDepositFromEthereumSendParamAndSourceConfig(parameters, sandbox),
+        estimateDepositFromEthereumFees(parameters, providers, sandbox),
+    ]);
+    let gasLimit = config_1.BridgeConfig.settings.depositSourceChainGasLimit;
+    const vaultComposerSync = index_1.IVaultComposerSync__factory.connect(sourceConfig.layerZeroVaultComposerSyncAddress, sourceSigner);
+    const sourceWallet = await sourceSigner.getAddress();
+    try {
+        // Estimate gas
+        const estimatedGasLimit = await vaultComposerSync.depositAndSend.estimateGas(parameters.quantityInAssetUnits, sendParam, sourceWallet, // Refund address - extra gas (if any) is returned to this address
+        {
+            ...extraRequestParams,
+            from: sourceWallet,
+            // Native gas to pay for the cross chain message fee
+            value: gasFee,
+        });
+        // Add 20% buffer for safety
+        gasLimit = Number(new bignumber_js_1.default(estimatedGasLimit.toString())
+            .times(new bignumber_js_1.default(1.2))
+            .toFixed(0));
+    }
+    catch (error) {
+        // ethers.js will perform the estimation at the block gas limit, which is much higher than the
+        // gas actually needed by the tx. If the wallet does not have the funds to cover the tx at this
+        // high gas limit then the RPC will throw an INSUFFICIENT_FUNDS error; however the wallet may
+        // still have enough funds to successfully bridge at the actual gas limit. In this case simply
+        // fall through and use the configured default gas limit. The wallet software in use should
+        // still show if that limit is insufficient, which is only an issue for blockchains with
+        // variable gas costs such as Arbitrum One
+        if (error?.code === 'INSUFFICIENT_FUNDS') {
+            console.log('[depositViaVaultComposerSync] Insufficient funds - continue with default gas');
+        }
+        else if (ignoreEstimateError) {
+            // TODO: In latest contract it throws 'CALL_EXCEPTION' instead of 'INSUFFICIENT_FUNDS'
+            console.log('[depositViaVaultComposerSync] Estimate failed - continue with default gas', error);
+        }
+        else {
+            throw error;
+        }
+    }
+    const response = await vaultComposerSync.depositAndSend.send(parameters.quantityInAssetUnits, sendParam, sourceWallet, // Refund address - extra gas (if any) is returned to this address
+    {
+        from: sourceWallet,
+        gasLimit,
+        value: gasFee,
+    });
+    return response.hash;
+}
+exports.depositViaVaultComposerSync = depositViaVaultComposerSync;
+/**
+ * Deposit funds cross-chain into the Exchange using a LayerZero OFT or Stargate
+ */
+async function depositViaForwarder(parameters, providers, sourceSigner, sandbox, extraRequestParams, 
+/** Let software wallet show estimate to the user. Even on expected TX failure. */
+ignoreEstimateError) {
+    const [{ sendParam, sourceConfig }, { gasFee }] = await Promise.all([
+        getDepositViaForwarderSendParamAndSourceConfig(parameters, providers, sandbox),
+        estimateDepositViaForwarderFees(parameters, providers, sandbox),
+    ]);
     let gasLimit = config_1.BridgeConfig.settings.depositSourceChainGasLimit;
     const oft = index_1.IOFT__factory.connect(sourceConfig.layerzeroOFTAddress, sourceSigner);
-    const wallet = getDestinationWallet(parameters);
+    const sourceWallet = await sourceSigner.getAddress();
     try {
         // Estimate gas
-        const estimatedGasLimit = await oft.send.estimateGas(sendParam, { nativeFee: gasFee, lzTokenFee: 0 }, wallet, // Refund address - extra gas (if any) is returned to this address
+        const estimatedGasLimit = await oft.send.estimateGas(sendParam, { nativeFee: gasFee, lzTokenFee: 0 }, sourceWallet, // Refund address - extra gas (if any) is returned to this address
         {
             ...extraRequestParams,
-            from: wallet,
+            from: sourceWallet,
             // Native gas to pay for the cross chain message fee
             value: gasFee,
         });
@@ -99,19 +162,26 @@ async function depositViaBridge(parameters, providers, sourceSigner, sandbox, ex
         // fall through and use the configured default gas limit. The wallet software in use should
         // still show if that limit is insufficient, which is only an issue for blockchains with
         // variable gas costs such as Arbitrum One
-        if (!error.code || error.code !== 'INSUFFICIENT_FUNDS') {
+        if (error?.code === 'INSUFFICIENT_FUNDS') {
+            console.log('[depositViaForwarder] Insufficient funds - continue with default gas');
+        }
+        else if (ignoreEstimateError) {
+            // TODO: In latest contract it throws 'CALL_EXCEPTION' instead of 'INSUFFICIENT_FUNDS'
+            console.log('[depositViaForwarder] Estimate failed - continue with default gas', error);
+        }
+        else {
             throw error;
         }
     }
-    const response = await oft.send(sendParam, { nativeFee: gasFee, lzTokenFee: 0 }, wallet, // Refund address - extra gas (if any) is returned to this address
+    const response = await oft.send(sendParam, { nativeFee: gasFee, lzTokenFee: 0 }, sourceWallet, // Refund address - extra gas (if any) is returned to this address
     {
-        from: wallet,
+        from: sourceWallet,
         gasLimit,
         value: gasFee,
     });
     return response.hash;
 }
-exports.depositViaBridge = depositViaBridge;
+exports.depositViaForwarder = depositViaForwarder;
 function encodeDepositBridgeAdapterPayload(sourceConfig, parameters) {
     if (parameters.bridgePayloadType ===
         DepositBridgeAdapterPayloadType.addManagedAccount) {
@@ -169,8 +239,8 @@ exports.encodeFixedIncomeVaultConfigurationFields = encodeFixedIncomeVaultConfig
  * Estimate native gas fee needed to deposit USDC cross-chain into the Exchange
  */
 async function estimateDepositFees(parameters, providers, sandbox) {
-    if (parameters.sourceBridgeTarget === request_1.BridgeTarget.LAYERZERO_BERACHAIN) {
-        return estimateDepositFromBerachainFees(parameters, providers, sandbox);
+    if (parameters.sourceBridgeTarget === request_1.BridgeTarget.STARGATE_ETHEREUM) {
+        return estimateDepositFromEthereumFees(parameters, providers, sandbox);
     }
     return estimateDepositViaForwarderFees(parameters, providers, sandbox);
 }
@@ -191,11 +261,11 @@ function getDestinationWallet(parameters) {
 exports.getDestinationWallet = getDestinationWallet;
 /**
  * Estimate native gas fee needed to deposit USDC cross-chain into the Exchange
- * from Berachain using the OFT pathway
+ * from Ethereum using the OFT pathway
  */
-async function estimateDepositFromBerachainFees(parameters, providers, sandbox) {
-    const { sendParam, sourceConfig } = await getDepositFromBerachainSendParamAndSourceConfig(parameters, sandbox);
-    const oft = index_1.IOFT__factory.connect(sourceConfig.layerzeroOFTAddress, providers.berachain);
+async function estimateDepositFromEthereumFees(parameters, providers, sandbox) {
+    const { sendParam, sourceConfig } = await getDepositFromEthereumSendParamAndSourceConfig(parameters, sandbox);
+    const oft = index_1.IOFT__factory.connect(sourceConfig.layerzeroOFTAddress, providers.ethereum);
     const [[gasFee], [, , receipt]] = await Promise.all([
         oft.quoteSend(sendParam, false, {
             from: getDestinationWallet(parameters),
@@ -216,25 +286,24 @@ async function estimateDepositViaForwarderFees(parameters, providers, sandbox) {
         }),
         ioft.quoteOFT(sendParam),
     ]);
-    // Once we obtain the quantity delivered after slippage to Berachain, calculate
+    // Once we obtain the quantity delivered after slippage to Ethereum, calculate
     // the quantity subsequently delivered to Katana after any additional slippage
-    const { quantityDeliveredInAssetUnits } = await estimateDepositFromBerachainFees({ ...parameters, quantityInAssetUnits: receipt.amountReceivedLD }, providers, sandbox);
+    const { quantityDeliveredInAssetUnits } = await estimateDepositFromEthereumFees({ ...parameters, quantityInAssetUnits: receipt.amountReceivedLD }, providers, sandbox);
     return {
         gasFee,
         quantityDeliveredInAssetUnits,
     };
 }
-async function getDepositFromBerachainSendParamAndSourceConfig(parameters, sandbox) {
-    const { sourceConfig, destinationConfig } = getSourceAndDestinationConfigs(request_1.BridgeTarget.LAYERZERO_BERACHAIN, request_1.BridgeTarget.KATANA_KATANA, sandbox);
+async function getDepositFromEthereumSendParamAndSourceConfig(parameters, sandbox) {
+    const { sourceConfig, destinationConfig } = getSourceAndDestinationConfigs(request_1.BridgeTarget.STARGATE_ETHEREUM, request_1.BridgeTarget.KATANA_KATANA, sandbox);
     const exchangeLayerZeroAdapterAddress = await (0, utils_1.loadExchangeLayerZeroAddressFromApiIfNeeded)(parameters.exchangeLayerZeroAdapterAddress);
-    let extraOptions = new Uint8Array();
-    if (parameters.bridgePayloadType ===
-        DepositBridgeAdapterPayloadType.addManagedAccount) {
-        const { Options } = await import('@layerzerolabs/lz-v2-utilities');
-        extraOptions = Options.newOptions()
-            .addExecutorComposeOption(0, config_1.BridgeConfig.settings.addManagedAccountExtraGas, 0)
-            .toBytes();
-    }
+    const { Options } = await import('@layerzerolabs/lz-v2-utilities');
+    const extraOptions = Options.newOptions()
+        .addExecutorComposeOption(0, (parameters.bridgePayloadType ===
+        DepositBridgeAdapterPayloadType.addManagedAccount) ?
+        config_1.BridgeConfig.settings.addManagedAccountComposeGasLimit
+        : config_1.BridgeConfig.settings.depositComposeGasLimit, 0)
+        .toBytes();
     const sendParam = {
         dstEid: destinationConfig.layerZeroEndpointId, // Destination endpoint ID
         to: ethers_1.ethers.zeroPadValue(exchangeLayerZeroAdapterAddress, 32), // Recipient address
@@ -244,24 +313,27 @@ async function getDepositFromBerachainSendParamAndSourceConfig(parameters, sandb
         composeMsg: encodeDepositBridgeAdapterPayload(sourceConfig, parameters), // Additional options supplied by the caller to be used in the LayerZero message
         oftCmd: '0x', // The OFT command to be executed, unused in default OFT implementations
     };
-    return { sendParam, sourceConfig };
+    return {
+        sendParam,
+        sourceConfig: sourceConfig,
+    };
 }
 async function getDepositViaForwarderSendParamAndSourceConfig(parameters, providers, sandbox) {
-    const { sourceConfig, destinationConfig: berachainConfig } = getSourceAndDestinationConfigs(parameters.sourceBridgeTarget, request_1.BridgeTarget.LAYERZERO_BERACHAIN, sandbox);
-    const { gasFee: berachainGasFee } = await estimateDepositFromBerachainFees(parameters, providers, sandbox);
+    const { sourceConfig, destinationConfig: ethereumConfig } = getSourceAndDestinationConfigs(parameters.sourceBridgeTarget, request_1.BridgeTarget.STARGATE_ETHEREUM, sandbox);
+    const { gasFee: ethereumGasFee } = await estimateDepositFromEthereumFees(parameters, providers, sandbox);
     // Add 20% buffer for safety
-    const additionalNativeDrop = new bignumber_js_1.default(berachainGasFee.toString())
+    const additionalNativeDrop = new bignumber_js_1.default(ethereumGasFee.toString())
         .times(new bignumber_js_1.default(1.2))
         .toFixed(0);
     const stargateBridgeForwarderContractAddress = await (0, utils_1.loadStargateBridgeForwarderContractAddressFromApiIfNeeded)(parameters.stargateBridgeForwarderContractAddress);
     // FIXME CJS dynamic import
     const { Options } = await import('@layerzerolabs/lz-v2-utilities');
     const extraOptions = Options.newOptions()
-        // Native drop is specified in BERA wei
+        // Native drop is specified in ETH wei
         .addExecutorComposeOption(0, config_1.BridgeConfig.settings.stargateBridgeForwarderGasLimit, additionalNativeDrop)
         .toHex();
     const sendParam = {
-        dstEid: berachainConfig.layerZeroEndpointId, // Destination endpoint ID
+        dstEid: ethereumConfig.layerZeroEndpointId, // Destination endpoint ID
         to: ethers_1.ethers.zeroPadValue(stargateBridgeForwarderContractAddress, 32), // Recipient address
         amountLD: parameters.quantityInAssetUnits, // Amount to send in local decimals
         minAmountLD: (0, _pipmath_1.multiplyPips)(parameters.quantityInAssetUnits, parameters.minimumForwardQuantityMultiplierInPips), // Minimum amount to send in local decimals