@hyperbridge/sdk 1.6.3 → 1.6.4

package/dist/browser/index.d.ts

@@ -1069,6 +1069,8 @@ declare class ChainConfigService {
     getUsdtDecimals(chain: string): number;
     getCNgnAsset(chain: string): HexString | undefined;
     getCNgnDecimals(chain: string): number | undefined;
+    getExtAsset(chain: string): HexString | undefined;
+    getExtDecimals(chain: string): number | undefined;
     getChainId(chain: string): number;
     getConsensusStateId(chain: string): HexString;
     getHyperbridgeChainId(): number;
@@ -2329,12 +2331,6 @@ declare enum RequestKind {
  * Configuration for the IntentFiller
  */
 interface FillerConfig {
-    /**
-     * Policy for determining confirmation requirements
-     */
-    confirmationPolicy: {
-        getConfirmationBlocks: (chainId: number, amountUsd: number) => number;
-    };
     /**
      * Maximum number of orders to process concurrently
      */
@@ -3878,6 +3874,7 @@ declare const BundlerMethod: {
     readonly ETH_SEND_USER_OPERATION: "eth_sendUserOperation";
     readonly ETH_GET_USER_OPERATION_RECEIPT: "eth_getUserOperationReceipt";
     readonly ETH_ESTIMATE_USER_OPERATION_GAS: "eth_estimateUserOperationGas";
+    readonly PIMLICO_GET_USER_OPERATION_GAS_PRICE: "pimlico_getUserOperationGasPrice";
 };
 type BundlerMethod = (typeof BundlerMethod)[keyof typeof BundlerMethod];
 /** Response from bundler's eth_estimateUserOperationGas */
@@ -3951,7 +3948,6 @@ declare class IntentsV2 {
     private readonly orderPlacer;
     private readonly orderExecutor;
     private readonly orderCanceller;
-    private readonly orderStatusChecker;
     private readonly bidManager;
     private readonly gasEstimator;
     private constructor();
@@ -3974,6 +3970,7 @@ declare class IntentsV2 {
         pollIntervalMs?: number;
     }): AsyncGenerator<{
         calldata: HexString;
+        feesInWei?: bigint;
         sessionPrivateKey: HexString;
     } | IntentOrderStatusUpdate, void, HexString>;
     placeOrder(order: OrderV2, graffiti?: HexString): AsyncGenerator<{
@@ -3988,35 +3985,6 @@ declare class IntentsV2 {
     estimateFillOrderV2(params: EstimateFillOrderV2Params): Promise<FillOrderEstimateV2>;
     encodeERC7821Execute(calls: ERC7821Call[]): HexString;
     decodeERC7821Execute(callData: HexString): ERC7821Call[] | null;
-    isOrderFilled(order: OrderV2): Promise<boolean>;
-    isOrderRefunded(order: OrderV2): Promise<boolean>;
-}
-
-declare class OrderStatusChecker {
-    private readonly ctx;
-    constructor(ctx: IntentsV2Context);
-    /**
-     * Checks if a V2 order has been filled by reading the commitment storage slot on the destination chain.
-     *
-     * Reads the storage slot returned by `calculateCommitmentSlotHash` on the IntentGatewayV2 contract.
-     * A non-zero value at that slot means the solver has called `fillOrder` and the order is complete
-     * from the user's perspective (the beneficiary has received their tokens).
-     *
-     * @param order - The V2 order to check. `order.id` is used as the commitment; if not set it is computed.
-     * @returns True if the order has been filled on the destination chain, false otherwise.
-     */
-    isOrderFilled(order: OrderV2): Promise<boolean>;
-    /**
-     * Checks if a V2 order has been refunded by reading the `_orders` mapping on the source chain.
-     *
-     * Calls `_orders(commitment, tokenAddress)` for each input token. When the order is placed the
-     * escrowed amounts are stored there. After a successful refund the contract zeroes them out.
-     * An order is considered refunded when all escrowed input amounts have been returned (i.e. are 0).
-     *
-     * @param order - The V2 order to check. `order.id` is used as the commitment; if not set it is computed.
-     * @returns True if all escrowed inputs have been returned to the user on the source chain, false otherwise.
-     */
-    isOrderRefunded(order: OrderV2): Promise<boolean>;
 }
 
 /**
@@ -4433,11 +4401,13 @@ interface ChainConfigData {
         USDC: string;
         USDT: string;
         cNGN?: string;
+        EXT?: string;
     };
     tokenDecimals?: {
         USDC: number;
         USDT: number;
         cNGN?: number;
+        EXT?: number;
     };
     tokenStorageSlots?: {
         USDT?: {
@@ -4491,4 +4461,4 @@ declare const getChainId: (stateMachineId: string) => number | undefined;
 declare const getViemChain: (chainId: number) => Chain | undefined;
 declare const hyperbridgeAddress = "";
 
-export { ADDRESS_ZERO, type AllStatusKey, type AssetTeleported, type AssetTeleportedResponse, type BidStorageEntry, type BidSubmissionResult, type BlockMetadata, type BundlerGasEstimate, BundlerMethod, type CancelEvent, type CancelEventMap, type CancelOptions, type ChainConfig, type ChainConfigData, ChainConfigService, Chains, type ClientConfig, DEFAULT_ADDRESS, DEFAULT_GRAFFITI, DOMAIN_TYPEHASH, DUMMY_PRIVATE_KEY, type DecodedOrderPlacedLog, type DecodedOrderV2PlacedLog, type DecodedPostRequestEvent, type DecodedPostResponseEvent, type DispatchGet, type DispatchInfoV2, type DispatchPost, ERC20Method, type ERC7821Call, ERC7821_BATCH_MODE, type EstimateFillOrderV2Params, type EstimateGasCallData, EvmChain, type EvmChainParams, EvmLanguage, type ExecuteIntentOrderOptions, type ExecutionResult, type FillOptions, type FillOptionsV2, type FillOrderEstimateV2, type FillerBid, type FillerConfig, type GetRequestResponse, type GetRequestWithStatus, type GetResponseByRequestIdResponse, type GetResponseStorageValues, type HexString, type HostParams, HyperClientStatus, type HyperbridgeTxEvents, type IChain, type IConfig, type IEvmChain, type IEvmConfig, type IGetRequest, type IGetRequestMessage, type IGetResponse, type IGetResponseMessage, type IHyperbridgeConfig, type IIsmpMessage, type IMessage, type IPostRequest, type IPostResponse, type IProof, type IRequestMessage, type ISubstrateConfig, type ITimeoutPostRequestMessage, IndexerClient, type IndexerQueryClient, IntentGateway, type IntentGatewayParams, IntentOrderStatus, type IntentOrderStatusKey, type IntentOrderStatusMetadata, type IntentOrderStatusUpdate, IntentsCoprocessor, IntentsV2, type IntentsV2Context, type IsmpRequest, MOCK_ADDRESS, type NewDeployment, ORDER_V2_PARAM_TYPE, type Order, type OrderResponse, OrderStatus, OrderStatusChecker, type OrderStatusMetadata, type OrderV2, type OrderWithStatus, PACKED_USEROP_TYPEHASH, PLACE_ORDER_SELECTOR, type PackedUserOperation, type Params, type PaymentInfo, type PaymentInfoV2, type PostRequestStatus, type PostRequestTimeoutStatus, type PostRequestWithStatus, type QuoteNativeResult, REQUEST_COMMITMENTS_SLOT, REQUEST_RECEIPTS_SLOT, RESPONSE_COMMITMENTS_SLOT, RESPONSE_RECEIPTS_SLOT, type RequestBody, type RequestCommitment, RequestKind, type RequestResponse, RequestStatus, type RequestStatusKey, type RequestStatusWithMetadata, type ResponseCommitmentWithValues, type RetryConfig, SELECT_SOLVER_TYPEHASH, STATE_COMMITMENTS_SLOT, type SelectBidResult, type SelectOptions, type StateMachineHeight, type StateMachineIdParams, type StateMachineResponse, type StateMachineUpdate, type StorageFacade, type SubmitBidOptions, SubstrateChain, Swap, TESTNET_CHAINS, type TeleportParams, TeleportStatus, TimeoutStatus, type TimeoutStatusKey, TokenGateway, type TokenGatewayAssetTeleportedResponse, type TokenGatewayAssetTeleportedWithStatus, type TokenInfo, type TokenInfoV2, type TokenPrice, type TokenPricesResponse, type TokenRegistry, type TokenRegistryResponse, type Transaction, TronChain, type TronChainParams, USE_ETHERSCAN_CHAINS, type XcmGatewayParams, __test, adjustDecimals, bytes20ToBytes32, bytes32ToBytes20, calculateAllowanceMappingLocation, calculateBalanceMappingLocation, chainConfigs, constructRedeemEscrowRequestBody, constructRefundEscrowRequestBody, convertCodecToIGetRequest, convertCodecToIProof, convertIGetRequestToCodec, convertIProofToCodec, convertStateIdToStateMachineId, convertStateMachineEnumToString, convertStateMachineIdToEnum, createChain, createEvmChain, createIndexerClient, createQueryClient, decodeUserOpScale, encodeERC7821ExecuteBatch, encodeISMPMessage, encodeUserOpScale, encodeWithdrawalRequest, estimateGasForPost, fetchPrice, fetchSourceProof, generateRootWithProof, getChain, getChainId, getConfigByStateMachineId, getContractCallInput, getEvmChain, getGasPriceFromEtherscan, getOrFetchStorageSlot, getOrderPlacedFromTx, getPostRequestEventFromTx, getPostResponseEventFromTx, getRequestCommitment, getStateCommitmentFieldSlot, getStateCommitmentSlot, getStorageSlot, getSubstrateChain, getViemChain, hexToString, hyperbridgeAddress, maxBigInt, orderCommitment, orderV2Commitment, parseStateMachineId, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, requestCommitmentKey, retryPromise, teleport, teleportDot, transformOrderForContract, tronChainIds, tronNile };
+export { ADDRESS_ZERO, type AllStatusKey, type AssetTeleported, type AssetTeleportedResponse, type BidStorageEntry, type BidSubmissionResult, type BlockMetadata, type BundlerGasEstimate, BundlerMethod, type CancelEvent, type CancelEventMap, type CancelOptions, type ChainConfig, type ChainConfigData, ChainConfigService, Chains, type ClientConfig, DEFAULT_ADDRESS, DEFAULT_GRAFFITI, DOMAIN_TYPEHASH, DUMMY_PRIVATE_KEY, type DecodedOrderPlacedLog, type DecodedOrderV2PlacedLog, type DecodedPostRequestEvent, type DecodedPostResponseEvent, type DispatchGet, type DispatchInfoV2, type DispatchPost, ERC20Method, type ERC7821Call, ERC7821_BATCH_MODE, type EstimateFillOrderV2Params, type EstimateGasCallData, EvmChain, type EvmChainParams, EvmLanguage, type ExecuteIntentOrderOptions, type ExecutionResult, type FillOptions, type FillOptionsV2, type FillOrderEstimateV2, type FillerBid, type FillerConfig, type GetRequestResponse, type GetRequestWithStatus, type GetResponseByRequestIdResponse, type GetResponseStorageValues, type HexString, type HostParams, HyperClientStatus, type HyperbridgeTxEvents, type IChain, type IConfig, type IEvmChain, type IEvmConfig, type IGetRequest, type IGetRequestMessage, type IGetResponse, type IGetResponseMessage, type IHyperbridgeConfig, type IIsmpMessage, type IMessage, type IPostRequest, type IPostResponse, type IProof, type IRequestMessage, type ISubstrateConfig, type ITimeoutPostRequestMessage, IndexerClient, type IndexerQueryClient, IntentGateway, type IntentGatewayParams, IntentOrderStatus, type IntentOrderStatusKey, type IntentOrderStatusMetadata, type IntentOrderStatusUpdate, IntentsCoprocessor, IntentsV2, type IntentsV2Context, type IsmpRequest, MOCK_ADDRESS, type NewDeployment, ORDER_V2_PARAM_TYPE, type Order, type OrderResponse, OrderStatus, type OrderStatusMetadata, type OrderV2, type OrderWithStatus, PACKED_USEROP_TYPEHASH, PLACE_ORDER_SELECTOR, type PackedUserOperation, type Params, type PaymentInfo, type PaymentInfoV2, type PostRequestStatus, type PostRequestTimeoutStatus, type PostRequestWithStatus, type QuoteNativeResult, REQUEST_COMMITMENTS_SLOT, REQUEST_RECEIPTS_SLOT, RESPONSE_COMMITMENTS_SLOT, RESPONSE_RECEIPTS_SLOT, type RequestBody, type RequestCommitment, RequestKind, type RequestResponse, RequestStatus, type RequestStatusKey, type RequestStatusWithMetadata, type ResponseCommitmentWithValues, type RetryConfig, SELECT_SOLVER_TYPEHASH, STATE_COMMITMENTS_SLOT, type SelectBidResult, type SelectOptions, type StateMachineHeight, type StateMachineIdParams, type StateMachineResponse, type StateMachineUpdate, type StorageFacade, type SubmitBidOptions, SubstrateChain, Swap, TESTNET_CHAINS, type TeleportParams, TeleportStatus, TimeoutStatus, type TimeoutStatusKey, TokenGateway, type TokenGatewayAssetTeleportedResponse, type TokenGatewayAssetTeleportedWithStatus, type TokenInfo, type TokenInfoV2, type TokenPrice, type TokenPricesResponse, type TokenRegistry, type TokenRegistryResponse, type Transaction, TronChain, type TronChainParams, USE_ETHERSCAN_CHAINS, type XcmGatewayParams, __test, adjustDecimals, bytes20ToBytes32, bytes32ToBytes20, calculateAllowanceMappingLocation, calculateBalanceMappingLocation, chainConfigs, constructRedeemEscrowRequestBody, constructRefundEscrowRequestBody, convertCodecToIGetRequest, convertCodecToIProof, convertIGetRequestToCodec, convertIProofToCodec, convertStateIdToStateMachineId, convertStateMachineEnumToString, convertStateMachineIdToEnum, createChain, createEvmChain, createIndexerClient, createQueryClient, decodeUserOpScale, encodeERC7821ExecuteBatch, encodeISMPMessage, encodeUserOpScale, encodeWithdrawalRequest, estimateGasForPost, fetchPrice, fetchSourceProof, generateRootWithProof, getChain, getChainId, getConfigByStateMachineId, getContractCallInput, getEvmChain, getGasPriceFromEtherscan, getOrFetchStorageSlot, getOrderPlacedFromTx, getPostRequestEventFromTx, getPostResponseEventFromTx, getRequestCommitment, getStateCommitmentFieldSlot, getStateCommitmentSlot, getStorageSlot, getSubstrateChain, getViemChain, hexToString, hyperbridgeAddress, maxBigInt, orderCommitment, orderV2Commitment, parseStateMachineId, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, requestCommitmentKey, retryPromise, teleport, teleportDot, transformOrderForContract, tronChainIds, tronNile };

package/dist/browser/index.js

@@ -1,6 +1,6 @@
 import { createConsola, LogLevels } from 'consola';
 import { flatten, zip, capitalize, maxBy, isNil } from 'lodash-es';
-import { defineChain, keccak256, toHex, hexToBytes, encodePacked, encodeAbiParameters, bytesToHex, createPublicClient, http, encodeFunctionData, erc20Abi, bytesToBigInt, pad, toBytes, numberToBytes, maxUint256, parseAbiParameters, parseAbiItem, formatUnits, parseUnits, concatHex, hexToString as hexToString$1, parseEventLogs, isHex, concat, decodeFunctionData, decodeAbiParameters } from 'viem';
+import { defineChain, keccak256, toHex, hexToBytes, encodePacked, encodeAbiParameters, bytesToHex, createPublicClient, http, encodeFunctionData, erc20Abi, bytesToBigInt, pad, toBytes, numberToBytes, maxUint256, parseAbiParameters, parseAbiItem, formatUnits, parseUnits, concatHex, hexToString as hexToString$1, parseEventLogs, concat, decodeFunctionData, decodeAbiParameters, isHex } from 'viem';
 import mergeRace from '@async-generator/merge-race';
 import { polygonAmoy, unichain, polygon, base, arbitrum, bsc, mainnet, sepolia, gnosisChiado, bscTestnet, tron, gnosis, soneium, baseSepolia, optimismSepolia, optimism, arbitrumSepolia } from 'viem/chains';
 import { TronWeb } from 'tronweb';
@@ -439,13 +439,11 @@ var chainConfigs = {
       WETH: "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
       DAI: "0x6b175474e89094c44da98b954eedeac495271d0f",
       USDC: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
-      USDT: "0xdac17f958d2ee523a2206206994597c13d831ec7",
-      cNGN: "0x17CDB2a01e7a34CbB3DD4b83260B05d0274C8dab"
+      USDT: "0xdac17f958d2ee523a2206206994597c13d831ec7"
     },
     tokenDecimals: {
       USDC: 6,
-      USDT: 6,
-      cNGN: 6
+      USDT: 6
     },
     tokenStorageSlots: {
       USDT: { balanceSlot: 2, allowanceSlot: 5 },
@@ -491,11 +489,13 @@ var chainConfigs = {
       WETH: "0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c",
       DAI: "0x1af3f329e8be154074d8769d1ffa4ee058b1dbc3",
       USDC: "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
-      USDT: "0x55d398326f99059ff775485246999027b3197955"
+      USDT: "0x55d398326f99059ff775485246999027b3197955",
+      EXT: "0x7C8c11ADb8EF7cd3CFa718008Ea048445C6E7209"
     },
     tokenDecimals: {
       USDC: 18,
-      USDT: 18
+      USDT: 18,
+      EXT: 18
     },
     tokenStorageSlots: {
       USDT: { balanceSlot: 1, allowanceSlot: 2 },
@@ -543,11 +543,13 @@ var chainConfigs = {
       WETH: "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
       DAI: "0xda10009cbd5d07dd0cecc66161fc93d7c9000da1",
       USDC: "0xaf88d065e77c8cc2239327c5edb3a432268e5831",
-      USDT: "0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9"
+      USDT: "0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9",
+      EXT: "0x0e668E5127087e236578893a0e01E41837A28469"
     },
     tokenDecimals: {
       USDC: 6,
-      USDT: 6
+      USDT: 6,
+      EXT: 18
     },
     tokenStorageSlots: {
       USDT: { balanceSlot: 51, allowanceSlot: 52 },
@@ -594,12 +596,12 @@ var chainConfigs = {
       DAI: "0x50c5725949a6f0c72e6c4a641f24049a917db0cb",
       USDC: "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
       USDT: "0xfde4c96c8593536e31f229ea8f37b2ada2699bb2",
-      cNGN: "0x46C85152bFe9f96829aA94755D9f915F9B10EF5F"
+      EXT: "0x0e668E5127087e236578893a0e01E41837A28469"
     },
     tokenDecimals: {
       USDC: 6,
       USDT: 6,
-      cNGN: 6
+      EXT: 18
     },
     tokenStorageSlots: {
       USDT: { balanceSlot: 0, allowanceSlot: 1 },
@@ -646,12 +648,12 @@ var chainConfigs = {
       DAI: "0x8f3cf7ad23cd3cadbd9735aff958023239c6a063",
       USDC: "0x3c499c542cef5e3811e1192ce70d8cc03d5c3359",
       USDT: "0xc2132d05d31c914a87c6611c10748aeb04b58e8f",
-      cNGN: "0x52828daa48C1a9A06F37500882b42daf0bE04C3B"
+      EXT: "0x7C8c11ADb8EF7cd3CFa718008Ea048445C6E7209"
     },
     tokenDecimals: {
       USDC: 6,
       USDT: 6,
-      cNGN: 6
+      EXT: 18
     },
     tokenStorageSlots: {
       USDT: { balanceSlot: 0, allowanceSlot: 1 },
@@ -3886,6 +3888,12 @@ var ChainConfigService = class {
   getCNgnDecimals(chain) {
     return this.getConfig(chain)?.tokenDecimals?.cNGN;
   }
+  getExtAsset(chain) {
+    return this.getConfig(chain)?.assets?.EXT;
+  }
+  getExtDecimals(chain) {
+    return this.getConfig(chain)?.tokenDecimals?.EXT;
+  }
   getChainId(chain) {
     return this.getConfig(chain)?.chainId ?? 0;
   }
@@ -8383,6 +8391,7 @@ var IntentsCoprocessor = class _IntentsCoprocessor {
       provider: new WsProvider(wsUrl),
       typesBundle: {
         spec: {
+          nexus: { hasher: keccakAsU8a },
           gargantua: { hasher: keccakAsU8a }
         }
       }
@@ -8432,7 +8441,8 @@ var IntentsCoprocessor = class _IntentsCoprocessor {
     if (this.substratePrivateKey.includes(" ")) {
       return keyring.addFromMnemonic(this.substratePrivateKey);
     }
-    const seedBytes = Buffer.from(this.substratePrivateKey, "hex");
+    const hex = this.substratePrivateKey.startsWith("0x") ? this.substratePrivateKey.slice(2) : this.substratePrivateKey;
+    const seedBytes = Buffer.from(hex, "hex");
     return keyring.addFromSeed(seedBytes);
   }
   /**
@@ -15148,7 +15158,8 @@ var ERC7821_BATCH_MODE = "0x0100000000000000000000000000000000000000000000000000
 var BundlerMethod = {
   ETH_SEND_USER_OPERATION: "eth_sendUserOperation",
   ETH_GET_USER_OPERATION_RECEIPT: "eth_getUserOperationReceipt",
-  ETH_ESTIMATE_USER_OPERATION_GAS: "eth_estimateUserOperationGas"
+  ETH_ESTIMATE_USER_OPERATION_GAS: "eth_estimateUserOperationGas",
+  PIMLICO_GET_USER_OPERATION_GAS_PRICE: "pimlico_getUserOperationGasPrice"
 };
 
 // src/protocols/intentsV2/CryptoUtils.ts
@@ -15988,7 +15999,7 @@ var BidManager = class {
         signature
       };
       try {
-        await this.simulate(order, selectOptions, bidWithOptions.options, solverAddress2, intentGatewayV2Address);
+        await this.simulate(bidWithOptions.bid, selectOptions, intentGatewayV2Address);
         selectedBid = bidWithOptions;
         sessionSignature = signature;
         break;
@@ -16125,37 +16136,24 @@ var BidManager = class {
     }
     return null;
   }
-  async simulate(order, selectOptions, fillOptions, solverAddress, intentGatewayV2Address) {
-    const nativeOutputValue = order.output.assets.filter((asset) => bytes32ToBytes20(asset.token) === ADDRESS_ZERO).reduce((sum, asset) => sum + asset.amount, 0n);
-    const totalNativeValue = nativeOutputValue + fillOptions.nativeDispatchFee;
+  async simulate(bid, selectOptions, intentGatewayV2Address) {
+    const solverAddress = bid.userOp.sender;
     const selectCalldata = encodeFunctionData({
       abi: ABI3,
       functionName: "select",
       args: [selectOptions]
     });
-    const fillOrderCalldata = encodeFunctionData({
-      abi: ABI3,
-      functionName: "fillOrder",
-      args: [transformOrderForContract(order), fillOptions]
-    });
-    const batchedCalldata = this.crypto.encodeERC7821Execute([
-      {
-        target: intentGatewayV2Address,
-        value: 0n,
-        data: selectCalldata
-      },
-      {
-        target: intentGatewayV2Address,
-        value: totalNativeValue,
-        data: fillOrderCalldata
-      }
-    ]);
+    const calls = [
+      { target: intentGatewayV2Address, value: 0n, data: selectCalldata },
+      { target: solverAddress, value: 0n, data: bid.userOp.callData }
+    ];
+    const batchedCalldata = this.crypto.encodeERC7821Execute(calls);
     try {
       await this.ctx.dest.client.call({
         account: solverAddress,
         to: solverAddress,
         data: batchedCalldata,
-        value: totalNativeValue
+        value: 0n
       });
     } catch (e) {
       throw new Error(`Simulation failed: ${e instanceof Error ? e.message : String(e)}`);
@@ -16361,11 +16359,13 @@ var GasEstimator = class {
     const { order } = params;
     const solverPrivateKey = generatePrivateKey();
     const solverAccountAddress = privateKeyToAddress(solverPrivateKey);
-    const souceStateMachineId = isHex(order.source) ? hexToString$1(order.source) : order.source;
+    const sourceStateMachineId = isHex(order.source) ? hexToString$1(order.source) : order.source;
     const destStateMachineId = isHex(order.destination) ? hexToString$1(order.destination) : order.destination;
     const intentGatewayV2Address = this.ctx.dest.configService.getIntentGatewayV2Address(destStateMachineId);
     const entryPointAddress = this.ctx.dest.configService.getEntryPointV08Address(destStateMachineId);
-    const chainId = BigInt(Number.parseInt(destStateMachineId.split("-")[1]));
+    const chainId = BigInt(
+      this.ctx.dest.client.chain?.id ?? Number.parseInt(this.ctx.dest.config.stateMachineId.split("-")[1])
+    );
     const totalEthValue = order.output.assets.filter((output) => bytes32ToBytes20(output.token) === ADDRESS_ZERO).reduce((sum, output) => sum + output.amount, 0n);
     const sourceFeeToken = await getFeeToken(this.ctx, this.ctx.source.config.stateMachineId, this.ctx.source);
     const destFeeToken = await getFeeToken(this.ctx, this.ctx.dest.config.stateMachineId, this.ctx.dest);
@@ -16382,7 +16382,7 @@ var GasEstimator = class {
       intentGatewayV2Address,
       entryPointAddress
     });
-    const isSameChain = souceStateMachineId === destStateMachineId;
+    const isSameChain = order.source === destStateMachineId;
     let postRequestFeeInDestFeeToken = 0n;
     let protocolFeeInNativeToken = 0n;
     if (!isSameChain) {
@@ -16391,7 +16391,7 @@ var GasEstimator = class {
         this.ctx,
         postRequestGas,
         "source",
-        souceStateMachineId
+        sourceStateMachineId
       );
       postRequestFeeInDestFeeToken = adjustDecimals(
         postRequestFeeInSourceFeeToken,
@@ -16400,12 +16400,12 @@ var GasEstimator = class {
       );
       const postRequest = {
         source: destStateMachineId,
-        dest: souceStateMachineId,
+        dest: order.source,
         body: constructRedeemEscrowRequestBody({ ...order, id: orderV2Commitment(order) }, MOCK_ADDRESS),
         timeoutTimestamp: 0n,
         nonce: await this.ctx.source.getHostNonce(),
         from: this.ctx.source.configService.getIntentGatewayV2Address(destStateMachineId),
-        to: this.ctx.source.configService.getIntentGatewayV2Address(souceStateMachineId)
+        to: this.ctx.source.configService.getIntentGatewayV2Address(sourceStateMachineId)
       };
       protocolFeeInNativeToken = await this.quoteNative(postRequest, postRequestFeeInDestFeeToken).catch(
         () => this.ctx.dest.quoteNative(postRequest, postRequestFeeInDestFeeToken).catch(() => 0n)
@@ -16422,8 +16422,8 @@ var GasEstimator = class {
     const gasPrice = await this.ctx.dest.client.getGasPrice();
     const priorityFeeBumpPercent = params.maxPriorityFeePerGasBumpPercent ?? 8;
     const maxFeeBumpPercent = params.maxFeePerGasBumpPercent ?? 10;
-    const maxPriorityFeePerGas = gasPrice + gasPrice * BigInt(priorityFeeBumpPercent) / 100n;
-    const maxFeePerGas = gasPrice + gasPrice * BigInt(maxFeeBumpPercent) / 100n;
+    let maxPriorityFeePerGas = gasPrice + gasPrice * BigInt(priorityFeeBumpPercent) / 100n;
+    let maxFeePerGas = gasPrice + gasPrice * BigInt(maxFeeBumpPercent) / 100n;
     const orderForEstimation = { ...order, session: solverAccountAddress };
     const commitment = orderV2Commitment(orderForEstimation);
     const fillOrderCalldata = encodeFunctionData({
@@ -16485,6 +16485,23 @@ var GasEstimator = class {
         callGasLimit = BigInt(gasEstimate.callGasLimit) * 105n / 100n;
         verificationGasLimit = BigInt(gasEstimate.verificationGasLimit) * 105n / 100n;
         preVerificationGas = BigInt(gasEstimate.preVerificationGas) * 105n / 100n;
+        if (this.ctx.bundlerUrl?.toLowerCase().includes("pimlico.io")) {
+          try {
+            const pimlicoGasPrices = await this.crypto.sendBundler(
+              BundlerMethod.PIMLICO_GET_USER_OPERATION_GAS_PRICE,
+              []
+            );
+            const level = pimlicoGasPrices.fast ?? pimlicoGasPrices.standard ?? pimlicoGasPrices.slow ?? null;
+            if (level) {
+              const pimMaxFeePerGas = BigInt(level.maxFeePerGas);
+              const pimMaxPriorityFeePerGas = BigInt(level.maxPriorityFeePerGas);
+              maxFeePerGas = pimMaxFeePerGas;
+              maxPriorityFeePerGas = pimMaxPriorityFeePerGas;
+            }
+          } catch (e) {
+            console.warn("Pimlico gas price fetch failed, using default gas price:", e);
+          }
+        }
       } catch (e) {
         console.warn("Bundler gas estimation failed, using fallback values:", e);
       }
@@ -16639,66 +16656,6 @@ var GasEstimator = class {
     });
   }
 };
-var OrderStatusChecker = class {
-  constructor(ctx) {
-    this.ctx = ctx;
-  }
-  /**
-   * Checks if a V2 order has been filled by reading the commitment storage slot on the destination chain.
-   *
-   * Reads the storage slot returned by `calculateCommitmentSlotHash` on the IntentGatewayV2 contract.
-   * A non-zero value at that slot means the solver has called `fillOrder` and the order is complete
-   * from the user's perspective (the beneficiary has received their tokens).
-   *
-   * @param order - The V2 order to check. `order.id` is used as the commitment; if not set it is computed.
-   * @returns True if the order has been filled on the destination chain, false otherwise.
-   */
-  async isOrderFilled(order) {
-    const commitment = order.id ?? orderV2Commitment(order);
-    const destStateMachineId = isHex(order.destination) ? hexToString$1(order.destination) : order.destination;
-    const intentGatewayV2Address = this.ctx.dest.configService.getIntentGatewayV2Address(destStateMachineId);
-    const filledSlot = await this.ctx.dest.client.readContract({
-      abi: ABI3,
-      address: intentGatewayV2Address,
-      functionName: "calculateCommitmentSlotHash",
-      args: [commitment]
-    });
-    const filledStatus = await this.ctx.dest.client.getStorageAt({
-      address: intentGatewayV2Address,
-      slot: filledSlot
-    });
-    return filledStatus !== "0x0000000000000000000000000000000000000000000000000000000000000000";
-  }
-  /**
-   * Checks if a V2 order has been refunded by reading the `_orders` mapping on the source chain.
-   *
-   * Calls `_orders(commitment, tokenAddress)` for each input token. When the order is placed the
-   * escrowed amounts are stored there. After a successful refund the contract zeroes them out.
-   * An order is considered refunded when all escrowed input amounts have been returned (i.e. are 0).
-   *
-   * @param order - The V2 order to check. `order.id` is used as the commitment; if not set it is computed.
-   * @returns True if all escrowed inputs have been returned to the user on the source chain, false otherwise.
-   */
-  async isOrderRefunded(order) {
-    if (!order.inputs || order.inputs.length === 0) return false;
-    const commitment = order.id ?? orderV2Commitment(order);
-    const sourceStateMachineId = isHex(order.source) ? hexToString$1(order.source) : order.source;
-    const intentGatewayV2Address = this.ctx.source.configService.getIntentGatewayV2Address(sourceStateMachineId);
-    for (const input of order.inputs) {
-      const tokenAddress = bytes32ToBytes20(input.token);
-      const escrowedAmount = await this.ctx.source.client.readContract({
-        abi: ABI3,
-        address: intentGatewayV2Address,
-        functionName: "_orders",
-        args: [commitment, tokenAddress]
-      });
-      if (escrowedAmount !== 0n) {
-        return false;
-      }
-    }
-    return true;
-  }
-};
 
 // src/protocols/intentsV2/IntentsV2.ts
 var IntentsV2 = class _IntentsV2 {
@@ -16711,7 +16668,6 @@ var IntentsV2 = class _IntentsV2 {
   orderPlacer;
   orderExecutor;
   orderCanceller;
-  orderStatusChecker;
   bidManager;
   gasEstimator;
   constructor(source, dest, intentsCoprocessor, bundlerUrl) {
@@ -16741,7 +16697,6 @@ var IntentsV2 = class _IntentsV2 {
     this.orderPlacer = new OrderPlacer(this.ctx);
     this.orderExecutor = new OrderExecutor(this.ctx, bidManager);
     this.orderCanceller = new OrderCanceller(this.ctx);
-    this.orderStatusChecker = new OrderStatusChecker(this.ctx);
     this.bidManager = bidManager;
     this.gasEstimator = gasEstimator;
     this._crypto = crypto;
@@ -16778,13 +16733,15 @@ var IntentsV2 = class _IntentsV2 {
     }
   }
   async *execute(order, graffiti = DEFAULT_GRAFFITI, options) {
+    let feesInWei;
     if (!order.fees || order.fees === 0n) {
       const estimate = await this.gasEstimator.estimateFillOrderV2({
         order,
         maxPriorityFeePerGasBumpPercent: options?.maxPriorityFeePerGasBumpPercent,
         maxFeePerGasBumpPercent: options?.maxFeePerGasBumpPercent
       });
-      order.fees = estimate.totalGasInFeeToken;
+      feesInWei = estimate.totalGasCostWei + estimate.totalGasCostWei * 2n / 100n;
+      order.fees = estimate.totalGasInFeeToken + estimate.totalGasInFeeToken * 1n / 100n;
     }
     const placeOrderGen = this.orderPlacer.placeOrder(order, graffiti);
     const placeOrderFirst = await placeOrderGen.next();
@@ -16792,7 +16749,7 @@ var IntentsV2 = class _IntentsV2 {
       throw new Error("placeOrder generator completed without yielding");
     }
     const { calldata, sessionPrivateKey } = placeOrderFirst.value;
-    const signedTransaction = yield { calldata, sessionPrivateKey };
+    const signedTransaction = yield { calldata, feesInWei, sessionPrivateKey };
     const placeOrderSecond = await placeOrderGen.next(signedTransaction);
     if (placeOrderSecond.done === false) {
       throw new Error("placeOrder generator yielded unexpectedly after signing");
@@ -16835,12 +16792,6 @@ var IntentsV2 = class _IntentsV2 {
   decodeERC7821Execute(callData) {
     return this._crypto.decodeERC7821Execute(callData);
   }
-  async isOrderFilled(order) {
-    return this.orderStatusChecker.isOrderFilled(order);
-  }
-  async isOrderRefunded(order) {
-    return this.orderStatusChecker.isOrderRefunded(order);
-  }
 };
 var TokenGateway = class {
   source;
@@ -17292,6 +17243,6 @@ async function teleportDot(param_) {
   return stream;
 }
 
-export { ADDRESS_ZERO, BundlerMethod, ChainConfigService, Chains, DEFAULT_ADDRESS, DEFAULT_GRAFFITI, DOMAIN_TYPEHASH, DUMMY_PRIVATE_KEY, ERC20Method, ERC7821_BATCH_MODE, EvmChain, EvmLanguage, HyperClientStatus, IndexerClient, IntentGateway, IntentOrderStatus, IntentsCoprocessor, IntentsV2, MOCK_ADDRESS, ORDER_V2_PARAM_TYPE, OrderStatus, OrderStatusChecker, PACKED_USEROP_TYPEHASH, PLACE_ORDER_SELECTOR, REQUEST_COMMITMENTS_SLOT, REQUEST_RECEIPTS_SLOT, RESPONSE_COMMITMENTS_SLOT, RESPONSE_RECEIPTS_SLOT, RequestKind, RequestStatus, SELECT_SOLVER_TYPEHASH, STATE_COMMITMENTS_SLOT, SubstrateChain, Swap, TESTNET_CHAINS, TeleportStatus, TimeoutStatus, TokenGateway, TronChain, USE_ETHERSCAN_CHAINS, __test, adjustDecimals, bytes20ToBytes32, bytes32ToBytes20, calculateAllowanceMappingLocation, calculateBalanceMappingLocation, chainConfigs, constructRedeemEscrowRequestBody, constructRefundEscrowRequestBody, convertCodecToIGetRequest, convertCodecToIProof, convertIGetRequestToCodec, convertIProofToCodec, convertStateIdToStateMachineId, convertStateMachineEnumToString, convertStateMachineIdToEnum, createChain, createEvmChain, createIndexerClient, createQueryClient, decodeUserOpScale, encodeERC7821ExecuteBatch, encodeISMPMessage, encodeUserOpScale, encodeWithdrawalRequest, estimateGasForPost, fetchPrice, fetchSourceProof2 as fetchSourceProof, generateRootWithProof, getChain, getChainId, getConfigByStateMachineId, getContractCallInput, getEvmChain, getGasPriceFromEtherscan, getOrFetchStorageSlot, getOrderPlacedFromTx, getPostRequestEventFromTx, getPostResponseEventFromTx, getRequestCommitment, getStateCommitmentFieldSlot, getStateCommitmentSlot, getStorageSlot, getSubstrateChain, getViemChain, hexToString, hyperbridgeAddress, maxBigInt, orderCommitment, orderV2Commitment, parseStateMachineId, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, requestCommitmentKey, retryPromise, teleport, teleportDot, transformOrderForContract, tronChainIds, tronNile };
+export { ADDRESS_ZERO, BundlerMethod, ChainConfigService, Chains, DEFAULT_ADDRESS, DEFAULT_GRAFFITI, DOMAIN_TYPEHASH, DUMMY_PRIVATE_KEY, ERC20Method, ERC7821_BATCH_MODE, EvmChain, EvmLanguage, HyperClientStatus, IndexerClient, IntentGateway, IntentOrderStatus, IntentsCoprocessor, IntentsV2, MOCK_ADDRESS, ORDER_V2_PARAM_TYPE, OrderStatus, PACKED_USEROP_TYPEHASH, PLACE_ORDER_SELECTOR, REQUEST_COMMITMENTS_SLOT, REQUEST_RECEIPTS_SLOT, RESPONSE_COMMITMENTS_SLOT, RESPONSE_RECEIPTS_SLOT, RequestKind, RequestStatus, SELECT_SOLVER_TYPEHASH, STATE_COMMITMENTS_SLOT, SubstrateChain, Swap, TESTNET_CHAINS, TeleportStatus, TimeoutStatus, TokenGateway, TronChain, USE_ETHERSCAN_CHAINS, __test, adjustDecimals, bytes20ToBytes32, bytes32ToBytes20, calculateAllowanceMappingLocation, calculateBalanceMappingLocation, chainConfigs, constructRedeemEscrowRequestBody, constructRefundEscrowRequestBody, convertCodecToIGetRequest, convertCodecToIProof, convertIGetRequestToCodec, convertIProofToCodec, convertStateIdToStateMachineId, convertStateMachineEnumToString, convertStateMachineIdToEnum, createChain, createEvmChain, createIndexerClient, createQueryClient, decodeUserOpScale, encodeERC7821ExecuteBatch, encodeISMPMessage, encodeUserOpScale, encodeWithdrawalRequest, estimateGasForPost, fetchPrice, fetchSourceProof2 as fetchSourceProof, generateRootWithProof, getChain, getChainId, getConfigByStateMachineId, getContractCallInput, getEvmChain, getGasPriceFromEtherscan, getOrFetchStorageSlot, getOrderPlacedFromTx, getPostRequestEventFromTx, getPostResponseEventFromTx, getRequestCommitment, getStateCommitmentFieldSlot, getStateCommitmentSlot, getStorageSlot, getSubstrateChain, getViemChain, hexToString, hyperbridgeAddress, maxBigInt, orderCommitment, orderV2Commitment, parseStateMachineId, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, requestCommitmentKey, retryPromise, teleport, teleportDot, transformOrderForContract, tronChainIds, tronNile };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map