@atomiqlabs/chain-starknet 5.0.2 → 5.1.1

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]: "0x06874044dae5bbe712775cdb576d6aef45fc87a22ce629f2b101a7d591d4e7ca",
-    [starknet_1.constants.StarknetChainId.SN_MAIN]: "0x04fb26d02d2cf612566cd86cab299716d926272e9f49514670233952ecaf8f0c"
+    [starknet_1.constants.StarknetChainId.SN_SEPOLIA]: "0x017bf50dd28b6d823a231355bb25813d4396c8e19d2df03026038714a22f0413",
+    [starknet_1.constants.StarknetChainId.SN_MAIN]: "0x04f278e1f19e495c3b1dd35ef307c4f7510768ed95481958fbae588bd173f79a"
 };
 const defaultClaimAddresses = {
     [starknet_1.constants.StarknetChainId.SN_SEPOLIA]: {
@@ -75,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[handler.address] = handler;
+            this.claimHandlersByAddress[(0, Utils_1.toHex)(handler.address)] = handler;
             this.claimHandlersBySwapType[handlerCtor.type] = handler;
         });
         this.timelockRefundHandler = new TimelockRefundHandler_1.TimelockRefundHandler(handlerAddresses.refund.timelock);

package/dist/starknet/swaps/StarknetSwapData.js

@@ -258,7 +258,8 @@ 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))
+            claimer_bounty: starknet_1.cairo.uint256((0, Utils_1.toBigInt)(this.claimerBounty)),
+            success_action: new starknet_1.CairoOption(starknet_1.CairoOptionVariant.None) //For now enforce no success action
         };
     }
     static fromSerializedFeltArray(span, claimHandlerImpl) {
@@ -274,6 +275,13 @@ 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;
+        if (hasSuccessAction) {
+            const executionHash = (0, Utils_1.toHex)(span.shift());
+            const executionExpiry = (0, Utils_1.toBigInt)(span.shift());
+            const executionFee = (0, Utils_1.toBigInt)({ low: span.shift(), high: span.shift() });
+            // throw new Error("Success action not allowed!");
+        }
         return new StarknetSwapData(offerer, claimer, token, refundHandler, claimHandler, payOut, payIn, reputation, sequence, claimData, refundData, amount, feeToken, securityDeposit, claimerBounty, claimHandlerImpl.getType(), null);
     }
 }

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 = { l1: 750 };
+HashlockClaimHandler.gas = { l1DataGas: 0, l2Gas: 800 * 40000, l1Gas: 0 };

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 = { l1: 20000 };
+BitcoinNoncedOutputClaimHandler.gas = { l1DataGas: 0, l2Gas: 20000 * 40000, l1Gas: 0 };

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 = { l1: 20000 };
+BitcoinOutputClaimHandler.gas = { l1DataGas: 0, l2Gas: 20000 * 40000, l1Gas: 0 };

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 = { l1: 20000 };
+BitcoinTxIdClaimHandler.gas = { l1DataGas: 0, l2Gas: 20000 * 40000, l1Gas: 0 };

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 = { l1: 20000 };
+IBitcoinClaimHandler.gas = { l1DataGas: 0, l2Gas: 20000 * 40000, l1Gas: 0 };

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/StarknetAction";
+import { StarknetGas } from "../../../chain/modules/StarknetFees";
 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 = { l1: 500 };
+TimelockRefundHandler.gas = { l1DataGas: 0, l2Gas: 4000000, l1Gas: 0 };

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

@@ -117,6 +117,6 @@ class StarknetLpVault extends StarknetSwapModule_1.StarknetSwapModule {
 }
 exports.StarknetLpVault = StarknetLpVault;
 StarknetLpVault.GasCosts = {
-    WITHDRAW: { l1: 750, l2: 0 },
-    DEPOSIT: { l1: 750, l2: 0 }
+    WITHDRAW: { l1DataGas: 500, l2Gas: 3200000, l1Gas: 0 },
+    DEPOSIT: { l1: 500, l2Gas: 4000000, l1Gas: 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, StarknetAction_1.sumStarknetGas)(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, StarknetFees_1.starknetGasAdd)(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[swapData.claimHandler.toLowerCase()];
+        const claimHandler = this.contract.claimHandlersByAddress[(0, Utils_1.toHex)(swapData.claimHandler)];
         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[swapData.claimHandler.toLowerCase()];
+        const claimHandler = this.contract.claimHandlersByAddress[(0, Utils_1.toHex)(swapData.claimHandler)];
         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[swapData.claimHandler.toLowerCase()];
+        const claimHandler = this.contract.claimHandlersByAddress[(0, Utils_1.toHex)(swapData.claimHandler)];
         if (claimHandler != null)
-            gasRequired = (0, StarknetAction_1.sumStarknetGas)(gasRequired, claimHandler.getGas(swapData));
-        return StarknetFees_1.StarknetFees.getGasFee(gasRequired.l1, feeRate);
+            gasRequired = (0, StarknetFees_1.starknetGasAdd)(gasRequired, claimHandler.getGas(swapData));
+        return StarknetFees_1.StarknetFees.getGasFee(gasRequired, feeRate);
     }
 }
 exports.StarknetSwapClaim = StarknetSwapClaim;
 StarknetSwapClaim.GasCosts = {
-    CLAIM: { l1: 500, l2: 0 },
-    CLAIM_PAY_OUT: { l1: 1000, l2: 0 }
+    CLAIM: { l1DataGas: 750, l2Gas: 4000000, l1Gas: 0 },
+    CLAIM_PAY_OUT: { l1DataGas: 900, l2Gas: 6000000, l1Gas: 0 }
 };

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

@@ -6,10 +6,24 @@ const Utils_1 = require("../../../utils/Utils");
 const buffer_1 = require("buffer");
 const StarknetAction_1 = require("../../chain/StarknetAction");
 const StarknetSwapModule_1 = require("../StarknetSwapModule");
+const starknet_1 = require("starknet");
 const StarknetFees_1 = require("../../chain/modules/StarknetFees");
 const Initialize = [
     { name: 'Swap hash', type: 'felt' },
-    { name: 'Timeout', type: 'timestamp' }
+    { name: 'Offerer', type: 'ContractAddress' },
+    { name: 'Claimer', type: 'ContractAddress' },
+    { name: 'Token amount', type: 'TokenAmount' },
+    { name: 'Pay in', type: 'bool' },
+    { name: 'Pay out', type: 'bool' },
+    { name: 'Tracking reputation', type: 'bool' },
+    { name: 'Claim handler', type: 'ContractAddress' },
+    { name: 'Claim data', type: 'felt' },
+    { name: 'Refund handler', type: 'ContractAddress' },
+    { name: 'Refund data', type: 'felt' },
+    { name: 'Security deposit', type: 'TokenAmount' },
+    { name: 'Claimer bounty', type: 'TokenAmount' },
+    { name: 'Claim action hash', type: 'felt' },
+    { name: 'Deadline', type: 'timestamp' }
 ];
 class StarknetSwapInit extends StarknetSwapModule_1.StarknetSwapModule {
     /**
@@ -51,7 +65,29 @@ class StarknetSwapInit extends StarknetSwapModule_1.StarknetSwapModule {
         const authTimeout = Math.floor(Date.now() / 1000) + authorizationTimeout;
         const signature = await this.root.Signatures.signTypedMessage(signer, Initialize, "Initialize", {
             "Swap hash": "0x" + swapData.getEscrowHash(),
-            "Timeout": (0, Utils_1.toHex)(authTimeout)
+            "Offerer": swapData.offerer,
+            "Claimer": swapData.claimer,
+            "Token amount": {
+                token_address: swapData.token,
+                amount: starknet_1.cairo.uint256(swapData.amount)
+            },
+            "Pay in": swapData.isPayIn(),
+            "Pay out": swapData.isPayOut(),
+            "Tracking reputation": swapData.reputation,
+            "Refund handler": swapData.refundHandler,
+            "Claim handler": swapData.claimHandler,
+            "Claim data": "0x" + swapData.getClaimHash(),
+            "Refund data": swapData.refundData.startsWith("0x") ? swapData.refundData : "0x" + swapData.refundData,
+            "Security deposit": {
+                token_address: swapData.feeToken,
+                amount: starknet_1.cairo.uint256(swapData.securityDeposit)
+            },
+            "Claimer bounty": {
+                token_address: swapData.feeToken,
+                amount: starknet_1.cairo.uint256(swapData.claimerBounty)
+            },
+            "Claim action hash": 0n,
+            "Deadline": (0, Utils_1.toHex)(authTimeout)
         });
         return {
             prefix: this.getAuthPrefix(swapData),
@@ -87,7 +123,29 @@ class StarknetSwapInit extends StarknetSwapModule_1.StarknetSwapModule {
             throw new base_1.SignatureVerificationError("Authorization expired!");
         const valid = await this.root.Signatures.isValidSignature(signature, signer, Initialize, "Initialize", {
             "Swap hash": "0x" + swapData.getEscrowHash(),
-            "Timeout": (0, Utils_1.toHex)(timeoutBN)
+            "Offerer": swapData.offerer,
+            "Claimer": swapData.claimer,
+            "Token amount": {
+                token_address: swapData.token,
+                amount: starknet_1.cairo.uint256(swapData.amount)
+            },
+            "Pay in": swapData.isPayIn(),
+            "Pay out": swapData.isPayOut(),
+            "Tracking reputation": swapData.reputation,
+            "Refund handler": swapData.refundHandler,
+            "Claim handler": swapData.claimHandler,
+            "Claim data": "0x" + swapData.getClaimHash(),
+            "Refund data": swapData.refundData.startsWith("0x") ? swapData.refundData : "0x" + swapData.refundData,
+            "Security deposit": {
+                token_address: swapData.feeToken,
+                amount: starknet_1.cairo.uint256(swapData.securityDeposit)
+            },
+            "Claimer bounty": {
+                token_address: swapData.feeToken,
+                amount: starknet_1.cairo.uint256(swapData.claimerBounty)
+            },
+            "Claim action hash": 0n,
+            "Deadline": (0, Utils_1.toHex)(timeoutBN)
         });
         if (!valid)
             throw new base_1.SignatureVerificationError("Invalid signature!");
@@ -155,11 +213,11 @@ class StarknetSwapInit extends StarknetSwapModule_1.StarknetSwapModule {
      */
     async getInitFee(swapData, feeRate) {
         feeRate ?? (feeRate = await this.root.Fees.getFeeRate());
-        return StarknetFees_1.StarknetFees.getGasFee(swapData.payIn ? StarknetSwapInit.GasCosts.INIT_PAY_IN.l1 : StarknetSwapInit.GasCosts.INIT.l1, feeRate);
+        return StarknetFees_1.StarknetFees.getGasFee(swapData.payIn ? StarknetSwapInit.GasCosts.INIT_PAY_IN : StarknetSwapInit.GasCosts.INIT, feeRate);
     }
 }
 exports.StarknetSwapInit = StarknetSwapInit;
 StarknetSwapInit.GasCosts = {
-    INIT: { l1: 500, l2: 0 },
-    INIT_PAY_IN: { l1: 1000, l2: 0 },
+    INIT: { l1DataGas: 750, l2Gas: 8000000, l1Gas: 0 },
+    INIT_PAY_IN: { l1DataGas: 500, l2Gas: 4800000, l1Gas: 0 },
 };

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

@@ -22,7 +22,7 @@ class StarknetSwapRefund extends StarknetSwapModule_1.StarknetSwapModule {
      * @private
      */
     Refund(signer, swapData, witness, handlerGas) {
-        return new StarknetAction_1.StarknetAction(signer, this.root, this.swapContract.populateTransaction.refund(swapData.toEscrowStruct(), witness), (0, StarknetAction_1.sumStarknetGas)(swapData.payIn ? StarknetSwapRefund.GasCosts.REFUND_PAY_OUT : StarknetSwapRefund.GasCosts.REFUND, handlerGas));
+        return new StarknetAction_1.StarknetAction(signer, this.root, this.swapContract.populateTransaction.refund(swapData.toEscrowStruct(), witness), (0, StarknetFees_1.starknetGasAdd)(swapData.payIn ? StarknetSwapRefund.GasCosts.REFUND_PAY_OUT : StarknetSwapRefund.GasCosts.REFUND, handlerGas));
     }
     /**
      * Action for cooperative refunding with signature
@@ -118,11 +118,11 @@ class StarknetSwapRefund extends StarknetSwapModule_1.StarknetSwapModule {
      */
     async getRefundFee(swapData, feeRate) {
         feeRate ?? (feeRate = await this.root.Fees.getFeeRate());
-        return StarknetFees_1.StarknetFees.getGasFee(swapData.payIn ? StarknetSwapRefund.GasCosts.REFUND_PAY_OUT.l1 : StarknetSwapRefund.GasCosts.REFUND.l1, feeRate);
+        return StarknetFees_1.StarknetFees.getGasFee(swapData.payIn ? StarknetSwapRefund.GasCosts.REFUND_PAY_OUT : StarknetSwapRefund.GasCosts.REFUND, feeRate);
     }
 }
 exports.StarknetSwapRefund = StarknetSwapRefund;
 StarknetSwapRefund.GasCosts = {
-    REFUND: { l1: 750, l2: 0 },
-    REFUND_PAY_OUT: { l1: 1250, l2: 0 }
+    REFUND: { l1DataGas: 750, l2Gas: 4000000, l1Gas: 0 },
+    REFUND_PAY_OUT: { l1DataGas: 900, l2Gas: 6000000, l1Gas: 0 }
 };

package/dist/utils/Utils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findLastIndex = exports.parseInitFunctionCalldata = 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_types_07_1 = require("starknet-types-07");
+const starknet_types_08_1 = require("@starknet-io/starknet-types-08");
 const starknet_1 = require("starknet");
 const buffer_1 = require("buffer");
 const StarknetSwapData_1 = require("../starknet/swaps/StarknetSwapData");
@@ -35,10 +35,14 @@ function onceAsync(executor) {
 exports.onceAsync = onceAsync;
 function getLogger(prefix) {
     return {
-        debug: (msg, ...args) => console.debug(prefix + msg, ...args),
-        info: (msg, ...args) => console.info(prefix + msg, ...args),
-        warn: (msg, ...args) => console.warn(prefix + msg, ...args),
-        error: (msg, ...args) => console.error(prefix + msg, ...args)
+        // @ts-ignore
+        debug: (msg, ...args) => global.atomiqLogLevel >= 3 && console.debug(prefix + msg, ...args),
+        // @ts-ignore
+        info: (msg, ...args) => global.atomiqLogLevel >= 2 && console.info(prefix + msg, ...args),
+        // @ts-ignore
+        warn: (msg, ...args) => (global.atomiqLogLevel == null || global.atomiqLogLevel >= 1) && console.warn(prefix + msg, ...args),
+        // @ts-ignore
+        error: (msg, ...args) => (global.atomiqLogLevel == null || global.atomiqLogLevel >= 0) && console.error(prefix + msg, ...args)
     };
 }
 exports.getLogger = getLogger;
@@ -75,7 +79,7 @@ function toHex(value, length = 64) {
     switch (typeof (value)) {
         case "string":
             if (value.startsWith("0x")) {
-                return "0x" + value.slice(2).padStart(length, "0");
+                return "0x" + value.slice(2).padStart(length, "0").toLowerCase();
             }
             else {
                 return "0x" + BigInt(value).toString(16).padStart(length, "0");
@@ -94,8 +98,8 @@ function calculateHash(tx) {
         chainId: tx.details.chainId,
         nonce: tx.details.nonce,
         accountDeploymentData: tx.details.version === "0x3" ? tx.details.accountDeploymentData : null,
-        nonceDataAvailabilityMode: tx.details.version === "0x3" ? starknet_types_07_1.EDAMode[tx.details.nonceDataAvailabilityMode] : null,
-        feeDataAvailabilityMode: tx.details.version === "0x3" ? starknet_types_07_1.EDAMode[tx.details.feeDataAvailabilityMode] : null,
+        nonceDataAvailabilityMode: tx.details.version === "0x3" ? starknet_types_08_1.EDAMode[tx.details.nonceDataAvailabilityMode] : null,
+        feeDataAvailabilityMode: tx.details.version === "0x3" ? starknet_types_08_1.EDAMode[tx.details.feeDataAvailabilityMode] : null,
         resourceBounds: tx.details.version === "0x3" ? tx.details.resourceBounds : null,
         tip: tx.details.version === "0x3" ? tx.details.tip : null,
         paymasterData: tx.details.version === "0x3" ? tx.details.paymasterData : null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-starknet",
-  "version": "5.0.2",
+  "version": "5.1.1",
   "description": "Starknet specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -29,7 +29,7 @@
     "buffer": "6.0.3"
   },
   "peerDependencies": {
-    "starknet": "^6.11.0"
+    "starknet": "^7.5.0"
   },
   "devDependencies": {
     "typescript": "4.9.5"

package/src/starknet/StarknetInitializer.ts

@@ -4,7 +4,7 @@ import {StarknetChainInterface, StarknetRetryPolicy} from "./chain/StarknetChain
 import {StarknetBtcRelay} from "./btcrelay/StarknetBtcRelay";
 import {StarknetSwapContract} from "./swaps/StarknetSwapContract";
 import {StarknetChainEventsBrowser} from "./events/StarknetChainEventsBrowser";
-import {BaseTokenType, BitcoinNetwork, BitcoinRpc, ChainData, ChainInitializer} from "@atomiqlabs/base";
+import {BaseTokenType, BitcoinNetwork, BitcoinRpc, ChainData, ChainInitializer, ChainSwapType} from "@atomiqlabs/base";
 import {StarknetChainType} from "./StarknetChainType";
 import {StarknetSwapData} from "./swaps/StarknetSwapData";
 import {StarknetSpvVaultContract} from "./spv_swap/StarknetSpvVaultContract";
@@ -27,7 +27,12 @@ export const StarknetAssets: StarknetAssetsType = {
     WBTC: {
         address: "0x03fe2b97c1fd336e750087d68b9b867997fd64a2661ff3ca5a7c771641e8e7ac",
         decimals: 8
-    }
+    },
+    // TBTC: {
+    //     address: "0x04daa17763b286d1e59b97c283C0b8C949994C361e426A28F743c67bDfE9a32f",
+    //     decimals: 18,
+    //     displayDecimals: 8
+    // }
 } as const;
 
 export type StarknetOptions = {
@@ -38,6 +43,14 @@ export type StarknetOptions = {
     swapContract?: string,
     btcRelayContract?: string,
     spvVaultContract?: string,
+    handlerContracts?: {
+        refund?: {
+            timelock?: string
+        },
+        claim?: {
+            [type in ChainSwapType]?: string
+        }
+    }
 
     fees?: StarknetFees
 }
@@ -51,7 +64,7 @@ export function initializeStarknet(
         new RpcProviderWithRetries({nodeUrl: options.rpcUrl}) :
         options.rpcUrl;
 
-    const Fees = options.fees ?? new StarknetFees(provider, "STRK");
+    const Fees = options.fees ?? new StarknetFees(provider);
 
     const chainId = options.chainId ??
         (network===BitcoinNetwork.MAINNET ? constants.StarknetChainId.SN_MAIN : constants.StarknetChainId.SN_SEPOLIA);
@@ -63,7 +76,7 @@ export function initializeStarknet(
     );
 
     const swapContract = new StarknetSwapContract(
-        chainInterface, btcRelay, options.swapContract
+        chainInterface, btcRelay, options.swapContract, options.handlerContracts
     );
 
     const spvVaultContract = new StarknetSpvVaultContract(

package/src/starknet/btcrelay/StarknetBtcRelay.ts

@@ -13,7 +13,7 @@ import {StarknetTx} from "../chain/modules/StarknetTransactions";
 import {StarknetSigner} from "../wallet/StarknetSigner";
 import {BtcRelayAbi} from "./BtcRelayAbi";
 import {BigNumberish, hash} from "starknet";
-import {StarknetFees} from "../chain/modules/StarknetFees";
+import {StarknetFees, starknetGasAdd, starknetGasMul} from "../chain/modules/StarknetFees";
 import {StarknetChainInterface} from "../chain/StarknetChainInterface";
 import {StarknetAction} from "../chain/StarknetAction";
 
@@ -29,8 +29,8 @@ function serializeBlockHeader(e: BtcBlock): StarknetBtcHeader {
     });
 }
 
-const GAS_PER_BLOCKHEADER = 850;
-const GAS_PER_BLOCKHEADER_FORK = 1000;
+const GAS_PER_BLOCKHEADER = {l1DataGas: 600, l2Gas: 40_000_000, l1Gas: 0};
+const GAS_PER_BLOCKHEADER_FORK = {l1DataGas: 1000, l2Gas: 60_000_000, l1Gas: 0};
 
 const btcRelayAddreses = {
     [BitcoinNetwork.TESTNET4]: "0x0099b63f39f0cabb767361de3d8d3e97212351a51540e2687c2571f4da490dbe",
@@ -62,7 +62,7 @@ export class StarknetBtcRelay<B extends BtcBlock>
                 entrypoint: "submit_main_blockheaders",
                 calldata: serializeCalldata(mainHeaders, storedHeader, [])
             },
-            {l1: GAS_PER_BLOCKHEADER * mainHeaders.length, l2: 0}
+            starknetGasMul(GAS_PER_BLOCKHEADER, mainHeaders.length)
         )
     }
 
@@ -73,7 +73,7 @@ export class StarknetBtcRelay<B extends BtcBlock>
                 entrypoint: "submit_short_fork_blockheaders",
                 calldata: serializeCalldata(forkHeaders, storedHeader, [])
             },
-            {l1: GAS_PER_BLOCKHEADER * forkHeaders.length, l2: 0}
+            starknetGasMul(GAS_PER_BLOCKHEADER, forkHeaders.length)
         )
     }
 
@@ -84,7 +84,10 @@ export class StarknetBtcRelay<B extends BtcBlock>
                 entrypoint: "submit_fork_blockheaders",
                 calldata: serializeCalldata(forkHeaders, storedHeader, [toHex(forkId)])
             },
-            {l1: (GAS_PER_BLOCKHEADER * forkHeaders.length) + (GAS_PER_BLOCKHEADER_FORK * totalForkHeaders), l2: 0}
+            starknetGasAdd(
+                starknetGasMul(GAS_PER_BLOCKHEADER, forkHeaders.length),
+                starknetGasMul(GAS_PER_BLOCKHEADER_FORK, totalForkHeaders)
+            )
         )
     }
 

package/src/starknet/chain/StarknetAction.ts

@@ -1,20 +1,11 @@
 import {Call} from "starknet";
 import {StarknetChainInterface} from "./StarknetChainInterface";
 import {StarknetTx} from "./modules/StarknetTransactions";
-
-export type StarknetGas = {l1?: number, l2?: number};
-
-export function sumStarknetGas(a: StarknetGas, b: StarknetGas) {
-    return {
-        l1: (a?.l1 ?? 0) + (b?.l1 ?? 0),
-        l2: (a?.l2 ?? 0) + (b?.l2 ?? 0)
-    }
-}
+import {StarknetGas, starknetGasAdd} from "./modules/StarknetFees";
 
 export class StarknetAction {
 
-    L1GasLimit: number;
-    L2GasLimit: number;
+    gas: StarknetGas;
     readonly mainSigner: string;
     private readonly root: StarknetChainInterface;
     private readonly instructions: Call[];
@@ -30,8 +21,11 @@ export class StarknetAction {
         this.mainSigner = mainSigner;
         this.root = root;
         this.instructions = Array.isArray(instructions) ? instructions : [instructions];
-        this.L1GasLimit = gasLimit?.l1 ?? 0;
-        this.L2GasLimit = gasLimit?.l2 ?? 0;
+        this.gas = {
+            l1Gas: gasLimit?.l1Gas ?? 0,
+            l2Gas: gasLimit?.l2Gas ?? 0,
+            l1DataGas: gasLimit?.l1DataGas ?? 0,
+        };
         this.feeRate = feeRate;
     }
 
@@ -41,8 +35,7 @@ export class StarknetAction {
 
     public addIx(instruction: Call, gasLimit?: StarknetGas) {
         this.instructions.push(instruction);
-        this.L1GasLimit += gasLimit?.l1 ?? 0;
-        this.L2GasLimit += gasLimit?.l2 ?? 0;
+        this.gas = starknetGasAdd(this.gas, gasLimit);
     }
 
     public add(action: StarknetAction): this {
@@ -51,10 +44,12 @@ export class StarknetAction {
 
     public addAction(action: StarknetAction, index: number = this.instructions.length): this {
         if(action.mainSigner!==this.mainSigner) throw new Error("Actions need to have the same signer!");
-        if(this.L1GasLimit==null && action.L1GasLimit!=null) this.L1GasLimit = action.L1GasLimit;
-        if(this.L2GasLimit==null && action.L2GasLimit!=null) this.L2GasLimit = action.L2GasLimit;
-        if(this.L1GasLimit!=null && action.L1GasLimit!=null) this.L1GasLimit += action.L1GasLimit;
-        if(this.L2GasLimit!=null && action.L2GasLimit!=null) this.L2GasLimit += action.L2GasLimit;
+        if(this.gas.l1Gas==null && action.gas.l1Gas!=null) this.gas.l1Gas = action.gas.l1Gas;
+        if(this.gas.l2Gas==null && action.gas.l2Gas!=null) this.gas.l2Gas = action.gas.l2Gas;
+        if(this.gas.l1DataGas==null && action.gas.l1DataGas!=null) this.gas.l1DataGas = action.gas.l1DataGas;
+        if(this.gas.l1Gas!=null && action.gas.l1Gas!=null) this.gas.l1Gas += action.gas.l1Gas;
+        if(this.gas.l2Gas!=null && action.gas.l2Gas!=null) this.gas.l2Gas += action.gas.l2Gas;
+        if(this.gas.l1DataGas!=null && action.gas.l1DataGas!=null) this.gas.l1DataGas += action.gas.l1DataGas;
         this.instructions.splice(index, 0, ...action.instructions);
         if(this.feeRate==null) this.feeRate = action.feeRate;
         return this;
@@ -68,7 +63,7 @@ export class StarknetAction {
             type: "INVOKE",
             tx: this.instructions,
             details: {
-                ...this.root.Fees.getFeeDetails(this.L1GasLimit, this.L2GasLimit, feeRate),
+                ...this.root.Fees.getFeeDetails(this.gas, feeRate),
                 walletAddress: this.mainSigner,
                 cairoVersion: "1",
                 chainId: this.root.starknetChainId,

package/src/starknet/chain/modules/StarknetAccounts.ts

@@ -6,7 +6,7 @@ import {DeployAccountContractPayload} from "starknet";
 export class StarknetAccounts extends StarknetModule {
 
     public async getAccountDeployTransaction(deploymentData: DeployAccountContractPayload): Promise<StarknetTx> {
-        const feeDetails = this.root.Fees.getFeeDetails(5000, 0, await this.root.Fees.getFeeRate());
+        const feeDetails = this.root.Fees.getFeeDetails({l1DataGas: 500, l2Gas: 5_000*40_000, l1Gas: 0}, await this.root.Fees.getFeeRate());
         const details = {
             ...feeDetails,
             walletAddress: deploymentData.contractAddress,