@reyaxyz/sdk 0.134.10 → 0.134.12

package/README.md

@@ -6,5 +6,5 @@
 
 | Statements                  | Branches                | Functions                 | Lines             |
 | --------------------------- | ----------------------- | ------------------------- | ----------------- |
-| ![Statements](https://img.shields.io/badge/statements-8.04%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-5.12%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-3.79%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-7.73%25-red.svg?style=flat) |
+| ![Statements](https://img.shields.io/badge/statements-9.16%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-5.75%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-4.1%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-8.81%25-red.svg?style=flat) |
 

package/dist/services/margin-accounts/index.js

@@ -22,5 +22,4 @@ __exportStar(require("./bridgeAndDepositExistingMA"), exports);
 __exportStar(require("./bridgeAndDepositNewMA"), exports);
 __exportStar(require("./transferMarginBetweenAccounts"), exports);
 __exportStar(require("./withdrawMAAndBridge"), exports);
-__exportStar(require("./rescueFundsFromEmbeddedWallet"), exports);
 //# sourceMappingURL=index.js.map

package/dist/services/margin-accounts/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/margin-accounts/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,4CAA0B;AAC1B,6CAA2B;AAC3B,+DAA6C;AAC7C,0DAAwC;AACxC,kEAAgD;AAChD,wDAAsC;AACtC,kEAAgD","sourcesContent":["export * from './types';\nexport * from './account';\nexport * from './deposit';\nexport * from './withdraw';\nexport * from './bridgeAndDepositExistingMA';\nexport * from './bridgeAndDepositNewMA';\nexport * from './transferMarginBetweenAccounts';\nexport * from './withdrawMAAndBridge';\nexport * from './rescueFundsFromEmbeddedWallet';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/margin-accounts/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,4CAA0B;AAC1B,6CAA2B;AAC3B,+DAA6C;AAC7C,0DAAwC;AACxC,kEAAgD;AAChD,wDAAsC","sourcesContent":["export * from './types';\nexport * from './account';\nexport * from './deposit';\nexport * from './withdraw';\nexport * from './bridgeAndDepositExistingMA';\nexport * from './bridgeAndDepositNewMA';\nexport * from './transferMarginBetweenAccounts';\nexport * from './withdrawMAAndBridge';\n"]}

package/dist/types/services/margin-accounts/index.d.ts

@@ -6,5 +6,4 @@ export * from './bridgeAndDepositExistingMA';
 export * from './bridgeAndDepositNewMA';
 export * from './transferMarginBetweenAccounts';
 export * from './withdrawMAAndBridge';
-export * from './rescueFundsFromEmbeddedWallet';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/services/margin-accounts/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/margin-accounts/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,iCAAiC,CAAC;AAChD,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/margin-accounts/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,iCAAiC,CAAC;AAChD,cAAc,uBAAuB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.134.10",
+  "version": "0.134.12",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -29,11 +29,11 @@
     "generate:coverage-badges": "npx istanbul-badges-readme --silent"
   },
   "dependencies": {
-    "@reyaxyz/common": "0.291.8",
+    "@reyaxyz/common": "0.291.9",
     "axios": "^1.6.2",
     "bignumber.js": "^9.1.2",
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.3.1",
-  "gitHead": "bf535ce18c8216b972688a5254eb18113f9b7b43"
+  "gitHead": "6438674e51b74d423e6d918de5e77da954c6d648"
 }

package/src/services/margin-accounts/index.ts

@@ -6,4 +6,3 @@ export * from './bridgeAndDepositExistingMA';
 export * from './bridgeAndDepositNewMA';
 export * from './transferMarginBetweenAccounts';
 export * from './withdrawMAAndBridge';
-export * from './rescueFundsFromEmbeddedWallet';

package/dist/services/margin-accounts/rescueFundsFromEmbeddedWallet.js

@@ -1,221 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rescueFundsFromEmbeddedWallet = exports.isValidToRescueFundsFromEmbeddedWallet = void 0;
-var ethers_1 = require("ethers");
-var config_1 = require("../../config");
-var common_1 = require("@reyaxyz/common");
-var network_1 = require("../../utils/network");
-var CoreAbi = [
-    "function deposit(uint128, address, uint256) external",
-    "function execute(uint128, (uint8, bytes, uint128, uint128)[] calldata) external",
-    "function getCollateralInfo(uint128, address) external view returns ((int256,int256,int256))",
-];
-var Erc20Abi = [
-    "function approve(address, uint256) external returns (bool)",
-    "function balanceOf(address) external view returns (uint256)",
-];
-var getAccountRusdAmount = function (embeddedWallet, accountId) { return __awaiter(void 0, void 0, void 0, function () {
-    var reyaChainId, coreAddress, core, rusdAddress, result;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                reyaChainId = (0, config_1.getSdkConfig)().chain;
-                coreAddress = (0, common_1.getAddress)(reyaChainId, common_1.ContractType.CORE_PROXY);
-                core = new ethers_1.Contract(coreAddress, CoreAbi, embeddedWallet);
-                rusdAddress = (0, common_1.getTokenInfoByName)('RUSD', reyaChainId).address;
-                return [4 /*yield*/, core.getCollateralInfo(accountId, rusdAddress)];
-            case 1:
-                result = _a.sent();
-                return [2 /*return*/, result[1].toString()];
-        }
-    });
-}); };
-var checkUserForRescueFundsFromEmbeddedWallet = function (_a) {
-    var mainWallet = _a.mainWallet, embeddedWallet = _a.embeddedWallet;
-    return __awaiter(void 0, void 0, void 0, function () {
-        var reyaChainId, _b, embeddedWalletAddress, mainWalletAddress, fromAccountId, toAccountId, rusdAmount;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    reyaChainId = (0, config_1.getSdkConfig)().chain;
-                    return [4 /*yield*/, Promise.all([
-                            embeddedWallet.getAddress(),
-                            mainWallet.getAddress(),
-                        ])];
-                case 1:
-                    _b = _c.sent(), embeddedWalletAddress = _b[0], mainWalletAddress = _b[1];
-                    fromAccountId = 0;
-                    toAccountId = 0;
-                    if (reyaChainId === common_1.ReyaChainId.reyaNetwork) {
-                        if (embeddedWalletAddress.toLowerCase() ===
-                            '0xae173a960084903b1d278ff9e3a81ded82275556'.toLowerCase() &&
-                            mainWalletAddress.toLowerCase() ===
-                                '0xae173a960084903b1d278ff9e3a81ded82275556'.toLowerCase()) {
-                            fromAccountId = 95928;
-                            toAccountId = 20135;
-                        }
-                        if (embeddedWalletAddress.toLowerCase() ===
-                            '0x07976A7DC83c4470859e391139785146E4b69B21'.toLowerCase() &&
-                            mainWalletAddress.toLowerCase() ===
-                                '0xae173a960084903b1d278ff9e3a81ded82275556'.toLowerCase()) {
-                            fromAccountId = 102993;
-                            toAccountId = 20135;
-                        }
-                        if (embeddedWalletAddress.toLowerCase() ===
-                            '0x105E50Dc1210F5fE3f00187fbD6b94F5f275D141'.toLowerCase() &&
-                            mainWalletAddress.toLowerCase() ===
-                                '0x800949e55f51AB7Ed905CE2b8CC50F205332C04f'.toLowerCase()) {
-                            fromAccountId = 101822;
-                            toAccountId = 102857;
-                        }
-                    }
-                    if (fromAccountId === 0) {
-                        return [2 /*return*/, {
-                                isValid: false,
-                            }];
-                    }
-                    return [4 /*yield*/, getAccountRusdAmount(embeddedWallet, fromAccountId)];
-                case 2:
-                    rusdAmount = _c.sent();
-                    if (rusdAmount === '0') {
-                        return [2 /*return*/, {
-                                isValid: false,
-                            }];
-                    }
-                    return [2 /*return*/, {
-                            isValid: true,
-                            fromAccountId: fromAccountId,
-                            toAccountId: toAccountId,
-                            rusdAmount: rusdAmount,
-                        }];
-            }
-        });
-    });
-};
-var isValidToRescueFundsFromEmbeddedWallet = function (params) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
-    return [2 /*return*/, checkUserForRescueFundsFromEmbeddedWallet(params).then(function (r) { return r.isValid; })];
-}); }); };
-exports.isValidToRescueFundsFromEmbeddedWallet = isValidToRescueFundsFromEmbeddedWallet;
-var validateInputs = function (_a) {
-    var embeddedWallet = _a.embeddedWallet, mainWallet = _a.mainWallet;
-    return __awaiter(void 0, void 0, void 0, function () {
-        var embeddedWalletProvider, mainWalletProvider, embeddedWalletChainId, _b, mainWalletChainId, _c, doChainIdsMatch, isConnectedToReya, result;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
-                case 0:
-                    embeddedWalletProvider = embeddedWallet.provider;
-                    mainWalletProvider = mainWallet.provider;
-                    if (!embeddedWalletProvider) {
-                        throw new Error('Embedded wallet provider not found');
-                    }
-                    if (!mainWalletProvider) {
-                        throw new Error('Main wallet provider not found');
-                    }
-                    _b = Number;
-                    return [4 /*yield*/, embeddedWalletProvider.getNetwork()];
-                case 1:
-                    embeddedWalletChainId = _b.apply(void 0, [(_d.sent()).chainId]);
-                    _c = Number;
-                    return [4 /*yield*/, mainWalletProvider.getNetwork()];
-                case 2:
-                    mainWalletChainId = _c.apply(void 0, [(_d.sent()).chainId]);
-                    doChainIdsMatch = embeddedWalletChainId === mainWalletChainId;
-                    if (!doChainIdsMatch) {
-                        throw new Error('Chain IDs do not match');
-                    }
-                    isConnectedToReya = embeddedWalletChainId === (0, config_1.getSdkConfig)().chain;
-                    if (!isConnectedToReya) {
-                        throw new Error("Wallet is not connected to Reya, ".concat(embeddedWalletChainId));
-                    }
-                    return [4 /*yield*/, checkUserForRescueFundsFromEmbeddedWallet({
-                            embeddedWallet: embeddedWallet,
-                            mainWallet: mainWallet,
-                        })];
-                case 3:
-                    result = _d.sent();
-                    if (!result.isValid) {
-                        throw new Error('Invalid rescue funds from embedded wallet');
-                    }
-                    return [2 /*return*/, result];
-            }
-        });
-    });
-};
-var rescueFundsFromEmbeddedWallet = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, rusdAmount, fromAccountId, toAccountId, embeddedWallet, reyaChainId, coreAddress, core, rusdAddress, rusd, encodedInput, tx, tx, tx;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0: return [4 /*yield*/, validateInputs(params)];
-            case 1:
-                _a = _b.sent(), rusdAmount = _a.rusdAmount, fromAccountId = _a.fromAccountId, toAccountId = _a.toAccountId;
-                embeddedWallet = params.embeddedWallet;
-                reyaChainId = (0, network_1.getReyaNetwork)();
-                console.log('rusd amount', rusdAmount);
-                coreAddress = (0, common_1.getAddress)(reyaChainId, common_1.ContractType.CORE_PROXY);
-                core = new ethers_1.Contract(coreAddress, CoreAbi, embeddedWallet);
-                rusdAddress = (0, common_1.getTokenInfoByName)('RUSD', reyaChainId).address;
-                rusd = new ethers_1.Contract(rusdAddress, Erc20Abi, embeddedWallet);
-                encodedInput = ethers_1.AbiCoder.defaultAbiCoder().encode(['address', 'uint256'], [rusdAddress, rusdAmount]);
-                return [4 /*yield*/, core.execute(fromAccountId, [[1, encodedInput, 0, 0]])];
-            case 2:
-                tx = _b.sent();
-                return [4 /*yield*/, tx.wait()];
-            case 3:
-                _b.sent();
-                console.log('Withdrawal executed successfully.');
-                return [4 /*yield*/, rusd.approve(coreAddress, rusdAmount)];
-            case 4:
-                tx = _b.sent();
-                return [4 /*yield*/, tx.wait()];
-            case 5:
-                _b.sent();
-                console.log('Approval executed successfully.');
-                return [4 /*yield*/, core.deposit(toAccountId, rusdAddress, rusdAmount)];
-            case 6:
-                tx = _b.sent();
-                return [4 /*yield*/, tx.wait()];
-            case 7:
-                _b.sent();
-                console.log('Deposit executed successfully.');
-                return [2 /*return*/];
-        }
-    });
-}); };
-exports.rescueFundsFromEmbeddedWallet = rescueFundsFromEmbeddedWallet;
-//# sourceMappingURL=rescueFundsFromEmbeddedWallet.js.map

package/dist/services/margin-accounts/rescueFundsFromEmbeddedWallet.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"rescueFundsFromEmbeddedWallet.js","sourceRoot":"/","sources":["services/margin-accounts/rescueFundsFromEmbeddedWallet.ts"],"names":[],"mappings":"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","sourcesContent":["import { AbiCoder, Contract, JsonRpcSigner, Signer } from 'ethers';\nimport { getSdkConfig } from '../../config';\nimport {\n  ContractType,\n  getAddress,\n  getTokenInfoByName,\n  ReyaChainId,\n} from '@reyaxyz/common';\nimport { getReyaNetwork } from '../../utils/network';\n\nexport type RescueFundsFromEmbeddedWalletParams = {\n  embeddedWallet: JsonRpcSigner | Signer;\n  mainWallet: JsonRpcSigner | Signer;\n};\n\nconst CoreAbi = [\n  `function deposit(uint128, address, uint256) external`,\n  `function execute(uint128, (uint8, bytes, uint128, uint128)[] calldata) external`,\n  `function getCollateralInfo(uint128, address) external view returns ((int256,int256,int256))`,\n];\n\nconst Erc20Abi = [\n  `function approve(address, uint256) external returns (bool)`,\n  `function balanceOf(address) external view returns (uint256)`,\n];\n\nconst getAccountRusdAmount = async (\n  embeddedWallet: JsonRpcSigner | Signer,\n  accountId: number,\n): Promise<string> => {\n  const reyaChainId = getSdkConfig().chain;\n  const coreAddress = getAddress(reyaChainId, ContractType.CORE_PROXY);\n  const core = new Contract(coreAddress, CoreAbi, embeddedWallet);\n  const rusdAddress = getTokenInfoByName('RUSD', reyaChainId).address;\n  const result = await core.getCollateralInfo(accountId, rusdAddress);\n  return result[1].toString();\n};\n\nconst checkUserForRescueFundsFromEmbeddedWallet = async ({\n  mainWallet,\n  embeddedWallet,\n}: RescueFundsFromEmbeddedWalletParams): Promise<\n  | {\n      isValid: false;\n    }\n  | {\n      isValid: true;\n      fromAccountId: number;\n      toAccountId: number;\n      rusdAmount: string;\n    }\n> => {\n  const reyaChainId = getSdkConfig().chain;\n  const [embeddedWalletAddress, mainWalletAddress] = await Promise.all([\n    embeddedWallet.getAddress(),\n    mainWallet.getAddress(),\n  ]);\n\n  let fromAccountId = 0;\n  let toAccountId = 0;\n\n  if (reyaChainId === ReyaChainId.reyaNetwork) {\n    if (\n      embeddedWalletAddress.toLowerCase() ===\n        '0xae173a960084903b1d278ff9e3a81ded82275556'.toLowerCase() &&\n      mainWalletAddress.toLowerCase() ===\n        '0xae173a960084903b1d278ff9e3a81ded82275556'.toLowerCase()\n    ) {\n      fromAccountId = 95928;\n      toAccountId = 20135;\n    }\n\n    if (\n      embeddedWalletAddress.toLowerCase() ===\n        '0x07976A7DC83c4470859e391139785146E4b69B21'.toLowerCase() &&\n      mainWalletAddress.toLowerCase() ===\n        '0xae173a960084903b1d278ff9e3a81ded82275556'.toLowerCase()\n    ) {\n      fromAccountId = 102993;\n      toAccountId = 20135;\n    }\n\n    if (\n      embeddedWalletAddress.toLowerCase() ===\n        '0x105E50Dc1210F5fE3f00187fbD6b94F5f275D141'.toLowerCase() &&\n      mainWalletAddress.toLowerCase() ===\n        '0x800949e55f51AB7Ed905CE2b8CC50F205332C04f'.toLowerCase()\n    ) {\n      fromAccountId = 101822;\n      toAccountId = 102857;\n    }\n  }\n\n  if (fromAccountId === 0) {\n    return {\n      isValid: false,\n    };\n  }\n\n  const rusdAmount = await getAccountRusdAmount(embeddedWallet, fromAccountId);\n\n  if (rusdAmount === '0') {\n    return {\n      isValid: false,\n    };\n  }\n\n  return {\n    isValid: true,\n    fromAccountId,\n    toAccountId,\n    rusdAmount,\n  };\n};\n\nexport const isValidToRescueFundsFromEmbeddedWallet = async (\n  params: RescueFundsFromEmbeddedWalletParams,\n) => checkUserForRescueFundsFromEmbeddedWallet(params).then((r) => r.isValid);\n\nconst validateInputs = async ({\n  embeddedWallet,\n  mainWallet,\n}: RescueFundsFromEmbeddedWalletParams): Promise<{\n  rusdAmount: string;\n  fromAccountId: number;\n  toAccountId: number;\n}> => {\n  const embeddedWalletProvider = embeddedWallet.provider;\n  const mainWalletProvider = mainWallet.provider;\n\n  if (!embeddedWalletProvider) {\n    throw new Error('Embedded wallet provider not found');\n  }\n\n  if (!mainWalletProvider) {\n    throw new Error('Main wallet provider not found');\n  }\n\n  const embeddedWalletChainId = Number(\n    (await embeddedWalletProvider.getNetwork()).chainId,\n  );\n  const mainWalletChainId = Number(\n    (await mainWalletProvider.getNetwork()).chainId,\n  );\n\n  const doChainIdsMatch = embeddedWalletChainId === mainWalletChainId;\n  if (!doChainIdsMatch) {\n    throw new Error('Chain IDs do not match');\n  }\n\n  const isConnectedToReya = embeddedWalletChainId === getSdkConfig().chain;\n\n  if (!isConnectedToReya) {\n    throw new Error(\n      `Wallet is not connected to Reya, ${embeddedWalletChainId}`,\n    );\n  }\n\n  const result = await checkUserForRescueFundsFromEmbeddedWallet({\n    embeddedWallet,\n    mainWallet,\n  });\n\n  if (!result.isValid) {\n    throw new Error('Invalid rescue funds from embedded wallet');\n  }\n\n  return result;\n};\n\nexport const rescueFundsFromEmbeddedWallet = async (\n  params: RescueFundsFromEmbeddedWalletParams,\n): Promise<void> => {\n  const { rusdAmount, fromAccountId, toAccountId } =\n    await validateInputs(params);\n  const { embeddedWallet } = params;\n  const reyaChainId = getReyaNetwork();\n\n  console.log('rusd amount', rusdAmount);\n\n  const coreAddress = getAddress(reyaChainId, ContractType.CORE_PROXY);\n\n  const core = new Contract(coreAddress, CoreAbi, embeddedWallet);\n\n  const rusdAddress = getTokenInfoByName('RUSD', reyaChainId).address;\n  const rusd = new Contract(rusdAddress, Erc20Abi, embeddedWallet);\n\n  {\n    const encodedInput = AbiCoder.defaultAbiCoder().encode(\n      ['address', 'uint256'],\n      [rusdAddress, rusdAmount],\n    );\n\n    const tx = await core.execute(fromAccountId, [[1, encodedInput, 0, 0]]);\n\n    await tx.wait();\n\n    console.log('Withdrawal executed successfully.');\n  }\n\n  {\n    const tx = await rusd.approve(coreAddress, rusdAmount);\n    await tx.wait();\n\n    console.log('Approval executed successfully.');\n  }\n\n  {\n    const tx = await core.deposit(toAccountId, rusdAddress, rusdAmount);\n\n    await tx.wait();\n\n    console.log('Deposit executed successfully.');\n  }\n};\n"]}

package/dist/types/services/margin-accounts/rescueFundsFromEmbeddedWallet.d.ts

@@ -1,8 +0,0 @@
-import { JsonRpcSigner, Signer } from 'ethers';
-export type RescueFundsFromEmbeddedWalletParams = {
-    embeddedWallet: JsonRpcSigner | Signer;
-    mainWallet: JsonRpcSigner | Signer;
-};
-export declare const isValidToRescueFundsFromEmbeddedWallet: (params: RescueFundsFromEmbeddedWalletParams) => Promise<boolean>;
-export declare const rescueFundsFromEmbeddedWallet: (params: RescueFundsFromEmbeddedWalletParams) => Promise<void>;
-//# sourceMappingURL=rescueFundsFromEmbeddedWallet.d.ts.map

package/dist/types/services/margin-accounts/rescueFundsFromEmbeddedWallet.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"rescueFundsFromEmbeddedWallet.d.ts","sourceRoot":"/","sources":["services/margin-accounts/rescueFundsFromEmbeddedWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAUnE,MAAM,MAAM,mCAAmC,GAAG;IAChD,cAAc,EAAE,aAAa,GAAG,MAAM,CAAC;IACvC,UAAU,EAAE,aAAa,GAAG,MAAM,CAAC;CACpC,CAAC;AAsGF,eAAO,MAAM,sCAAsC,WACzC,mCAAmC,qBACgC,CAAC;AAqD9E,eAAO,MAAM,6BAA6B,WAChC,mCAAmC,KAC1C,QAAQ,IAAI,CA0Cd,CAAC"}

package/src/services/margin-accounts/rescueFundsFromEmbeddedWallet.ts

@@ -1,215 +0,0 @@
-import { AbiCoder, Contract, JsonRpcSigner, Signer } from 'ethers';
-import { getSdkConfig } from '../../config';
-import {
-  ContractType,
-  getAddress,
-  getTokenInfoByName,
-  ReyaChainId,
-} from '@reyaxyz/common';
-import { getReyaNetwork } from '../../utils/network';
-
-export type RescueFundsFromEmbeddedWalletParams = {
-  embeddedWallet: JsonRpcSigner | Signer;
-  mainWallet: JsonRpcSigner | Signer;
-};
-
-const CoreAbi = [
-  `function deposit(uint128, address, uint256) external`,
-  `function execute(uint128, (uint8, bytes, uint128, uint128)[] calldata) external`,
-  `function getCollateralInfo(uint128, address) external view returns ((int256,int256,int256))`,
-];
-
-const Erc20Abi = [
-  `function approve(address, uint256) external returns (bool)`,
-  `function balanceOf(address) external view returns (uint256)`,
-];
-
-const getAccountRusdAmount = async (
-  embeddedWallet: JsonRpcSigner | Signer,
-  accountId: number,
-): Promise<string> => {
-  const reyaChainId = getSdkConfig().chain;
-  const coreAddress = getAddress(reyaChainId, ContractType.CORE_PROXY);
-  const core = new Contract(coreAddress, CoreAbi, embeddedWallet);
-  const rusdAddress = getTokenInfoByName('RUSD', reyaChainId).address;
-  const result = await core.getCollateralInfo(accountId, rusdAddress);
-  return result[1].toString();
-};
-
-const checkUserForRescueFundsFromEmbeddedWallet = async ({
-  mainWallet,
-  embeddedWallet,
-}: RescueFundsFromEmbeddedWalletParams): Promise<
-  | {
-      isValid: false;
-    }
-  | {
-      isValid: true;
-      fromAccountId: number;
-      toAccountId: number;
-      rusdAmount: string;
-    }
-> => {
-  const reyaChainId = getSdkConfig().chain;
-  const [embeddedWalletAddress, mainWalletAddress] = await Promise.all([
-    embeddedWallet.getAddress(),
-    mainWallet.getAddress(),
-  ]);
-
-  let fromAccountId = 0;
-  let toAccountId = 0;
-
-  if (reyaChainId === ReyaChainId.reyaNetwork) {
-    if (
-      embeddedWalletAddress.toLowerCase() ===
-        '0xae173a960084903b1d278ff9e3a81ded82275556'.toLowerCase() &&
-      mainWalletAddress.toLowerCase() ===
-        '0xae173a960084903b1d278ff9e3a81ded82275556'.toLowerCase()
-    ) {
-      fromAccountId = 95928;
-      toAccountId = 20135;
-    }
-
-    if (
-      embeddedWalletAddress.toLowerCase() ===
-        '0x07976A7DC83c4470859e391139785146E4b69B21'.toLowerCase() &&
-      mainWalletAddress.toLowerCase() ===
-        '0xae173a960084903b1d278ff9e3a81ded82275556'.toLowerCase()
-    ) {
-      fromAccountId = 102993;
-      toAccountId = 20135;
-    }
-
-    if (
-      embeddedWalletAddress.toLowerCase() ===
-        '0x105E50Dc1210F5fE3f00187fbD6b94F5f275D141'.toLowerCase() &&
-      mainWalletAddress.toLowerCase() ===
-        '0x800949e55f51AB7Ed905CE2b8CC50F205332C04f'.toLowerCase()
-    ) {
-      fromAccountId = 101822;
-      toAccountId = 102857;
-    }
-  }
-
-  if (fromAccountId === 0) {
-    return {
-      isValid: false,
-    };
-  }
-
-  const rusdAmount = await getAccountRusdAmount(embeddedWallet, fromAccountId);
-
-  if (rusdAmount === '0') {
-    return {
-      isValid: false,
-    };
-  }
-
-  return {
-    isValid: true,
-    fromAccountId,
-    toAccountId,
-    rusdAmount,
-  };
-};
-
-export const isValidToRescueFundsFromEmbeddedWallet = async (
-  params: RescueFundsFromEmbeddedWalletParams,
-) => checkUserForRescueFundsFromEmbeddedWallet(params).then((r) => r.isValid);
-
-const validateInputs = async ({
-  embeddedWallet,
-  mainWallet,
-}: RescueFundsFromEmbeddedWalletParams): Promise<{
-  rusdAmount: string;
-  fromAccountId: number;
-  toAccountId: number;
-}> => {
-  const embeddedWalletProvider = embeddedWallet.provider;
-  const mainWalletProvider = mainWallet.provider;
-
-  if (!embeddedWalletProvider) {
-    throw new Error('Embedded wallet provider not found');
-  }
-
-  if (!mainWalletProvider) {
-    throw new Error('Main wallet provider not found');
-  }
-
-  const embeddedWalletChainId = Number(
-    (await embeddedWalletProvider.getNetwork()).chainId,
-  );
-  const mainWalletChainId = Number(
-    (await mainWalletProvider.getNetwork()).chainId,
-  );
-
-  const doChainIdsMatch = embeddedWalletChainId === mainWalletChainId;
-  if (!doChainIdsMatch) {
-    throw new Error('Chain IDs do not match');
-  }
-
-  const isConnectedToReya = embeddedWalletChainId === getSdkConfig().chain;
-
-  if (!isConnectedToReya) {
-    throw new Error(
-      `Wallet is not connected to Reya, ${embeddedWalletChainId}`,
-    );
-  }
-
-  const result = await checkUserForRescueFundsFromEmbeddedWallet({
-    embeddedWallet,
-    mainWallet,
-  });
-
-  if (!result.isValid) {
-    throw new Error('Invalid rescue funds from embedded wallet');
-  }
-
-  return result;
-};
-
-export const rescueFundsFromEmbeddedWallet = async (
-  params: RescueFundsFromEmbeddedWalletParams,
-): Promise<void> => {
-  const { rusdAmount, fromAccountId, toAccountId } =
-    await validateInputs(params);
-  const { embeddedWallet } = params;
-  const reyaChainId = getReyaNetwork();
-
-  console.log('rusd amount', rusdAmount);
-
-  const coreAddress = getAddress(reyaChainId, ContractType.CORE_PROXY);
-
-  const core = new Contract(coreAddress, CoreAbi, embeddedWallet);
-
-  const rusdAddress = getTokenInfoByName('RUSD', reyaChainId).address;
-  const rusd = new Contract(rusdAddress, Erc20Abi, embeddedWallet);
-
-  {
-    const encodedInput = AbiCoder.defaultAbiCoder().encode(
-      ['address', 'uint256'],
-      [rusdAddress, rusdAmount],
-    );
-
-    const tx = await core.execute(fromAccountId, [[1, encodedInput, 0, 0]]);
-
-    await tx.wait();
-
-    console.log('Withdrawal executed successfully.');
-  }
-
-  {
-    const tx = await rusd.approve(coreAddress, rusdAmount);
-    await tx.wait();
-
-    console.log('Approval executed successfully.');
-  }
-
-  {
-    const tx = await core.deposit(toAccountId, rusdAddress, rusdAmount);
-
-    await tx.wait();
-
-    console.log('Deposit executed successfully.');
-  }
-};