@atomiqlabs/chain-starknet 4.0.0-dev.4 → 4.0.0-dev.5

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

@@ -16,9 +16,6 @@ export declare const EscrowManagerAbi: readonly [{
     readonly type: "struct";
     readonly name: "escrow_manager::structs::escrow::EscrowExecution";
     readonly members: readonly [{
-        readonly name: "contract";
-        readonly type: "core::starknet::contract_address::ContractAddress";
-    }, {
         readonly name: "hash";
         readonly type: "core::felt252";
     }, {

package/dist/starknet/swaps/EscrowManagerAbi.js

@@ -25,10 +25,6 @@ exports.EscrowManagerAbi = [
         "type": "struct",
         "name": "escrow_manager::structs::escrow::EscrowExecution",
         "members": [
-            {
-                "name": "contract",
-                "type": "core::starknet::contract_address::ContractAddress"
-            },
             {
                 "name": "hash",
                 "type": "core::felt252"

package/dist/starknet/swaps/StarknetSwapContract.js

@@ -76,7 +76,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.d.ts

@@ -4,6 +4,11 @@ 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;
@@ -28,8 +33,9 @@ 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);
+    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(data: any);
     getOfferer(): string;
     setOfferer(newOfferer: string): void;
@@ -64,4 +70,5 @@ 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,6 +8,14 @@ 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);
@@ -24,7 +32,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) {
+    constructor(offererOrData, claimer, token, refundHandler, claimHandler, payOut, payIn, reputation, sequence, claimData, refundData, amount, feeToken, securityDeposit, claimerBounty, kind, extraData, successAction) {
         super();
         if (claimer != null || token != null || refundHandler != null || claimHandler != null ||
             payOut != null || payIn != null || reputation != null || sequence != null || claimData != null || refundData != null ||
@@ -46,6 +54,7 @@ class StarknetSwapData extends base_1.SwapData {
             this.claimerBounty = claimerBounty;
             this.kind = kind;
             this.extraData = extraData;
+            this.successAction = successAction;
         }
         else {
             this.offerer = offererOrData.offerer;
@@ -65,6 +74,11 @@ 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() {
@@ -102,7 +116,12 @@ 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
+            extraData: this.extraData,
+            successAction: this.successAction == null ? null : {
+                executionHash: this.successAction.executionHash,
+                executionExpiry: this.successAction.executionExpiry.toString(10),
+                executionFee: this.successAction.executionFee.toString(10)
+            }
         };
     }
     getAmount() {
@@ -130,7 +149,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));
-        let escrowHash = starknet_1.hash.computePoseidonHashOnElements([
+        const elements = [
             this.offerer,
             this.claimer,
             this.token,
@@ -146,7 +165,14 @@ 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");
@@ -243,7 +269,8 @@ class StarknetSwapData extends base_1.SwapData {
             other.refundData.toLowerCase() === this.refundData.toLowerCase() &&
             other.amount === this.amount &&
             other.securityDeposit === this.securityDeposit &&
-            other.claimerBounty === this.claimerBounty;
+            other.claimerBounty === this.claimerBounty &&
+            successActionEquals(other.successAction, this.successAction);
     }
     toEscrowStruct() {
         return {
@@ -259,7 +286,11 @@ class StarknetSwapData extends base_1.SwapData {
             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(starknet_1.CairoOptionVariant.None) //For now enforce no success action
+            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)
+            })
         };
     }
     static fromSerializedFeltArray(span, claimHandlerImpl) {
@@ -276,14 +307,18 @@ class StarknetSwapData extends base_1.SwapData {
         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) {
-            const executionContract = (0, Utils_1.toHex)(span.shift());
-            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!");
+            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);
+        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;
     }
 }
 exports.StarknetSwapData = StarknetSwapData;

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

@@ -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,7 +87,7 @@ 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, StarknetFees_1.starknetGasAdd)(gasRequired, claimHandler.getGas(swapData));
         return StarknetFees_1.StarknetFees.getGasFee(gasRequired, feeRate);

package/dist/utils/Utils.js

@@ -79,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");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-starknet",
-  "version": "4.0.0-dev.4",
+  "version": "4.0.0-dev.5",
   "description": "Starknet specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -22,7 +22,7 @@
   "author": "adambor",
   "license": "ISC",
   "dependencies": {
-    "@atomiqlabs/base": "^10.0.0-dev.7",
+    "@atomiqlabs/base": "^10.0.0-dev.8",
     "@noble/hashes": "^1.7.1",
     "@scure/btc-signer": "1.6.0",
     "abi-wan-kanabi": "2.2.4",

package/src/starknet/swaps/EscrowManagerAbi.ts

@@ -22,10 +22,6 @@ 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"

package/src/starknet/swaps/StarknetSwapContract.ts

@@ -134,7 +134,7 @@ export class StarknetSwapContract
 
         claimHandlersList.forEach(handlerCtor => {
             const handler = new handlerCtor(handlerAddresses.claim[handlerCtor.type]);
-            this.claimHandlersByAddress[handler.address] = handler;
+            this.claimHandlersByAddress[toHex(handler.address)] = handler;
             this.claimHandlersBySwapType[handlerCtor.type] = handler;
         });
 

package/src/starknet/swaps/StarknetSwapData.ts

@@ -14,6 +14,21 @@ const FLAG_REPUTATION: bigint = 0x04n;
 
 export type StarknetSwapDataType = StringToPrimitiveType<typeof EscrowManagerAbi, "escrow_manager::structs::escrow::EscrowData">;
 
+export type StarknetSuccessAction = {
+    executionHash: string,
+    executionExpiry: bigint,
+    executionFee: bigint
+}
+
+function successActionEquals(a: StarknetSuccessAction, b: StarknetSuccessAction): boolean {
+    if(a!=null && b!=null) {
+        return a.executionHash.toLowerCase()===b.executionHash.toLowerCase() &&
+            a.executionExpiry === b.executionExpiry &&
+            a.executionFee === b.executionFee;
+    }
+    return a === b;
+}
+
 export class StarknetSwapData extends SwapData {
 
     static toFlags(value: number | bigint | string): {payOut: boolean, payIn: boolean, reputation: boolean, sequence: bigint} {
@@ -57,6 +72,8 @@ export class StarknetSwapData extends SwapData {
 
     extraData: string;
 
+    successAction?: StarknetSuccessAction;
+
     kind: ChainSwapType;
 
     constructor(
@@ -76,7 +93,8 @@ export class StarknetSwapData extends SwapData {
         securityDeposit: bigint,
         claimerBounty: bigint,
         kind: ChainSwapType,
-        extraData: string
+        extraData: string,
+        successAction?: StarknetSuccessAction
     );
 
     constructor(data: any);
@@ -98,7 +116,8 @@ export class StarknetSwapData extends SwapData {
         securityDeposit?: bigint,
         claimerBounty?: bigint,
         kind?: ChainSwapType,
-        extraData?: string
+        extraData?: string,
+        successAction?: StarknetSuccessAction
     ) {
         super();
         if(claimer!=null || token!=null || refundHandler!=null || claimHandler!=null ||
@@ -121,6 +140,7 @@ export class StarknetSwapData extends SwapData {
             this.claimerBounty = claimerBounty;
             this.kind = kind;
             this.extraData = extraData;
+            this.successAction = successAction;
         } else {
             this.offerer = offererOrData.offerer;
             this.claimer = offererOrData.claimer;
@@ -139,6 +159,11 @@ export class StarknetSwapData extends 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),
+            }
         }
     }
 
@@ -181,7 +206,12 @@ export class StarknetSwapData extends 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
+            extraData: this.extraData,
+            successAction: this.successAction==null ? null : {
+                executionHash: this.successAction.executionHash,
+                executionExpiry: this.successAction.executionExpiry.toString(10),
+                executionFee: this.successAction.executionFee.toString(10)
+            }
         }
     }
 
@@ -217,7 +247,7 @@ export class StarknetSwapData extends SwapData {
         const amountValue = cairo.uint256("0x"+this.amount.toString(16));
         const securityDepositValue = cairo.uint256("0x"+this.securityDeposit.toString(16));
         const claimerBountyValue = cairo.uint256("0x"+this.claimerBounty.toString(16));
-        let escrowHash = hash.computePoseidonHashOnElements([
+        const elements = [
             this.offerer,
             this.claimer,
             this.token,
@@ -233,7 +263,15 @@ export class StarknetSwapData extends SwapData {
             securityDepositValue.high,
             claimerBountyValue.low,
             claimerBountyValue.high
-        ]);
+        ];
+        if(this.successAction!=null) {
+            elements.push(this.successAction.executionHash);
+            elements.push(this.successAction.executionExpiry);
+            const feeValue = cairo.uint256("0x"+this.successAction.executionFee.toString(16));
+            elements.push(feeValue.low, feeValue.high);
+        }
+
+        let escrowHash = hash.computePoseidonHashOnElements(elements);
         if(escrowHash.startsWith("0x")) escrowHash = escrowHash.slice(2);
         return escrowHash.padStart(64, "0");
     }
@@ -334,7 +372,8 @@ export class StarknetSwapData extends SwapData {
             other.refundData.toLowerCase()===this.refundData.toLowerCase() &&
             other.amount === this.amount &&
             other.securityDeposit === this.securityDeposit &&
-            other.claimerBounty === this.claimerBounty
+            other.claimerBounty === this.claimerBounty &&
+            successActionEquals(other.successAction, this.successAction)
     }
 
     toEscrowStruct(): StarknetSwapDataType {
@@ -351,7 +390,14 @@ export class StarknetSwapData extends SwapData {
             fee_token: this.feeToken,
             security_deposit: cairo.uint256(toBigInt(this.securityDeposit)),
             claimer_bounty: cairo.uint256(toBigInt(this.claimerBounty)),
-            success_action: new CairoOption(CairoOptionVariant.None) //For now enforce no success action
+            success_action: new CairoOption(
+                this.successAction==null ? CairoOptionVariant.None : CairoOptionVariant.Some,
+                this.successAction==null ? undefined : {
+                    hash: this.successAction.executionHash,
+                    expiry: this.successAction.executionExpiry,
+                    fee: cairo.uint256(this.successAction.executionFee)
+                }
+            ) as StarknetSwapDataType["success_action"]
         }
     }
 
@@ -369,12 +415,13 @@ export class StarknetSwapData extends SwapData {
         const securityDeposit = toBigInt({low: span.shift(), high: span.shift()});
         const claimerBounty = toBigInt({low: span.shift(), high: span.shift()});
         const hasSuccessAction = toBigInt(span.shift()) === 0n;
+        let successAction: StarknetSuccessAction = null;
         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!");
+            successAction = {
+                executionHash: toHex(span.shift()),
+                executionExpiry: toBigInt(span.shift()),
+                executionFee: toBigInt({low: span.shift(), high: span.shift()})
+            }
         }
 
         return new StarknetSwapData(
@@ -394,10 +441,15 @@ export class StarknetSwapData extends SwapData {
             securityDeposit,
             claimerBounty,
             claimHandlerImpl.getType(),
-            null
+            null,
+            successAction
         );
     }
 
+    hasSuccessAction(): boolean {
+        return this.successAction != null;
+    }
+
 }
 
 SwapData.deserializers["strk"] = StarknetSwapData;

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

@@ -64,7 +64,7 @@ export class StarknetSwapClaim extends StarknetSwapModule {
             throw new SwapDataVerificationError("Not enough time to reliably pay the invoice");
         }
 
-        const claimHandler: IClaimHandler<Buffer, string> = this.contract.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
+        const claimHandler: IClaimHandler<Buffer, string> = this.contract.claimHandlersByAddress[toHex(swapData.claimHandler)];
         if(claimHandler==null) throw new SwapDataVerificationError("Unknown claim handler!");
         if(claimHandler.getType()!==ChainSwapType.HTLC) throw new SwapDataVerificationError("Invalid claim handler!");
 
@@ -101,7 +101,7 @@ export class StarknetSwapClaim extends StarknetSwapModule {
         synchronizer?: RelaySynchronizer<StarknetBtcStoredHeader, StarknetTx, any>,
         feeRate?: string
     ): Promise<StarknetTx[] | null> {
-        const claimHandler: IClaimHandler<any, BitcoinOutputWitnessData | BitcoinWitnessData> = this.contract.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
+        const claimHandler: IClaimHandler<any, BitcoinOutputWitnessData | BitcoinWitnessData> = this.contract.claimHandlersByAddress[toHex(swapData.claimHandler)];
         if(claimHandler==null) throw new SwapDataVerificationError("Unknown claim handler!");
         if(
             claimHandler.getType()!==ChainSwapType.CHAIN_NONCED &&
@@ -133,7 +133,7 @@ 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()];
+        const claimHandler: IClaimHandler<any, any> = this.contract.claimHandlersByAddress[toHex(swapData.claimHandler)];
         if(claimHandler!=null) gasRequired = starknetGasAdd(gasRequired, claimHandler.getGas(swapData));
 
         return StarknetFees.getGasFee(gasRequired, feeRate);

package/src/utils/Utils.ts

@@ -83,7 +83,7 @@ export function toHex(value: number | bigint | string | Buffer, length: number =
     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");
             }