@hyperbridge/sdk 1.6.3 → 1.6.5

package/dist/node/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 */
@@ -3974,6 +3971,7 @@ declare class IntentsV2 {
         pollIntervalMs?: number;
     }): AsyncGenerator<{
         calldata: HexString;
+        feesInWei?: bigint;
         sessionPrivateKey: HexString;
     } | IntentOrderStatusUpdate, void, HexString>;
     placeOrder(order: OrderV2, graffiti?: HexString): AsyncGenerator<{
@@ -4433,11 +4431,13 @@ interface ChainConfigData {
         USDC: string;
         USDT: string;
         cNGN?: string;
+        EXT?: string;
     };
     tokenDecimals?: {
         USDC: number;
         USDT: number;
         cNGN?: number;
+        EXT?: number;
     };
     tokenStorageSlots?: {
         USDT?: {

package/dist/node/index.js

@@ -441,11 +441,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 },
@@ -493,11 +495,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 },
@@ -3836,6 +3840,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;
   }
@@ -8333,6 +8343,7 @@ var IntentsCoprocessor = class _IntentsCoprocessor {
       provider: new WsProvider(wsUrl),
       typesBundle: {
         spec: {
+          nexus: { hasher: keccakAsU8a },
           gargantua: { hasher: keccakAsU8a }
         }
       }
@@ -8382,7 +8393,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);
   }
   /**
@@ -15088,7 +15100,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
@@ -15928,7 +15941,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;
@@ -16065,37 +16078,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)}`);
@@ -16362,8 +16362,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({
@@ -16425,6 +16425,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);
       }
@@ -16718,13 +16735,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();
@@ -16732,7 +16751,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");