@reyaxyz/sdk 0.34.4 → 0.36.0

package/src/services/token/getAllowance.ts

@@ -1,5 +1,10 @@
 import { ApprovalType, GetAllowanceParams } from './types';
-import { getERC20Allowance } from '@reyaxyz/common';
+import {
+  GetSocketVaultParams,
+  getERC20Allowance,
+  getSocketVault,
+  getTokenInfoByAddress,
+} from '@reyaxyz/common';
 import { ContractType, getAddress } from '../../utils/contractAddresses';
 
 export const getAllowance = async (
@@ -10,10 +15,29 @@ export const getAllowance = async (
   const network = await params.signer.provider?.getNetwork();
   const chainId = Number(network?.chainId);
 
-  const contractProxyAddress =
-    params.type === ApprovalType.DEPOSIT
-      ? getAddress(chainId, ContractType.CORE_PROXY)
-      : getAddress(chainId, ContractType.PASSIVE_POOL_PROXY);
+  const tokenInfo = getTokenInfoByAddress(underLyingTokenAddress);
+
+  let contractProxyAddress;
+  switch (params.type) {
+    case ApprovalType.DEPOSIT:
+      contractProxyAddress = getAddress(chainId, ContractType.CORE_PROXY);
+      break;
+    case ApprovalType.LP:
+      contractProxyAddress = getAddress(
+        chainId,
+        ContractType.PASSIVE_POOL_PROXY,
+      );
+      break;
+    case ApprovalType.BRIDGE:
+      contractProxyAddress = getSocketVault({
+        moneyInOutChainId: chainId,
+        tokenName: tokenInfo.name,
+      } as GetSocketVaultParams);
+      break;
+    default:
+      throw new Error('Unexpected approval type in getAllowance');
+  }
+
   const walletAddress: string = await params.signer.getAddress();
 
   const allowance = await getERC20Allowance({

package/src/services/token/getUsdcBalance.ts

@@ -0,0 +1,15 @@
+import { GetUsdcBalanceParams } from './types';
+import { getBalanceByTokenAddress } from './getBalanceByTokenAddress';
+import { MoneyInOutChainId, getTokenInfoByName } from '@reyaxyz/common';
+
+export const getUsdcBalance = async ({
+  signer,
+}: GetUsdcBalanceParams): Promise<number> => {
+  const network = await signer.provider?.getNetwork();
+  const moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);
+
+  return getBalanceByTokenAddress({
+    signer,
+    tokenAddress: getTokenInfoByName('USDC', moneyInOutChainId).address,
+  });
+};

package/src/services/token/index.ts

@@ -1,5 +1,5 @@
 export * from './types';
 export * from './approve';
 export * from './getAllowance';
-export * from './getBalanceByChainId';
 export * from './getBalanceByTokenAddress';
+export * from './getUsdcBalance';

package/src/services/token/types.ts

@@ -1,10 +1,10 @@
 import { JsonRpcSigner, Signer } from 'ethers';
 import { TokenEntity } from '@reyaxyz/common';
-import { MoneyInOutChainId, ReyaChainId } from '@reyaxyz/common';
 
 export enum ApprovalType {
   LP,
   DEPOSIT,
+  BRIDGE,
 }
 
 export type ApproveTokenParams = {
@@ -24,7 +24,6 @@ export type GetBalanceByTokenAddressParams = {
   tokenAddress: TokenEntity['address'];
 };
 
-export type GetBalanceByChainIdParams = {
+export type GetUsdcBalanceParams = {
   signer: Signer | JsonRpcSigner;
-  chainId: ReyaChainId | MoneyInOutChainId;
 };

package/src/utils/contractAddresses.ts

@@ -13,7 +13,8 @@ const addresses: Record<ReyaChainId, Record<ContractType, Address>> = {
     [ContractType.CORE_PROXY]: '0xaf68ce211989a9b05a8d6212c8f432785296a847',
     [ContractType.PASSIVE_POOL_PROXY]:
       '0x79d6f095ba4b74a3d2b4522e7080ed76d8aeb940',
-    [ContractType.PERIPHERY_PROXY]: 'todo',
+    [ContractType.PERIPHERY_PROXY]:
+      '0x8a0500b4290aba646a3d46027b621e5167a56b8d',
   },
   // TODO: add proper config
   [ReyaChainId.reyaNetwork]: {
@@ -26,16 +27,16 @@ const addresses: Record<ReyaChainId, Record<ContractType, Address>> = {
 export const getAddress = (
   chainId: number,
   contractName: ContractType,
-): string => {
+): Address => {
   const keyChainId = chainId.toString();
 
   if (!Object.keys(addresses).includes(keyChainId)) {
-    return `Unspecified addresses for chain id ${keyChainId}`;
+    throw new Error(`Unspecified addresses for chain id ${keyChainId}`);
   }
 
   const networkAddresses = addresses[chainId as ReyaChainId];
   if (!Object.keys(networkAddresses).includes(contractName)) {
-    return `Unspecified address for ${contractName} contract`;
+    throw new Error(`Unspecified address for ${contractName} contract`);
   }
 
   return networkAddresses[contractName];

package/dist/services/token/getBalanceByChainId.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getBalanceByChainId.js","sourceRoot":"/","sources":["services/token/getBalanceByChainId.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uEAAsE;AACtE,0CAAiE;AAEjE,yCAAyC;AACzC,IAAM,eAAe;IAInB,GAAC,oBAAW,CAAC,UAAU,IAAG,4CAA4C;IACtE,GAAC,oBAAW,CAAC,WAAW,IAAG,4CAA4C;IACvE,GAAC,0BAAiB,CAAC,aAAa,IAC9B,4CAA4C;IAC9C,GAAC,0BAAiB,CAAC,eAAe,IAChC,4CAA4C;IAC9C,GAAC,0BAAiB,CAAC,SAAS,IAAG,4CAA4C;IAC3E,GAAC,0BAAiB,CAAC,eAAe,IAChC,4CAA4C;OAC/C,CAAC;AAEF,yCAAyC;AAClC,IAAM,mBAAmB,GAAG,UAAO,EAGd;QAF1B,MAAM,YAAA,EACN,OAAO,aAAA;;;YAEP,sBAAO,IAAA,mDAAwB,EAAC;oBAC9B,MAAM,QAAA;oBACN,YAAY,EAAE,eAAe,CAAC,OAAO,CAAC;iBACvC,CAAC,EAAC;;;CACJ,CAAC;AARW,QAAA,mBAAmB,uBAQ9B","sourcesContent":["import { GetBalanceByChainIdParams } from './types';\nimport { getBalanceByTokenAddress } from './getBalanceByTokenAddress';\nimport { MoneyInOutChainId, ReyaChainId } from '@reyaxyz/common';\n\n// TODO: Milan hardcoded address atm fix!\nconst chainToTokenMap: Record<\n  ReyaChainId | MoneyInOutChainId,\n  Lowercase<string>\n> = {\n  [ReyaChainId.reyaCronos]: '0x1b700a40a0707dd5f0bc31cbc57d730558e5714d',\n  [ReyaChainId.reyaNetwork]: '0x51b0b7f083e563d5cf9d0b5f3916b59fc49c7e5f',\n  [MoneyInOutChainId.polygonMumbai]:\n    '0xd9edcc943ed9729b08e52bb1e110fe43d1930773',\n  [MoneyInOutChainId.arbitrumSepolia]:\n    '0x8537307810fc40f4073a12a38554d4ff78efff41',\n  [MoneyInOutChainId.opSepolia]: '0x6d290609b3f5f02d52f28d97c75a443ed8564cbf',\n  [MoneyInOutChainId.ethereumSepolia]:\n    '0x565810cbfa3cf1390963e5afa2fb953795686339',\n};\n\n// TODO: Milan hardcoded address atm fix!\nexport const getBalanceByChainId = async ({\n  signer,\n  chainId,\n}: GetBalanceByChainIdParams): Promise<number> => {\n  return getBalanceByTokenAddress({\n    signer,\n    tokenAddress: chainToTokenMap[chainId],\n  });\n};\n"]}

package/dist/types/services/token/getBalanceByChainId.d.ts

@@ -1,3 +0,0 @@
-import { GetBalanceByChainIdParams } from './types';
-export declare const getBalanceByChainId: ({ signer, chainId, }: GetBalanceByChainIdParams) => Promise<number>;
-//# sourceMappingURL=getBalanceByChainId.d.ts.map

package/dist/types/services/token/getBalanceByChainId.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getBalanceByChainId.d.ts","sourceRoot":"/","sources":["services/token/getBalanceByChainId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AAqBpD,eAAO,MAAM,mBAAmB,yBAG7B,yBAAyB,KAAG,QAAQ,MAAM,CAK5C,CAAC"}

package/dist/types/utils/network.d.ts

@@ -1,4 +0,0 @@
-import { MoneyInOutChainId, ReyaChainId } from '@reyaxyz/common';
-export declare function getReyaNetwork(env: 'production' | 'test'): ReyaChainId;
-export declare function getReyaNetworkFromMoneyInOutChainId(moneyInOutChainId: MoneyInOutChainId): ReyaChainId;
-//# sourceMappingURL=network.d.ts.map

package/dist/types/utils/network.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"network.d.ts","sourceRoot":"/","sources":["utils/network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEjE,wBAAgB,cAAc,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,GAAG,WAAW,CAKtE;AAED,wBAAgB,mCAAmC,CACjD,iBAAiB,EAAE,iBAAiB,GACnC,WAAW,CAWb"}

package/dist/utils/network.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getReyaNetworkFromMoneyInOutChainId = exports.getReyaNetwork = void 0;
-var common_1 = require("@reyaxyz/common");
-function getReyaNetwork(env) {
-    if (env === 'production')
-        return common_1.ReyaChainId.reyaNetwork;
-    if (env === 'test')
-        return common_1.ReyaChainId.reyaCronos;
-    throw new Error('Unknown error passed');
-}
-exports.getReyaNetwork = getReyaNetwork;
-function getReyaNetworkFromMoneyInOutChainId(moneyInOutChainId) {
-    switch (moneyInOutChainId) {
-        case common_1.MoneyInOutChainId.polygonMumbai:
-        case common_1.MoneyInOutChainId.arbitrumSepolia:
-        case common_1.MoneyInOutChainId.opSepolia:
-        case common_1.MoneyInOutChainId.ethereumSepolia:
-            return getReyaNetwork('test');
-        default:
-            throw new Error('getReyaNetwork: unexpected moneyInOutChainId');
-    }
-}
-exports.getReyaNetworkFromMoneyInOutChainId = getReyaNetworkFromMoneyInOutChainId;
-//# sourceMappingURL=network.js.map

package/dist/utils/network.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"network.js","sourceRoot":"/","sources":["utils/network.ts"],"names":[],"mappings":";;;AAAA,0CAAiE;AAEjE,SAAgB,cAAc,CAAC,GAA0B;IACvD,IAAI,GAAG,KAAK,YAAY;QAAE,OAAO,oBAAW,CAAC,WAAW,CAAC;IACzD,IAAI,GAAG,KAAK,MAAM;QAAE,OAAO,oBAAW,CAAC,UAAU,CAAC;IAElD,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;AAC1C,CAAC;AALD,wCAKC;AAED,SAAgB,mCAAmC,CACjD,iBAAoC;IAEpC,QAAQ,iBAAiB,EAAE,CAAC;QAC1B,KAAK,0BAAiB,CAAC,aAAa,CAAC;QACrC,KAAK,0BAAiB,CAAC,eAAe,CAAC;QACvC,KAAK,0BAAiB,CAAC,SAAS,CAAC;QACjC,KAAK,0BAAiB,CAAC,eAAe;YACpC,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;QAEhC;YACE,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IACpE,CAAC;AACH,CAAC;AAbD,kFAaC","sourcesContent":["import { MoneyInOutChainId, ReyaChainId } from '@reyaxyz/common';\n\nexport function getReyaNetwork(env: 'production' | 'test'): ReyaChainId {\n  if (env === 'production') return ReyaChainId.reyaNetwork;\n  if (env === 'test') return ReyaChainId.reyaCronos;\n\n  throw new Error('Unknown error passed');\n}\n\nexport function getReyaNetworkFromMoneyInOutChainId(\n  moneyInOutChainId: MoneyInOutChainId,\n): ReyaChainId {\n  switch (moneyInOutChainId) {\n    case MoneyInOutChainId.polygonMumbai:\n    case MoneyInOutChainId.arbitrumSepolia:\n    case MoneyInOutChainId.opSepolia:\n    case MoneyInOutChainId.ethereumSepolia:\n      return getReyaNetwork('test');\n\n    default:\n      throw new Error('getReyaNetwork: unexpected moneyInOutChainId');\n  }\n}\n"]}

package/src/services/token/getBalanceByChainId.ts

@@ -1,30 +0,0 @@
-import { GetBalanceByChainIdParams } from './types';
-import { getBalanceByTokenAddress } from './getBalanceByTokenAddress';
-import { MoneyInOutChainId, ReyaChainId } from '@reyaxyz/common';
-
-// TODO: Milan hardcoded address atm fix!
-const chainToTokenMap: Record<
-  ReyaChainId | MoneyInOutChainId,
-  Lowercase<string>
-> = {
-  [ReyaChainId.reyaCronos]: '0x1b700a40a0707dd5f0bc31cbc57d730558e5714d',
-  [ReyaChainId.reyaNetwork]: '0x51b0b7f083e563d5cf9d0b5f3916b59fc49c7e5f',
-  [MoneyInOutChainId.polygonMumbai]:
-    '0xd9edcc943ed9729b08e52bb1e110fe43d1930773',
-  [MoneyInOutChainId.arbitrumSepolia]:
-    '0x8537307810fc40f4073a12a38554d4ff78efff41',
-  [MoneyInOutChainId.opSepolia]: '0x6d290609b3f5f02d52f28d97c75a443ed8564cbf',
-  [MoneyInOutChainId.ethereumSepolia]:
-    '0x565810cbfa3cf1390963e5afa2fb953795686339',
-};
-
-// TODO: Milan hardcoded address atm fix!
-export const getBalanceByChainId = async ({
-  signer,
-  chainId,
-}: GetBalanceByChainIdParams): Promise<number> => {
-  return getBalanceByTokenAddress({
-    signer,
-    tokenAddress: chainToTokenMap[chainId],
-  });
-};

package/src/utils/network.ts

@@ -1,23 +0,0 @@
-import { MoneyInOutChainId, ReyaChainId } from '@reyaxyz/common';
-
-export function getReyaNetwork(env: 'production' | 'test'): ReyaChainId {
-  if (env === 'production') return ReyaChainId.reyaNetwork;
-  if (env === 'test') return ReyaChainId.reyaCronos;
-
-  throw new Error('Unknown error passed');
-}
-
-export function getReyaNetworkFromMoneyInOutChainId(
-  moneyInOutChainId: MoneyInOutChainId,
-): ReyaChainId {
-  switch (moneyInOutChainId) {
-    case MoneyInOutChainId.polygonMumbai:
-    case MoneyInOutChainId.arbitrumSepolia:
-    case MoneyInOutChainId.opSepolia:
-    case MoneyInOutChainId.ethereumSepolia:
-      return getReyaNetwork('test');
-
-    default:
-      throw new Error('getReyaNetwork: unexpected moneyInOutChainId');
-  }
-}