@boostxyz/sdk 7.2.0 → 7.4.0

package/src/Incentives/ERC20PeggedVariableCriteriaIncentiveV2.ts

@@ -37,6 +37,7 @@ import {
 import { ERC20PeggedVariableCriteriaIncentiveV2 as ERC20PeggedVariableCriteriaIncentiveV2Bases } from '../../dist/deployments.json';
 import {
   SignatureType,
+  decodeAndReorderLogArgs,
   getScalarValueFromTuple,
   isCriteriaFieldIndexTuple,
 } from '../Actions/EventAction';
@@ -235,25 +236,63 @@ export class ERC20PeggedVariableCriteriaIncentiveV2 extends DeployableTarget<
    * @throws {InvalidCriteriaTypeError | NoMatchingLogsError | DecodedArgsError}
    */
   public async getIncentiveScalar(
-    { chainId, hash, knownSignatures }: GetIncentiveScalarV2Params,
+    { chainId, hash, knownSignatures, logs }: GetIncentiveScalarV2Params,
     params?: ReadParams,
   ): Promise<bigint> {
     const criteria = await this.getIncentiveCriteria(params);
     if (criteria.criteriaType === SignatureType.EVENT) {
-      const transactionReceipt = await getTransactionReceipt(this._config, {
-        chainId,
-        hash,
-      });
+      const eventAbi = knownSignatures[criteria.signature] as AbiEvent;
+
       if (criteria.fieldIndex === CheatCodes.GAS_REBATE_INCENTIVE) {
+        const transactionReceipt = await getTransactionReceipt(this._config, {
+          chainId,
+          hash,
+        });
         const totalCost =
           transactionReceipt.gasUsed * transactionReceipt.effectiveGasPrice + // Normal gas cost
           (transactionReceipt.blobGasUsed ?? 0n) *
             (transactionReceipt.blobGasPrice ?? 0n); // Blob gas cost - account for potential undefined values
         return totalCost;
       }
-      const logs = transactionReceipt.logs;
 
-      if (logs.length === 0) {
+      // if logs are provided, use them to extract the scalar
+      if (logs && logs.length > 0) {
+        try {
+          // only check logs that match the criteria signature
+          const signatureMatchingLogs = logs
+            .filter((log) => log.topics && log.topics[0] === criteria.signature)
+            .map((log) => decodeAndReorderLogArgs(eventAbi, log));
+
+          if (signatureMatchingLogs.length > 0) {
+            for (const log of signatureMatchingLogs) {
+              if (isCriteriaFieldIndexTuple(criteria.fieldIndex)) {
+                return getScalarValueFromTuple(
+                  log.args as unknown[],
+                  criteria.fieldIndex,
+                );
+              }
+              const scalarValue = log.args
+                ? (log.args as string[])[criteria.fieldIndex]
+                : undefined;
+              if (scalarValue !== undefined) {
+                return BigInt(scalarValue);
+              }
+            }
+          }
+        } catch (e) {
+          throw new DecodedArgsError(
+            `An error occurred while extracting scalar from logs: ${(e as Error).message}`,
+          );
+        }
+      }
+
+      const transactionReceipt = await getTransactionReceipt(this._config, {
+        chainId,
+        hash,
+      });
+      const receiptLogs = transactionReceipt.logs;
+
+      if (receiptLogs.length === 0) {
         throw new NoMatchingLogsError(
           `No logs found for event signature ${criteria.signature}`,
         );
@@ -264,7 +303,7 @@ export class ERC20PeggedVariableCriteriaIncentiveV2 extends DeployableTarget<
         const eventAbi = knownSignatures[criteria.signature] as AbiEvent;
         const decodedEvents = parseEventLogs({
           abi: [eventAbi],
-          logs,
+          logs: receiptLogs,
         });
         if (decodedEvents == undefined || decodedEvents.length === 0) {
           throw new NoMatchingLogsError(

package/src/Incentives/ERC20VariableCriteriaIncentiveV2.ts

@@ -9,6 +9,7 @@ import {
   type AbiEvent,
   type AbiFunction,
   type Address,
+  type GetLogsReturnType,
   type Hex,
   decodeAbiParameters,
   decodeFunctionData,
@@ -22,6 +23,7 @@ import { ERC20VariableCriteriaIncentiveV2 as ERC20VariableCriteriaIncentiveV2Bas
 import {
   SignatureType,
   ValueType,
+  decodeAndReorderLogArgs,
   getScalarValueFromTuple,
   isCriteriaFieldIndexTuple,
 } from '../Actions/EventAction';
@@ -115,6 +117,7 @@ export interface GetIncentiveScalarV2Params {
   chainId: number;
   hash: Hex;
   knownSignatures: Record<Hex, AbiFunction | AbiEvent>;
+  logs?: GetLogsReturnType<AbiEvent, AbiEvent[], true>;
 }
 
 /**
@@ -247,25 +250,63 @@ export class ERC20VariableCriteriaIncentiveV2 extends ERC20VariableIncentive<
    * @throws {InvalidCriteriaTypeError | NoMatchingLogsError | DecodedArgsError}
    */
   public async getIncentiveScalar(
-    { chainId, hash, knownSignatures }: GetIncentiveScalarV2Params,
+    { chainId, hash, knownSignatures, logs }: GetIncentiveScalarV2Params,
     params?: ReadParams,
   ): Promise<bigint> {
     const criteria = await this.getIncentiveCriteria(params);
     if (criteria.criteriaType === SignatureType.EVENT) {
-      const transactionReceipt = await getTransactionReceipt(this._config, {
-        chainId,
-        hash,
-      });
+      const eventAbi = knownSignatures[criteria.signature] as AbiEvent;
+
       if (criteria.fieldIndex === CheatCodes.GAS_REBATE_INCENTIVE) {
+        const transactionReceipt = await getTransactionReceipt(this._config, {
+          chainId,
+          hash,
+        });
         const totalCost =
           transactionReceipt.gasUsed * transactionReceipt.effectiveGasPrice + // Normal gas cost
           (transactionReceipt.blobGasUsed ?? 0n) *
             (transactionReceipt.blobGasPrice ?? 0n); // Blob gas cost - account for potential undefined values
         return totalCost;
       }
-      const logs = transactionReceipt.logs;
 
-      if (logs.length === 0) {
+      // if logs are provided, use them to extract the scalar
+      if (logs && logs.length > 0) {
+        try {
+          // only check logs that match the criteria signature
+          const signatureMatchingLogs = logs
+            .filter((log) => log.topics && log.topics[0] === criteria.signature)
+            .map((log) => decodeAndReorderLogArgs(eventAbi, log));
+
+          if (signatureMatchingLogs.length > 0) {
+            for (const log of signatureMatchingLogs) {
+              if (isCriteriaFieldIndexTuple(criteria.fieldIndex)) {
+                return getScalarValueFromTuple(
+                  log.args as unknown[],
+                  criteria.fieldIndex,
+                );
+              }
+              const scalarValue = log.args
+                ? (log.args as string[])[criteria.fieldIndex]
+                : undefined;
+              if (scalarValue !== undefined) {
+                return BigInt(scalarValue);
+              }
+            }
+          }
+        } catch (e) {
+          throw new DecodedArgsError(
+            `An error occurred while extracting scalar from logs: ${(e as Error).message}`,
+          );
+        }
+      }
+
+      const transactionReceipt = await getTransactionReceipt(this._config, {
+        chainId,
+        hash,
+      });
+      const receiptLogs = transactionReceipt.logs;
+
+      if (receiptLogs.length === 0) {
         throw new NoMatchingLogsError(
           `No logs found for event signature ${criteria.signature}`,
         );
@@ -276,7 +317,7 @@ export class ERC20VariableCriteriaIncentiveV2 extends ERC20VariableIncentive<
         const eventAbi = knownSignatures[criteria.signature] as AbiEvent;
         const decodedEvents = parseEventLogs({
           abi: [eventAbi],
-          logs,
+          logs: receiptLogs,
         });
         if (decodedEvents == undefined || decodedEvents.length === 0) {
           throw new NoMatchingLogsError(

package/dist/deployments-Dk-Z1L2X.cjs

@@ -1,2 +0,0 @@
-"use strict";const e={10:"0x204AF74f15D385351F9113A1162D1B6Fa3C0B2Ed",8453:"0x204AF74f15D385351F9113A1162D1B6Fa3C0B2Ed",42161:"0xE79Cc2063A470087604F7690F3Ff5e0759addA06",84532:"0x204AF74f15D385351F9113A1162D1B6Fa3C0B2Ed",11155111:"0x204AF74f15D385351F9113A1162D1B6Fa3C0B2Ed"},C={10:"0x9bfc5ee7Bdc4F49709A3dd101fe5Ef3d94172201",8453:"0x378632819F39C74c4F56B1429E760739c5fb51b7",42161:"0xa017d8DBeB026a80b3E99F8e118bfFC3efd842BC",84532:"0x378632819F39C74c4F56B1429E760739c5fb51b7",11155111:"0x378632819F39C74c4F56B1429E760739c5fb51b7"},E={10:"0x157471E996D261A93bB987e62C990CCac757e50A",8453:"0x54aBB00F12755Be99729E50dade1BA62c75F8879",42161:"0xCF9A795Fed701aa214598998a2D4566413D906Ce",84532:"0x54aBB00F12755Be99729E50dade1BA62c75F8879",11155111:"0x54aBB00F12755Be99729E50dade1BA62c75F8879"},a={10:"0x5706C507517c915CceD6528AB5C7f417bDaE5dD8",8453:"0x5706C507517c915CceD6528AB5C7f417bDaE5dD8",42161:"0x7Df4b5625567AA946d93118Fe8e81Fa4d6b10Cfd",84532:"0x5706C507517c915CceD6528AB5C7f417bDaE5dD8",11155111:"0x5706C507517c915CceD6528AB5C7f417bDaE5dD8"},d={10:"0x7856e771Dbaa54C68a152de58E8314bA3715E6B9",8453:"0x7856e771Dbaa54C68a152de58E8314bA3715E6B9",42161:"0x67f6185EB855aCd514fAC9d9e6Bd83b01040Ce33",84532:"0x7856e771Dbaa54C68a152de58E8314bA3715E6B9",11155111:"0x7856e771Dbaa54C68a152de58E8314bA3715E6B9"},B={10:"0xa556B15963EBFE06bB25067A865D43f56082A4d3",8453:"0xa556B15963EBFE06bB25067A865D43f56082A4d3",84532:"0xa556B15963EBFE06bB25067A865D43f56082A4d3",11155111:"0xa556B15963EBFE06bB25067A865D43f56082A4d3"},f={10:"0x27CEeCDFDFbC524d2753faAd0dA58b54f269bC69",8453:"0x27CEeCDFDFbC524d2753faAd0dA58b54f269bC69",84532:"0x27CEeCDFDFbC524d2753faAd0dA58b54f269bC69",11155111:"0x27CEeCDFDFbC524d2753faAd0dA58b54f269bC69"},D={10:"0x53bD3fE4F4f80E39B9a6C8a5EC67F4a33fe91E8f",8453:"0x53bD3fE4F4f80E39B9a6C8a5EC67F4a33fe91E8f",84532:"0x53bD3fE4F4f80E39B9a6C8a5EC67F4a33fe91E8f",11155111:"0x53bD3fE4F4f80E39B9a6C8a5EC67F4a33fe91E8f"},b={10:"0x068D72D8058D65890bbcB7D65cd76740f2ED31e5",8453:"0x068D72D8058D65890bbcB7D65cd76740f2ED31e5",42161:"0xB58d3bA94d16305bf35F8D2055faB44b01063F9B",84532:"0x068D72D8058D65890bbcB7D65cd76740f2ED31e5",11155111:"0x068D72D8058D65890bbcB7D65cd76740f2ED31e5"},F={10:"0x6d6B9f0a11Ac190E071c0A5A46702EC09306240f",8453:"0x6d6B9f0a11Ac190E071c0A5A46702EC09306240f",84532:"0x6d6B9f0a11Ac190E071c0A5A46702EC09306240f",11155111:"0x6d6B9f0a11Ac190E071c0A5A46702EC09306240f"},c={10:"0xBf307584B35d94067B2B75C9A11a74BFf84b2Ffd",8453:"0xBf307584B35d94067B2B75C9A11a74BFf84b2Ffd",42161:"0x3647EF9212033976204D9d3df3Ed46832888F7fB",84532:"0xBf307584B35d94067B2B75C9A11a74BFf84b2Ffd",11155111:"0xBf307584B35d94067B2B75C9A11a74BFf84b2Ffd"},A={10:"0xE2F3EFB000Cb5Fd912B931B92656E835b94ED70C",8453:"0xE2F3EFB000Cb5Fd912B931B92656E835b94ED70C",42161:"0xa4b9E4278Fc1C2Cd7f298D6Ab77fE5ed0BAEFa09",84532:"0xE2F3EFB000Cb5Fd912B931B92656E835b94ED70C",11155111:"0xE2F3EFB000Cb5Fd912B931B92656E835b94ED70C"},x={10:"0xCbfDeec39221D56398702dEe3309a88450633E52",8453:"0xCbfDeec39221D56398702dEe3309a88450633E52",84532:"0xCbfDeec39221D56398702dEe3309a88450633E52",11155111:"0xCbfDeec39221D56398702dEe3309a88450633E52"},t={10:"0xb8a299905dC2d23Cd55E77AefC110b05F6165A49",8453:"0xb8a299905dC2d23Cd55E77AefC110b05F6165A49",42161:"0xA1aDC1b479e5188C4c3780B161426fc25A11d45E",84532:"0xb8a299905dC2d23Cd55E77AefC110b05F6165A49",11155111:"0xb8a299905dC2d23Cd55E77AefC110b05F6165A49"},n={10:"0xe7E59DDB78E0544aB2f81519381736C0b8f27692",8453:"0xe7E59DDB78E0544aB2f81519381736C0b8f27692",42161:"0xaEAB5967508DE105fa66bED2575cdF3b17631682",84532:"0xe7E59DDB78E0544aB2f81519381736C0b8f27692",11155111:"0xe7E59DDB78E0544aB2f81519381736C0b8f27692"},i={10:"0x8EAF9538c6D1F171E7883df279010626C57fC2C1",8453:"0x8EAF9538c6D1F171E7883df279010626C57fC2C1",42161:"0x290D20454bC26b68924c193e981fCa38f2588975",84532:"0x8EAF9538c6D1F171E7883df279010626C57fC2C1",11155111:"0x8EAF9538c6D1F171E7883df279010626C57fC2C1"},r={10:"0x425EcbdB2f88bD40F9c9e88Fd0a38D8a295a6Ef6",8453:"0x425EcbdB2f88bD40F9c9e88Fd0a38D8a295a6Ef6",42161:"0xEB43d4fCf7F64863b3D066EE005Fa298F0CFd8eC",84532:"0x425EcbdB2f88bD40F9c9e88Fd0a38D8a295a6Ef6",11155111:"0x425EcbdB2f88bD40F9c9e88Fd0a38D8a295a6Ef6"},o={10:"0xb8CD58c748EbC58D6C1C0128C8e0734f439A0a1B",8453:"0xb8CD58c748EbC58D6C1C0128C8e0734f439A0a1B",42161:"0x6dA00E864f55ceA64d0d24968fb8bb02Cd8C43E8",84532:"0xb8CD58c748EbC58D6C1C0128C8e0734f439A0a1B",11155111:"0xb8CD58c748EbC58D6C1C0128C8e0734f439A0a1B"},s={10:"0xFE865b98C9892f77F07e3d971c4783CF3C02E92d",8453:"0xFE865b98C9892f77F07e3d971c4783CF3C02E92d",42161:"0x2399DAB7d25bE315C2074BEcd50f243f4982D655",84532:"0xFE865b98C9892f77F07e3d971c4783CF3C02E92d",11155111:"0xFE865b98C9892f77F07e3d971c4783CF3C02E92d"},g={10:"0x69E5D1Cf8BDcE70eC3604B9e26C3aC61eCf19A1F",8453:"0x69E5D1Cf8BDcE70eC3604B9e26C3aC61eCf19A1F",84532:"0x69E5D1Cf8BDcE70eC3604B9e26C3aC61eCf19A1F",11155111:"0x69E5D1Cf8BDcE70eC3604B9e26C3aC61eCf19A1F"};exports.AllowListIncentive=e;exports.BoostCore=C;exports.BoostRegistry=E;exports.CGDAIncentive=a;exports.ERC20Incentive=d;exports.ERC20PeggedIncentive=B;exports.ERC20PeggedVariableCriteriaIncentive=f;exports.ERC20PeggedVariableCriteriaIncentiveV2=D;exports.ERC20VariableCriteriaIncentive=b;exports.ERC20VariableCriteriaIncentiveV2=F;exports.ERC20VariableIncentive=c;exports.EventAction=A;exports.LimitedSignerValidator=x;exports.ManagedBudget=t;exports.ManagedBudgetWithFees=n;exports.PointsIncentive=i;exports.SignerValidator=r;exports.SimpleAllowList=o;exports.SimpleDenyList=s;exports.TransparentBudget=g;
-//# sourceMappingURL=deployments-Dk-Z1L2X.cjs.map

package/dist/deployments-Dk-Z1L2X.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"deployments-Dk-Z1L2X.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":""}