@chainflip/bitcoin 1.2.5 → 1.2.7

package/dist/index.cjs

@@ -185,10 +185,16 @@ var makeRequest = async (rpcUrl, method, params) => {
       params
     })
   });
-  if (res.status !== 200) {
-    throw new Error(`HTTP error [${res.status}]: ${await res.text() || res.statusText}`);
+  const text = await res.text();
+  let json;
+  try {
+    json = JSON.parse(text);
+  } catch {
+    if (res.status !== 200) {
+      throw new Error(`HTTP error [${res.status}]: ${text || res.statusText}`);
+    }
+    throw new Error(`Invalid JSON response: ${text}`);
   }
-  const json = await res.json();
   const result = rpcResponse.parse(json);
   if (result.error) {
     if (result.error.code === -5) return null;
@@ -209,7 +215,7 @@ var addressByteLengths = {
   Polkadot: 32,
   Assethub: 32
 };
-var createSwapDataCodec = (asset) => scaleTs.Struct({
+var createSwapDataCodecV0 = (asset) => scaleTs.Struct({
   version: scaleTs.u8,
   destinationAsset: scaleTs.u8,
   destinationAddress: scaleTs.Bytes(addressByteLengths[chainflip.assetConstants[asset].chain]),
@@ -223,6 +229,21 @@ var createSwapDataCodec = (asset) => scaleTs.Struct({
     affiliates: scaleTs.Vector(scaleTs.Struct({ accountIndex: scaleTs.u8, commissionBps: scaleTs.u8 }))
   })
 });
+var createSwapDataCodecV1 = (asset) => scaleTs.Struct({
+  version: scaleTs.u8,
+  destinationAsset: scaleTs.u8,
+  destinationAddress: scaleTs.Bytes(addressByteLengths[chainflip.assetConstants[asset].chain]),
+  parameters: scaleTs.Struct({
+    retryDuration: scaleTs.u16,
+    minOutputAmount: scaleTs.u128,
+    maxOraclePriceSlippage: scaleTs.u8,
+    numberOfChunks: scaleTs.u16,
+    chunkInterval: scaleTs.u16,
+    boostFee: scaleTs.u8,
+    brokerFee: scaleTs.u8,
+    affiliates: scaleTs.Vector(scaleTs.Struct({ accountIndex: scaleTs.u8, commissionBps: scaleTs.u8 }))
+  })
+});
 
 // src/deposit.ts
 var encodeChainAddress = (data, asset) => {
@@ -244,11 +265,18 @@ var contractIdToInternalAsset = Object.fromEntries(
 );
 var parseVaultSwapData = (data) => {
   const version = data[0];
-  assertion.assert(version === 0, "unsupported version");
   const contractId = data[1];
   const outputAsset = contractIdToInternalAsset[contractId];
+  let destinationAddress;
+  let parameters;
+  if (version === 1) {
+    ({ destinationAddress, parameters } = createSwapDataCodecV1(outputAsset).dec(data));
+  } else if (version === 0) {
+    ({ destinationAddress, parameters } = createSwapDataCodecV0(outputAsset).dec(data));
+  } else {
+    throw new Error("unsupported version");
+  }
   assertion.assert(outputAsset, "unknown asset contract id");
-  const { destinationAddress, parameters } = createSwapDataCodec(outputAsset).dec(data);
   return {
     ...parameters,
     outputAsset,
@@ -271,7 +299,8 @@ var findVaultSwapData = async (url, txId) => {
     refundParams: {
       refundAddress: tx.vout[2].scriptPubKey.address,
       retryDuration: data.retryDuration,
-      minPrice: getX128PriceFromAmounts(amount, data.minOutputAmount)
+      minPrice: getX128PriceFromAmounts(amount, data.minOutputAmount),
+      maxOraclePriceSlippage: "maxOraclePriceSlippage" in data ? data.maxOraclePriceSlippage : null
     },
     destinationAddress: data.destinationAddress,
     outputAsset: data.outputAsset,

package/dist/index.js

@@ -158,10 +158,16 @@ var makeRequest = async (rpcUrl, method, params) => {
       params
     })
   });
-  if (res.status !== 200) {
-    throw new Error(`HTTP error [${res.status}]: ${await res.text() || res.statusText}`);
+  const text = await res.text();
+  let json;
+  try {
+    json = JSON.parse(text);
+  } catch {
+    if (res.status !== 200) {
+      throw new Error(`HTTP error [${res.status}]: ${text || res.statusText}`);
+    }
+    throw new Error(`Invalid JSON response: ${text}`);
   }
-  const json = await res.json();
   const result = rpcResponse.parse(json);
   if (result.error) {
     if (result.error.code === -5) return null;
@@ -182,7 +188,7 @@ var addressByteLengths = {
   Polkadot: 32,
   Assethub: 32
 };
-var createSwapDataCodec = (asset) => Struct({
+var createSwapDataCodecV0 = (asset) => Struct({
   version: u8,
   destinationAsset: u8,
   destinationAddress: Bytes(addressByteLengths[assetConstants[asset].chain]),
@@ -196,6 +202,21 @@ var createSwapDataCodec = (asset) => Struct({
     affiliates: Vector(Struct({ accountIndex: u8, commissionBps: u8 }))
   })
 });
+var createSwapDataCodecV1 = (asset) => Struct({
+  version: u8,
+  destinationAsset: u8,
+  destinationAddress: Bytes(addressByteLengths[assetConstants[asset].chain]),
+  parameters: Struct({
+    retryDuration: u16,
+    minOutputAmount: u128,
+    maxOraclePriceSlippage: u8,
+    numberOfChunks: u16,
+    chunkInterval: u16,
+    boostFee: u8,
+    brokerFee: u8,
+    affiliates: Vector(Struct({ accountIndex: u8, commissionBps: u8 }))
+  })
+});
 
 // src/deposit.ts
 var encodeChainAddress = (data, asset) => {
@@ -217,11 +238,18 @@ var contractIdToInternalAsset = Object.fromEntries(
 );
 var parseVaultSwapData = (data) => {
   const version = data[0];
-  assert(version === 0, "unsupported version");
   const contractId = data[1];
   const outputAsset = contractIdToInternalAsset[contractId];
+  let destinationAddress;
+  let parameters;
+  if (version === 1) {
+    ({ destinationAddress, parameters } = createSwapDataCodecV1(outputAsset).dec(data));
+  } else if (version === 0) {
+    ({ destinationAddress, parameters } = createSwapDataCodecV0(outputAsset).dec(data));
+  } else {
+    throw new Error("unsupported version");
+  }
   assert(outputAsset, "unknown asset contract id");
-  const { destinationAddress, parameters } = createSwapDataCodec(outputAsset).dec(data);
   return {
     ...parameters,
     outputAsset,
@@ -244,7 +272,8 @@ var findVaultSwapData = async (url, txId) => {
     refundParams: {
       refundAddress: tx.vout[2].scriptPubKey.address,
       retryDuration: data.retryDuration,
-      minPrice: getX128PriceFromAmounts(amount, data.minOutputAmount)
+      minPrice: getX128PriceFromAmounts(amount, data.minOutputAmount),
+      maxOraclePriceSlippage: "maxOraclePriceSlippage" in data ? data.maxOraclePriceSlippage : null
     },
     destinationAddress: data.destinationAddress,
     outputAsset: data.outputAsset,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chainflip/bitcoin",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "type": "module",
   "repository": "https://github.com/chainflip-io/chainflip-product-toolkit.git",
   "publishConfig": {
@@ -11,14 +11,24 @@
     "dist",
     "README.md"
   ],
-  "main": "dist/index.cjs",
-  "module": "dist/index.js",
+  "exports": {
+    ".": {
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      },
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
   "dependencies": {
-    "@chainflip/utils": "0.8.3",
-    "bignumber.js": "^9.2.0",
+    "@chainflip/utils": "0.8.18",
+    "bignumber.js": "^9.3.1",
     "bitcoinjs-lib": "7.0.0-rc.0",
     "scale-ts": "^1.6.1",
-    "zod": "^3.24.2"
+    "zod": "^3.25.75"
   },
   "scripts": {
     "eslint:check": "pnpm eslint --max-warnings 0 './**/*.ts'",