@chainflip/bitcoin 1.2.3 → 1.2.5

package/dist/index.cjs

@@ -7,7 +7,7 @@ var base58 = require('@chainflip/utils/base58');
 var chainflip = require('@chainflip/utils/chainflip');
 var consts = require('@chainflip/utils/consts');
 var ss58 = require('@chainflip/utils/ss58');
-var BigNumber = require('bignumber.js');
+var BigNumber2 = require('bignumber.js');
 var url = require('@chainflip/utils/url');
 var zod = require('zod');
 var scaleTs = require('scale-ts');
@@ -35,7 +35,7 @@ function _interopNamespace(e) {
 var bitcoin__namespace = /*#__PURE__*/_interopNamespace(bitcoin);
 var base58__namespace = /*#__PURE__*/_interopNamespace(base58);
 var ss58__namespace = /*#__PURE__*/_interopNamespace(ss58);
-var BigNumber__default = /*#__PURE__*/_interopDefault(BigNumber);
+var BigNumber2__default = /*#__PURE__*/_interopDefault(BigNumber2);
 
 // src/address.ts
 
@@ -133,7 +133,7 @@ var isValidAddressForNetwork = (address2, cfOrBtcNetwork) => {
 };
 var hexString = zod.z.string().regex(/^([0-9a-f]{2})+$/, { message: "expected hex string" });
 var vout = zod.z.object({
-  value: zod.z.number().transform((n) => BigInt(new BigNumber__default.default(n).shiftedBy(8).toFixed(0))),
+  value: zod.z.number().transform((n) => BigInt(new BigNumber2__default.default(n).shiftedBy(8).toFixed(0))),
   n: zod.z.number()
 });
 var nulldataVout = zod.z.object({
@@ -185,6 +185,9 @@ var makeRequest = async (rpcUrl, method, params) => {
       params
     })
   });
+  if (res.status !== 200) {
+    throw new Error(`HTTP error [${res.status}]: ${await res.text() || res.statusText}`);
+  }
   const json = await res.json();
   const result = rpcResponse.parse(json);
   if (result.error) {
@@ -203,7 +206,8 @@ var addressByteLengths = {
   Arbitrum: 20,
   Ethereum: 20,
   Solana: 32,
-  Polkadot: 32
+  Polkadot: 32,
+  Assethub: 32
 };
 var createSwapDataCodec = (asset) => scaleTs.Struct({
   version: scaleTs.u8,
@@ -225,6 +229,7 @@ var encodeChainAddress = (data, asset) => {
   switch (chainflip.assetConstants[asset].chain) {
     case "Solana":
       return base58__namespace.encode(data);
+    case "Assethub":
     case "Polkadot":
       return ss58__namespace.encode({ data, ss58Format: consts.POLKADOT_SS58_PREFIX });
     case "Ethereum":
@@ -251,7 +256,7 @@ var parseVaultSwapData = (data) => {
   };
 };
 var getX128PriceFromAmounts = (depositAmount, minOutputAmount) => BigInt(
-  new BigNumber.BigNumber(minOutputAmount.toString()).div(depositAmount.toString()).multipliedBy(new BigNumber.BigNumber(2).pow(128)).toFixed(0, BigNumber.BigNumber.ROUND_FLOOR)
+  new BigNumber2__default.default(minOutputAmount.toString()).div(depositAmount.toString()).multipliedBy(new BigNumber2__default.default(2).pow(128)).toFixed(0, BigNumber2__default.default.ROUND_FLOOR)
 );
 var findVaultSwapData = async (url, txId) => {
   const tx = await makeRequest(url, "getrawtransaction", [txId, true]);
@@ -274,10 +279,7 @@ var findVaultSwapData = async (url, txId) => {
     affiliateFees: data.affiliates,
     ccmDepositMetadata: null,
     maxBoostFee: data.boostFee,
-    dcaParams: data.numberOfChunks > 0 && data.chunkInterval > 0 ? {
-      chunkInterval: data.chunkInterval,
-      numberOfChunks: data.numberOfChunks
-    } : null,
+    dcaParams: data.numberOfChunks === 1 && data.chunkInterval === 2 ? null : { chunkInterval: data.chunkInterval, numberOfChunks: data.numberOfChunks },
     depositChainBlockHeight: block && block.height
   };
 };

package/dist/index.d.cts

@@ -1,7 +1,6 @@
-import { ChainflipNetwork as ChainflipNetwork$1 } from '@chainflip/utils/chainflip';
+import { ChainflipNetwork } from '@chainflip/utils/chainflip';
 import { VaultSwapData } from '@chainflip/utils/types';
 
-type ChainflipNetwork = 'mainnet' | 'perseverance' | 'sisyphos' | 'backspin';
 type BitcoinNetwork = 'mainnet' | 'testnet' | 'regtest';
 
 type Bytelike = Uint8Array | number[] | `0x${string}`;
@@ -24,13 +23,13 @@ type DecodedSegwitAddress = {
     version: number;
 };
 type SegwitAddressType = 'P2WPKH' | 'P2WSH' | 'Taproot';
-declare const encodeAddress: (data: Bytelike, kind: Base58AddressType | SegwitAddressType, cfOrBtcnetwork: BitcoinNetwork | ChainflipNetwork$1) => string;
-declare const decodeAddress: (address: string, cfOrBtcNetwork: BitcoinNetwork | ChainflipNetwork$1) => DecodedBase58Address | DecodedSegwitAddress;
-declare const isValidAddressForNetwork: (address: string, cfOrBtcNetwork: BitcoinNetwork | ChainflipNetwork$1) => boolean;
+declare const encodeAddress: (data: Bytelike, kind: Base58AddressType | SegwitAddressType, cfOrBtcnetwork: BitcoinNetwork | ChainflipNetwork) => string;
+declare const decodeAddress: (address: string, cfOrBtcNetwork: BitcoinNetwork | ChainflipNetwork) => DecodedBase58Address | DecodedSegwitAddress;
+declare const isValidAddressForNetwork: (address: string, cfOrBtcNetwork: BitcoinNetwork | ChainflipNetwork) => boolean;
 
 type BitcoinVaultSwapData = VaultSwapData<null> & {
     depositAddress: string;
 };
 declare const findVaultSwapData: (url: string, txId: string) => Promise<BitcoinVaultSwapData | null>;
 
-export { type Base58AddressType, type BitcoinNetwork, type BitcoinVaultSwapData, type Bytelike, type ChainflipNetwork, type DecodedBase58Address, type DecodedSegwitAddress, type HRP, type SegwitAddressType, decodeAddress, encodeAddress, findVaultSwapData, isValidAddressForNetwork };
+export { type Base58AddressType, type BitcoinNetwork, type BitcoinVaultSwapData, type Bytelike, type DecodedBase58Address, type DecodedSegwitAddress, type HRP, type SegwitAddressType, decodeAddress, encodeAddress, findVaultSwapData, isValidAddressForNetwork };

package/dist/index.d.ts

@@ -1,7 +1,6 @@
-import { ChainflipNetwork as ChainflipNetwork$1 } from '@chainflip/utils/chainflip';
+import { ChainflipNetwork } from '@chainflip/utils/chainflip';
 import { VaultSwapData } from '@chainflip/utils/types';
 
-type ChainflipNetwork = 'mainnet' | 'perseverance' | 'sisyphos' | 'backspin';
 type BitcoinNetwork = 'mainnet' | 'testnet' | 'regtest';
 
 type Bytelike = Uint8Array | number[] | `0x${string}`;
@@ -24,13 +23,13 @@ type DecodedSegwitAddress = {
     version: number;
 };
 type SegwitAddressType = 'P2WPKH' | 'P2WSH' | 'Taproot';
-declare const encodeAddress: (data: Bytelike, kind: Base58AddressType | SegwitAddressType, cfOrBtcnetwork: BitcoinNetwork | ChainflipNetwork$1) => string;
-declare const decodeAddress: (address: string, cfOrBtcNetwork: BitcoinNetwork | ChainflipNetwork$1) => DecodedBase58Address | DecodedSegwitAddress;
-declare const isValidAddressForNetwork: (address: string, cfOrBtcNetwork: BitcoinNetwork | ChainflipNetwork$1) => boolean;
+declare const encodeAddress: (data: Bytelike, kind: Base58AddressType | SegwitAddressType, cfOrBtcnetwork: BitcoinNetwork | ChainflipNetwork) => string;
+declare const decodeAddress: (address: string, cfOrBtcNetwork: BitcoinNetwork | ChainflipNetwork) => DecodedBase58Address | DecodedSegwitAddress;
+declare const isValidAddressForNetwork: (address: string, cfOrBtcNetwork: BitcoinNetwork | ChainflipNetwork) => boolean;
 
 type BitcoinVaultSwapData = VaultSwapData<null> & {
     depositAddress: string;
 };
 declare const findVaultSwapData: (url: string, txId: string) => Promise<BitcoinVaultSwapData | null>;
 
-export { type Base58AddressType, type BitcoinNetwork, type BitcoinVaultSwapData, type Bytelike, type ChainflipNetwork, type DecodedBase58Address, type DecodedSegwitAddress, type HRP, type SegwitAddressType, decodeAddress, encodeAddress, findVaultSwapData, isValidAddressForNetwork };
+export { type Base58AddressType, type BitcoinNetwork, type BitcoinVaultSwapData, type Bytelike, type DecodedBase58Address, type DecodedSegwitAddress, type HRP, type SegwitAddressType, decodeAddress, encodeAddress, findVaultSwapData, isValidAddressForNetwork };

package/dist/index.js

@@ -5,7 +5,7 @@ import * as base58 from '@chainflip/utils/base58';
 import { assetContractId, assetConstants } from '@chainflip/utils/chainflip';
 import { POLKADOT_SS58_PREFIX } from '@chainflip/utils/consts';
 import * as ss58 from '@chainflip/utils/ss58';
-import BigNumber, { BigNumber as BigNumber$1 } from 'bignumber.js';
+import BigNumber2 from 'bignumber.js';
 import { parseUrlWithBasicAuth } from '@chainflip/utils/url';
 import { z } from 'zod';
 import { Struct, Bytes, u8, Vector, u16, u128 } from 'scale-ts';
@@ -106,7 +106,7 @@ var isValidAddressForNetwork = (address2, cfOrBtcNetwork) => {
 };
 var hexString = z.string().regex(/^([0-9a-f]{2})+$/, { message: "expected hex string" });
 var vout = z.object({
-  value: z.number().transform((n) => BigInt(new BigNumber(n).shiftedBy(8).toFixed(0))),
+  value: z.number().transform((n) => BigInt(new BigNumber2(n).shiftedBy(8).toFixed(0))),
   n: z.number()
 });
 var nulldataVout = z.object({
@@ -158,6 +158,9 @@ var makeRequest = async (rpcUrl, method, params) => {
       params
     })
   });
+  if (res.status !== 200) {
+    throw new Error(`HTTP error [${res.status}]: ${await res.text() || res.statusText}`);
+  }
   const json = await res.json();
   const result = rpcResponse.parse(json);
   if (result.error) {
@@ -176,7 +179,8 @@ var addressByteLengths = {
   Arbitrum: 20,
   Ethereum: 20,
   Solana: 32,
-  Polkadot: 32
+  Polkadot: 32,
+  Assethub: 32
 };
 var createSwapDataCodec = (asset) => Struct({
   version: u8,
@@ -198,6 +202,7 @@ var encodeChainAddress = (data, asset) => {
   switch (assetConstants[asset].chain) {
     case "Solana":
       return base58.encode(data);
+    case "Assethub":
     case "Polkadot":
       return ss58.encode({ data, ss58Format: POLKADOT_SS58_PREFIX });
     case "Ethereum":
@@ -224,7 +229,7 @@ var parseVaultSwapData = (data) => {
   };
 };
 var getX128PriceFromAmounts = (depositAmount, minOutputAmount) => BigInt(
-  new BigNumber$1(minOutputAmount.toString()).div(depositAmount.toString()).multipliedBy(new BigNumber$1(2).pow(128)).toFixed(0, BigNumber$1.ROUND_FLOOR)
+  new BigNumber2(minOutputAmount.toString()).div(depositAmount.toString()).multipliedBy(new BigNumber2(2).pow(128)).toFixed(0, BigNumber2.ROUND_FLOOR)
 );
 var findVaultSwapData = async (url, txId) => {
   const tx = await makeRequest(url, "getrawtransaction", [txId, true]);
@@ -247,10 +252,7 @@ var findVaultSwapData = async (url, txId) => {
     affiliateFees: data.affiliates,
     ccmDepositMetadata: null,
     maxBoostFee: data.boostFee,
-    dcaParams: data.numberOfChunks > 0 && data.chunkInterval > 0 ? {
-      chunkInterval: data.chunkInterval,
-      numberOfChunks: data.numberOfChunks
-    } : null,
+    dcaParams: data.numberOfChunks === 1 && data.chunkInterval === 2 ? null : { chunkInterval: data.chunkInterval, numberOfChunks: data.numberOfChunks },
     depositChainBlockHeight: block && block.height
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chainflip/bitcoin",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "type": "module",
   "repository": "https://github.com/chainflip-io/chainflip-product-toolkit.git",
   "publishConfig": {
@@ -14,9 +14,9 @@
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "dependencies": {
-    "@chainflip/utils": "0.7.2",
-    "bignumber.js": "^9.1.2",
-    "bitcoinjs-lib": "^7.0.0-rc.0",
+    "@chainflip/utils": "0.8.3",
+    "bignumber.js": "^9.2.0",
+    "bitcoinjs-lib": "7.0.0-rc.0",
     "scale-ts": "^1.6.1",
     "zod": "^3.24.2"
   },