@atomiqlabs/chain-starknet 4.0.0-dev.9 → 5.0.0

package/dist/starknet/swaps/EscrowManagerAbi.js

@@ -21,38 +21,6 @@ exports.EscrowManagerAbi = [
             }
         ]
     },
-    {
-        "type": "struct",
-        "name": "escrow_manager::structs::escrow::EscrowExecution",
-        "members": [
-            {
-                "name": "hash",
-                "type": "core::felt252"
-            },
-            {
-                "name": "expiry",
-                "type": "core::integer::u64"
-            },
-            {
-                "name": "fee",
-                "type": "core::integer::u256"
-            }
-        ]
-    },
-    {
-        "type": "enum",
-        "name": "core::option::Option::<escrow_manager::structs::escrow::EscrowExecution>",
-        "variants": [
-            {
-                "name": "Some",
-                "type": "escrow_manager::structs::escrow::EscrowExecution"
-            },
-            {
-                "name": "None",
-                "type": "()"
-            }
-        ]
-    },
     {
         "type": "struct",
         "name": "escrow_manager::structs::escrow::EscrowData",
@@ -104,10 +72,6 @@ exports.EscrowManagerAbi = [
             {
                 "name": "claimer_bounty",
                 "type": "core::integer::u256"
-            },
-            {
-                "name": "success_action",
-                "type": "core::option::Option::<escrow_manager::structs::escrow::EscrowExecution>"
             }
         ]
     },

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

@@ -15,7 +15,6 @@ import { StarknetSwapClaim } from "./modules/StarknetSwapClaim";
 import { IHandler } from "./handlers/IHandler";
 import { StarknetBtcStoredHeader } from "../btcrelay/headers/StarknetBtcStoredHeader";
 export declare class StarknetSwapContract extends StarknetContractBase<typeof EscrowManagerAbi> implements SwapContract<StarknetSwapData, StarknetTx, never, StarknetPreFetchVerification, StarknetSigner, "STARKNET"> {
-    readonly supportsInitWithoutClaimer = true;
     readonly chainId: "STARKNET";
     readonly claimWithSecretTimeout: number;
     readonly claimWithTxDataTimeout: number;
@@ -183,9 +182,9 @@ export declare class StarknetSwapContract extends StarknetContractBase<typeof Es
     /**
      * Get the estimated solana fee of the commit transaction
      */
-    getCommitFee(signer: string, swapData: StarknetSwapData, feeRate?: string): Promise<bigint>;
+    getCommitFee(swapData: StarknetSwapData, feeRate?: string): Promise<bigint>;
     /**
      * Get the estimated solana transaction fee of the refund transaction
      */
-    getRefundFee(signer: string, swapData: StarknetSwapData, feeRate?: string): Promise<bigint>;
+    getRefundFee(swapData: StarknetSwapData, feeRate?: string): Promise<bigint>;
 }

package/dist/starknet/swaps/StarknetSwapContract.js

@@ -19,8 +19,8 @@ const ESCROW_STATE_COMMITTED = 1;
 const ESCROW_STATE_CLAIMED = 2;
 const ESCROW_STATE_REFUNDED = 3;
 const swapContractAddreses = {
-    [starknet_1.constants.StarknetChainId.SN_SEPOLIA]: "0x030ae7fc7bbce9b8c888b1117f5573c786dd8e1541c722227b8673ac7dda70c0",
-    [starknet_1.constants.StarknetChainId.SN_MAIN]: "0x02e1070519f27ec94dde395c8d72a5fcb144d40a786cf60b9b45395d36cc2f69"
+    [starknet_1.constants.StarknetChainId.SN_SEPOLIA]: "0x06874044dae5bbe712775cdb576d6aef45fc87a22ce629f2b101a7d591d4e7ca",
+    [starknet_1.constants.StarknetChainId.SN_MAIN]: "0x04fb26d02d2cf612566cd86cab299716d926272e9f49514670233952ecaf8f0c"
 };
 const defaultClaimAddresses = {
     [starknet_1.constants.StarknetChainId.SN_SEPOLIA]: {
@@ -47,7 +47,6 @@ const defaultRefundAddresses = {
 class StarknetSwapContract extends StarknetContractBase_1.StarknetContractBase {
     constructor(chainInterface, btcRelay, contractAddress = swapContractAddreses[chainInterface.starknetChainId], handlerAddresses) {
         super(chainInterface, contractAddress, EscrowManagerAbi_1.EscrowManagerAbi);
-        this.supportsInitWithoutClaimer = true;
         ////////////////////////
         //// Constants
         this.chainId = "STARKNET";
@@ -76,7 +75,7 @@ class StarknetSwapContract extends StarknetContractBase_1.StarknetContractBase {
         handlerAddresses.claim = { ...defaultClaimAddresses[chainInterface.starknetChainId], ...handlerAddresses.claim };
         ClaimHandlers_1.claimHandlersList.forEach(handlerCtor => {
             const handler = new handlerCtor(handlerAddresses.claim[handlerCtor.type]);
-            this.claimHandlersByAddress[(0, Utils_1.toHex)(handler.address)] = handler;
+            this.claimHandlersByAddress[handler.address] = handler;
             this.claimHandlersBySwapType[handlerCtor.type] = handler;
         });
         this.timelockRefundHandler = new TimelockRefundHandler_1.TimelockRefundHandler(handlerAddresses.refund.timelock);
@@ -255,6 +254,20 @@ class StarknetSwapContract extends StarknetContractBase_1.StarknetContractBase {
                     getClaimTxId: async () => {
                         const events = await this.Events.getContractBlockEvents(["escrow_manager::events::Claim"], [null, null, null, "0x" + escrowHash], blockHeight, blockHeight);
                         return events.length === 0 ? null : events[0].txHash;
+                    },
+                    getClaimResult: async () => {
+                        const events = await this.Events.getContractBlockEvents(["escrow_manager::events::Claim"], [null, null, null, "0x" + escrowHash], blockHeight, blockHeight);
+                        if (events.length === 0)
+                            return null;
+                        const event = events[0];
+                        const claimHandlerHex = (0, Utils_1.toHex)(event.params.claim_handler);
+                        const claimHandler = this.claimHandlersByAddress[claimHandlerHex];
+                        if (claimHandler == null) {
+                            starknet_1.logger.warn("getCommitStatus(): getClaimResult(" + escrowHash + "): Unknown claim handler with claim: " + claimHandlerHex);
+                            return null;
+                        }
+                        const witnessResult = claimHandler.parseWitnessResult(event.params.witness_result);
+                        return witnessResult;
                     }
                 };
             default:
@@ -397,13 +410,13 @@ class StarknetSwapContract extends StarknetContractBase_1.StarknetContractBase {
     /**
      * Get the estimated solana fee of the commit transaction
      */
-    getCommitFee(signer, swapData, feeRate) {
+    getCommitFee(swapData, feeRate) {
         return this.Init.getInitFee(swapData, feeRate);
     }
     /**
      * Get the estimated solana transaction fee of the refund transaction
      */
-    getRefundFee(signer, swapData, feeRate) {
+    getRefundFee(swapData, feeRate) {
         return this.Refund.getRefundFee(swapData, feeRate);
     }
 }

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

@@ -4,11 +4,6 @@ import { StringToPrimitiveType } from "abi-wan-kanabi/dist/kanabi";
 import { EscrowManagerAbi } from "./EscrowManagerAbi";
 import { IClaimHandler } from "./handlers/claim/ClaimHandlers";
 export type StarknetSwapDataType = StringToPrimitiveType<typeof EscrowManagerAbi, "escrow_manager::structs::escrow::EscrowData">;
-export type StarknetSuccessAction = {
-    executionHash: string;
-    executionExpiry: bigint;
-    executionFee: bigint;
-};
 export declare class StarknetSwapData extends SwapData {
     static toFlags(value: number | bigint | string): {
         payOut: boolean;
@@ -33,9 +28,8 @@ export declare class StarknetSwapData extends SwapData {
     securityDeposit: bigint;
     claimerBounty: bigint;
     extraData: string;
-    successAction?: StarknetSuccessAction;
     kind: ChainSwapType;
-    constructor(offerer: string, claimer: string, token: string, refundHandler: string, claimHandler: string, payOut: boolean, payIn: boolean, reputation: boolean, sequence: bigint, claimData: string, refundData: string, amount: bigint, feeToken: string, securityDeposit: bigint, claimerBounty: bigint, kind: ChainSwapType, extraData: string, successAction?: StarknetSuccessAction);
+    constructor(offerer: string, claimer: string, token: string, refundHandler: string, claimHandler: string, payOut: boolean, payIn: boolean, reputation: boolean, sequence: bigint, claimData: string, refundData: string, amount: bigint, feeToken: string, securityDeposit: bigint, claimerBounty: bigint, kind: ChainSwapType, extraData: string);
     constructor(data: any);
     getOfferer(): string;
     setOfferer(newOfferer: string): void;
@@ -70,5 +64,4 @@ export declare class StarknetSwapData extends SwapData {
     equals(other: StarknetSwapData): boolean;
     toEscrowStruct(): StarknetSwapDataType;
     static fromSerializedFeltArray(span: BigNumberish[], claimHandlerImpl: IClaimHandler<any, any>): StarknetSwapData;
-    hasSuccessAction(): boolean;
 }

package/dist/starknet/swaps/StarknetSwapData.js

@@ -8,14 +8,6 @@ const Utils_1 = require("../../utils/Utils");
 const FLAG_PAY_OUT = 0x01n;
 const FLAG_PAY_IN = 0x02n;
 const FLAG_REPUTATION = 0x04n;
-function successActionEquals(a, b) {
-    if (a != null && b != null) {
-        return a.executionHash.toLowerCase() === b.executionHash.toLowerCase() &&
-            a.executionExpiry === b.executionExpiry &&
-            a.executionFee === b.executionFee;
-    }
-    return a === b;
-}
 class StarknetSwapData extends base_1.SwapData {
     static toFlags(value) {
         const val = (0, Utils_1.toBigInt)(value);
@@ -32,7 +24,7 @@ class StarknetSwapData extends base_1.SwapData {
             (this.payIn ? FLAG_PAY_IN : 0n) +
             (this.reputation ? FLAG_REPUTATION : 0n);
     }
-    constructor(offererOrData, claimer, token, refundHandler, claimHandler, payOut, payIn, reputation, sequence, claimData, refundData, amount, feeToken, securityDeposit, claimerBounty, kind, extraData, successAction) {
+    constructor(offererOrData, claimer, token, refundHandler, claimHandler, payOut, payIn, reputation, sequence, claimData, refundData, amount, feeToken, securityDeposit, claimerBounty, kind, extraData) {
         super();
         if (claimer != null || token != null || refundHandler != null || claimHandler != null ||
             payOut != null || payIn != null || reputation != null || sequence != null || claimData != null || refundData != null ||
@@ -54,7 +46,6 @@ class StarknetSwapData extends base_1.SwapData {
             this.claimerBounty = claimerBounty;
             this.kind = kind;
             this.extraData = extraData;
-            this.successAction = successAction;
         }
         else {
             this.offerer = offererOrData.offerer;
@@ -74,11 +65,6 @@ class StarknetSwapData extends base_1.SwapData {
             this.claimerBounty = offererOrData.claimerBounty == null ? null : BigInt(offererOrData.claimerBounty);
             this.kind = offererOrData.kind;
             this.extraData = offererOrData.extraData;
-            this.successAction = offererOrData.successAction == null ? null : {
-                executionHash: offererOrData.successAction.executionHash,
-                executionExpiry: BigInt(offererOrData.successAction.executionExpiry),
-                executionFee: BigInt(offererOrData.successAction.executionFee),
-            };
         }
     }
     getOfferer() {
@@ -116,12 +102,7 @@ class StarknetSwapData extends base_1.SwapData {
             securityDeposit: this.securityDeposit == null ? null : this.securityDeposit.toString(10),
             claimerBounty: this.claimerBounty == null ? null : this.claimerBounty.toString(10),
             kind: this.kind,
-            extraData: this.extraData,
-            successAction: this.successAction == null ? null : {
-                executionHash: this.successAction.executionHash,
-                executionExpiry: this.successAction.executionExpiry.toString(10),
-                executionFee: this.successAction.executionFee.toString(10)
-            }
+            extraData: this.extraData
         };
     }
     getAmount() {
@@ -149,7 +130,7 @@ class StarknetSwapData extends base_1.SwapData {
         const amountValue = starknet_1.cairo.uint256("0x" + this.amount.toString(16));
         const securityDepositValue = starknet_1.cairo.uint256("0x" + this.securityDeposit.toString(16));
         const claimerBountyValue = starknet_1.cairo.uint256("0x" + this.claimerBounty.toString(16));
-        const elements = [
+        let escrowHash = starknet_1.hash.computePoseidonHashOnElements([
             this.offerer,
             this.claimer,
             this.token,
@@ -165,14 +146,7 @@ class StarknetSwapData extends base_1.SwapData {
             securityDepositValue.high,
             claimerBountyValue.low,
             claimerBountyValue.high
-        ];
-        if (this.successAction != null) {
-            elements.push(this.successAction.executionHash);
-            elements.push(this.successAction.executionExpiry);
-            const feeValue = starknet_1.cairo.uint256("0x" + this.successAction.executionFee.toString(16));
-            elements.push(feeValue.low, feeValue.high);
-        }
-        let escrowHash = starknet_1.hash.computePoseidonHashOnElements(elements);
+        ]);
         if (escrowHash.startsWith("0x"))
             escrowHash = escrowHash.slice(2);
         return escrowHash.padStart(64, "0");
@@ -269,8 +243,7 @@ class StarknetSwapData extends base_1.SwapData {
             other.refundData.toLowerCase() === this.refundData.toLowerCase() &&
             other.amount === this.amount &&
             other.securityDeposit === this.securityDeposit &&
-            other.claimerBounty === this.claimerBounty &&
-            successActionEquals(other.successAction, this.successAction);
+            other.claimerBounty === this.claimerBounty;
     }
     toEscrowStruct() {
         return {
@@ -285,12 +258,7 @@ class StarknetSwapData extends base_1.SwapData {
             amount: starknet_1.cairo.uint256((0, Utils_1.toBigInt)(this.amount)),
             fee_token: this.feeToken,
             security_deposit: starknet_1.cairo.uint256((0, Utils_1.toBigInt)(this.securityDeposit)),
-            claimer_bounty: starknet_1.cairo.uint256((0, Utils_1.toBigInt)(this.claimerBounty)),
-            success_action: new starknet_1.CairoOption(this.successAction == null ? starknet_1.CairoOptionVariant.None : starknet_1.CairoOptionVariant.Some, this.successAction == null ? undefined : {
-                hash: this.successAction.executionHash,
-                expiry: this.successAction.executionExpiry,
-                fee: starknet_1.cairo.uint256(this.successAction.executionFee)
-            })
+            claimer_bounty: starknet_1.cairo.uint256((0, Utils_1.toBigInt)(this.claimerBounty))
         };
     }
     static fromSerializedFeltArray(span, claimHandlerImpl) {
@@ -306,19 +274,7 @@ class StarknetSwapData extends base_1.SwapData {
         const feeToken = (0, Utils_1.toHex)(span.shift());
         const securityDeposit = (0, Utils_1.toBigInt)({ low: span.shift(), high: span.shift() });
         const claimerBounty = (0, Utils_1.toBigInt)({ low: span.shift(), high: span.shift() });
-        const hasSuccessAction = (0, Utils_1.toBigInt)(span.shift()) === 0n;
-        let successAction = null;
-        if (hasSuccessAction) {
-            successAction = {
-                executionHash: (0, Utils_1.toHex)(span.shift()),
-                executionExpiry: (0, Utils_1.toBigInt)(span.shift()),
-                executionFee: (0, Utils_1.toBigInt)({ low: span.shift(), high: span.shift() })
-            };
-        }
-        return new StarknetSwapData(offerer, claimer, token, refundHandler, claimHandler, payOut, payIn, reputation, sequence, claimData, refundData, amount, feeToken, securityDeposit, claimerBounty, claimHandlerImpl.getType(), null, successAction);
-    }
-    hasSuccessAction() {
-        return this.successAction != null;
+        return new StarknetSwapData(offerer, claimer, token, refundHandler, claimHandler, payOut, payIn, reputation, sequence, claimData, refundData, amount, feeToken, securityDeposit, claimerBounty, claimHandlerImpl.getType(), null);
     }
 }
 exports.StarknetSwapData = StarknetSwapData;

package/dist/starknet/swaps/handlers/IHandler.d.ts

@@ -1,7 +1,7 @@
 import { StarknetSwapData } from "../StarknetSwapData";
 import { BigNumberish } from "starknet";
+import { StarknetGas } from "../../chain/StarknetAction";
 import { StarknetTx } from "../../chain/modules/StarknetTransactions";
-import { StarknetGas } from "../../chain/modules/StarknetFees";
 export interface IHandler<TCommitmentData, TWitnessData> {
     readonly address: string;
     getCommitment(data: TCommitmentData): BigNumberish;

package/dist/starknet/swaps/handlers/claim/ClaimHandlers.d.ts

@@ -1,7 +1,7 @@
 import { ChainSwapType } from "@atomiqlabs/base";
+import { StarknetGas } from "../../../chain/StarknetAction";
 import { IHandler } from "../IHandler";
 import { BigNumberish } from "starknet";
-import { StarknetGas } from "../../../chain/modules/StarknetFees";
 export interface IClaimHandler<C, W> extends IHandler<C, W> {
     getType(): ChainSwapType;
     parseWitnessResult(result: BigNumberish[]): string;

package/dist/starknet/swaps/handlers/claim/HashlockClaimHandler.d.ts

@@ -1,10 +1,10 @@
 import { StarknetSwapData } from "../../StarknetSwapData";
 import { BigNumberish } from "starknet";
 import { ChainSwapType } from "@atomiqlabs/base";
+import { StarknetGas } from "../../../chain/StarknetAction";
 import { Buffer } from "buffer";
 import { StarknetTx } from "../../../chain/modules/StarknetTransactions";
 import { IClaimHandler } from "./ClaimHandlers";
-import { StarknetGas } from "../../../chain/modules/StarknetFees";
 export declare class HashlockClaimHandler implements IClaimHandler<Buffer, string> {
     readonly address: string;
     static readonly type: ChainSwapType;

package/dist/starknet/swaps/handlers/claim/HashlockClaimHandler.js

@@ -41,4 +41,4 @@ class HashlockClaimHandler {
 }
 exports.HashlockClaimHandler = HashlockClaimHandler;
 HashlockClaimHandler.type = base_1.ChainSwapType.HTLC;
-HashlockClaimHandler.gas = { l1DataGas: 0, l2Gas: 800 * 40000, l1Gas: 0 };
+HashlockClaimHandler.gas = { l1: 750 };

package/dist/starknet/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler.d.ts

@@ -1,11 +1,11 @@
 import { StarknetSwapData } from "../../../StarknetSwapData";
+import { StarknetGas } from "../../../../chain/StarknetAction";
 import { ChainSwapType } from "@atomiqlabs/base";
 import { BigNumberish } from "starknet";
 import { StarknetTx } from "../../../../chain/modules/StarknetTransactions";
 import { BitcoinCommitmentData, IBitcoinClaimHandler } from "./IBitcoinClaimHandler";
 import { BitcoinOutputWitnessData } from "./BitcoinOutputClaimHandler";
 import { Buffer } from "buffer";
-import { StarknetGas } from "../../../../chain/modules/StarknetFees";
 export type BitcoinNoncedOutputCommitmentData = {
     output: Buffer;
     amount: bigint;

package/dist/starknet/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler.js

@@ -45,4 +45,4 @@ class BitcoinNoncedOutputClaimHandler extends IBitcoinClaimHandler_1.IBitcoinCla
 }
 exports.BitcoinNoncedOutputClaimHandler = BitcoinNoncedOutputClaimHandler;
 BitcoinNoncedOutputClaimHandler.type = base_1.ChainSwapType.CHAIN_NONCED;
-BitcoinNoncedOutputClaimHandler.gas = { l1DataGas: 0, l2Gas: 20000 * 40000, l1Gas: 0 };
+BitcoinNoncedOutputClaimHandler.gas = { l1: 20000 };

package/dist/starknet/swaps/handlers/claim/btc/BitcoinOutputClaimHandler.d.ts

@@ -1,10 +1,10 @@
 import { StarknetSwapData } from "../../../StarknetSwapData";
+import { StarknetGas } from "../../../../chain/StarknetAction";
 import { ChainSwapType } from "@atomiqlabs/base";
 import { BigNumberish } from "starknet";
 import { StarknetTx } from "../../../../chain/modules/StarknetTransactions";
 import { BitcoinCommitmentData, BitcoinWitnessData, IBitcoinClaimHandler } from "./IBitcoinClaimHandler";
 import { Buffer } from "buffer";
-import { StarknetGas } from "../../../../chain/modules/StarknetFees";
 export type BitcoinOutputCommitmentData = {
     output: Buffer;
     amount: bigint;

package/dist/starknet/swaps/handlers/claim/btc/BitcoinOutputClaimHandler.js

@@ -37,4 +37,4 @@ class BitcoinOutputClaimHandler extends IBitcoinClaimHandler_1.IBitcoinClaimHand
 }
 exports.BitcoinOutputClaimHandler = BitcoinOutputClaimHandler;
 BitcoinOutputClaimHandler.type = base_1.ChainSwapType.CHAIN;
-BitcoinOutputClaimHandler.gas = { l1DataGas: 0, l2Gas: 20000 * 40000, l1Gas: 0 };
+BitcoinOutputClaimHandler.gas = { l1: 20000 };

package/dist/starknet/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler.d.ts

@@ -1,9 +1,9 @@
 import { StarknetSwapData } from "../../../StarknetSwapData";
+import { StarknetGas } from "../../../../chain/StarknetAction";
 import { ChainSwapType } from "@atomiqlabs/base";
 import { BigNumberish } from "starknet";
 import { StarknetTx } from "../../../../chain/modules/StarknetTransactions";
 import { BitcoinCommitmentData, BitcoinWitnessData, IBitcoinClaimHandler } from "./IBitcoinClaimHandler";
-import { StarknetGas } from "../../../../chain/modules/StarknetFees";
 export type BitcoinTxIdCommitmentData = {
     txId: string;
 };

package/dist/starknet/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler.js

@@ -27,4 +27,4 @@ class BitcoinTxIdClaimHandler extends IBitcoinClaimHandler_1.IBitcoinClaimHandle
 }
 exports.BitcoinTxIdClaimHandler = BitcoinTxIdClaimHandler;
 BitcoinTxIdClaimHandler.type = base_1.ChainSwapType.CHAIN_TXID;
-BitcoinTxIdClaimHandler.gas = { l1DataGas: 0, l2Gas: 20000 * 40000, l1Gas: 0 };
+BitcoinTxIdClaimHandler.gas = { l1: 20000 };

package/dist/starknet/swaps/handlers/claim/btc/IBitcoinClaimHandler.d.ts

@@ -1,11 +1,11 @@
 import { IClaimHandler } from "../ClaimHandlers";
 import { StarknetSwapData } from "../../../StarknetSwapData";
+import { StarknetGas } from "../../../../chain/StarknetAction";
 import { ChainSwapType, RelaySynchronizer } from "@atomiqlabs/base";
 import { BigNumberish } from "starknet";
 import { StarknetBtcStoredHeader } from "../../../../btcrelay/headers/StarknetBtcStoredHeader";
 import { StarknetTx } from "../../../../chain/modules/StarknetTransactions";
 import { StarknetBtcRelay } from "../../../../btcrelay/StarknetBtcRelay";
-import { StarknetGas } from "../../../../chain/modules/StarknetFees";
 export type BitcoinCommitmentData = {
     btcRelay: StarknetBtcRelay<any>;
     confirmations: number;

package/dist/starknet/swaps/handlers/claim/btc/IBitcoinClaimHandler.js

@@ -49,4 +49,4 @@ class IBitcoinClaimHandler {
 exports.IBitcoinClaimHandler = IBitcoinClaimHandler;
 IBitcoinClaimHandler.address = "";
 IBitcoinClaimHandler.type = base_1.ChainSwapType.CHAIN_TXID;
-IBitcoinClaimHandler.gas = { l1DataGas: 0, l2Gas: 20000 * 40000, l1Gas: 0 };
+IBitcoinClaimHandler.gas = { l1: 20000 };

package/dist/starknet/swaps/handlers/refund/TimelockRefundHandler.d.ts

@@ -2,7 +2,7 @@ import { StarknetTx } from "../../../chain/modules/StarknetTransactions";
 import { StarknetSwapData } from "../../StarknetSwapData";
 import { BigNumberish } from "starknet";
 import { IHandler } from "../IHandler";
-import { StarknetGas } from "../../../chain/modules/StarknetFees";
+import { StarknetGas } from "../../../chain/StarknetAction";
 export declare class TimelockRefundHandler implements IHandler<bigint, never> {
     readonly address: string;
     static readonly gas: StarknetGas;

package/dist/starknet/swaps/handlers/refund/TimelockRefundHandler.js

@@ -24,4 +24,4 @@ class TimelockRefundHandler {
     }
 }
 exports.TimelockRefundHandler = TimelockRefundHandler;
-TimelockRefundHandler.gas = { l1DataGas: 0, l2Gas: 4000000, l1Gas: 0 };
+TimelockRefundHandler.gas = { l1: 500 };

package/dist/starknet/swaps/modules/StarknetLpVault.js

@@ -117,6 +117,6 @@ class StarknetLpVault extends StarknetSwapModule_1.StarknetSwapModule {
 }
 exports.StarknetLpVault = StarknetLpVault;
 StarknetLpVault.GasCosts = {
-    WITHDRAW: { l1DataGas: 500, l2Gas: 3200000, l1Gas: 0 },
-    DEPOSIT: { l1: 500, l2Gas: 4000000, l1Gas: 0 }
+    WITHDRAW: { l1: 750, l2: 0 },
+    DEPOSIT: { l1: 750, l2: 0 }
 };

package/dist/starknet/swaps/modules/StarknetSwapClaim.js

@@ -18,7 +18,7 @@ class StarknetSwapClaim extends StarknetSwapModule_1.StarknetSwapModule {
      * @private
      */
     Claim(signer, swapData, witness, claimHandlerGas) {
-        return new StarknetAction_1.StarknetAction(signer, this.root, this.swapContract.populateTransaction.claim(swapData.toEscrowStruct(), witness), (0, StarknetFees_1.starknetGasAdd)(swapData.payOut ? StarknetSwapClaim.GasCosts.CLAIM_PAY_OUT : StarknetSwapClaim.GasCosts.CLAIM, claimHandlerGas));
+        return new StarknetAction_1.StarknetAction(signer, this.root, this.swapContract.populateTransaction.claim(swapData.toEscrowStruct(), witness), (0, StarknetAction_1.sumStarknetGas)(swapData.payOut ? StarknetSwapClaim.GasCosts.CLAIM_PAY_OUT : StarknetSwapClaim.GasCosts.CLAIM, claimHandlerGas));
     }
     /**
      * Creates transactions claiming the swap using a secret (for HTLC swaps)
@@ -36,7 +36,7 @@ class StarknetSwapClaim extends StarknetSwapModule_1.StarknetSwapModule {
         if (checkExpiry && await this.contract.isExpired(swapData.claimer.toString(), swapData)) {
             throw new base_1.SwapDataVerificationError("Not enough time to reliably pay the invoice");
         }
-        const claimHandler = this.contract.claimHandlersByAddress[(0, Utils_1.toHex)(swapData.claimHandler)];
+        const claimHandler = this.contract.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
         if (claimHandler == null)
             throw new base_1.SwapDataVerificationError("Unknown claim handler!");
         if (claimHandler.getType() !== base_1.ChainSwapType.HTLC)
@@ -61,7 +61,7 @@ class StarknetSwapClaim extends StarknetSwapModule_1.StarknetSwapModule {
      * @param feeRate fee rate to be used for the transactions
      */
     async txsClaimWithTxData(signer, swapData, tx, requiredConfirmations, vout, commitedHeader, synchronizer, feeRate) {
-        const claimHandler = this.contract.claimHandlersByAddress[(0, Utils_1.toHex)(swapData.claimHandler)];
+        const claimHandler = this.contract.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
         if (claimHandler == null)
             throw new base_1.SwapDataVerificationError("Unknown claim handler!");
         if (claimHandler.getType() !== base_1.ChainSwapType.CHAIN_NONCED &&
@@ -87,14 +87,14 @@ class StarknetSwapClaim extends StarknetSwapModule_1.StarknetSwapModule {
     async getClaimFee(swapData, feeRate) {
         feeRate ?? (feeRate = await this.root.Fees.getFeeRate());
         let gasRequired = swapData.payOut ? StarknetSwapClaim.GasCosts.CLAIM_PAY_OUT : StarknetSwapClaim.GasCosts.CLAIM;
-        const claimHandler = this.contract.claimHandlersByAddress[(0, Utils_1.toHex)(swapData.claimHandler)];
+        const claimHandler = this.contract.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
         if (claimHandler != null)
-            gasRequired = (0, StarknetFees_1.starknetGasAdd)(gasRequired, claimHandler.getGas(swapData));
-        return StarknetFees_1.StarknetFees.getGasFee(gasRequired, feeRate);
+            gasRequired = (0, StarknetAction_1.sumStarknetGas)(gasRequired, claimHandler.getGas(swapData));
+        return StarknetFees_1.StarknetFees.getGasFee(gasRequired.l1, feeRate);
     }
 }
 exports.StarknetSwapClaim = StarknetSwapClaim;
 StarknetSwapClaim.GasCosts = {
-    CLAIM: { l1DataGas: 750, l2Gas: 4000000, l1Gas: 0 },
-    CLAIM_PAY_OUT: { l1DataGas: 900, l2Gas: 6000000, l1Gas: 0 }
+    CLAIM: { l1: 500, l2: 0 },
+    CLAIM_PAY_OUT: { l1: 1000, l2: 0 }
 };

package/dist/starknet/swaps/modules/StarknetSwapInit.d.ts

@@ -10,7 +10,6 @@ export declare class StarknetSwapInit extends StarknetSwapModule {
     /**
      * bare Init action based on the data passed in swapData
      *
-     * @param signer
      * @param swapData
      * @param timeout
      * @param signature
@@ -43,7 +42,6 @@ export declare class StarknetSwapInit extends StarknetSwapModule {
     /**
      * Checks whether the provided signature data is valid, using preFetchedData if provided and still valid
      *
-     * @param sender
      * @param swapData
      * @param timeout
      * @param prefix