@atomiqlabs/chain-starknet 8.2.2 → 8.3.0

package/dist/starknet/btcrelay/StarknetBtcRelay.js

@@ -23,7 +23,7 @@ function serializeBlockHeader(e) {
     });
 }
 const GAS_PER_BLOCKHEADER = { l1DataGas: 600, l2Gas: 24000000, l1Gas: 0 };
-const GAS_PER_BLOCKHEADER_FORK = { l1DataGas: 1000, l2Gas: 40000000, l1Gas: 0 };
+const GAS_PER_BLOCKHEADER_FORK_REORG = { l1DataGas: 1000, l2Gas: 4000000, l1Gas: 0 };
 const btcRelayAddreses = {
     [base_1.BitcoinNetwork.TESTNET4]: "0x0099b63f39f0cabb767361de3d8d3e97212351a51540e2687c2571f4da490dbe",
     [base_1.BitcoinNetwork.TESTNET]: "0x068601c79da2231d21e015ccfd59c243861156fa523a12c9f987ec28eb8dbc8c",
@@ -94,7 +94,7 @@ class StarknetBtcRelay extends StarknetContractBase_1.StarknetContractBase {
             contractAddress: this.contract.address,
             entrypoint: "submit_fork_blockheaders",
             calldata: serializeCalldata(forkHeaders, storedHeader, [(0, Utils_1.toHex)(forkId)])
-        }, StarknetFees_1.StarknetFees.starknetGasAdd(StarknetFees_1.StarknetFees.starknetGasMul(GAS_PER_BLOCKHEADER, forkHeaders.length), StarknetFees_1.StarknetFees.starknetGasMul(GAS_PER_BLOCKHEADER_FORK, totalForkHeaders)));
+        }, StarknetFees_1.StarknetFees.starknetGasAdd(StarknetFees_1.StarknetFees.starknetGasMul(GAS_PER_BLOCKHEADER, forkHeaders.length), StarknetFees_1.StarknetFees.starknetGasMul(GAS_PER_BLOCKHEADER_FORK_REORG, totalForkHeaders)));
     }
     constructor(chainInterface, bitcoinRpc, bitcoinNetwork, contractAddress = btcRelayAddreses[bitcoinNetwork], contractDeploymentHeight) {
         if (contractAddress == null)
@@ -104,7 +104,7 @@ class StarknetBtcRelay extends StarknetContractBase_1.StarknetContractBase {
                 ? btcRelayDeploymentHeights[bitcoinNetwork]
                 : undefined));
         this.maxHeadersPerTx = 40;
-        this.maxForkHeadersPerTx = 30;
+        this.maxForkHeadersPerTx = 25;
         this.maxShortForkHeadersPerTx = 40;
         this._bitcoinRpc = bitcoinRpc;
     }

package/dist/starknet/swaps/StarknetSwapData.d.ts

@@ -231,4 +231,8 @@ export declare class StarknetSwapData extends SwapData {
      * @inheritDoc
      */
     hasSuccessAction(): boolean;
+    /**
+     * @inheritDoc
+     */
+    getEscrowStruct(): any;
 }

package/dist/starknet/swaps/StarknetSwapData.js

@@ -469,6 +469,12 @@ class StarknetSwapData extends base_1.SwapData {
     hasSuccessAction() {
         return this.successAction != null;
     }
+    /**
+     * @inheritDoc
+     */
+    getEscrowStruct() {
+        return (0, Utils_1.replaceBigInts)(this.toEscrowStruct());
+    }
 }
 exports.StarknetSwapData = StarknetSwapData;
 base_1.SwapData.deserializers["strk"] = StarknetSwapData;

package/dist/utils/Utils.d.ts

@@ -74,4 +74,5 @@ export declare function serializeResourceBounds(resourceBounds: {
     };
 };
 export declare function deserializeResourceBounds(resourceBounds: ResourceBounds): ResourceBoundsBN;
+export declare function replaceBigInts<T>(obj: T): ReplaceBigInt<T>;
 export {};

package/dist/utils/Utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deserializeResourceBounds = exports.serializeResourceBounds = exports.deserializeSignature = exports.serializeSignature = exports.bigIntMax = exports.findLastIndex = exports.poseidonHashRange = exports.bufferToByteArray = exports.bufferToBytes31Span = exports.bytes31SpanToBuffer = exports.toBigInt = exports.bigNumberishToBuffer = exports.u32ReverseEndianness = exports.bufferToU32Array = exports.u32ArrayToBuffer = exports.calculateHash = exports.toHex = exports.tryWithRetries = exports.getLogger = exports.onceAsync = exports.timeoutPromise = exports.isUint256 = void 0;
+exports.replaceBigInts = exports.deserializeResourceBounds = exports.serializeResourceBounds = exports.deserializeSignature = exports.serializeSignature = exports.bigIntMax = exports.findLastIndex = exports.poseidonHashRange = exports.bufferToByteArray = exports.bufferToBytes31Span = exports.bytes31SpanToBuffer = exports.toBigInt = exports.bigNumberishToBuffer = exports.u32ReverseEndianness = exports.bufferToU32Array = exports.u32ArrayToBuffer = exports.calculateHash = exports.toHex = exports.tryWithRetries = exports.getLogger = exports.onceAsync = exports.timeoutPromise = exports.isUint256 = void 0;
 const starknet_1 = require("starknet");
 const buffer_1 = require("buffer");
 function isUint256(val) {
@@ -302,3 +302,21 @@ function deserializeResourceBounds(resourceBounds) {
     };
 }
 exports.deserializeResourceBounds = deserializeResourceBounds;
+function replaceBigInts(obj) {
+    const replace = (value) => {
+        if (typeof (value) === "bigint")
+            return "0x" + value.toString(16);
+        if (value == null || typeof (value) !== "object")
+            return value;
+        if (Array.isArray(value)) {
+            return value.map(replace);
+        }
+        const mapped = Object.create(Object.getPrototypeOf(value));
+        for (const key of Object.keys(value)) {
+            mapped[key] = replace(value[key]);
+        }
+        return mapped;
+    };
+    return replace(obj);
+}
+exports.replaceBigInts = replaceBigInts;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-starknet",
-  "version": "8.2.2",
+  "version": "8.3.0",
   "description": "Starknet specific base implementation",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -31,7 +31,7 @@
     "url": "git+https://github.com/atomiqlabs/atomiq-chain-starknet.git"
   },
   "dependencies": {
-    "@atomiqlabs/base": "^13.2.0",
+    "@atomiqlabs/base": "^13.3.0",
     "@noble/hashes": "^1.7.1",
     "@scure/btc-signer": "^1.6.0",
     "abi-wan-kanabi": "2.2.4",

package/src/starknet/btcrelay/StarknetBtcRelay.ts

@@ -29,7 +29,7 @@ function serializeBlockHeader(e: BtcBlock): StarknetBtcHeader {
 }
 
 const GAS_PER_BLOCKHEADER = {l1DataGas: 600, l2Gas: 24_000_000, l1Gas: 0};
-const GAS_PER_BLOCKHEADER_FORK = {l1DataGas: 1000, l2Gas: 40_000_000, l1Gas: 0};
+const GAS_PER_BLOCKHEADER_FORK_REORG = {l1DataGas: 1000, l2Gas: 4_000_000, l1Gas: 0};
 
 const btcRelayAddreses: {[network in BitcoinNetwork]?: string} = {
     [BitcoinNetwork.TESTNET4]: "0x0099b63f39f0cabb767361de3d8d3e97212351a51540e2687c2571f4da490dbe",
@@ -121,7 +121,7 @@ export class StarknetBtcRelay<B extends BtcBlock>
             },
             StarknetFees.starknetGasAdd(
                 StarknetFees.starknetGasMul(GAS_PER_BLOCKHEADER, forkHeaders.length),
-                StarknetFees.starknetGasMul(GAS_PER_BLOCKHEADER_FORK, totalForkHeaders)
+                StarknetFees.starknetGasMul(GAS_PER_BLOCKHEADER_FORK_REORG, totalForkHeaders)
             )
         )
     }
@@ -132,7 +132,7 @@ export class StarknetBtcRelay<B extends BtcBlock>
     readonly _bitcoinRpc: BitcoinRpc<B>;
 
     readonly maxHeadersPerTx: number = 40;
-    readonly maxForkHeadersPerTx: number = 30;
+    readonly maxForkHeadersPerTx: number = 25;
     readonly maxShortForkHeadersPerTx: number = 40;
 
     constructor(

package/src/starknet/swaps/StarknetSwapData.ts

@@ -1,7 +1,7 @@
 import {SwapData, ChainSwapType} from "@atomiqlabs/base";
 import {TimelockRefundHandler} from "./handlers/refund/TimelockRefundHandler";
 import {BigNumberish, cairo, CairoOption, CairoOptionVariant, hash} from "starknet";
-import {Serialized, toBigInt, toHex} from "../../utils/Utils";
+import {replaceBigInts, Serialized, toBigInt, toHex} from "../../utils/Utils";
 import {
     StringToPrimitiveType
 } from "abi-wan-kanabi/dist/kanabi";
@@ -582,6 +582,13 @@ export class StarknetSwapData extends SwapData {
         return this.successAction != null;
     }
 
+    /**
+     * @inheritDoc
+     */
+    getEscrowStruct(): any {
+        return replaceBigInts(this.toEscrowStruct());
+    }
+
 }
 
 SwapData.deserializers["strk"] = StarknetSwapData;

package/src/utils/Utils.ts

@@ -341,3 +341,22 @@ export function deserializeResourceBounds(resourceBounds: ResourceBounds): Resou
         }
     };
 }
+
+export function replaceBigInts<T>(obj: T): ReplaceBigInt<T> {
+    const replace = (value: any): any => {
+        if(typeof(value)==="bigint") return "0x"+value.toString(16);
+        if(value==null || typeof(value)!=="object") return value;
+
+        if(Array.isArray(value)) {
+            return value.map(replace);
+        }
+
+        const mapped: any = {};
+        for(const key of Object.keys(value)) {
+            mapped[key] = replace(value[key]);
+        }
+        return mapped;
+    };
+
+    return replace(obj);
+}