@bosonprotocol/core-sdk 1.12.0-alpha.8 → 1.12.0

package/dist/esm/offers/renderContractualAgreement.js

@@ -1,9 +1,9 @@
 import * as yup from "yup";
 import { BigNumber } from "@ethersproject/bignumber";
-import { subgraph } from "..";
 import { utils } from "@bosonprotocol/common";
 import Mustache from "mustache";
-import { formatUnits } from "ethers/lib/utils";
+import { formatUnits } from "@ethersproject/units";
+import { MetadataType } from "../subgraph";
 export class InvalidOfferDataError extends Error {
     missingProperties;
     constructor(missingProperties) {
@@ -114,7 +114,7 @@ export async function renderContractualAgreementForOffer(existingOfferData) {
     if (!existingOfferData.metadata) {
         throw new Error(`Offer Metadata is undefined`);
     }
-    if (existingOfferData.metadata.type !== subgraph.MetadataType.ProductV1) {
+    if (existingOfferData.metadata.type !== MetadataType.ProductV1) {
         throw new Error(`Invalid Offer Metadata: Type is not supported: '${existingOfferData.metadata.type}'`);
     }
     if (!existingOfferData.metadata.exchangePolicy) {

package/dist/esm/offers/renderContractualAgreement.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderContractualAgreement.js","sourceRoot":"","sources":["../../../src/offers/renderContractualAgreement.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"renderContractualAgreement.js","sourceRoot":"","sources":["../../../src/offers/renderContractualAgreement.ts"],"names":[],"mappings":"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"}

package/dist/esm/utils/signature.d.ts

@@ -0,0 +1,21 @@
+import { Web3LibAdapter } from "@bosonprotocol/common";
+declare type SignatureArgs = {
+    web3Lib: Web3LibAdapter;
+    verifyingContractAddress: string;
+    chainId: number;
+    customSignatureType?: Record<string, unknown>;
+    primaryType: string;
+    message: Record<string, unknown>;
+};
+export declare function prepareDataSignatureParameters(args: SignatureArgs): Promise<{
+    r: string;
+    s: string;
+    v: number;
+}>;
+export declare function getSignatureParameters(signature: string): {
+    r: string;
+    s: string;
+    v: number;
+};
+export {};
+//# sourceMappingURL=signature.d.ts.map

package/dist/esm/utils/signature.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"signature.d.ts","sourceRoot":"","sources":["../../../src/utils/signature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAIvD,aAAK,aAAa,GAAG;IACnB,OAAO,EAAE,cAAc,CAAC;IACxB,wBAAwB,EAAE,MAAM,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9C,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC,CAAC;AAEF,wBAAsB,8BAA8B,CAAC,IAAI,EAAE,aAAa;;;;GAkCvE;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM;;;;EAevD"}

package/dist/esm/utils/signature.js

@@ -0,0 +1,47 @@
+import { isHexString, hexZeroPad } from "@ethersproject/bytes";
+import { BigNumber } from "@ethersproject/bignumber";
+export async function prepareDataSignatureParameters(args) {
+    const domainType = [
+        { name: "name", type: "string" },
+        { name: "version", type: "string" },
+        { name: "verifyingContract", type: "address" },
+        { name: "salt", type: "bytes32" }
+    ];
+    const domainData = {
+        name: "BosonProtocolDiamond",
+        version: "V1",
+        verifyingContract: args.verifyingContractAddress,
+        salt: hexZeroPad(BigNumber.from(args.chainId).toHexString(), 32)
+    };
+    const signatureTypes = {
+        EIP712Domain: domainType,
+        ...args.customSignatureType
+    };
+    const dataToSign = JSON.stringify({
+        types: signatureTypes,
+        domain: domainData,
+        primaryType: args.primaryType,
+        message: args.message
+    });
+    const signer = await args.web3Lib.getSignerAddress();
+    const signature = await args.web3Lib.send("eth_signTypedData_v4", [
+        signer,
+        dataToSign
+    ]);
+    return getSignatureParameters(signature);
+}
+export function getSignatureParameters(signature) {
+    if (!isHexString(signature)) {
+        throw new Error(`Value "${signature}" is not a valid hex string`);
+    }
+    signature = signature.substring(2);
+    const r = "0x" + signature.substring(0, 64);
+    const s = "0x" + signature.substring(64, 128);
+    const v = parseInt(signature.substring(128, 130), 16);
+    return {
+        r,
+        s,
+        v
+    };
+}
+//# sourceMappingURL=signature.js.map

package/dist/esm/utils/signature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"signature.js","sourceRoot":"","sources":["../../../src/utils/signature.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAWrD,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAAC,IAAmB;IACtE,MAAM,UAAU,GAAG;QACjB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE;QAChC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE;QACnC,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,SAAS,EAAE;QAC9C,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;KAClC,CAAC;IAEF,MAAM,UAAU,GAAG;QACjB,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,IAAI;QACb,iBAAiB,EAAE,IAAI,CAAC,wBAAwB;QAChD,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,EAAE,CAAC;KACjE,CAAC;IAEF,MAAM,cAAc,GAAG;QACrB,YAAY,EAAE,UAAU;QACxB,GAAG,IAAI,CAAC,mBAAmB;KAC5B,CAAC;IAEF,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,KAAK,EAAE,cAAc;QACrB,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;IACrD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE;QAChE,MAAM;QACN,UAAU;KACX,CAAC,CAAC;IAEH,OAAO,sBAAsB,CAAC,SAAS,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,SAAiB;IACtD,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,UAAU,SAAS,6BAA6B,CAAC,CAAC;KACnE;IAED,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC5C,MAAM,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC9C,MAAM,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;IAEtD,OAAO;QACL,CAAC;QACD,CAAC;QACD,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/esm/utils/tokenInfoManager.d.ts

@@ -7,6 +7,9 @@ export interface ITokenInfo {
 export interface ITokenInfoManager {
     getExchangeTokenInfo: (tokenAddress: string) => Promise<ITokenInfo>;
 }
+export declare const NATIVE_TOKENS: {
+    [key: number]: ITokenInfo;
+};
 export declare class TokenInfoManager implements ITokenInfoManager {
     private _tokenInfos;
     private _web3Lib;

package/dist/esm/utils/tokenInfoManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tokenInfoManager.d.ts","sourceRoot":"","sources":["../../../src/utils/tokenInfoManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAIvD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iBAAiB;IAChC,oBAAoB,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CACrE;AAqDD,qBAAa,gBAAiB,YAAW,iBAAiB;IACxD,OAAO,CAAC,WAAW,CAAiC;IACpD,OAAO,CAAC,QAAQ,CAAiB;gBAEd,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc;IAQ9C,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;CAmB7E"}
+{"version":3,"file":"tokenInfoManager.d.ts","sourceRoot":"","sources":["../../../src/utils/tokenInfoManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAIvD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iBAAiB;IAChC,oBAAoB,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CACrE;AAED,eAAO,MAAM,aAAa,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;CAiDtD,CAAC;AAEF,qBAAa,gBAAiB,YAAW,iBAAiB;IACxD,OAAO,CAAC,WAAW,CAAiC;IACpD,OAAO,CAAC,QAAQ,CAAiB;gBAEd,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc;IAQ9C,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;CAmB7E"}

package/dist/esm/utils/tokenInfoManager.js

@@ -1,6 +1,6 @@
 import { AddressZero } from "@ethersproject/constants";
-import { erc20 } from "..";
-const NATIVE_TOKENS = {
+import { getDecimals, getName, getSymbol } from "../erc20/handler";
+export const NATIVE_TOKENS = {
     1: {
         // Ethereum Mainnet
         name: "Ether",
@@ -67,9 +67,9 @@ export class TokenInfoManager {
                 contractAddress: tokenAddress
             };
             const [decimals, name, symbol] = await Promise.all([
-                erc20.handler.getDecimals(args),
-                erc20.handler.getName(args),
-                erc20.handler.getSymbol(args)
+                getDecimals(args),
+                getName(args),
+                getSymbol(args)
             ]);
             this._tokenInfos.set(tokenAddress.toLowerCase(), {
                 decimals,

package/dist/esm/utils/tokenInfoManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"tokenInfoManager.js","sourceRoot":"","sources":["../../../src/utils/tokenInfoManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC;AAY3B,MAAM,aAAa,GAAkC;IACnD,CAAC,EAAE;QACD,mBAAmB;QACnB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,KAAK;KACd;IACD,CAAC,EAAE;QACD,mBAAmB;QACnB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,KAAK;KACd;IACD,CAAC,EAAE;QACD,mBAAmB;QACnB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,KAAK;KACd;IACD,CAAC,EAAE;QACD,kBAAkB;QAClB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,KAAK;KACd;IACD,GAAG,EAAE;QACH,kBAAkB;QAClB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,OAAO;KAChB;IACD,KAAK,EAAE;QACL,iBAAiB;QACjB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,OAAO;KAChB;IACD,IAAI,EAAE;QACJ,eAAe;QACf,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,KAAK;KACd;IACD,KAAK,EAAE;QACL,gBAAgB;QAChB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,KAAK;KACd;CACF,CAAC;AAEF,MAAM,OAAO,gBAAgB;IACnB,WAAW,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC5C,QAAQ,CAAiB;IAEjC,YAAmB,OAAe,EAAE,OAAuB;QACzD,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,6BAA6B,OAAO,GAAG,CAAC,CAAC;SAC1D;QACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC;QAC1D,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,YAAoB;QACpD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,EAAE;YACrD,MAAM,IAAI,GAAG;gBACX,OAAO,EAAE,IAAI,CAAC,QAAQ;gBACtB,eAAe,EAAE,YAAY;aAC9B,CAAC;YACF,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACjD,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC;gBAC/B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;gBAC3B,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;aAC9B,CAAC,CAAC;YACH,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE;gBAC/C,QAAQ;gBACR,IAAI;gBACJ,MAAM;aACP,CAAC,CAAC;SACJ;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IAC1D,CAAC;CACF"}
+{"version":3,"file":"tokenInfoManager.js","sourceRoot":"","sources":["../../../src/utils/tokenInfoManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAYnE,MAAM,CAAC,MAAM,aAAa,GAAkC;IAC1D,CAAC,EAAE;QACD,mBAAmB;QACnB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,KAAK;KACd;IACD,CAAC,EAAE;QACD,mBAAmB;QACnB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,KAAK;KACd;IACD,CAAC,EAAE;QACD,mBAAmB;QACnB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,KAAK;KACd;IACD,CAAC,EAAE;QACD,kBAAkB;QAClB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,KAAK;KACd;IACD,GAAG,EAAE;QACH,kBAAkB;QAClB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,OAAO;KAChB;IACD,KAAK,EAAE;QACL,iBAAiB;QACjB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,OAAO;KAChB;IACD,IAAI,EAAE;QACJ,eAAe;QACf,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,KAAK;KACd;IACD,KAAK,EAAE;QACL,gBAAgB;QAChB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,KAAK;KACd;CACF,CAAC;AAEF,MAAM,OAAO,gBAAgB;IACnB,WAAW,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC5C,QAAQ,CAAiB;IAEjC,YAAmB,OAAe,EAAE,OAAuB;QACzD,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,6BAA6B,OAAO,GAAG,CAAC,CAAC;SAC1D;QACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC;QAC1D,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,YAAoB;QACpD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,EAAE;YACrD,MAAM,IAAI,GAAG;gBACX,OAAO,EAAE,IAAI,CAAC,QAAQ;gBACtB,eAAe,EAAE,YAAY;aAC9B,CAAC;YACF,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACjD,WAAW,CAAC,IAAI,CAAC;gBACjB,OAAO,CAAC,IAAI,CAAC;gBACb,SAAS,CAAC,IAAI,CAAC;aAChB,CAAC,CAAC;YACH,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE;gBAC/C,QAAQ;gBACR,IAAI;gBACJ,MAAM;aACP,CAAC,CAAC;SACJ;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IAC1D,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bosonprotocol/core-sdk",
-  "version": "1.12.0-alpha.8",
+  "version": "1.12.0",
   "description": "> TODO: description",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -33,7 +33,7 @@
     "access": "restricted"
   },
   "dependencies": {
-    "@bosonprotocol/common": "^1.9.0-alpha.8",
+    "@bosonprotocol/common": "^1.9.0",
     "@ethersproject/abi": "^5.5.0",
     "@ethersproject/address": "^5.5.0",
     "@ethersproject/bignumber": "^5.5.0",
@@ -43,7 +43,8 @@
     "cross-fetch": "^3.1.5",
     "graphql": "^16.5.0",
     "graphql-request": "^4.3.0",
-    "mustache": "^4.2.0"
+    "mustache": "^4.2.0",
+    "yup": "^0.32.11"
   },
   "devDependencies": {
     "eslint": "^8.10.0",
@@ -53,5 +54,5 @@
     "ts-jest": "^27.1.3",
     "typescript": "^4.5.5"
   },
-  "gitHead": "d93decaaf99ce399767d3e2f8e681746135c2ee3"
+  "gitHead": "f06848f53b45df78d54419ab1858d259f3cd7429"
 }

package/src/accounts/index.ts

@@ -5,6 +5,8 @@ export * as handler from "./handler";
 export * as subgraph from "./subgraph";
 export * from "./types";
 
-export const validation = {
+export const validation: {
+  createSellerArgsSchema: typeof utils.validation.createSellerArgsSchema;
+} = {
   createSellerArgsSchema: utils.validation.createSellerArgsSchema
 };

package/src/core-sdk.ts

@@ -574,6 +574,31 @@ export class CoreSDK {
     );
   }
 
+  /**
+   * Utility method to retrieve the created `sellerId` from logs after calling `createSeller`
+   * or `createOfferAndSeller`.
+   * @param logs - Logs to search in.
+   * @returns Created offer id.
+   */
+  public getCreatedSellerIdFromLogs(logs: Log[]): string | null {
+    const sellerId = getValueFromLogs({
+      iface: accounts.iface.bosonAccountHandlerIface,
+      logs,
+      eventArgsKey: "sellerId",
+      eventName: "SellerCreated"
+    });
+
+    return (
+      sellerId ||
+      getValueFromLogs({
+        iface: orchestration.iface.bosonOrchestrationHandlerIface,
+        logs,
+        eventArgsKey: "sellerId",
+        eventName: "SellerCreated"
+      })
+    );
+  }
+
   /**
    * Voids an existing offer by calling the `OfferHandlerFacet` contract.
    * This transaction only succeeds if the connected signer is the `operator`.
@@ -1057,37 +1082,19 @@ export class CoreSDK {
     });
   }
 
-  public async signMutualAgreement(args: {
-    exchangeId: string;
-    buyerPercent: string;
+  public async signDisputeResolutionProposal(args: {
+    exchangeId: BigNumberish;
+    buyerPercent: BigNumberish;
   }) {
-    // Set the message Type, needed for signature
-    const resolutionType = [
-      { name: "exchangeId", type: "uint256" },
-      { name: "buyerPercent", type: "uint256" }
-    ];
-
-    const customSignatureType = {
-      Resolution: resolutionType
-    };
-
-    const message = {
-      exchangeId: args.exchangeId,
-      buyerPercent: args.buyerPercent
-    };
-
     if (this._chainId === undefined) {
       this._chainId = await this._web3Lib.getChainId();
     }
 
-    return metaTx.handler.prepareDataSignatureParameters({
+    return disputes.handler.signResolutionProposal({
+      ...args,
       web3Lib: this._web3Lib,
-      metaTxHandlerAddress: this._protocolDiamond,
-      chainId: this._chainId,
-      customTransactionType: customSignatureType,
-      primaryType: "Resolution",
-      message,
-      nonce: "" // not used in this case
+      contractAddress: this._protocolDiamond,
+      chainId: this._chainId
     });
   }
 

package/src/disputes/handler.ts

@@ -1,6 +1,7 @@
 import { Web3LibAdapter, TransactionResponse } from "@bosonprotocol/common";
 import { BigNumberish } from "@ethersproject/bignumber";
 import { BytesLike } from "@ethersproject/bytes";
+
 import {
   encodeRaiseDispute,
   encodeDecideDispute,
@@ -13,6 +14,7 @@ import {
   encodeResolveDispute,
   encodeRetractDispute
 } from "./interface";
+import { prepareDataSignatureParameters } from "../utils/signature";
 
 export async function raiseDispute(args: {
   exchangeId: BigNumberish;
@@ -130,3 +132,32 @@ export async function expireEscalatedDispute(args: {
     data: encodeExpireEscalatedDispute(args.exchangeId)
   });
 }
+
+export async function signResolutionProposal(args: {
+  exchangeId: BigNumberish;
+  buyerPercent: BigNumberish;
+  contractAddress: string;
+  web3Lib: Web3LibAdapter;
+  chainId: number;
+}) {
+  const customSignatureType = {
+    Resolution: [
+      { name: "exchangeId", type: "uint256" },
+      { name: "buyerPercent", type: "uint256" }
+    ]
+  };
+
+  const message = {
+    exchangeId: args.exchangeId,
+    buyerPercent: args.buyerPercent
+  };
+
+  return prepareDataSignatureParameters({
+    message,
+    customSignatureType,
+    web3Lib: args.web3Lib,
+    verifyingContractAddress: args.contractAddress,
+    chainId: args.chainId,
+    primaryType: "Resolution"
+  });
+}

package/src/exchanges/handler.ts

@@ -48,6 +48,7 @@ export async function commitToOffer(
   }
 
   return args.web3Lib.sendTransaction({
+    from: args.buyer,
     to: args.contractAddress,
     data: encodeCommitToOffer(args.buyer, args.offerId),
     value: offer.exchangeToken.address === AddressZero ? offer.price : "0"

package/src/meta-tx/handler.ts

@@ -1,9 +1,8 @@
 import { Web3LibAdapter } from "@bosonprotocol/common";
-import { isHexString, hexZeroPad } from "@ethersproject/bytes";
-import { BigNumber, BigNumberish } from "@ethersproject/bignumber";
+import { BigNumberish } from "@ethersproject/bignumber";
 
 import { bosonExchangeHandlerIface } from "../exchanges/interface";
-import { bosonFundsHandlerIface } from "../funds/interface";
+import { prepareDataSignatureParameters } from "../utils/signature";
 
 type BaseMetaTxArgs = {
   web3Lib: Web3LibAdapter;
@@ -26,7 +25,7 @@ export async function signExecuteMetaTx(
     { name: "functionSignature", type: "bytes" }
   ];
 
-  const customTransactionType = {
+  const customSignatureType = {
     MetaTransaction: metaTransactionType
   };
 
@@ -42,7 +41,8 @@ export async function signExecuteMetaTx(
 
   return prepareDataSignatureParameters({
     ...args,
-    customTransactionType,
+    verifyingContractAddress: args.metaTxHandlerAddress,
+    customSignatureType,
     primaryType: "MetaTransaction",
     message
   });
@@ -68,7 +68,7 @@ export async function signExecuteMetaTxCommitToOffer(
     { name: "offerDetails", type: "MetaTxOfferDetails" }
   ];
 
-  const customTransactionType = {
+  const customSignatureType = {
     MetaTxCommitToOffer: metaTransactionType,
     MetaTxOfferDetails: offerType
   };
@@ -88,7 +88,8 @@ export async function signExecuteMetaTxCommitToOffer(
 
   const signatureParams = await prepareDataSignatureParameters({
     ...args,
-    customTransactionType,
+    verifyingContractAddress: args.metaTxHandlerAddress,
+    customSignatureType,
     primaryType: "MetaTxCommitToOffer",
     message
   });
@@ -162,7 +163,7 @@ export async function signExecuteMetaTxRaiseDispute(
     { name: "disputeDetails", type: "MetaTxDisputeDetails" }
   ];
 
-  const customTransactionType = {
+  const customSignatureType = {
     MetaTxDispute: metaTransactionType,
     MetaTxDisputeDetails: disputeType
   };
@@ -181,7 +182,8 @@ export async function signExecuteMetaTxRaiseDispute(
   // TODO: encode function data when adding dispute resolver module
   return prepareDataSignatureParameters({
     ...args,
-    customTransactionType,
+    verifyingContractAddress: args.metaTxHandlerAddress,
+    customSignatureType,
     primaryType: "MetaTxDispute",
     message
   });
@@ -214,7 +216,7 @@ export async function signExecuteMetaTxResolveDispute(
     { name: "disputeResolutionDetails", type: "MetaTxDisputeResolutionDetails" }
   ];
 
-  const customTransactionType = {
+  const customSignatureType = {
     MetaTxDisputeResolution: metaTransactionType,
     MetaTxDisputeResolutionDetails: disputeResolutionType
   };
@@ -236,7 +238,8 @@ export async function signExecuteMetaTxResolveDispute(
   // TODO: encode function data when adding dispute resolver module
   return prepareDataSignatureParameters({
     ...args,
-    customTransactionType,
+    verifyingContractAddress: args.metaTxHandlerAddress,
+    customSignatureType,
     primaryType: "MetaTxDisputeResolution",
     message
   });
@@ -265,7 +268,7 @@ export async function signExecuteMetaTxWithdrawFunds(
     { name: "fundDetails", type: "MetaTxFundDetails" }
   ];
 
-  const customTransactionType = {
+  const customSignatureType = {
     MetaTxFund: metaTransactionType,
     MetaTxFundDetails: fundType
   };
@@ -284,7 +287,8 @@ export async function signExecuteMetaTxWithdrawFunds(
 
   const signatureParams = await prepareDataSignatureParameters({
     ...args,
-    customTransactionType,
+    verifyingContractAddress: args.metaTxHandlerAddress,
+    customSignatureType,
     primaryType: "MetaTxFund",
     message
   });
@@ -322,7 +326,7 @@ function makeExchangeMetaTxSigner(
       { name: "exchangeDetails", type: "MetaTxExchangeDetails" }
     ];
 
-    const customTransactionType = {
+    const customSignatureType = {
       MetaTxExchange: metaTransactionType,
       MetaTxExchangeDetails: exchangeType
     };
@@ -341,7 +345,8 @@ function makeExchangeMetaTxSigner(
 
     const signatureParams = await prepareDataSignatureParameters({
       ...args,
-      customTransactionType,
+      verifyingContractAddress: args.metaTxHandlerAddress,
+      customSignatureType,
       primaryType: "MetaTxExchange",
       message
     });
@@ -357,62 +362,3 @@ function makeExchangeMetaTxSigner(
     };
   };
 }
-
-export async function prepareDataSignatureParameters(
-  args: BaseMetaTxArgs & {
-    customTransactionType?: Record<string, unknown>;
-    primaryType: string;
-    message: Record<string, unknown>;
-  }
-) {
-  const domainType = [
-    { name: "name", type: "string" },
-    { name: "version", type: "string" },
-    { name: "verifyingContract", type: "address" },
-    { name: "salt", type: "bytes32" }
-  ];
-
-  const domainData = {
-    name: "BosonProtocolDiamond",
-    version: "V1",
-    verifyingContract: args.metaTxHandlerAddress,
-    salt: hexZeroPad(BigNumber.from(args.chainId).toHexString(), 32)
-  };
-
-  const metaTxTypes = {
-    EIP712Domain: domainType,
-    ...args.customTransactionType
-  };
-
-  const dataToSign = JSON.stringify({
-    types: metaTxTypes,
-    domain: domainData,
-    primaryType: args.primaryType,
-    message: args.message
-  });
-
-  const signer = await args.web3Lib.getSignerAddress();
-  const signature = await args.web3Lib.send("eth_signTypedData_v4", [
-    signer,
-    dataToSign
-  ]);
-
-  return getSignatureParameters(signature);
-}
-
-export function getSignatureParameters(signature: string) {
-  if (!isHexString(signature)) {
-    throw new Error(`Value "${signature}" is not a valid hex string`);
-  }
-
-  signature = signature.substring(2);
-  const r = "0x" + signature.substring(0, 64);
-  const s = "0x" + signature.substring(64, 128);
-  const v = parseInt(signature.substring(128, 130), 16);
-
-  return {
-    r,
-    s,
-    v
-  };
-}

package/src/offers/getOfferStatus.ts

@@ -1,4 +1,4 @@
-import { subgraph } from "..";
+import { OfferFieldsFragment } from "../subgraph";
 
 export enum OfferState {
   VOIDED = "VOIDED",
@@ -7,7 +7,7 @@ export enum OfferState {
   VALID = "VALID"
 }
 
-export function getOfferStatus(offer: subgraph.OfferFieldsFragment) {
+export function getOfferStatus(offer: OfferFieldsFragment) {
   const toTimeStamp = (numberString: string) => Number(numberString) * 1000;
   const timeNow = Date.now();
 

package/src/offers/index.ts

@@ -8,6 +8,8 @@ export * from "./types";
 export * from "./getOfferStatus";
 export * from "./renderContractualAgreement";
 
-export const validation = {
+export const validation: {
+  createOfferArgsSchema: typeof utils.validation.createOfferArgsSchema;
+} = {
   createOfferArgsSchema: utils.validation.createOfferArgsSchema
 };

package/src/offers/interface.ts

@@ -54,7 +54,8 @@ export function argsToOfferDatesStruct(
   const {
     validFromDateInMS,
     validUntilDateInMS,
-    voucherRedeemableFromDateInMS
+    voucherRedeemableFromDateInMS,
+    voucherRedeemableUntilDateInMS
   } = args;
 
   return {
@@ -63,10 +64,9 @@ export function argsToOfferDatesStruct(
     voucherRedeemableFrom: utils.timestamp.msToSec(
       voucherRedeemableFromDateInMS
     ),
-    voucherRedeemableUntil:
-      // NOTE: Field `voucherRedeemableUntil` not yet fully supported in protocol.
-      // Therefore converting to `voucherValid` field.
-      "0"
+    voucherRedeemableUntil: utils.timestamp.msToSec(
+      voucherRedeemableUntilDateInMS
+    )
   };
 }
 
@@ -75,22 +75,13 @@ export function argsToOfferDurationsStruct(
 ): Partial<OfferDurationsStruct> {
   const {
     fulfillmentPeriodDurationInMS,
-    voucherRedeemableUntilDateInMS,
-    voucherRedeemableFromDateInMS,
     voucherValidDurationInMS = 0,
     resolutionPeriodDurationInMS
   } = args;
 
   return {
     fulfillmentPeriod: utils.timestamp.msToSec(fulfillmentPeriodDurationInMS),
-    voucherValid: utils.timestamp.msToSec(
-      voucherValidDurationInMS ||
-        // NOTE: Field `voucherRedeemableUntil` not yet fully supported in protocol.
-        // Therefore converting to `voucherValid` field.
-        BigNumber.from(voucherRedeemableUntilDateInMS).sub(
-          BigNumber.from(voucherRedeemableFromDateInMS)
-        )
-    ),
+    voucherValid: utils.timestamp.msToSec(voucherValidDurationInMS),
     resolutionPeriod: utils.timestamp.msToSec(resolutionPeriodDurationInMS)
   };
 }