@atomiqlabs/chain-starknet 2.0.1 → 3.0.0-beta.1

package/src/starknet/swaps/EscrowManagerAbi.ts

@@ -18,6 +18,42 @@ export const EscrowManagerAbi = [
             }
         ]
     },
+    {
+        "type": "struct",
+        "name": "escrow_manager::structs::escrow::EscrowExecution",
+        "members": [
+            {
+                "name": "contract",
+                "type": "core::starknet::contract_address::ContractAddress"
+            },
+            {
+                "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",
@@ -69,6 +105,10 @@ export const EscrowManagerAbi = [
             {
                 "name": "claimer_bounty",
                 "type": "core::integer::u256"
+            },
+            {
+                "name": "success_action",
+                "type": "core::option::Option::<escrow_manager::structs::escrow::EscrowExecution>"
             }
         ]
     },

package/src/starknet/swaps/StarknetSwapContract.ts

@@ -33,8 +33,8 @@ const ESCROW_STATE_CLAIMED = 2;
 const ESCROW_STATE_REFUNDED = 3;
 
 const swapContractAddreses = {
-    [constants.StarknetChainId.SN_SEPOLIA]: "0x06874044dae5bbe712775cdb576d6aef45fc87a22ce629f2b101a7d591d4e7ca",
-    [constants.StarknetChainId.SN_MAIN]: "0x04fb26d02d2cf612566cd86cab299716d926272e9f49514670233952ecaf8f0c"
+    [constants.StarknetChainId.SN_SEPOLIA]: "0x030ae7fc7bbce9b8c888b1117f5573c786dd8e1541c722227b8673ac7dda70c0",
+    [constants.StarknetChainId.SN_MAIN]: "0x02e1070519f27ec94dde395c8d72a5fcb144d40a786cf60b9b45395d36cc2f69"
 };
 
 const defaultClaimAddresses = {

package/src/starknet/swaps/StarknetSwapData.ts

@@ -1,6 +1,6 @@
 import {SwapData, ChainSwapType} from "@atomiqlabs/base";
 import {TimelockRefundHandler} from "./handlers/refund/TimelockRefundHandler";
-import {BigNumberish, cairo, hash} from "starknet";
+import {BigNumberish, cairo, CairoOption, CairoOptionVariant, hash} from "starknet";
 import {toBigInt, toHex} from "../../utils/Utils";
 import {
     StringToPrimitiveType
@@ -350,7 +350,8 @@ export class StarknetSwapData extends SwapData {
             amount: cairo.uint256(toBigInt(this.amount)),
             fee_token: this.feeToken,
             security_deposit: cairo.uint256(toBigInt(this.securityDeposit)),
-            claimer_bounty: cairo.uint256(toBigInt(this.claimerBounty))
+            claimer_bounty: cairo.uint256(toBigInt(this.claimerBounty)),
+            success_action: new CairoOption(CairoOptionVariant.None) //For now enforce no success action
         }
     }
 
@@ -367,6 +368,14 @@ export class StarknetSwapData extends SwapData {
         const feeToken = toHex(span.shift());
         const securityDeposit = toBigInt({low: span.shift(), high: span.shift()});
         const claimerBounty = toBigInt({low: span.shift(), high: span.shift()});
+        const hasSuccessAction = toBigInt(span.shift()) === 0n;
+        if(hasSuccessAction) {
+            const executionContract = toHex(span.shift());
+            const executionHash = toHex(span.shift());
+            const executionExpiry = toBigInt(span.shift());
+            const executionFee = toBigInt({low: span.shift(), high: span.shift()});
+            // throw new Error("Success action not allowed!");
+        }
 
         return new StarknetSwapData(
             offerer,

package/src/starknet/swaps/handlers/IHandler.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> {

package/src/starknet/swaps/handlers/claim/ClaimHandlers.ts

@@ -1,11 +1,11 @@
 import {HashlockClaimHandler} from "./HashlockClaimHandler";
 import {ChainSwapType} from "@atomiqlabs/base";
-import {StarknetGas} from "../../../chain/StarknetAction";
 import {IHandler} from "../IHandler";
 import {BitcoinTxIdClaimHandler} from "./btc/BitcoinTxIdClaimHandler";
 import {BitcoinOutputClaimHandler} from "./btc/BitcoinOutputClaimHandler";
 import {BitcoinNoncedOutputClaimHandler} from "./btc/BitcoinNoncedOutputClaimHandler";
 import {BigNumberish} from "starknet";
+import {StarknetGas} from "../../../chain/modules/StarknetFees";
 
 export interface IClaimHandler<C, W> extends IHandler<C, W> {
     getType(): ChainSwapType;

package/src/starknet/swaps/handlers/claim/HashlockClaimHandler.ts

@@ -2,17 +2,17 @@ import {StarknetSwapData} from "../../StarknetSwapData";
 import {bufferToU32Array, toHex, u32ArrayToBuffer} from "../../../../utils/Utils";
 import {BigNumberish, hash} from "starknet";
 import {ChainSwapType} from "@atomiqlabs/base";
-import {StarknetGas} from "../../../chain/StarknetAction";
 import {Buffer} from "buffer";
 import {sha256} from "@noble/hashes/sha2";
 import {StarknetTx} from "../../../chain/modules/StarknetTransactions";
 import {IClaimHandler} from "./ClaimHandlers";
+import {StarknetGas} from "../../../chain/modules/StarknetFees";
 
 export class HashlockClaimHandler implements IClaimHandler<Buffer, string> {
 
     public readonly address: string;
     public static readonly type: ChainSwapType = ChainSwapType.HTLC;
-    public static readonly gas: StarknetGas = {l1: 750};
+    public static readonly gas: StarknetGas = {l1DataGas: 0, l2Gas: 800*40_000, l1Gas: 0};
 
     constructor(address: string) {
         this.address = address;

package/src/starknet/swaps/handlers/claim/btc/BitcoinNoncedOutputClaimHandler.ts

@@ -1,5 +1,4 @@
 import {StarknetSwapData} from "../../../StarknetSwapData";
-import {StarknetGas} from "../../../../chain/StarknetAction";
 import {ChainSwapType} from "@atomiqlabs/base";
 import {BigNumberish, hash} from "starknet";
 import {StarknetTx} from "../../../../chain/modules/StarknetTransactions";
@@ -8,6 +7,7 @@ import {BitcoinCommitmentData, IBitcoinClaimHandler} from "./IBitcoinClaimHandle
 import {BitcoinOutputWitnessData} from "./BitcoinOutputClaimHandler";
 import {Transaction} from "@scure/btc-signer";
 import {Buffer} from "buffer";
+import {StarknetGas} from "../../../../chain/modules/StarknetFees";
 
 export type BitcoinNoncedOutputCommitmentData = {
     output: Buffer,
@@ -27,7 +27,7 @@ function getTransactionNonce(btcTx: Transaction): bigint {
 export class BitcoinNoncedOutputClaimHandler extends IBitcoinClaimHandler<BitcoinNoncedOutputCommitmentData, BitcoinOutputWitnessData> {
 
     public static readonly type: ChainSwapType = ChainSwapType.CHAIN_NONCED;
-    public static readonly gas: StarknetGas = {l1: 20000};
+    public static readonly gas: StarknetGas = {l1DataGas: 0, l2Gas: 20_000*40_000, l1Gas: 0};
 
     protected serializeCommitment(data: BitcoinNoncedOutputCommitmentData & BitcoinCommitmentData): BigNumberish[] {
         return [

package/src/starknet/swaps/handlers/claim/btc/BitcoinOutputClaimHandler.ts

@@ -1,5 +1,4 @@
 import {StarknetSwapData} from "../../../StarknetSwapData";
-import {StarknetGas} from "../../../../chain/StarknetAction";
 import {ChainSwapType} from "@atomiqlabs/base";
 import {BigNumberish, hash} from "starknet";
 import {StarknetTx} from "../../../../chain/modules/StarknetTransactions";
@@ -7,6 +6,7 @@ import {bufferToByteArray, getLogger, poseidonHashRange, toBigInt} from "../../.
 import {BitcoinCommitmentData, BitcoinWitnessData, IBitcoinClaimHandler} from "./IBitcoinClaimHandler";
 import {Transaction} from "@scure/btc-signer";
 import {Buffer} from "buffer";
+import {StarknetGas} from "../../../../chain/modules/StarknetFees";
 
 export type BitcoinOutputCommitmentData = {
     output: Buffer,
@@ -22,7 +22,7 @@ const logger = getLogger("BitcoinOutputClaimHandler: ");
 export class BitcoinOutputClaimHandler extends IBitcoinClaimHandler<BitcoinOutputCommitmentData, BitcoinOutputWitnessData> {
 
     public static readonly type: ChainSwapType = ChainSwapType.CHAIN;
-    public static readonly gas: StarknetGas = {l1: 20000};
+    public static readonly gas: StarknetGas = {l1DataGas: 0, l2Gas: 20_000 * 40_000, l1Gas: 0};
 
     protected serializeCommitment(data: BitcoinOutputCommitmentData & BitcoinCommitmentData): BigNumberish[] {
         return [

package/src/starknet/swaps/handlers/claim/btc/BitcoinTxIdClaimHandler.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 {bufferToU32Array, getLogger} from "../../../../../utils/Utils";
 import {BitcoinCommitmentData, BitcoinWitnessData, IBitcoinClaimHandler} from "./IBitcoinClaimHandler";
 import {Buffer} from "buffer";
+import {StarknetGas} from "../../../../chain/modules/StarknetFees";
 
 export type BitcoinTxIdCommitmentData = {
     txId: string
@@ -16,7 +16,7 @@ const logger = getLogger("BitcoinTxIdClaimHandler: ");
 export class BitcoinTxIdClaimHandler extends IBitcoinClaimHandler<BitcoinTxIdCommitmentData, BitcoinWitnessData> {
 
     public static readonly type: ChainSwapType = ChainSwapType.CHAIN_TXID;
-    public static readonly gas: StarknetGas = {l1: 20000};
+    public static readonly gas: StarknetGas = {l1DataGas: 0, l2Gas: 20_000 * 40_000, l1Gas: 0};
 
     protected serializeCommitment(data: BitcoinTxIdCommitmentData & BitcoinCommitmentData): BigNumberish[] {
         return [

package/src/starknet/swaps/handlers/claim/btc/IBitcoinClaimHandler.ts

@@ -1,12 +1,12 @@
 import {IClaimHandler} from "../ClaimHandlers";
 import {StarknetSwapData} from "../../../StarknetSwapData";
-import {StarknetGas} from "../../../../chain/StarknetAction";
 import {ChainSwapType, RelaySynchronizer} from "@atomiqlabs/base";
 import {BigNumberish, hash} from "starknet";
 import {StarknetBtcStoredHeader} from "../../../../btcrelay/headers/StarknetBtcStoredHeader";
 import {StarknetTx} from "../../../../chain/modules/StarknetTransactions";
 import {StarknetBtcRelay} from "../../../../btcrelay/StarknetBtcRelay";
 import {bufferToU32Array, getLogger, u32ArrayToBuffer} from "../../../../../utils/Utils";
+import {StarknetGas} from "../../../../chain/modules/StarknetFees";
 
 export type BitcoinCommitmentData = {
     btcRelay: StarknetBtcRelay<any>,
@@ -33,7 +33,7 @@ export abstract class IBitcoinClaimHandler<C, W extends BitcoinWitnessData> impl
 
     public static readonly address = "";
     public static readonly type: ChainSwapType = ChainSwapType.CHAIN_TXID;
-    public static readonly gas: StarknetGas = {l1: 20000};
+    public static readonly gas: StarknetGas = {l1DataGas: 0, l2Gas: 20_000 * 40_000, l1Gas: 0};
 
     protected serializeCommitment(data: BitcoinCommitmentData): BigNumberish[] {
         return [

package/src/starknet/swaps/handlers/refund/TimelockRefundHandler.ts

@@ -1,14 +1,14 @@
 import {StarknetTx} from "../../../chain/modules/StarknetTransactions";
 import {StarknetSwapData} from "../../StarknetSwapData";
-import {bigNumberishToBuffer, toBigInt} from "../../../../utils/Utils";
+import {bigNumberishToBuffer} from "../../../../utils/Utils";
 import {BigNumberish} from "starknet";
 import {IHandler} from "../IHandler";
-import {StarknetGas} from "../../../chain/StarknetAction";
+import {StarknetGas} from "../../../chain/modules/StarknetFees";
 
 export class TimelockRefundHandler implements IHandler<bigint, never> {
 
     public readonly address: string;
-    public static readonly gas: StarknetGas = {l1: 500};
+    public static readonly gas: StarknetGas = {l1DataGas: 0, l2Gas: 4_000_000, l1Gas: 0};
 
     constructor(address: string) {
         this.address = address;

package/src/starknet/swaps/modules/StarknetLpVault.ts

@@ -8,8 +8,8 @@ import {StarknetTx} from "../../chain/modules/StarknetTransactions";
 export class StarknetLpVault extends StarknetSwapModule {
 
     private static readonly GasCosts = {
-        WITHDRAW: {l1: 750, l2: 0},
-        DEPOSIT: {l1: 750, l2: 0}
+        WITHDRAW: {l1DataGas: 500, l2Gas: 3_200_000, l1Gas: 0},
+        DEPOSIT: {l1: 500, l2Gas: 4_000_000, l1Gas: 0}
     };
 
     /**

package/src/starknet/swaps/modules/StarknetSwapClaim.ts

@@ -2,11 +2,11 @@ import {ChainSwapType, RelaySynchronizer, SwapDataVerificationError} from "@atom
 import {toHex} from "../../../utils/Utils";
 import {StarknetSwapModule} from "../StarknetSwapModule";
 import {StarknetSwapData} from "../StarknetSwapData";
-import {StarknetAction, StarknetGas, sumStarknetGas} from "../../chain/StarknetAction";
+import {StarknetAction} from "../../chain/StarknetAction";
 import {BigNumberish} from "starknet";
 import {IClaimHandler} from "../handlers/claim/ClaimHandlers";
 import {StarknetTx} from "../../chain/modules/StarknetTransactions";
-import {StarknetFees} from "../../chain/modules/StarknetFees";
+import {StarknetFees, StarknetGas, starknetGasAdd} from "../../chain/modules/StarknetFees";
 import {StarknetBtcStoredHeader} from "../../btcrelay/headers/StarknetBtcStoredHeader";
 import {BitcoinOutputWitnessData} from "../handlers/claim/btc/BitcoinOutputClaimHandler";
 import {BitcoinWitnessData} from "../handlers/claim/btc/IBitcoinClaimHandler";
@@ -15,8 +15,8 @@ import {Buffer} from "buffer";
 export class StarknetSwapClaim extends StarknetSwapModule {
 
     private static readonly GasCosts = {
-        CLAIM: {l1: 500, l2: 0},
-        CLAIM_PAY_OUT: {l1: 1000, l2: 0}
+        CLAIM: {l1DataGas: 750, l2Gas: 4_000_000, l1Gas: 0},
+        CLAIM_PAY_OUT: {l1DataGas: 900, l2Gas: 6_000_000, l1Gas: 0}
     };
 
     /**
@@ -37,7 +37,7 @@ export class StarknetSwapClaim extends StarknetSwapModule {
     ): StarknetAction {
         return new StarknetAction(signer, this.root,
             this.swapContract.populateTransaction.claim(swapData.toEscrowStruct(), witness),
-            sumStarknetGas(swapData.payOut ? StarknetSwapClaim.GasCosts.CLAIM_PAY_OUT : StarknetSwapClaim.GasCosts.CLAIM, claimHandlerGas)
+            starknetGasAdd(swapData.payOut ? StarknetSwapClaim.GasCosts.CLAIM_PAY_OUT : StarknetSwapClaim.GasCosts.CLAIM, claimHandlerGas)
         );
     }
 
@@ -134,9 +134,9 @@ export class StarknetSwapClaim extends StarknetSwapModule {
         let gasRequired = swapData.payOut ? StarknetSwapClaim.GasCosts.CLAIM_PAY_OUT : StarknetSwapClaim.GasCosts.CLAIM;
 
         const claimHandler: IClaimHandler<any, any> = this.contract.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
-        if(claimHandler!=null) gasRequired = sumStarknetGas(gasRequired, claimHandler.getGas(swapData));
+        if(claimHandler!=null) gasRequired = starknetGasAdd(gasRequired, claimHandler.getGas(swapData));
 
-        return StarknetFees.getGasFee(gasRequired.l1, feeRate);
+        return StarknetFees.getGasFee(gasRequired, feeRate);
     }
 
 }

package/src/starknet/swaps/modules/StarknetSwapInit.ts

@@ -1,10 +1,10 @@
 import {SignatureVerificationError, SwapCommitStatus, SwapDataVerificationError} from "@atomiqlabs/base";
-import {bufferToBytes31Span, toBigInt, toHex, tryWithRetries} from "../../../utils/Utils";
+import {bufferToBytes31Span, toHex, tryWithRetries} from "../../../utils/Utils";
 import {Buffer} from "buffer";
 import {StarknetSwapData} from "../StarknetSwapData";
 import {StarknetAction} from "../../chain/StarknetAction";
 import {StarknetSwapModule} from "../StarknetSwapModule";
-import {BigNumberish} from "starknet";
+import {BigNumberish, cairo} from "starknet";
 import {StarknetSigner} from "../../wallet/StarknetSigner";
 import {StarknetFees} from "../../chain/modules/StarknetFees";
 import {StarknetTx} from "../../chain/modules/StarknetTransactions";
@@ -15,14 +15,27 @@ export type StarknetPreFetchVerification = {
 
 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' }
 ];
 
 export class StarknetSwapInit extends StarknetSwapModule {
 
     private static readonly GasCosts = {
-        INIT: {l1: 500, l2: 0},
-        INIT_PAY_IN: {l1: 1000, l2: 0},
+        INIT: {l1DataGas: 750, l2Gas: 8_000_000, l1Gas: 0},
+        INIT_PAY_IN: {l1DataGas: 500, l2Gas: 4_800_000, l1Gas: 0},
     };
 
     /**
@@ -82,7 +95,29 @@ export class StarknetSwapInit extends StarknetSwapModule {
 
         const signature = await this.root.Signatures.signTypedMessage(signer, Initialize, "Initialize", {
             "Swap hash": "0x"+swapData.getEscrowHash(),
-            "Timeout": toHex(authTimeout)
+            "Offerer": swapData.offerer,
+            "Claimer": swapData.claimer,
+            "Token amount": {
+                token_address: swapData.token,
+                amount: 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: cairo.uint256(swapData.securityDeposit)
+            },
+            "Claimer bounty": {
+                token_address: swapData.feeToken,
+                amount: cairo.uint256(swapData.claimerBounty)
+            },
+            "Claim action hash": 0n,
+            "Deadline": toHex(authTimeout)
         });
 
         return {
@@ -126,7 +161,29 @@ export class StarknetSwapInit extends StarknetSwapModule {
 
         const valid = await this.root.Signatures.isValidSignature(signature, signer, Initialize, "Initialize", {
             "Swap hash": "0x"+swapData.getEscrowHash(),
-            "Timeout": toHex(timeoutBN)
+            "Offerer": swapData.offerer,
+            "Claimer": swapData.claimer,
+            "Token amount": {
+                token_address: swapData.token,
+                amount: 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: cairo.uint256(swapData.securityDeposit)
+            },
+            "Claimer bounty": {
+                token_address: swapData.feeToken,
+                amount: cairo.uint256(swapData.claimerBounty)
+            },
+            "Claim action hash": 0n,
+            "Deadline": toHex(timeoutBN)
         });
 
         if(!valid) throw new SignatureVerificationError("Invalid signature!");
@@ -221,6 +278,6 @@ export class StarknetSwapInit extends StarknetSwapModule {
      */
     async getInitFee(swapData?: StarknetSwapData, feeRate?: string): Promise<bigint> {
         feeRate ??= await this.root.Fees.getFeeRate();
-        return StarknetFees.getGasFee(swapData.payIn ? StarknetSwapInit.GasCosts.INIT_PAY_IN.l1 : StarknetSwapInit.GasCosts.INIT.l1, feeRate);
+        return StarknetFees.getGasFee(swapData.payIn ? StarknetSwapInit.GasCosts.INIT_PAY_IN : StarknetSwapInit.GasCosts.INIT, feeRate);
     }
 }

package/src/starknet/swaps/modules/StarknetSwapRefund.ts

@@ -2,13 +2,12 @@ import {SignatureVerificationError, SwapDataVerificationError} from "@atomiqlabs
 import {toHex, tryWithRetries} from "../../../utils/Utils";
 import {StarknetSwapModule} from "../StarknetSwapModule";
 import {StarknetSwapData} from "../StarknetSwapData";
-import {StarknetAction, StarknetGas, sumStarknetGas} from "../../chain/StarknetAction";
-import {StarknetSwapContract} from "../StarknetSwapContract";
+import {StarknetAction} from "../../chain/StarknetAction";
 import {IHandler} from "../handlers/IHandler";
 import {BigNumberish} from "starknet";
 import {StarknetTx} from "../../chain/modules/StarknetTransactions";
 import {StarknetSigner} from "../../wallet/StarknetSigner";
-import {StarknetFees} from "../../chain/modules/StarknetFees";
+import {StarknetFees, StarknetGas, starknetGasAdd} from "../../chain/modules/StarknetFees";
 
 const Refund = [
     { name: 'Swap hash', type: 'felt' },
@@ -18,8 +17,8 @@ const Refund = [
 export class StarknetSwapRefund extends StarknetSwapModule {
 
     private static readonly GasCosts = {
-        REFUND: {l1: 750, l2: 0},
-        REFUND_PAY_OUT: {l1: 1250, l2: 0}
+        REFUND: {l1DataGas: 750, l2Gas: 4_000_000, l1Gas: 0},
+        REFUND_PAY_OUT: {l1DataGas: 900, l2Gas: 6_000_000, l1Gas: 0}
     };
 
     /**
@@ -40,7 +39,7 @@ export class StarknetSwapRefund extends StarknetSwapModule {
     ): StarknetAction {
         return new StarknetAction(signer, this.root,
             this.swapContract.populateTransaction.refund(swapData.toEscrowStruct(), witness),
-            sumStarknetGas(swapData.payIn ? StarknetSwapRefund.GasCosts.REFUND_PAY_OUT : StarknetSwapRefund.GasCosts.REFUND, handlerGas)
+            starknetGasAdd(swapData.payIn ? StarknetSwapRefund.GasCosts.REFUND_PAY_OUT : StarknetSwapRefund.GasCosts.REFUND, handlerGas)
         );
     }
 
@@ -192,7 +191,7 @@ export class StarknetSwapRefund extends StarknetSwapModule {
      */
     async getRefundFee(swapData: StarknetSwapData, feeRate?: string): Promise<bigint> {
         feeRate ??= await this.root.Fees.getFeeRate();
-        return StarknetFees.getGasFee(swapData.payIn ? StarknetSwapRefund.GasCosts.REFUND_PAY_OUT.l1 : StarknetSwapRefund.GasCosts.REFUND.l1, feeRate);
+        return StarknetFees.getGasFee(swapData.payIn ? StarknetSwapRefund.GasCosts.REFUND_PAY_OUT : StarknetSwapRefund.GasCosts.REFUND, feeRate);
     }
 
 }

package/src/utils/Utils.ts

@@ -1,4 +1,4 @@
-import {EDAMode} from "starknet-types-07";
+import {EDAMode} from "@starknet-io/starknet-types-08";
 import {BigNumberish, CallData, hash, Uint256} from "starknet";
 import {StarknetTx} from "../starknet/chain/modules/StarknetTransactions";
 import {Buffer} from "buffer";