@bosonprotocol/core-sdk 1.47.1-alpha.0 → 1.48.0-alpha.1

package/src/orchestration/interface.ts

@@ -1,7 +1,8 @@
-import { abis, ConditionStruct } from "@bosonprotocol/common";
+import { abis, ConditionStruct, FullOfferArgs } from "@bosonprotocol/common";
 import { Interface } from "@ethersproject/abi";
 import { createSellerArgsToStruct } from "../accounts/interface";
 import { createOfferArgsToStructs } from "../offers/interface";
+import { fullOfferArgsToStruct } from "../exchanges/interface";
 
 import { CreateSellerArgs } from "../accounts/types";
 import { CreateOfferArgs } from "../offers/types";
@@ -181,3 +182,32 @@ export function encodeRaiseAndEscalateDispute(exchangeId: BigNumberish) {
     [exchangeId]
   );
 }
+
+export function encodeCommitToOfferAndRedeemVoucher(offerId: BigNumberish) {
+  return bosonOrchestrationHandlerIface.encodeFunctionData(
+    "commitToOfferAndRedeemVoucher",
+    [offerId]
+  );
+}
+
+export function encodeCommitToConditionalOfferAndRedeemVoucher(
+  offerId: BigNumberish,
+  tokenId: BigNumberish
+) {
+  return bosonOrchestrationHandlerIface.encodeFunctionData(
+    "commitToConditionalOfferAndRedeemVoucher",
+    [offerId, tokenId]
+  );
+}
+
+export function encodeCreateOfferCommitAndRedeem(args: FullOfferArgs) {
+  return bosonOrchestrationHandlerIface.encodeFunctionData(
+    "createOfferCommitAndRedeem",
+    [
+      fullOfferArgsToStruct(args),
+      args.offerCreator,
+      args.signature,
+      args.conditionalTokenId || "0"
+    ]
+  );
+}

package/src/orchestration/mixin.ts

@@ -1,5 +1,6 @@
 import {
   ConditionStruct,
+  FullOfferArgs,
   TransactionResponse,
   TransactionRequest,
   Web3LibAdapter
@@ -415,6 +416,192 @@ export class OrchestrationMixin<
     }
   }
 
+  /**
+   * Commits to a seller-initiated offer and immediately redeems the voucher in
+   * a single transaction by calling the `OrchestrationHandler`.
+   * @param offerId - ID of offer to commit to.
+   * @param overrides - Optional overrides.
+   * @returns Transaction response.
+   */
+  // Overload: returnTxInfo is true → returns TransactionRequest
+  public async commitToOfferAndRedeemVoucher(
+    offerId: BigNumberish,
+    overrides: Partial<{
+      contractAddress: string;
+      returnTxInfo: true;
+    }>
+  ): Promise<TransactionRequest>;
+
+  // Overload: returnTxInfo is false or undefined → returns TransactionResponse
+  public async commitToOfferAndRedeemVoucher(
+    offerId: BigNumberish,
+    overrides?: Partial<{
+      contractAddress: string;
+      returnTxInfo?: false;
+    }>
+  ): Promise<TransactionResponse>;
+
+  // Implementation
+  public async commitToOfferAndRedeemVoucher(
+    offerId: BigNumberish,
+    overrides: Partial<{
+      contractAddress: string;
+      returnTxInfo?: boolean;
+    }> = {}
+  ): Promise<TransactionResponse | TransactionRequest> {
+    const { returnTxInfo } = overrides;
+
+    const commitArgs = {
+      offerId,
+      web3Lib: this._web3Lib,
+      subgraphUrl: this._subgraphUrl,
+      metadataStorage: this._metadataStorage,
+      theGraphStorage: this._theGraphStorage,
+      contractAddress: overrides.contractAddress || this._protocolDiamond
+    } as const satisfies Parameters<
+      typeof handler.commitToOfferAndRedeemVoucher
+    >[0];
+
+    if (returnTxInfo === true) {
+      return handler.commitToOfferAndRedeemVoucher({
+        ...commitArgs,
+        returnTxInfo: true
+      });
+    } else {
+      return handler.commitToOfferAndRedeemVoucher({
+        ...commitArgs,
+        returnTxInfo: false
+      });
+    }
+  }
+
+  /**
+   * Commits to a conditional offer and immediately redeems the voucher in a
+   * single transaction by calling the `OrchestrationHandler`.
+   * @param offerId - ID of offer to commit to.
+   * @param tokenId - ID of the token to use for the conditional commit.
+   * @param overrides - Optional overrides.
+   * @returns Transaction response.
+   */
+  // Overload: returnTxInfo is true → returns TransactionRequest
+  public async commitToConditionalOfferAndRedeemVoucher(
+    offerId: BigNumberish,
+    tokenId: BigNumberish,
+    overrides: Partial<{
+      contractAddress: string;
+      returnTxInfo: true;
+    }>
+  ): Promise<TransactionRequest>;
+
+  // Overload: returnTxInfo is false or undefined → returns TransactionResponse
+  public async commitToConditionalOfferAndRedeemVoucher(
+    offerId: BigNumberish,
+    tokenId: BigNumberish,
+    overrides?: Partial<{
+      contractAddress: string;
+      returnTxInfo?: false;
+    }>
+  ): Promise<TransactionResponse>;
+
+  // Implementation
+  public async commitToConditionalOfferAndRedeemVoucher(
+    offerId: BigNumberish,
+    tokenId: BigNumberish,
+    overrides: Partial<{
+      contractAddress: string;
+      returnTxInfo?: boolean;
+    }> = {}
+  ): Promise<TransactionResponse | TransactionRequest> {
+    const { returnTxInfo } = overrides;
+
+    const commitArgs = {
+      offerId,
+      tokenId,
+      web3Lib: this._web3Lib,
+      subgraphUrl: this._subgraphUrl,
+      metadataStorage: this._metadataStorage,
+      theGraphStorage: this._theGraphStorage,
+      contractAddress: overrides.contractAddress || this._protocolDiamond
+    } as const satisfies Parameters<
+      typeof handler.commitToConditionalOfferAndRedeemVoucher
+    >[0];
+
+    if (returnTxInfo === true) {
+      return handler.commitToConditionalOfferAndRedeemVoucher({
+        ...commitArgs,
+        returnTxInfo: true
+      });
+    } else {
+      return handler.commitToConditionalOfferAndRedeemVoucher({
+        ...commitArgs,
+        returnTxInfo: false
+      });
+    }
+  }
+
+  /**
+   * Creates an offer, commits to it and immediately redeems the voucher in a
+   * single transaction by calling the `OrchestrationHandler`.
+   * @param createOfferAndCommitArgs - Offer and commit arguments.
+   * @param overrides - Optional overrides.
+   * @returns Transaction response.
+   */
+  // Overload: returnTxInfo is true → returns TransactionRequest
+  public async createOfferCommitAndRedeem(
+    createOfferAndCommitArgs: FullOfferArgs,
+    overrides: Partial<{
+      contractAddress: string;
+      txRequest: TransactionRequest;
+      returnTxInfo: true;
+    }>
+  ): Promise<TransactionRequest>;
+
+  // Overload: returnTxInfo is false or undefined → returns TransactionResponse
+  public async createOfferCommitAndRedeem(
+    createOfferAndCommitArgs: FullOfferArgs,
+    overrides?: Partial<{
+      contractAddress: string;
+      txRequest: TransactionRequest;
+      returnTxInfo?: false;
+    }>
+  ): Promise<TransactionResponse>;
+
+  // Implementation
+  public async createOfferCommitAndRedeem(
+    createOfferAndCommitArgs: FullOfferArgs,
+    overrides: Partial<{
+      contractAddress: string;
+      txRequest: TransactionRequest;
+      returnTxInfo?: boolean;
+    }> = {}
+  ): Promise<TransactionResponse | TransactionRequest> {
+    const { returnTxInfo } = overrides;
+
+    const offerArgs = {
+      createOfferAndCommitArgs,
+      web3Lib: this._web3Lib,
+      subgraphUrl: this._subgraphUrl,
+      metadataStorage: this._metadataStorage,
+      theGraphStorage: this._theGraphStorage,
+      contractAddress: overrides.contractAddress || this._protocolDiamond,
+      txRequest: overrides.txRequest
+    } as const satisfies Parameters<
+      typeof handler.createOfferCommitAndRedeem
+    >[0];
+
+    if (returnTxInfo === true) {
+      return handler.createOfferCommitAndRedeem({
+        ...offerArgs,
+        returnTxInfo: true
+      });
+    } else {
+      return handler.createOfferCommitAndRedeem({
+        ...offerArgs,
+        returnTxInfo: false
+      });
+    }
+  }
+
   /**
    * Raises a dispute and immediately escalates it
    * @param exchangeId - Exchange ID

package/src/utils/signature.ts

@@ -20,12 +20,24 @@ export type StructuredData = {
       type: string;
     }[];
   };
-  domain: {
-    name: string;
-    version: string;
-    verifyingContract: string;
-    salt: string;
-  };
+  domain:
+    | {
+        name: string;
+        version: string;
+        verifyingContract: string;
+        salt: string;
+      }
+    | {
+        name: string;
+        version: string;
+        verifyingContract: string;
+        chainId: number | string;
+      }
+    | {
+        name: string;
+        verifyingContract: string;
+        chainId: number | string;
+      };
   primaryType: string;
   message: Record<string, unknown>;
 };