@bosonprotocol/core-sdk 1.44.0 → 1.44.1-alpha.1

package/src/disputes/handler.ts

@@ -188,38 +188,71 @@ export async function expireDisputeBatch(args: {
 }
 
 // Overload: returnTxInfo is true → returns TransactionRequest
-export async function resolveDispute(args: {
-  exchangeId: BigNumberish;
-  buyerPercentBasisPoints: BigNumberish;
-  sigR: BytesLike;
-  sigS: BytesLike;
-  sigV: BigNumberish;
-  contractAddress: string;
-  web3Lib: Web3LibAdapter;
-  returnTxInfo: true;
-}): Promise<TransactionRequest>;
+export async function resolveDispute(
+  args:
+    | {
+        exchangeId: BigNumberish;
+        buyerPercentBasisPoints: BigNumberish;
+        sigR: BytesLike;
+        sigS: BytesLike;
+        sigV: BigNumberish;
+        contractAddress: string;
+        web3Lib: Web3LibAdapter;
+        returnTxInfo: true;
+      }
+    | {
+        exchangeId: BigNumberish;
+        buyerPercentBasisPoints: BigNumberish;
+        signature: string;
+        contractAddress: string;
+        web3Lib: Web3LibAdapter;
+        returnTxInfo: true;
+      }
+): Promise<TransactionRequest>;
 // Overload: returnTxInfo is false or undefined → returns TransactionResponse
-export async function resolveDispute(args: {
-  exchangeId: BigNumberish;
-  buyerPercentBasisPoints: BigNumberish;
-  sigR: BytesLike;
-  sigS: BytesLike;
-  sigV: BigNumberish;
-  contractAddress: string;
-  web3Lib: Web3LibAdapter;
-  returnTxInfo?: false | undefined;
-}): Promise<TransactionResponse>;
+export async function resolveDispute(
+  args:
+    | {
+        exchangeId: BigNumberish;
+        buyerPercentBasisPoints: BigNumberish;
+        sigR: BytesLike;
+        sigS: BytesLike;
+        sigV: BigNumberish;
+        contractAddress: string;
+        web3Lib: Web3LibAdapter;
+        returnTxInfo?: false | undefined;
+      }
+    | {
+        exchangeId: BigNumberish;
+        buyerPercentBasisPoints: BigNumberish;
+        signature: string;
+        contractAddress: string;
+        web3Lib: Web3LibAdapter;
+        returnTxInfo?: false | undefined;
+      }
+): Promise<TransactionResponse>;
 // Implementation
-export async function resolveDispute(args: {
-  exchangeId: BigNumberish;
-  buyerPercentBasisPoints: BigNumberish;
-  sigR: BytesLike;
-  sigS: BytesLike;
-  sigV: BigNumberish;
-  contractAddress: string;
-  web3Lib: Web3LibAdapter;
-  returnTxInfo?: boolean;
-}): Promise<TransactionResponse | TransactionRequest> {
+export async function resolveDispute(
+  args:
+    | {
+        exchangeId: BigNumberish;
+        buyerPercentBasisPoints: BigNumberish;
+        sigR: BytesLike;
+        sigS: BytesLike;
+        sigV: BigNumberish;
+        contractAddress: string;
+        web3Lib: Web3LibAdapter;
+        returnTxInfo?: boolean;
+      }
+    | {
+        exchangeId: BigNumberish;
+        buyerPercentBasisPoints: BigNumberish;
+        signature: string;
+        contractAddress: string;
+        web3Lib: Web3LibAdapter;
+        returnTxInfo?: boolean;
+      }
+): Promise<TransactionResponse | TransactionRequest> {
   const transactionRequest = {
     to: args.contractAddress,
     data: encodeResolveDispute(args)

package/src/disputes/interface.ts

@@ -2,6 +2,7 @@ import { abis } from "@bosonprotocol/common";
 import { Interface } from "@ethersproject/abi";
 import { BigNumberish } from "@ethersproject/bignumber";
 import { BytesLike } from "@ethersproject/bytes";
+import { rebuildSignature } from "../utils/signature";
 
 export const bosonDisputeHandlerIface = new Interface(
   abis.IBosonDisputeHandlerABI
@@ -63,19 +64,35 @@ export function encodeRefuseEscalatedDispute(exchangeId: BigNumberish) {
   ]);
 }
 
-export function encodeResolveDispute(args: {
-  exchangeId: BigNumberish;
-  buyerPercentBasisPoints: BigNumberish;
-  sigR: BytesLike;
-  sigS: BytesLike;
-  sigV: BigNumberish;
-}) {
+export function encodeResolveDispute(
+  args:
+    | {
+        exchangeId: BigNumberish;
+        buyerPercentBasisPoints: BigNumberish;
+        sigR: BytesLike;
+        sigS: BytesLike;
+        sigV: BigNumberish;
+      }
+    | {
+        exchangeId: BigNumberish;
+        buyerPercentBasisPoints: BigNumberish;
+        signature: string;
+      }
+) {
+  let signature: string;
+  if (!("signature" in args)) {
+    signature = rebuildSignature({
+      r: args.sigR.toString(),
+      s: args.sigS.toString(),
+      v: Number(args.sigV)
+    });
+  } else {
+    signature = args.signature;
+  }
   return bosonDisputeHandlerIface.encodeFunctionData("resolveDispute", [
     args.exchangeId,
     args.buyerPercentBasisPoints,
-    args.sigR,
-    args.sigS,
-    args.sigV
+    signature
   ]);
 }
 

package/src/disputes/mixin.ts

@@ -254,40 +254,76 @@ export class DisputesMixin<T extends Web3LibAdapter> extends BaseCoreSDK<T> {
    * - `args.sigV` - v signature value of counterparty.
    * @returns Transaction response.
    */
-  public async resolveDispute(args: {
-    exchangeId: BigNumberish;
-    buyerPercentBasisPoints: BigNumberish;
-    sigR: BytesLike;
-    sigS: BytesLike;
-    sigV: BigNumberish;
-    returnTxInfo: true;
-  }): Promise<TransactionRequest>;
-  public async resolveDispute(args: {
-    exchangeId: BigNumberish;
-    buyerPercentBasisPoints: BigNumberish;
-    sigR: BytesLike;
-    sigS: BytesLike;
-    sigV: BigNumberish;
-    returnTxInfo?: false | undefined;
-  }): Promise<TransactionResponse>;
-  public async resolveDispute(args: {
-    exchangeId: BigNumberish;
-    buyerPercentBasisPoints: BigNumberish;
-    sigR: BytesLike;
-    sigS: BytesLike;
-    sigV: BigNumberish;
-    returnTxInfo?: boolean;
-  }): Promise<TransactionResponse | TransactionRequest> {
+  public async resolveDispute(
+    args:
+      | {
+          exchangeId: BigNumberish;
+          buyerPercentBasisPoints: BigNumberish;
+          sigR: BytesLike;
+          sigS: BytesLike;
+          sigV: BigNumberish;
+          returnTxInfo: true;
+        }
+      | {
+          exchangeId: BigNumberish;
+          buyerPercentBasisPoints: BigNumberish;
+          signature: string;
+          returnTxInfo: true;
+        }
+  ): Promise<TransactionRequest>;
+  public async resolveDispute(
+    args:
+      | {
+          exchangeId: BigNumberish;
+          buyerPercentBasisPoints: BigNumberish;
+          sigR: BytesLike;
+          sigS: BytesLike;
+          sigV: BigNumberish;
+          returnTxInfo?: false | undefined;
+        }
+      | {
+          exchangeId: BigNumberish;
+          buyerPercentBasisPoints: BigNumberish;
+          signature: string;
+          returnTxInfo?: false | undefined;
+        }
+  ): Promise<TransactionResponse>;
+  public async resolveDispute(
+    args:
+      | {
+          exchangeId: BigNumberish;
+          buyerPercentBasisPoints: BigNumberish;
+          sigR: BytesLike;
+          sigS: BytesLike;
+          sigV: BigNumberish;
+          returnTxInfo?: boolean;
+        }
+      | {
+          exchangeId: BigNumberish;
+          buyerPercentBasisPoints: BigNumberish;
+          signature: string;
+          returnTxInfo?: boolean;
+        }
+  ): Promise<TransactionResponse | TransactionRequest> {
     const { returnTxInfo } = args;
-    const resolveArgs = {
-      exchangeId: args.exchangeId,
-      buyerPercentBasisPoints: args.buyerPercentBasisPoints,
-      sigR: args.sigR,
-      sigS: args.sigS,
-      sigV: args.sigV,
-      contractAddress: this._protocolDiamond,
-      web3Lib: this._web3Lib
-    } as const satisfies Parameters<typeof resolveDispute>[0];
+    const resolveArgs =
+      "signature" in args
+        ? {
+            exchangeId: args.exchangeId,
+            buyerPercentBasisPoints: args.buyerPercentBasisPoints,
+            signature: args.signature,
+            contractAddress: this._protocolDiamond,
+            web3Lib: this._web3Lib
+          }
+        : ({
+            exchangeId: args.exchangeId,
+            buyerPercentBasisPoints: args.buyerPercentBasisPoints,
+            sigR: args.sigR,
+            sigS: args.sigS,
+            sigV: args.sigV,
+            contractAddress: this._protocolDiamond,
+            web3Lib: this._web3Lib
+          } as const satisfies Parameters<typeof resolveDispute>[0]);
 
     if (returnTxInfo === true) {
       return resolveDispute({

package/src/exchanges/interface.ts

@@ -6,8 +6,12 @@ export const bosonExchangeHandlerIface = new Interface(
   abis.IBosonExchangeHandlerABI
 );
 
+export const bosonExchangeCommitHandlerIface = new Interface(
+  abis.IBosonExchangeCommitHandlerABI
+);
+
 export function encodeCommitToOffer(buyer: string, offerId: BigNumberish) {
-  return bosonExchangeHandlerIface.encodeFunctionData("commitToOffer", [
+  return bosonExchangeCommitHandlerIface.encodeFunctionData("commitToOffer", [
     buyer,
     offerId
   ]);
@@ -18,7 +22,7 @@ export function encodeCommitToConditionalOffer(
   offerId: BigNumberish,
   tokenId: BigNumberish
 ) {
-  return bosonExchangeHandlerIface.encodeFunctionData(
+  return bosonExchangeCommitHandlerIface.encodeFunctionData(
     "commitToConditionalOffer",
     [buyer, offerId, tokenId]
   );

package/src/funds/handler.ts

@@ -11,7 +11,7 @@ import { getFunds } from "./subgraph";
 
 // Overload: returnTxInfo is true -> returns TransactionRequest
 export async function depositFunds(args: {
-  sellerId: BigNumberish;
+  entityId: BigNumberish;
   fundsTokenAddress?: string;
   fundsAmount: BigNumberish;
   contractAddress: string;
@@ -21,7 +21,7 @@ export async function depositFunds(args: {
 
 // Overload: returnTxInfo is false or undefined -> returns TransactionResponse
 export async function depositFunds(args: {
-  sellerId: BigNumberish;
+  entityId: BigNumberish;
   fundsTokenAddress?: string;
   fundsAmount: BigNumberish;
   contractAddress: string;
@@ -31,7 +31,7 @@ export async function depositFunds(args: {
 
 // Implementation
 export async function depositFunds(args: {
-  sellerId: BigNumberish;
+  entityId: BigNumberish;
   fundsTokenAddress?: string;
   fundsAmount: BigNumberish;
   contractAddress: string;
@@ -49,7 +49,7 @@ export async function depositFunds(args: {
   const transactionRequest: TransactionRequest = {
     to: args.contractAddress,
     data: encodeDepositFunds(
-      args.sellerId,
+      args.entityId,
       fundsTokenAddress,
       args.fundsAmount
     ),

package/src/funds/interface.ts

@@ -5,12 +5,12 @@ import { BigNumberish } from "@ethersproject/bignumber";
 export const bosonFundsHandlerIface = new Interface(abis.IBosonFundsHandlerABI);
 
 export function encodeDepositFunds(
-  sellerId: BigNumberish,
+  entityId: BigNumberish,
   tokenAddress: string,
   amount: BigNumberish
 ) {
   return bosonFundsHandlerIface.encodeFunctionData("depositFunds", [
-    sellerId,
+    entityId,
     tokenAddress,
     amount
   ]);

package/src/funds/mixin.ts

@@ -21,8 +21,8 @@ export class FundsMixin<T extends Web3LibAdapter> extends BaseCoreSDK<T> {
 
   /**
    * Deposit funds by calling the `FundsHandlerFacet` contract.
-   * This transaction only succeeds if there is an existing seller account for connected signer.
-   * @param sellerId - ID of seller account to deposit funds for.
+   * This transaction only succeeds if there is an existing entity account for connected signer.
+   * @param entityId - ID of the account to deposit funds for.
    * @param fundsAmount - Amount of funds.
    * @param fundsTokenAddress - Address of funds token.
    * @param overrides - Optional overrides.
@@ -30,7 +30,7 @@ export class FundsMixin<T extends Web3LibAdapter> extends BaseCoreSDK<T> {
    */
   // Overload: returnTxInfo is true → returns TransactionRequest
   public async depositFunds(
-    sellerId: BigNumberish,
+    entityId: BigNumberish,
     fundsAmount: BigNumberish,
     fundsTokenAddress: string,
     overrides: Partial<{
@@ -42,7 +42,7 @@ export class FundsMixin<T extends Web3LibAdapter> extends BaseCoreSDK<T> {
 
   // Overload: returnTxInfo is false or undefined → returns TransactionResponse
   public async depositFunds(
-    sellerId: BigNumberish,
+    entityId: BigNumberish,
     fundsAmount: BigNumberish,
     fundsTokenAddress?: string,
     overrides?: Partial<{
@@ -54,7 +54,7 @@ export class FundsMixin<T extends Web3LibAdapter> extends BaseCoreSDK<T> {
 
   // Implementation
   public async depositFunds(
-    sellerId: BigNumberish,
+    entityId: BigNumberish,
     fundsAmount: BigNumberish,
     fundsTokenAddress: string = AddressZero,
     overrides: Partial<{
@@ -66,7 +66,7 @@ export class FundsMixin<T extends Web3LibAdapter> extends BaseCoreSDK<T> {
     const { returnTxInfo } = overrides;
 
     const depositArgs = {
-      sellerId,
+      entityId,
       fundsAmount,
       fundsTokenAddress,
       web3Lib: this._web3Lib,

package/src/groups/interface.ts

@@ -21,7 +21,7 @@ export function createGroupArgsToStructs(
   return [
     {
       id: "0",
-      sellerId: "0",
+      sellerId: args.sellerId,
       offerIds: args.offerIds
     },
     conditionArgsToStructs(args)

package/src/meta-tx/handler.ts

@@ -22,14 +22,20 @@ import {
   encodeOptInToSellerUpdate,
   encodeUpdateSeller
 } from "../accounts/interface";
-import { bosonExchangeHandlerIface } from "../exchanges/interface";
+import {
+  bosonExchangeCommitHandlerIface,
+  bosonExchangeHandlerIface
+} from "../exchanges/interface";
 import {
   bosonOfferHandlerIface,
   encodeCreateOffer,
   encodeCreateOfferBatch,
   encodeReserveRange
 } from "../offers/interface";
-import { prepareDataSignatureParameters } from "../utils/signature";
+import {
+  prepareDataSignatureParameters,
+  rebuildSignature
+} from "../utils/signature";
 import {
   Biconomy,
   ForwarderDomainData,
@@ -476,7 +482,7 @@ export async function signMetaTxCreateOffer(
   return signMetaTx({
     ...args,
     functionName:
-      "createOffer((uint256,uint256,uint256,uint256,uint256,uint256,address,uint8,string,string,bool,uint256,(address[],uint256[])[]),(uint256,uint256,uint256,uint256),(uint256,uint256,uint256),uint256,uint256,uint256)",
+      "createOffer((uint256,uint256,uint256,uint256,uint256,uint256,address,uint8,uint8,string,string,bool,uint256,(address[],uint256[])[],uint256),(uint256,uint256,uint256,uint256),(uint256,uint256,uint256),(uint256,address),uint256,uint256)",
     functionSignature: encodeCreateOffer(args.createOfferArgs)
   });
 }
@@ -508,7 +514,7 @@ export async function signMetaTxCreateOfferBatch(
   return signMetaTx({
     ...args,
     functionName:
-      "createOfferBatch((uint256,uint256,uint256,uint256,uint256,uint256,address,uint8,string,string,bool,uint256,(address[],uint256[])[])[],(uint256,uint256,uint256,uint256)[],(uint256,uint256,uint256)[],uint256[],uint256[],uint256[])",
+      "createOfferBatch((uint256,uint256,uint256,uint256,uint256,uint256,address,uint8,uint8,string,string,bool,uint256,(address[],uint256[])[],uint256)[],(uint256,uint256,uint256,uint256)[],(uint256,uint256,uint256)[],(uint256,address)[],uint256[],uint256[])",
     functionSignature: encodeCreateOfferBatch(args.createOffersArgs)
   });
 }
@@ -813,7 +819,7 @@ export async function signMetaTxCreateOfferWithCondition(
   return signMetaTx({
     ...args,
     functionName:
-      "createOfferWithCondition((uint256,uint256,uint256,uint256,uint256,uint256,address,uint8,string,string,bool,uint256,(address[],uint256[])[]),(uint256,uint256,uint256,uint256),(uint256,uint256,uint256),uint256,(uint8,uint8,address,uint8,uint256,uint256,uint256,uint256),uint256,uint256)",
+      "createOfferWithCondition((uint256,uint256,uint256,uint256,uint256,uint256,address,uint8,uint8,string,string,bool,uint256,(address[],uint256[])[],uint256),(uint256,uint256,uint256,uint256),(uint256,uint256,uint256),(uint256,address),(uint8,uint8,address,uint8,uint256,uint256,uint256,uint256),uint256,uint256)",
     functionSignature: encodeCreateOfferWithCondition(
       args.offerToCreate,
       args.condition
@@ -871,7 +877,7 @@ export async function signMetaTxCommitToOffer(
   return {
     ...signatureParams,
     functionName,
-    functionSignature: bosonExchangeHandlerIface.encodeFunctionData(
+    functionSignature: bosonExchangeCommitHandlerIface.encodeFunctionData(
       "commitToOffer",
       [buyerAddress, args.offerId]
     )
@@ -931,7 +937,7 @@ export async function signMetaTxCommitToConditionalOffer(
   return {
     ...signatureParams,
     functionName,
-    functionSignature: bosonExchangeHandlerIface.encodeFunctionData(
+    functionSignature: bosonExchangeCommitHandlerIface.encodeFunctionData(
       "commitToConditionalOffer",
       [buyerAddress, args.offerId, args.tokenId]
     )
@@ -999,21 +1005,25 @@ export async function signMetaTxResolveDispute(
   args: BaseMetaTxArgs & {
     exchangeId: BigNumberish;
     buyerPercent: BigNumberish;
-    counterpartySig: {
-      r: string;
-      s: string;
-      v: number;
-    };
+    counterpartySig:
+      | {
+          r: string;
+          s: string;
+          v: number;
+        }
+      | string;
   }
 ): Promise<SignedMetaTx> {
-  const functionName = "resolveDispute(uint256,uint256,bytes32,bytes32,uint8)";
+  const functionName = "resolveDispute(uint256,uint256,bytes)";
+  const counterpartySig =
+    typeof args.counterpartySig === "string"
+      ? args.counterpartySig
+      : rebuildSignature(args.counterpartySig);
 
   const disputeResolutionType = [
     { name: "exchangeId", type: "uint256" },
     { name: "buyerPercentBasisPoints", type: "uint256" },
-    { name: "sigR", type: "bytes32" },
-    { name: "sigS", type: "bytes32" },
-    { name: "sigV", type: "uint8" }
+    { name: "signature", type: "bytes" }
   ];
 
   const metaTransactionType = [
@@ -1037,9 +1047,7 @@ export async function signMetaTxResolveDispute(
     disputeResolutionDetails: {
       exchangeId: args.exchangeId.toString(),
       buyerPercentBasisPoints: args.buyerPercent.toString(),
-      sigR: args.counterpartySig.r,
-      sigS: args.counterpartySig.s,
-      sigV: args.counterpartySig.v
+      signature: counterpartySig
     }
   };
 
@@ -1058,13 +1066,7 @@ export async function signMetaTxResolveDispute(
     functionSignature: bosonDisputeHandlerIface.encodeFunctionData(
       // remove params in brackets from string
       functionName.replace(/\(([^)]*)\)[^(]*$/, ""),
-      [
-        args.exchangeId,
-        args.buyerPercent,
-        args.counterpartySig.r,
-        args.counterpartySig.s,
-        args.counterpartySig.v
-      ]
+      [args.exchangeId, args.buyerPercent, counterpartySig]
     )
   };
 }
@@ -1147,7 +1149,7 @@ export async function signMetaTxWithdrawFunds(
 
 export async function signMetaTxDepositFunds(
   args: BaseMetaTxArgs & {
-    sellerId: BigNumberish;
+    entityId: BigNumberish;
     fundsTokenAddress: string;
     fundsAmount: BigNumberish;
   }
@@ -1166,7 +1168,7 @@ export async function signMetaTxDepositFunds(
     ...args,
     functionName: "depositFunds(uint256,address,uint256)",
     functionSignature: encodeDepositFunds(
-      args.sellerId,
+      args.entityId,
       args.fundsTokenAddress,
       args.fundsAmount
     )
@@ -1268,9 +1270,11 @@ export async function relayMetaTransaction(args: {
       metaTx.params.functionName,
       metaTx.params.functionSignature,
       metaTx.params.nonce,
-      metaTx.params.sigR,
-      metaTx.params.sigS,
-      metaTx.params.sigV
+      rebuildSignature({
+        r: metaTx.params.sigR.toString(),
+        s: metaTx.params.sigS.toString(),
+        v: Number(metaTx.params.sigV)
+      })
     ],
     from: metaTx.params.userAddress
   });