@reyaxyz/sdk 0.150.0 → 0.151.0

package/README.md

@@ -6,5 +6,5 @@
 
 | Statements                  | Branches                | Functions                 | Lines             |
 | --------------------------- | ----------------------- | ------------------------- | ----------------- |
-| ![Statements](https://img.shields.io/badge/statements-16%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-15.85%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-11.49%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-15.5%25-red.svg?style=flat) |
+| ![Statements](https://img.shields.io/badge/statements-15.33%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-15.29%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-10.86%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-14.84%25-red.svg?style=flat) |
 

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

@@ -20,4 +20,5 @@ __exportStar(require("./deposit"), exports);
 __exportStar(require("./transferMarginBetweenAccounts"), exports);
 __exportStar(require("./withdraw"), exports);
 __exportStar(require("./erc20"), exports);
+__exportStar(require("./weth"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/margin-accounts-v2/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,kDAAgC;AAChC,4CAA0B;AAC1B,kEAAgD;AAChD,6CAA2B;AAC3B,0CAAwB","sourcesContent":["export * from './types';\nexport * from './createAccount';\nexport * from './deposit';\nexport * from './transferMarginBetweenAccounts';\nexport * from './withdraw';\nexport * from './erc20';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/margin-accounts-v2/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,kDAAgC;AAChC,4CAA0B;AAC1B,kEAAgD;AAChD,6CAA2B;AAC3B,0CAAwB;AACxB,yCAAuB","sourcesContent":["export * from './types';\nexport * from './createAccount';\nexport * from './deposit';\nexport * from './transferMarginBetweenAccounts';\nexport * from './withdraw';\nexport * from './erc20';\nexport * from './weth';\n"]}

package/dist/services/margin-accounts-v2/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/margin-accounts-v2/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { Address, OFTMessagingFee } from '@reyaxyz/common';\n\nexport type CreateAccountParamsV2 = {\n  ownerAddress: string;\n  name: string;\n};\n\nexport type CreateAccountResultV2 = {\n  transactionHash: string | null;\n  accountId: number | null;\n};\n\nexport type TransferMAParamsV2 = {\n  collateralAddress: Address;\n  collateralDecimals: number;\n  signer: Signer | JsonRpcSigner;\n  coreSigNonce: number;\n  fromMarginAccountId: number;\n  toMarginAccountId: number;\n  amount: number;\n};\n\nexport type TransferMAResultV2 = {\n  transactionHash: string | null;\n  coreSigNonce: number | null;\n};\n\nexport type SocketBridgeAndDepositMAParamsV2 = {\n  collateralAddressInReyaPeriphery: Address;\n  collateralDecimals: number;\n  chainId: number;\n  bridgeFee: string;\n  vaultAddress: Address;\n  connectorAddress: Address;\n  msgGasLimit: string;\n  signer: Signer | JsonRpcSigner;\n  accountId: number;\n  amount: number;\n};\n\n/**\n * Whether the pending row was registered with the API.\n *\n * Recording it is best-effort -- the deposit is already on-chain by then, so a\n * failure never fails the deposit -- but the caller is the one with error\n * reporting wired up, so the outcome is returned rather than swallowed. A\n * `false` here means the deposit will not appear as pending until the bridge\n * delivers and the indexer picks it up.\n */\nexport type PendingTransactionPersistence =\n  | { status: true }\n  | { status: false; reason: string };\n\nexport type SocketBridgeAndDepositMAResultV2 = {\n  transactionHash: string | null;\n  persistedPendingTransaction: PendingTransactionPersistence;\n};\n\nexport type LzBridgeAndDepositMAParamsV2 = {\n  collateralAddress: Address;\n  collateralDecimals: number;\n  collateralAddressInReyaPeriphery: Address;\n  chainId: number;\n  dstEid: number;\n  bridgeFee: OFTMessagingFee;\n  extraOptions: string;\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: number;\n  amount: number;\n};\n\nexport type LzBridgeAndDepositMAResultV2 = {\n  transactionHash: string | null;\n};\n\nexport type EstimateFeeLzBridgeAndDepositMAParamsV2 = Pick<\n  LzBridgeAndDepositMAParamsV2,\n  | 'collateralAddress'\n  | 'collateralDecimals'\n  | 'collateralAddressInReyaPeriphery'\n  | 'chainId'\n  | 'dstEid'\n  | 'extraOptions'\n> & {\n  signer: Signer | JsonRpcSigner;\n};\n\nexport type EstimateFeeSocketBridgeAndDepositMAParamsV2 = Pick<\n  SocketBridgeAndDepositMAParamsV2,\n  'vaultAddress' | 'connectorAddress' | 'msgGasLimit' | 'chainId'\n> & {\n  signer: Signer | JsonRpcSigner;\n};\n\nexport type WithdrawMAAndSocketBridgeParamsV2 = {\n  collateralAddressInReyaCore: Address;\n  collateralDecimals: number;\n  destinationChainId: number;\n  msgGasLimit: string;\n  signer: Signer | JsonRpcSigner;\n  coreSigNonce: number;\n  marginAccountId: number;\n  amount: number;\n  receiverAddress: Address;\n};\n\nexport type WithdrawMAAndSocketBridgeResultV2 = {\n  transactionHash: string | null;\n  coreSigNonce: number | null;\n};\n\nexport type WithdrawMAAndLzBridgeParamsV2 = {\n  collateralAddressInReyaCore: Address;\n  collateralDecimals: number;\n  dstEid: number;\n  signer: Signer | JsonRpcSigner;\n  coreSigNonce: number;\n  marginAccountId: number;\n  amount: number;\n  receiverAddress: Address;\n};\n\nexport type WithdrawMAAndLzBridgeResultV2 = {\n  transactionHash: string | null;\n  coreSigNonce: number | null;\n};\n\nexport type Erc20ApproveParamsV2 = {\n  collateralAddress: Address;\n  collateralDecimals: number;\n  spenderAddress: Address;\n  chainId: number;\n  signer: Signer | JsonRpcSigner;\n  amount: number;\n};\n\nexport type Erc20ApproveResultV2 = {\n  transactionHash: string | null;\n};\n\nexport type Erc20GetAllowanceParamsV2 = {\n  signer: Signer | JsonRpcSigner;\n  collateralAddress: Address;\n  collateralDecimals: number;\n  walletAddress: Address;\n  spenderAddress: Address;\n  chainId: number;\n};\n\nexport type Erc20GetAllowanceResultV2 = {\n  allowance: number;\n};\n\nexport type Erc20GetBalanceParamsV2 = {\n  signer: Signer | JsonRpcSigner;\n  collateralAddress: Address;\n  collateralDecimals: number;\n  chainId: number;\n  walletAddress: Address;\n};\n\nexport type Erc20GetBalanceResultV2 = {\n  balance: number;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/margin-accounts-v2/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { Address, OFTMessagingFee } from '@reyaxyz/common';\n\nexport type CreateAccountParamsV2 = {\n  ownerAddress: string;\n  name: string;\n};\n\nexport type CreateAccountResultV2 = {\n  transactionHash: string | null;\n  accountId: number | null;\n};\n\nexport type TransferMAParamsV2 = {\n  collateralAddress: Address;\n  collateralDecimals: number;\n  signer: Signer | JsonRpcSigner;\n  coreSigNonce: number;\n  fromMarginAccountId: number;\n  toMarginAccountId: number;\n  amount: number;\n};\n\nexport type TransferMAResultV2 = {\n  transactionHash: string | null;\n  coreSigNonce: number | null;\n};\n\nexport type SocketBridgeAndDepositMAParamsV2 = {\n  collateralAddressInReyaPeriphery: Address;\n  collateralDecimals: number;\n  chainId: number;\n  bridgeFee: string;\n  vaultAddress: Address;\n  connectorAddress: Address;\n  msgGasLimit: string;\n  signer: Signer | JsonRpcSigner;\n  accountId: number;\n  amount: number;\n};\n\n/**\n * Whether the pending row was registered with the API.\n *\n * Recording it is best-effort -- the deposit is already on-chain by then, so a\n * failure never fails the deposit -- but the caller is the one with error\n * reporting wired up, so the outcome is returned rather than swallowed. A\n * `false` here means the deposit will not appear as pending until the bridge\n * delivers and the indexer picks it up.\n */\nexport type PendingTransactionPersistence =\n  | { status: true }\n  | { status: false; reason: string };\n\nexport type SocketBridgeAndDepositMAResultV2 = {\n  transactionHash: string | null;\n  persistedPendingTransaction: PendingTransactionPersistence;\n};\n\nexport type LzBridgeAndDepositMAParamsV2 = {\n  collateralAddress: Address;\n  collateralDecimals: number;\n  collateralAddressInReyaPeriphery: Address;\n  chainId: number;\n  dstEid: number;\n  bridgeFee: OFTMessagingFee;\n  extraOptions: string;\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: number;\n  amount: number;\n};\n\nexport type LzBridgeAndDepositMAResultV2 = {\n  transactionHash: string | null;\n};\n\nexport type EstimateFeeLzBridgeAndDepositMAParamsV2 = Pick<\n  LzBridgeAndDepositMAParamsV2,\n  | 'collateralAddress'\n  | 'collateralDecimals'\n  | 'collateralAddressInReyaPeriphery'\n  | 'chainId'\n  | 'dstEid'\n  | 'extraOptions'\n> & {\n  signer: Signer | JsonRpcSigner;\n};\n\nexport type EstimateFeeSocketBridgeAndDepositMAParamsV2 = Pick<\n  SocketBridgeAndDepositMAParamsV2,\n  'vaultAddress' | 'connectorAddress' | 'msgGasLimit' | 'chainId'\n> & {\n  signer: Signer | JsonRpcSigner;\n};\n\nexport type WithdrawMAAndSocketBridgeParamsV2 = {\n  collateralAddressInReyaCore: Address;\n  collateralDecimals: number;\n  destinationChainId: number;\n  msgGasLimit: string;\n  signer: Signer | JsonRpcSigner;\n  coreSigNonce: number;\n  marginAccountId: number;\n  amount: number;\n  receiverAddress: Address;\n};\n\nexport type WithdrawMAAndSocketBridgeResultV2 = {\n  transactionHash: string | null;\n  coreSigNonce: number | null;\n};\n\nexport type WithdrawMAAndLzBridgeParamsV2 = {\n  collateralAddressInReyaCore: Address;\n  collateralDecimals: number;\n  dstEid: number;\n  signer: Signer | JsonRpcSigner;\n  coreSigNonce: number;\n  marginAccountId: number;\n  amount: number;\n  receiverAddress: Address;\n};\n\nexport type WithdrawMAAndLzBridgeResultV2 = {\n  transactionHash: string | null;\n  coreSigNonce: number | null;\n};\n\nexport type Erc20ApproveParamsV2 = {\n  collateralAddress: Address;\n  collateralDecimals: number;\n  spenderAddress: Address;\n  chainId: number;\n  signer: Signer | JsonRpcSigner;\n  amount: number;\n};\n\nexport type Erc20ApproveResultV2 = {\n  transactionHash: string | null;\n};\n\nexport type WrapEthParamsV2 = {\n  signer: Signer | JsonRpcSigner;\n  collateralAddress: Address;\n  collateralDecimals: number;\n  chainId: number;\n  amount: number;\n};\n\nexport type WrapEthResultV2 = {\n  transactionHash: string | null;\n};\n\nexport type UnwrapEthParamsV2 = {\n  signer: Signer | JsonRpcSigner;\n  collateralAddress: Address;\n  collateralDecimals: number;\n  chainId: number;\n  amount: number;\n};\n\nexport type UnwrapEthResultV2 = {\n  transactionHash: string | null;\n};\n\nexport type Erc20GetAllowanceParamsV2 = {\n  signer: Signer | JsonRpcSigner;\n  collateralAddress: Address;\n  collateralDecimals: number;\n  walletAddress: Address;\n  spenderAddress: Address;\n  chainId: number;\n};\n\nexport type Erc20GetAllowanceResultV2 = {\n  allowance: number;\n};\n\nexport type Erc20GetBalanceParamsV2 = {\n  signer: Signer | JsonRpcSigner;\n  collateralAddress: Address;\n  collateralDecimals: number;\n  chainId: number;\n  walletAddress: Address;\n};\n\nexport type Erc20GetBalanceResultV2 = {\n  balance: number;\n};\n"]}

package/dist/services/margin-accounts-v2/weth/consts.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertPositiveAmount = exports.assertWrappableChain = exports.isWrappableChain = exports.WETH9_CHAIN_IDS = exports.WETH9_INTERFACE = void 0;
+var ethers_1 = require("ethers");
+var common_1 = require("@reyaxyz/common");
+exports.WETH9_INTERFACE = new ethers_1.Interface([
+    'function deposit() external payable',
+    'function withdraw(uint256 wad) external',
+]);
+// Only chains whose `WETH` is a genuine WETH9. Most are not — Polygon's is a
+// bridged UChildERC20, the Sepolia entries are test ERC20s, and the Reya chains'
+// is the Socket-bridged representation — and wrapping is payable, so calling one
+// of those sends native ETH somewhere unrecoverable. Verify `deposit()` on-chain
+// before adding a chain here.
+exports.WETH9_CHAIN_IDS = [
+    common_1.MoneyInOutChainId.ethereumMainnet,
+    common_1.MoneyInOutChainId.arbitrumOne,
+];
+var isWrappableChain = function (chainId) {
+    return exports.WETH9_CHAIN_IDS.includes(chainId);
+};
+exports.isWrappableChain = isWrappableChain;
+var assertWrappableChain = function (chainId) {
+    if (!(0, exports.isWrappableChain)(chainId)) {
+        throw new Error("ETH wrap/unwrap is not supported on chain ".concat(chainId, " \u2014 its WETH is not a WETH9 contract"));
+    }
+};
+exports.assertWrappableChain = assertWrappableChain;
+var assertPositiveAmount = function (amount, action) {
+    if (amount <= BigInt(0)) {
+        throw new Error("Cannot ".concat(action, " a zero or negative amount"));
+    }
+};
+exports.assertPositiveAmount = assertPositiveAmount;
+//# sourceMappingURL=consts.js.map

package/dist/services/margin-accounts-v2/weth/consts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"consts.js","sourceRoot":"/","sources":["services/margin-accounts-v2/weth/consts.ts"],"names":[],"mappings":";;;AAAA,iCAAmC;AACnC,0CAAoD;AAEvC,QAAA,eAAe,GAAG,IAAI,kBAAS,CAAC;IAC3C,qCAAqC;IACrC,yCAAyC;CAC1C,CAAC,CAAC;AAEH,6EAA6E;AAC7E,iFAAiF;AACjF,iFAAiF;AACjF,iFAAiF;AACjF,8BAA8B;AACjB,QAAA,eAAe,GAAsB;IAChD,0BAAiB,CAAC,eAAe;IACjC,0BAAiB,CAAC,WAAW;CAC9B,CAAC;AAEK,IAAM,gBAAgB,GAAG,UAAC,OAAe;IAC9C,OAAA,uBAAe,CAAC,QAAQ,CAAC,OAAO,CAAC;AAAjC,CAAiC,CAAC;AADvB,QAAA,gBAAgB,oBACO;AAE7B,IAAM,oBAAoB,GAAG,UAAC,OAAe;IAClD,IAAI,CAAC,IAAA,wBAAgB,EAAC,OAAO,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,oDAA6C,OAAO,6CAAqC,CAC1F,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AANW,QAAA,oBAAoB,wBAM/B;AAEK,IAAM,oBAAoB,GAAG,UAAC,MAAc,EAAE,MAAc;IACjE,IAAI,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,iBAAU,MAAM,+BAA4B,CAAC,CAAC;IAChE,CAAC;AACH,CAAC,CAAC;AAJW,QAAA,oBAAoB,wBAI/B","sourcesContent":["import { Interface } from 'ethers';\nimport { MoneyInOutChainId } from '@reyaxyz/common';\n\nexport const WETH9_INTERFACE = new Interface([\n  'function deposit() external payable',\n  'function withdraw(uint256 wad) external',\n]);\n\n// Only chains whose `WETH` is a genuine WETH9. Most are not — Polygon's is a\n// bridged UChildERC20, the Sepolia entries are test ERC20s, and the Reya chains'\n// is the Socket-bridged representation — and wrapping is payable, so calling one\n// of those sends native ETH somewhere unrecoverable. Verify `deposit()` on-chain\n// before adding a chain here.\nexport const WETH9_CHAIN_IDS: readonly number[] = [\n  MoneyInOutChainId.ethereumMainnet,\n  MoneyInOutChainId.arbitrumOne,\n];\n\nexport const isWrappableChain = (chainId: number): boolean =>\n  WETH9_CHAIN_IDS.includes(chainId);\n\nexport const assertWrappableChain = (chainId: number): void => {\n  if (!isWrappableChain(chainId)) {\n    throw new Error(\n      `ETH wrap/unwrap is not supported on chain ${chainId} — its WETH is not a WETH9 contract`,\n    );\n  }\n};\n\nexport const assertPositiveAmount = (amount: bigint, action: string): void => {\n  if (amount <= BigInt(0)) {\n    throw new Error(`Cannot ${action} a zero or negative amount`);\n  }\n};\n"]}

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

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WETH9_CHAIN_IDS = exports.isWrappableChain = exports.unwrapEthV2 = exports.wrapEthV2 = void 0;
+var wrap_weth_1 = require("./wrap.weth");
+Object.defineProperty(exports, "wrapEthV2", { enumerable: true, get: function () { return wrap_weth_1.wrapEthV2; } });
+var unwrap_weth_1 = require("./unwrap.weth");
+Object.defineProperty(exports, "unwrapEthV2", { enumerable: true, get: function () { return unwrap_weth_1.unwrapEthV2; } });
+var consts_1 = require("./consts");
+Object.defineProperty(exports, "isWrappableChain", { enumerable: true, get: function () { return consts_1.isWrappableChain; } });
+Object.defineProperty(exports, "WETH9_CHAIN_IDS", { enumerable: true, get: function () { return consts_1.WETH9_CHAIN_IDS; } });
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/margin-accounts-v2/weth/index.ts"],"names":[],"mappings":";;;AAAA,yCAAwC;AAA/B,sGAAA,SAAS,OAAA;AAClB,6CAA4C;AAAnC,0GAAA,WAAW,OAAA;AACpB,mCAA6D;AAApD,0GAAA,gBAAgB,OAAA;AAAE,yGAAA,eAAe,OAAA","sourcesContent":["export { wrapEthV2 } from './wrap.weth';\nexport { unwrapEthV2 } from './unwrap.weth';\nexport { isWrappableChain, WETH9_CHAIN_IDS } from './consts';\n"]}

package/dist/services/margin-accounts-v2/weth/unwrap.weth.js

@@ -0,0 +1,68 @@
+"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.unwrapEthV2 = void 0;
+var common_1 = require("@reyaxyz/common");
+var checkChainId_1 = require("../../../utils/checkChainId");
+var consts_1 = require("./consts");
+// `amount` is a JS number, which at 18 decimals cannot address individual wei,
+// so unwrapping a full balance must round down — a balance read back as a number
+// can scale to marginally more than is held, which reverts.
+var unwrapEthV2 = function (params) { return __awaiter(void 0, void 0, void 0, function () {
+    var amount, calldata, result;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                (0, consts_1.assertWrappableChain)(params.chainId);
+                return [4 /*yield*/, (0, checkChainId_1.checkChainId)(params.signer, params.chainId)];
+            case 1:
+                _a.sent();
+                amount = (0, common_1.scaleV2)(params.collateralDecimals)(params.amount);
+                (0, consts_1.assertPositiveAmount)(amount, 'unwrap');
+                calldata = consts_1.WETH9_INTERFACE.encodeFunctionData('withdraw', [amount]);
+                return [4 /*yield*/, (0, common_1.executeTransaction)(params.signer, calldata, '0', params.chainId, params.collateralAddress)];
+            case 2:
+                result = _a.sent();
+                return [2 /*return*/, {
+                        transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
+                    }];
+        }
+    });
+}); };
+exports.unwrapEthV2 = unwrapEthV2;
+//# sourceMappingURL=unwrap.weth.js.map

package/dist/services/margin-accounts-v2/weth/unwrap.weth.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"unwrap.weth.js","sourceRoot":"/","sources":["services/margin-accounts-v2/weth/unwrap.weth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA8D;AAC9D,4DAA2D;AAE3D,mCAIkB;AAElB,+EAA+E;AAC/E,iFAAiF;AACjF,4DAA4D;AACrD,IAAM,WAAW,GAAG,UACzB,MAAyB;;;;;gBAEzB,IAAA,6BAAoB,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBACrC,qBAAM,IAAA,2BAAY,EAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,EAAA;;gBAAjD,SAAiD,CAAC;gBAE5C,MAAM,GAAG,IAAA,gBAAO,EAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACjE,IAAA,6BAAoB,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;gBAEjC,QAAQ,GAAG,wBAAe,CAAC,kBAAkB,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;gBAE3D,qBAAM,IAAA,2BAAkB,EACrC,MAAM,CAAC,MAAM,EACb,QAAQ,EACR,GAAG,EACH,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,iBAAiB,CACzB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAtBW,QAAA,WAAW,eAsBtB","sourcesContent":["import { executeTransaction, scaleV2 } from '@reyaxyz/common';\nimport { checkChainId } from '../../../utils/checkChainId';\nimport { UnwrapEthParamsV2, UnwrapEthResultV2 } from '../types';\nimport {\n  assertPositiveAmount,\n  assertWrappableChain,\n  WETH9_INTERFACE,\n} from './consts';\n\n// `amount` is a JS number, which at 18 decimals cannot address individual wei,\n// so unwrapping a full balance must round down — a balance read back as a number\n// can scale to marginally more than is held, which reverts.\nexport const unwrapEthV2 = async (\n  params: UnwrapEthParamsV2,\n): Promise<UnwrapEthResultV2> => {\n  assertWrappableChain(params.chainId);\n  await checkChainId(params.signer, params.chainId);\n\n  const amount = scaleV2(params.collateralDecimals)(params.amount);\n  assertPositiveAmount(amount, 'unwrap');\n\n  const calldata = WETH9_INTERFACE.encodeFunctionData('withdraw', [amount]);\n\n  const result = await executeTransaction(\n    params.signer,\n    calldata,\n    '0',\n    params.chainId,\n    params.collateralAddress,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

package/dist/services/margin-accounts-v2/weth/wrap.weth.js

@@ -0,0 +1,65 @@
+"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.wrapEthV2 = void 0;
+var common_1 = require("@reyaxyz/common");
+var checkChainId_1 = require("../../../utils/checkChainId");
+var consts_1 = require("./consts");
+var wrapEthV2 = function (params) { return __awaiter(void 0, void 0, void 0, function () {
+    var amount, calldata, result;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                (0, consts_1.assertWrappableChain)(params.chainId);
+                return [4 /*yield*/, (0, checkChainId_1.checkChainId)(params.signer, params.chainId)];
+            case 1:
+                _a.sent();
+                amount = (0, common_1.scaleV2)(params.collateralDecimals)(params.amount);
+                (0, consts_1.assertPositiveAmount)(amount, 'wrap');
+                calldata = consts_1.WETH9_INTERFACE.encodeFunctionData('deposit', []);
+                return [4 /*yield*/, (0, common_1.executeTransaction)(params.signer, calldata, amount.toString(), params.chainId, params.collateralAddress)];
+            case 2:
+                result = _a.sent();
+                return [2 /*return*/, {
+                        transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
+                    }];
+        }
+    });
+}); };
+exports.wrapEthV2 = wrapEthV2;
+//# sourceMappingURL=wrap.weth.js.map

package/dist/services/margin-accounts-v2/weth/wrap.weth.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrap.weth.js","sourceRoot":"/","sources":["services/margin-accounts-v2/weth/wrap.weth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA8D;AAC9D,4DAA2D;AAE3D,mCAIkB;AAEX,IAAM,SAAS,GAAG,UACvB,MAAuB;;;;;gBAEvB,IAAA,6BAAoB,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBACrC,qBAAM,IAAA,2BAAY,EAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,EAAA;;gBAAjD,SAAiD,CAAC;gBAE5C,MAAM,GAAG,IAAA,gBAAO,EAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACjE,IAAA,6BAAoB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAE/B,QAAQ,GAAG,wBAAe,CAAC,kBAAkB,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;gBAEpD,qBAAM,IAAA,2BAAkB,EACrC,MAAM,CAAC,MAAM,EACb,QAAQ,EACR,MAAM,CAAC,QAAQ,EAAE,EACjB,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,iBAAiB,CACzB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAtBW,QAAA,SAAS,aAsBpB","sourcesContent":["import { executeTransaction, scaleV2 } from '@reyaxyz/common';\nimport { checkChainId } from '../../../utils/checkChainId';\nimport { WrapEthParamsV2, WrapEthResultV2 } from '../types';\nimport {\n  assertPositiveAmount,\n  assertWrappableChain,\n  WETH9_INTERFACE,\n} from './consts';\n\nexport const wrapEthV2 = async (\n  params: WrapEthParamsV2,\n): Promise<WrapEthResultV2> => {\n  assertWrappableChain(params.chainId);\n  await checkChainId(params.signer, params.chainId);\n\n  const amount = scaleV2(params.collateralDecimals)(params.amount);\n  assertPositiveAmount(amount, 'wrap');\n\n  const calldata = WETH9_INTERFACE.encodeFunctionData('deposit', []);\n\n  const result = await executeTransaction(\n    params.signer,\n    calldata,\n    amount.toString(),\n    params.chainId,\n    params.collateralAddress,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

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

@@ -4,4 +4,5 @@ export * from './deposit';
 export * from './transferMarginBetweenAccounts';
 export * from './withdraw';
 export * from './erc20';
+export * from './weth';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/margin-accounts-v2/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,iCAAiC,CAAC;AAChD,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/margin-accounts-v2/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,iCAAiC,CAAC;AAChD,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC"}

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

@@ -113,6 +113,26 @@ export type Erc20ApproveParamsV2 = {
 export type Erc20ApproveResultV2 = {
     transactionHash: string | null;
 };
+export type WrapEthParamsV2 = {
+    signer: Signer | JsonRpcSigner;
+    collateralAddress: Address;
+    collateralDecimals: number;
+    chainId: number;
+    amount: number;
+};
+export type WrapEthResultV2 = {
+    transactionHash: string | null;
+};
+export type UnwrapEthParamsV2 = {
+    signer: Signer | JsonRpcSigner;
+    collateralAddress: Address;
+    collateralDecimals: number;
+    chainId: number;
+    amount: number;
+};
+export type UnwrapEthResultV2 = {
+    transactionHash: string | null;
+};
 export type Erc20GetAllowanceParamsV2 = {
     signer: Signer | JsonRpcSigner;
     collateralAddress: Address;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/margin-accounts-v2/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/margin-accounts-v2/types.ts"],"names":[],"mappings":"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"}

package/dist/types/services/margin-accounts-v2/weth/consts.d.ts

@@ -0,0 +1,7 @@
+import { Interface } from 'ethers';
+export declare const WETH9_INTERFACE: Interface;
+export declare const WETH9_CHAIN_IDS: readonly number[];
+export declare const isWrappableChain: (chainId: number) => boolean;
+export declare const assertWrappableChain: (chainId: number) => void;
+export declare const assertPositiveAmount: (amount: bigint, action: string) => void;
+//# sourceMappingURL=consts.d.ts.map

package/dist/types/services/margin-accounts-v2/weth/consts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"consts.d.ts","sourceRoot":"/","sources":["services/margin-accounts-v2/weth/consts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAGnC,eAAO,MAAM,eAAe,WAG1B,CAAC;AAOH,eAAO,MAAM,eAAe,EAAE,SAAS,MAAM,EAG5C,CAAC;AAEF,eAAO,MAAM,gBAAgB,YAAa,MAAM,KAAG,OAChB,CAAC;AAEpC,eAAO,MAAM,oBAAoB,YAAa,MAAM,KAAG,IAMtD,CAAC;AAEF,eAAO,MAAM,oBAAoB,WAAY,MAAM,UAAU,MAAM,KAAG,IAIrE,CAAC"}

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

@@ -0,0 +1,4 @@
+export { wrapEthV2 } from './wrap.weth';
+export { unwrapEthV2 } from './unwrap.weth';
+export { isWrappableChain, WETH9_CHAIN_IDS } from './consts';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/margin-accounts-v2/weth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC"}

package/dist/types/services/margin-accounts-v2/weth/unwrap.weth.d.ts

@@ -0,0 +1,3 @@
+import { UnwrapEthParamsV2, UnwrapEthResultV2 } from '../types';
+export declare const unwrapEthV2: (params: UnwrapEthParamsV2) => Promise<UnwrapEthResultV2>;
+//# sourceMappingURL=unwrap.weth.d.ts.map

package/dist/types/services/margin-accounts-v2/weth/unwrap.weth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"unwrap.weth.d.ts","sourceRoot":"/","sources":["services/margin-accounts-v2/weth/unwrap.weth.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAUhE,eAAO,MAAM,WAAW,WACd,iBAAiB,KACxB,QAAQ,iBAAiB,CAoB3B,CAAC"}

package/dist/types/services/margin-accounts-v2/weth/wrap.weth.d.ts

@@ -0,0 +1,3 @@
+import { WrapEthParamsV2, WrapEthResultV2 } from '../types';
+export declare const wrapEthV2: (params: WrapEthParamsV2) => Promise<WrapEthResultV2>;
+//# sourceMappingURL=wrap.weth.d.ts.map

package/dist/types/services/margin-accounts-v2/weth/wrap.weth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrap.weth.d.ts","sourceRoot":"/","sources":["services/margin-accounts-v2/weth/wrap.weth.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAO5D,eAAO,MAAM,SAAS,WACZ,eAAe,KACtB,QAAQ,eAAe,CAoBzB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.150.0",
+  "version": "0.151.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -38,5 +38,5 @@
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.3.1",
-  "gitHead": "44d6dac5c229aa3ff0115cd08d0551c58ae0c544"
+  "gitHead": "dadf97097450e2424736c3657bf05cee4f2b3921"
 }

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

@@ -4,3 +4,4 @@ export * from './deposit';
 export * from './transferMarginBetweenAccounts';
 export * from './withdraw';
 export * from './erc20';
+export * from './weth';

package/src/services/margin-accounts-v2/types.ts

@@ -139,6 +139,30 @@ export type Erc20ApproveResultV2 = {
   transactionHash: string | null;
 };
 
+export type WrapEthParamsV2 = {
+  signer: Signer | JsonRpcSigner;
+  collateralAddress: Address;
+  collateralDecimals: number;
+  chainId: number;
+  amount: number;
+};
+
+export type WrapEthResultV2 = {
+  transactionHash: string | null;
+};
+
+export type UnwrapEthParamsV2 = {
+  signer: Signer | JsonRpcSigner;
+  collateralAddress: Address;
+  collateralDecimals: number;
+  chainId: number;
+  amount: number;
+};
+
+export type UnwrapEthResultV2 = {
+  transactionHash: string | null;
+};
+
 export type Erc20GetAllowanceParamsV2 = {
   signer: Signer | JsonRpcSigner;
   collateralAddress: Address;

package/src/services/margin-accounts-v2/weth/consts.ts

@@ -0,0 +1,34 @@
+import { Interface } from 'ethers';
+import { MoneyInOutChainId } from '@reyaxyz/common';
+
+export const WETH9_INTERFACE = new Interface([
+  'function deposit() external payable',
+  'function withdraw(uint256 wad) external',
+]);
+
+// Only chains whose `WETH` is a genuine WETH9. Most are not — Polygon's is a
+// bridged UChildERC20, the Sepolia entries are test ERC20s, and the Reya chains'
+// is the Socket-bridged representation — and wrapping is payable, so calling one
+// of those sends native ETH somewhere unrecoverable. Verify `deposit()` on-chain
+// before adding a chain here.
+export const WETH9_CHAIN_IDS: readonly number[] = [
+  MoneyInOutChainId.ethereumMainnet,
+  MoneyInOutChainId.arbitrumOne,
+];
+
+export const isWrappableChain = (chainId: number): boolean =>
+  WETH9_CHAIN_IDS.includes(chainId);
+
+export const assertWrappableChain = (chainId: number): void => {
+  if (!isWrappableChain(chainId)) {
+    throw new Error(
+      `ETH wrap/unwrap is not supported on chain ${chainId} — its WETH is not a WETH9 contract`,
+    );
+  }
+};
+
+export const assertPositiveAmount = (amount: bigint, action: string): void => {
+  if (amount <= BigInt(0)) {
+    throw new Error(`Cannot ${action} a zero or negative amount`);
+  }
+};

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

@@ -0,0 +1,3 @@
+export { wrapEthV2 } from './wrap.weth';
+export { unwrapEthV2 } from './unwrap.weth';
+export { isWrappableChain, WETH9_CHAIN_IDS } from './consts';

package/src/services/margin-accounts-v2/weth/unwrap.weth.ts

@@ -0,0 +1,35 @@
+import { executeTransaction, scaleV2 } from '@reyaxyz/common';
+import { checkChainId } from '../../../utils/checkChainId';
+import { UnwrapEthParamsV2, UnwrapEthResultV2 } from '../types';
+import {
+  assertPositiveAmount,
+  assertWrappableChain,
+  WETH9_INTERFACE,
+} from './consts';
+
+// `amount` is a JS number, which at 18 decimals cannot address individual wei,
+// so unwrapping a full balance must round down — a balance read back as a number
+// can scale to marginally more than is held, which reverts.
+export const unwrapEthV2 = async (
+  params: UnwrapEthParamsV2,
+): Promise<UnwrapEthResultV2> => {
+  assertWrappableChain(params.chainId);
+  await checkChainId(params.signer, params.chainId);
+
+  const amount = scaleV2(params.collateralDecimals)(params.amount);
+  assertPositiveAmount(amount, 'unwrap');
+
+  const calldata = WETH9_INTERFACE.encodeFunctionData('withdraw', [amount]);
+
+  const result = await executeTransaction(
+    params.signer,
+    calldata,
+    '0',
+    params.chainId,
+    params.collateralAddress,
+  );
+
+  return {
+    transactionHash: result?.hash || null,
+  };
+};

package/src/services/margin-accounts-v2/weth/wrap.weth.ts

@@ -0,0 +1,32 @@
+import { executeTransaction, scaleV2 } from '@reyaxyz/common';
+import { checkChainId } from '../../../utils/checkChainId';
+import { WrapEthParamsV2, WrapEthResultV2 } from '../types';
+import {
+  assertPositiveAmount,
+  assertWrappableChain,
+  WETH9_INTERFACE,
+} from './consts';
+
+export const wrapEthV2 = async (
+  params: WrapEthParamsV2,
+): Promise<WrapEthResultV2> => {
+  assertWrappableChain(params.chainId);
+  await checkChainId(params.signer, params.chainId);
+
+  const amount = scaleV2(params.collateralDecimals)(params.amount);
+  assertPositiveAmount(amount, 'wrap');
+
+  const calldata = WETH9_INTERFACE.encodeFunctionData('deposit', []);
+
+  const result = await executeTransaction(
+    params.signer,
+    calldata,
+    amount.toString(),
+    params.chainId,
+    params.collateralAddress,
+  );
+
+  return {
+    transactionHash: result?.hash || null,
+  };
+};