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

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)
@@ -89,12 +89,12 @@ class StarknetSwapClaim extends StarknetSwapModule_1.StarknetSwapModule {
         let gasRequired = swapData.payOut ? StarknetSwapClaim.GasCosts.CLAIM_PAY_OUT : StarknetSwapClaim.GasCosts.CLAIM;
         const claimHandler = this.contract.claimHandlersByAddress[swapData.claimHandler.toLowerCase()];
         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),
@@ -154,11 +190,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");
@@ -94,8 +94,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": "2.0.1",
+  "version": "3.0.0-beta.0",
   "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

@@ -12,7 +12,7 @@ import {StarknetSpvVaultData} from "./spv_swap/StarknetSpvVaultData";
 import {StarknetSpvWithdrawalData} from "./spv_swap/StarknetSpvWithdrawalData";
 import {RpcProviderWithRetries} from "./provider/RpcProviderWithRetries";
 
-export type StarknetAssetsType = BaseTokenType<"ETH" | "STRK" | "WBTC">;
+export type StarknetAssetsType = BaseTokenType<"ETH" | "STRK" | "WBTC" | "TBTC">;
 export const StarknetAssets: StarknetAssetsType = {
     ETH: {
         address: "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
@@ -27,6 +27,11 @@ export const StarknetAssets: StarknetAssetsType = {
     WBTC: {
         address: "0x03fe2b97c1fd336e750087d68b9b867997fd64a2661ff3ca5a7c771641e8e7ac",
         decimals: 8
+    },
+    TBTC: {
+        address: "0x04daa17763b286d1e59b97c283C0b8C949994C361e426A28F743c67bDfE9a32f",
+        decimals: 18,
+        displayDecimals: 8
     }
 } as const;
 
@@ -51,7 +56,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);

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,

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

@@ -4,6 +4,26 @@ import {StarknetTokens} from "./StarknetTokens";
 
 const MAX_FEE_AGE = 5000;
 
+export type StarknetFeeRate = {
+    l1GasCost: bigint;
+    l2GasCost: bigint;
+    l1DataGasCost: bigint;
+};
+
+export type StarknetGas = {
+    l1Gas: number,
+    l2Gas: number,
+    l1DataGas: number
+};
+
+export function starknetGasMul(gas: StarknetGas, scalar: number): StarknetGas {
+    return {l1Gas: gas.l1Gas * scalar, l2Gas: gas.l2Gas * scalar, l1DataGas: gas.l1DataGas * scalar};
+}
+
+export function starknetGasAdd(a: StarknetGas, b: StarknetGas): StarknetGas {
+    return {l1Gas: a.l1Gas + b.l1Gas, l2Gas: a.l2Gas + b.l2Gas, l1DataGas: a.l1DataGas + b.l1DataGas};
+}
+
 export class StarknetFees {
 
     private readonly logger = getLogger("StarknetFees: ");
@@ -11,25 +31,22 @@ export class StarknetFees {
     private readonly feeDA: "L1" | "L2";
     private readonly nonceDA: "L1" | "L2";
     private readonly provider: Provider;
-    private readonly gasToken: "ETH" | "STRK";
-    private readonly maxFeeRate: bigint;
+    private readonly maxFeeRate: StarknetFeeRate;
     private readonly feeMultiplierPPM: bigint;
 
     private blockFeeCache: {
         timestamp: number,
-        feeRate: Promise<bigint>
+        feeRate: Promise<StarknetFeeRate>
     } = null;
 
     constructor(
         provider: Provider,
-        gasToken: "ETH" | "STRK" = "STRK",
-        maxFeeRate: number = gasToken==="ETH" ? 100_000_000_000 /*100 GWei*/ : 1_000_000_000_000_000 /*100 * 10000 GWei*/,
+        maxFeeRate: StarknetFeeRate = {l1GasCost: 1_000_000_000_000_000n, l2GasCost: 1_000_000_000_000_000n, l1DataGasCost: 1_000_000_000_000_000n} /*100 * 10000 GWei*/,
         feeMultiplier: number = 1.25,
         da?: {fee?: "L1" | "L2", nonce?: "L1" | "L2"}
     ) {
         this.provider = provider;
-        this.gasToken = gasToken;
-        this.maxFeeRate = BigInt(maxFeeRate);
+        this.maxFeeRate = maxFeeRate;
         this.feeDA = da?.fee ?? "L1";
         this.nonceDA = da?.nonce ?? "L1";
         this.feeMultiplierPPM = BigInt(Math.floor(feeMultiplier*1000000));
@@ -39,16 +56,20 @@ export class StarknetFees {
      * Gets starknet fee rate
      *
      * @private
-     * @returns {Promise<BN>} L1 gas price denominated in Wei
+     * @returns {Promise<StarknetFeeRate>} L1 gas price denominated in Wei
      */
-    private async _getFeeRate(): Promise<bigint> {
-        const block = await this.provider.getBlockWithTxHashes("latest");
-        let l1GasCost = toBigInt(this.gasToken==="ETH" ? block.l1_gas_price.price_in_wei : block.l1_gas_price.price_in_fri);
-        l1GasCost = l1GasCost * this.feeMultiplierPPM / 1000000n;
+    private async _getFeeRate(): Promise<StarknetFeeRate> {
+        const block = await this.provider.getBlock("latest");
+
+        let l1GasCost = toBigInt(block.l1_gas_price.price_in_fri) * this.feeMultiplierPPM / 1000000n;
+        let l1DataGasCost = toBigInt(block.l1_data_gas_price.price_in_fri) * this.feeMultiplierPPM / 1000000n;
+        let l2GasCost = toBigInt(block.l2_gas_price.price_in_fri) * this.feeMultiplierPPM / 1000000n;
 
-        this.logger.debug("_getFeeRate(): L1 fee rate: "+l1GasCost.toString(10));
+        this.logger.debug("_getFeeRate(): L1 fee rate: ",[l1GasCost.toString(10), l1DataGasCost.toString(10), l2GasCost.toString(10)]);
 
-        return l1GasCost;
+        return {
+            l1GasCost, l2GasCost, l1DataGasCost
+        };
     }
 
     /**
@@ -69,10 +90,12 @@ export class StarknetFees {
             this.blockFeeCache = obj;
         }
 
-        let feeRate = await this.blockFeeCache.feeRate;
-        if(feeRate>this.maxFeeRate) feeRate = this.maxFeeRate;
+        let {l1GasCost, l2GasCost, l1DataGasCost} = await this.blockFeeCache.feeRate;
+        if(l1GasCost>this.maxFeeRate.l1GasCost) l1GasCost = this.maxFeeRate.l1GasCost;
+        if(l2GasCost>this.maxFeeRate.l2GasCost) l2GasCost = this.maxFeeRate.l2GasCost;
+        if(l1DataGasCost>this.maxFeeRate.l1DataGasCost) l1DataGasCost = this.maxFeeRate.l1DataGasCost;
 
-        const fee = feeRate.toString(10)+";"+(this.gasToken === "ETH" ? "v1" : "v3");
+        const fee = l1GasCost.toString(10)+","+l2GasCost.toString(10)+","+l1DataGasCost.toString(10)+";v3";
 
         this.logger.debug("getFeeRate(): calculated fee: "+fee);
 
@@ -80,22 +103,24 @@ export class StarknetFees {
     }
 
     public getDefaultGasToken(): string {
-        return this.gasToken==="ETH" ? StarknetTokens.ERC20_ETH : StarknetTokens.ERC20_STRK;
+        return StarknetTokens.ERC20_STRK;
     }
 
     /**
-     * Calculates the total gas fee fee paid for a given gas limit at a given fee rate
+     * Calculates the total gas fee paid for a given gas limit at a given fee rate
      *
      * @param gas
      * @param feeRate
      */
-    public static getGasFee(gas: number, feeRate: string): bigint {
+    public static getGasFee(gas: {l1DataGas: number, l2Gas: number, l1Gas: number}, feeRate: string): bigint {
         if(feeRate==null) return 0n;
 
         const arr = feeRate.split(";");
-        const gasPrice = BigInt(arr[0]);
+        const [l1GasCostStr, l2GasCostStr, l1DataGasCostStr] = arr[0].split(",");
 
-        return gasPrice * BigInt(gas);
+        return (BigInt(gas.l1Gas) * BigInt(l1GasCostStr)) +
+            (BigInt(gas.l2Gas) * BigInt(l2GasCostStr)) +
+            (BigInt(gas.l1DataGas) * BigInt(l1DataGasCostStr));
     }
 
     public static getGasToken(feeRate: string): string {
@@ -107,21 +132,18 @@ export class StarknetFees {
         return txVersion==="v1" ? StarknetTokens.ERC20_ETH : StarknetTokens.ERC20_STRK;
     }
 
-    getFeeDetails(L1GasLimit: number, L2GasLimit: number, feeRate: string) {
+    getFeeDetails(gas: {l1DataGas: number, l2Gas: number, l1Gas: number}, feeRate: string) {
         if(feeRate==null) return null;
 
         const arr = feeRate.split(";");
-        const gasPrice = BigInt(arr[0]);
-        const version = arr[1] as "v1" | "v3";
-
-        const maxFee = toHex(BigInt(L1GasLimit) * gasPrice, 16);
+        const [l1GasCostStr, l2GasCostStr, l1DataGasCostStr] = arr[0].split(",");
 
         return {
-            maxFee: maxFee,
-            version: version==="v1" ? "0x1" : "0x3" as "0x1" | "0x3",
+            version: "0x3" as const,
             resourceBounds: {
-                l1_gas: {max_amount: toHex(L1GasLimit, 16), max_price_per_unit: toHex(gasPrice, 16)},
-                l2_gas: {max_amount: "0x0", max_price_per_unit: "0x0"}
+                l1_gas: {max_amount: toHex(gas.l1Gas, 16), max_price_per_unit: toHex(toBigInt(l1GasCostStr), 16)},
+                l2_gas: {max_amount: toHex(gas.l2Gas, 16), max_price_per_unit: toHex(toBigInt(l2GasCostStr), 16)},
+                l1_data_gas: {max_amount: toHex(gas.l1DataGas, 16), max_price_per_unit: toHex(toBigInt(l1DataGasCostStr), 16)}
             },
             tip: "0x0",
             paymasterData: [],

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

@@ -54,11 +54,12 @@ export class StarknetSignatures extends StarknetModule {
         return JSON.stringify(stark.formatSignature(signature));
     }
 
-    public async isValidSignature(signature: string, address: string, type: StarknetType[], typeName: string, message: object) {
-        return new Account(this.provider, address, null).verifyMessage(
+    public async isValidSignature(signature: string, address: string, type: StarknetType[], typeName: string, message: object): Promise<boolean> {
+        return this.provider.verifyMessageInStarknet(
             this.getTypedMessage(type, typeName, message),
-            JSON.parse(signature)
-        )
+            JSON.parse(signature),
+            address
+        );
     }
 
     ///////////////////

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

@@ -12,8 +12,8 @@ export class StarknetTokens extends StarknetModule {
     public static readonly ERC20_STRK = "0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d";
 
     public static readonly GasCosts = {
-        TRANSFER: {l1: 400, l2: 0},
-        APPROVE: {l1: 400, l2: 0}
+        TRANSFER: {l1DataGas: 400, l2Gas: 4_000_000, l1Gas: 0},
+        APPROVE: {l1DataGas: 400, l2Gas: 4_000_000, l1Gas: 0}
     };
 
     private getContract(address: string) {

package/src/starknet/spv_swap/StarknetSpvVaultContract.ts

@@ -51,10 +51,10 @@ export class StarknetSpvVaultContract
     >
 {
     private static readonly GasCosts = {
-        DEPOSIT: {l1: 750, l2: 0},
-        OPEN: {l1: 1500, l2: 0},
-        FRONT: {l1: 750, l2: 0},
-        CLAIM: {l1: 10000, l2: 0}
+        DEPOSIT: {l1DataGas: 400, l2Gas: 4_000_000, l1Gas: 0},
+        OPEN: {l1DataGas: 1200, l2Gas: 3_200_000, l1Gas: 0},
+        FRONT: {l1DataGas: 800, l2Gas: 12_000_000, l1Gas: 0},
+        CLAIM: {l1DataGas: 1000, l2Gas: 400_000_000, l1Gas: 0}
     };
 
     readonly chainId = "STARKNET";
@@ -466,12 +466,12 @@ export class StarknetSpvVaultContract
 
     async getClaimFee(signer: string, withdrawalData: StarknetSpvWithdrawalData, feeRate?: string): Promise<bigint> {
         feeRate ??= await this.Chain.Fees.getFeeRate();
-        return StarknetFees.getGasFee(StarknetSpvVaultContract.GasCosts.CLAIM.l1, feeRate);
+        return StarknetFees.getGasFee(StarknetSpvVaultContract.GasCosts.CLAIM, feeRate);
     }
 
     async getFrontFee(signer: string, withdrawalData: StarknetSpvWithdrawalData, feeRate?: string): Promise<bigint> {
         feeRate ??= await this.Chain.Fees.getFeeRate();
-        return StarknetFees.getGasFee(StarknetSpvVaultContract.GasCosts.FRONT.l1, feeRate);
+        return StarknetFees.getGasFee(StarknetSpvVaultContract.GasCosts.FRONT, feeRate);
     }
 
 }