diff --git a/e2e/meta-tx-gateway/package.json b/e2e/meta-tx-gateway/package.json index 28eaf424b..acc60a782 100644 --- a/e2e/meta-tx-gateway/package.json +++ b/e2e/meta-tx-gateway/package.json @@ -1,6 +1,6 @@ { "name": "meta-tx-gateway", - "version": "1.7.2", + "version": "1.7.3-alpha.0", "description": "", "main": "index.js", "private": true, @@ -23,7 +23,7 @@ }, "homepage": "https://github.com/bosonprotocol/core-components#readme", "dependencies": { - "@bosonprotocol/common": "^1.26.0", + "@bosonprotocol/common": "^1.26.1-alpha.0", "cors": "^2.8.5", "dotenv": "^16.0.2", "ethers": "^5.7.0", diff --git a/e2e/tests/bundle.test.ts b/e2e/tests/bundle.test.ts index 06ade8cd8..8ce51e7f0 100644 --- a/e2e/tests/bundle.test.ts +++ b/e2e/tests/bundle.test.ts @@ -264,11 +264,8 @@ describe("Bundle e2e tests", () => { (bundles[0].items[0] as subgraph.NftItemMetadataEntity).tokenId ).toEqual(digitalItem.tokenId); expect( - (bundles[0].items[0] as subgraph.NftItemMetadataEntity).transferMethod - ).toEqual(digitalItem.transferMethod); - expect( - (bundles[0].items[0] as subgraph.NftItemMetadataEntity).transferDelay - ).toEqual(digitalItem.transferDelay); + (bundles[0].items[0] as subgraph.NftItemMetadataEntity).terms + ).toEqual(digitalItem.terms); expect( (bundles[0].items[0] as subgraph.NftItemMetadataEntity).tokenIdRange ).toBeTruthy(); diff --git a/package-lock.json b/package-lock.json index 3a7dcf349..99c13bbc9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,10 +39,10 @@ } }, "e2e/meta-tx-gateway": { - "version": "1.7.2", + "version": "1.7.3-alpha.0", "license": "ISC", "dependencies": { - "@bosonprotocol/common": "^1.26.0", + "@bosonprotocol/common": "^1.26.1-alpha.0", "cors": "^2.8.5", "dotenv": "^16.0.2", "ethers": "^5.7.0", @@ -49745,10 +49745,10 @@ }, "packages/common": { "name": "@bosonprotocol/common", - "version": "1.26.0", + "version": "1.26.1-alpha.0", "license": "Apache-2.0", "dependencies": { - "@bosonprotocol/metadata": "^1.15.0", + "@bosonprotocol/metadata": "^1.16.0-alpha.0", "@ethersproject/abi": "^5.5.0", "@ethersproject/address": "^5.5.0", "@ethersproject/bignumber": "^5.5.0", @@ -49766,10 +49766,10 @@ }, "packages/core-sdk": { "name": "@bosonprotocol/core-sdk", - "version": "1.37.0", + "version": "1.38.0-alpha.0", "license": "Apache-2.0", "dependencies": { - "@bosonprotocol/common": "^1.26.0", + "@bosonprotocol/common": "^1.26.1-alpha.0", "@ethersproject/abi": "^5.5.0", "@ethersproject/address": "^5.5.0", "@ethersproject/bignumber": "^5.5.0", @@ -49829,10 +49829,10 @@ }, "packages/eth-connect-sdk": { "name": "@bosonprotocol/eth-connect-sdk", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "license": "Apache-2.0", "dependencies": { - "@bosonprotocol/common": "^1.26.0" + "@bosonprotocol/common": "^1.26.1-alpha.0" }, "devDependencies": { "eslint": "^8.10.0", @@ -49848,10 +49848,10 @@ }, "packages/ethers-sdk": { "name": "@bosonprotocol/ethers-sdk", - "version": "1.13.0", + "version": "1.13.1-alpha.0", "license": "Apache-2.0", "dependencies": { - "@bosonprotocol/common": "^1.26.0" + "@bosonprotocol/common": "^1.26.1-alpha.0" }, "devDependencies": { "@typechain/ethers-v5": "^9.0.0", @@ -49868,10 +49868,10 @@ }, "packages/ipfs-storage": { "name": "@bosonprotocol/ipfs-storage", - "version": "1.11.1", + "version": "1.11.2-alpha.0", "license": "Apache-2.0", "dependencies": { - "@bosonprotocol/metadata": "^1.15.0", + "@bosonprotocol/metadata": "^1.16.0-alpha.0", "ipfs-http-client": "^56.0.1", "multiformats": "^9.6.4", "uint8arrays": "^3.0.0" @@ -49887,7 +49887,7 @@ }, "packages/metadata": { "name": "@bosonprotocol/metadata", - "version": "1.15.0", + "version": "1.16.0-alpha.0", "license": "Apache-2.0", "dependencies": { "schema-to-yup": "^1.11.11" @@ -49903,13 +49903,13 @@ }, "packages/react-kit": { "name": "@bosonprotocol/react-kit", - "version": "0.27.0", + "version": "0.27.1-alpha.0", "license": "Apache-2.0", "dependencies": { "@bosonprotocol/chat-sdk": "^1.3.1-alpha.9", - "@bosonprotocol/core-sdk": "^1.37.0", - "@bosonprotocol/ethers-sdk": "^1.13.0", - "@bosonprotocol/ipfs-storage": "^1.11.1", + "@bosonprotocol/core-sdk": "^1.38.0-alpha.0", + "@bosonprotocol/ethers-sdk": "^1.13.1-alpha.0", + "@bosonprotocol/ipfs-storage": "^1.11.2-alpha.0", "@davatar/react": "1.11.1", "@ethersproject/units": "5.6.0", "@glidejs/glide": "3.6.0", @@ -55011,7 +55011,7 @@ }, "packages/subgraph": { "name": "@bosonprotocol/subgraph", - "version": "1.31.0", + "version": "1.32.0-alpha.0", "license": "Apache-2.0", "dependencies": { "@graphprotocol/graph-cli": "0.26.0", @@ -56511,7 +56511,7 @@ "@bosonprotocol/common": { "version": "file:packages/common", "requires": { - "@bosonprotocol/metadata": "^1.15.0", + "@bosonprotocol/metadata": "^1.16.0-alpha.0", "@ethersproject/abi": "^5.5.0", "@ethersproject/address": "^5.5.0", "@ethersproject/bignumber": "^5.5.0", @@ -56528,7 +56528,7 @@ "@bosonprotocol/core-sdk": { "version": "file:packages/core-sdk", "requires": { - "@bosonprotocol/common": "^1.26.0", + "@bosonprotocol/common": "^1.26.1-alpha.0", "@ethersproject/abi": "^5.5.0", "@ethersproject/address": "^5.5.0", "@ethersproject/bignumber": "^5.5.0", @@ -56574,7 +56574,7 @@ "@bosonprotocol/eth-connect-sdk": { "version": "file:packages/eth-connect-sdk", "requires": { - "@bosonprotocol/common": "^1.26.0", + "@bosonprotocol/common": "^1.26.1-alpha.0", "eslint": "^8.10.0", "eth-connect": "^6.0.2", "jest": "29.6.2", @@ -56586,7 +56586,7 @@ "@bosonprotocol/ethers-sdk": { "version": "file:packages/ethers-sdk", "requires": { - "@bosonprotocol/common": "^1.26.0", + "@bosonprotocol/common": "^1.26.1-alpha.0", "@typechain/ethers-v5": "^9.0.0", "eslint": "^8.10.0", "jest": "29.6.2", @@ -56599,7 +56599,7 @@ "@bosonprotocol/ipfs-storage": { "version": "file:packages/ipfs-storage", "requires": { - "@bosonprotocol/metadata": "^1.15.0", + "@bosonprotocol/metadata": "^1.16.0-alpha.0", "@types/jest": "^29.5.4", "eslint": "^8.10.0", "ipfs-http-client": "^56.0.1", @@ -56627,9 +56627,9 @@ "version": "file:packages/react-kit", "requires": { "@bosonprotocol/chat-sdk": "^1.3.1-alpha.9", - "@bosonprotocol/core-sdk": "^1.37.0", - "@bosonprotocol/ethers-sdk": "^1.13.0", - "@bosonprotocol/ipfs-storage": "^1.11.1", + "@bosonprotocol/core-sdk": "^1.38.0-alpha.0", + "@bosonprotocol/ethers-sdk": "^1.13.1-alpha.0", + "@bosonprotocol/ipfs-storage": "^1.11.2-alpha.0", "@davatar/react": "1.11.1", "@ethersproject/units": "5.6.0", "@glidejs/glide": "3.6.0", @@ -81977,7 +81977,7 @@ "meta-tx-gateway": { "version": "file:e2e/meta-tx-gateway", "requires": { - "@bosonprotocol/common": "^1.26.0", + "@bosonprotocol/common": "^1.26.1-alpha.0", "@types/cors": "^2.8.12", "@types/express": "^4.17.13", "@types/morgan": "^1.9.3", diff --git a/packages/common/package.json b/packages/common/package.json index 95179fde0..2cdb68b2e 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@bosonprotocol/common", - "version": "1.26.0", + "version": "1.26.1-alpha.0", "description": "Common configs, types, interfaces and utilities shared by the core components of the Boson Protocol.", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", @@ -37,7 +37,7 @@ "typescript": "^5.1.6" }, "dependencies": { - "@bosonprotocol/metadata": "^1.15.0", + "@bosonprotocol/metadata": "^1.16.0-alpha.0", "@ethersproject/abi": "^5.5.0", "@ethersproject/address": "^5.5.0", "@ethersproject/bignumber": "^5.5.0", diff --git a/packages/core-sdk/package.json b/packages/core-sdk/package.json index 3a7b32ddd..599c15abc 100644 --- a/packages/core-sdk/package.json +++ b/packages/core-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@bosonprotocol/core-sdk", - "version": "1.37.0", + "version": "1.38.0-alpha.0", "description": "Facilitates interaction with the contracts and subgraphs of the Boson Protocol", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", @@ -35,7 +35,7 @@ "access": "public" }, "dependencies": { - "@bosonprotocol/common": "^1.26.0", + "@bosonprotocol/common": "^1.26.1-alpha.0", "@ethersproject/abi": "^5.5.0", "@ethersproject/address": "^5.5.0", "@ethersproject/bignumber": "^5.5.0", diff --git a/packages/core-sdk/src/metadata/bundle.graphql b/packages/core-sdk/src/metadata/bundle.graphql index 666c27e3a..a9b3e6a70 100644 --- a/packages/core-sdk/src/metadata/bundle.graphql +++ b/packages/core-sdk/src/metadata/bundle.graphql @@ -118,7 +118,7 @@ fragment BaseBundleMetadataEntityFields on BundleMetadataEntity { terms { key value - displayType + displayKey } quantity attributes { diff --git a/packages/core-sdk/src/offers/queries.graphql b/packages/core-sdk/src/offers/queries.graphql index f70509a7d..aa3e82e39 100644 --- a/packages/core-sdk/src/offers/queries.graphql +++ b/packages/core-sdk/src/offers/queries.graphql @@ -271,7 +271,7 @@ fragment BaseOfferFields on Offer { terms { key value - displayType + displayKey } quantity attributes { diff --git a/packages/core-sdk/src/subgraph.ts b/packages/core-sdk/src/subgraph.ts index 7560734ea..adaed8a52 100644 --- a/packages/core-sdk/src/subgraph.ts +++ b/packages/core-sdk/src/subgraph.ts @@ -11623,7 +11623,7 @@ export type SubscriptionUnknownItemMetadataEntityArgs = { export type Term = { __typename?: "Term"; - displayType: Scalars["String"]; + displayKey: Scalars["String"]; id: Scalars["ID"]; key: Scalars["String"]; value: Scalars["String"]; @@ -11632,26 +11632,26 @@ export type Term = { export type Term_Filter = { /** Filter for the block changed event. */ _change_block?: InputMaybe; - displayType?: InputMaybe; - displayType_contains?: InputMaybe; - displayType_contains_nocase?: InputMaybe; - displayType_ends_with?: InputMaybe; - displayType_ends_with_nocase?: InputMaybe; - displayType_gt?: InputMaybe; - displayType_gte?: InputMaybe; - displayType_in?: InputMaybe>; - displayType_lt?: InputMaybe; - displayType_lte?: InputMaybe; - displayType_not?: InputMaybe; - displayType_not_contains?: InputMaybe; - displayType_not_contains_nocase?: InputMaybe; - displayType_not_ends_with?: InputMaybe; - displayType_not_ends_with_nocase?: InputMaybe; - displayType_not_in?: InputMaybe>; - displayType_not_starts_with?: InputMaybe; - displayType_not_starts_with_nocase?: InputMaybe; - displayType_starts_with?: InputMaybe; - displayType_starts_with_nocase?: InputMaybe; + displayKey?: InputMaybe; + displayKey_contains?: InputMaybe; + displayKey_contains_nocase?: InputMaybe; + displayKey_ends_with?: InputMaybe; + displayKey_ends_with_nocase?: InputMaybe; + displayKey_gt?: InputMaybe; + displayKey_gte?: InputMaybe; + displayKey_in?: InputMaybe>; + displayKey_lt?: InputMaybe; + displayKey_lte?: InputMaybe; + displayKey_not?: InputMaybe; + displayKey_not_contains?: InputMaybe; + displayKey_not_contains_nocase?: InputMaybe; + displayKey_not_ends_with?: InputMaybe; + displayKey_not_ends_with_nocase?: InputMaybe; + displayKey_not_in?: InputMaybe>; + displayKey_not_starts_with?: InputMaybe; + displayKey_not_starts_with_nocase?: InputMaybe; + displayKey_starts_with?: InputMaybe; + displayKey_starts_with_nocase?: InputMaybe; id?: InputMaybe; id_gt?: InputMaybe; id_gte?: InputMaybe; @@ -11703,7 +11703,7 @@ export type Term_Filter = { }; export enum Term_OrderBy { - DisplayType = "displayType", + DisplayKey = "displayKey", Id = "id", Key = "key", Value = "value" @@ -12348,7 +12348,7 @@ export type GetSellerByIdQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -13742,7 +13742,7 @@ export type GetSellersQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -15540,7 +15540,7 @@ export type GetDisputeResolverByIdQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -16734,7 +16734,7 @@ export type GetDisputeResolversQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -18011,7 +18011,7 @@ export type GetOfferCollectionsQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -19187,7 +19187,7 @@ export type OfferCollectionFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -20329,7 +20329,7 @@ export type SellerFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -21982,7 +21982,7 @@ export type DisputeResolverFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -23870,7 +23870,7 @@ export type GetExchangeTokenByIdQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -24975,7 +24975,7 @@ export type GetExchangeTokensQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -26058,7 +26058,7 @@ export type ExchangeTokenFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -27312,7 +27312,7 @@ export type GetExchangeByIdQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -28499,7 +28499,7 @@ export type GetExchangesQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -29676,7 +29676,7 @@ export type ExchangeFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -31051,7 +31051,7 @@ export type GetBaseMetadataEntityByIdQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -32243,7 +32243,7 @@ export type GetBaseMetadataEntitiesQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -33425,7 +33425,7 @@ export type BaseMetadataEntityFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -34594,7 +34594,7 @@ export type BaseBaseMetadataEntityFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -35884,7 +35884,7 @@ export type GetBundleMetadataEntityByIdQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -36817,7 +36817,7 @@ export type GetBundleMetadataEntityByIdQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -37608,7 +37608,7 @@ export type GetBundleMetadataEntitiesQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -38541,7 +38541,7 @@ export type GetBundleMetadataEntitiesQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -39322,7 +39322,7 @@ export type BundleMetadataEntityFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -40243,7 +40243,7 @@ export type BundleMetadataEntityFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -41023,7 +41023,7 @@ export type BaseBundleMetadataEntityFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -41944,7 +41944,7 @@ export type BaseBundleMetadataEntityFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -42966,7 +42966,7 @@ export type GetProductV1ProductsWithVariantsQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -44181,7 +44181,7 @@ export type GetProductV1ProductsWithVariantsQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -45114,7 +45114,7 @@ export type GetProductV1ProductsWithVariantsQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -46087,7 +46087,7 @@ export type GetAllProductsWithNotVoidedVariantsQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -47302,7 +47302,7 @@ export type GetAllProductsWithNotVoidedVariantsQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -48235,7 +48235,7 @@ export type GetAllProductsWithNotVoidedVariantsQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -49222,7 +49222,7 @@ export type GetProductV1MetadataEntityByIdQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -50837,7 +50837,7 @@ export type GetProductV1MetadataEntitiesQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -52442,7 +52442,7 @@ export type ProductV1MetadataEntityFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -54034,7 +54034,7 @@ export type BaseProductV1MetadataEntityFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -55839,7 +55839,7 @@ export type BaseProductV1ProductWithVariantsFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -57054,7 +57054,7 @@ export type BaseProductV1ProductWithVariantsFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -57987,7 +57987,7 @@ export type BaseProductV1ProductWithVariantsFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -58949,7 +58949,7 @@ export type BaseProductV1ProductWithNotVoidedVariantsFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -60164,7 +60164,7 @@ export type BaseProductV1ProductWithNotVoidedVariantsFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -61097,7 +61097,7 @@ export type BaseProductV1ProductWithNotVoidedVariantsFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -62262,7 +62262,7 @@ export type GetOfferByIdQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -63443,7 +63443,7 @@ export type GetOffersQueryQuery = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -64716,7 +64716,7 @@ export type OfferFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -65772,7 +65772,7 @@ export type BaseOfferFieldsFragment = { __typename?: "Term"; key: string; value: string; - displayType: string; + displayKey: string; }> | null; attributes?: Array<{ __typename?: "MetadataAttribute"; @@ -67042,7 +67042,7 @@ export const BaseOfferFieldsFragmentDoc = gql` terms { key value - displayType + displayKey } quantity attributes { @@ -67542,7 +67542,7 @@ export const BaseBundleMetadataEntityFieldsFragmentDoc = gql` terms { key value - displayType + displayKey } quantity attributes { diff --git a/packages/eth-connect-sdk/package.json b/packages/eth-connect-sdk/package.json index 4fb2da2f6..26cabe8cf 100644 --- a/packages/eth-connect-sdk/package.json +++ b/packages/eth-connect-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@bosonprotocol/eth-connect-sdk", - "version": "1.6.0", + "version": "1.6.1-alpha.0", "description": "Implementation of the Web3LibAdapter interface and contract abstractions targeting eth-connect for the Boson Protocol.", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", @@ -30,7 +30,7 @@ "access": "public" }, "dependencies": { - "@bosonprotocol/common": "^1.26.0" + "@bosonprotocol/common": "^1.26.1-alpha.0" }, "devDependencies": { "eslint": "^8.10.0", diff --git a/packages/ethers-sdk/package.json b/packages/ethers-sdk/package.json index 8dac3a52c..297e0cdee 100644 --- a/packages/ethers-sdk/package.json +++ b/packages/ethers-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@bosonprotocol/ethers-sdk", - "version": "1.13.0", + "version": "1.13.1-alpha.0", "description": "Implementation of the Web3LibAdapter interface and contract abstractions targeting ethers for the Boson Protocol.", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", @@ -31,7 +31,7 @@ "access": "public" }, "dependencies": { - "@bosonprotocol/common": "^1.26.0" + "@bosonprotocol/common": "^1.26.1-alpha.0" }, "devDependencies": { "@typechain/ethers-v5": "^9.0.0", diff --git a/packages/ipfs-storage/package.json b/packages/ipfs-storage/package.json index f13d094e1..75311d75f 100644 --- a/packages/ipfs-storage/package.json +++ b/packages/ipfs-storage/package.json @@ -1,6 +1,6 @@ { "name": "@bosonprotocol/ipfs-storage", - "version": "1.11.1", + "version": "1.11.2-alpha.0", "description": "IPFS metadata storage implementation for building on top of the Boson Protocol.", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", @@ -38,7 +38,7 @@ "typescript": "^5.1.6" }, "dependencies": { - "@bosonprotocol/metadata": "^1.15.0", + "@bosonprotocol/metadata": "^1.16.0-alpha.0", "ipfs-http-client": "^56.0.1", "multiformats": "^9.6.4", "uint8arrays": "^3.0.0" diff --git a/packages/metadata/package.json b/packages/metadata/package.json index e9a2d67d3..bf3669362 100644 --- a/packages/metadata/package.json +++ b/packages/metadata/package.json @@ -1,6 +1,6 @@ { "name": "@bosonprotocol/metadata", - "version": "1.15.0", + "version": "1.16.0-alpha.0", "description": "Offer metadata schemas, types and tools of the Boson Protocol.", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", diff --git a/packages/metadata/src/nftItem/index.ts b/packages/metadata/src/nftItem/index.ts index 77a06ad56..088b223bf 100644 --- a/packages/metadata/src/nftItem/index.ts +++ b/packages/metadata/src/nftItem/index.ts @@ -39,15 +39,9 @@ export type NftItem = Omit & { }; quantity?: number; transferMethod?: string; - terms?: - | { - key: string; - value: string; - displayType?: string; - }[] - | { - key: string; - value: string; - display_type?: string; - }[]; + terms?: { + key: string; + value: string; + displayKey?: string; + }[]; }; diff --git a/packages/metadata/src/nftItem/schema.json b/packages/metadata/src/nftItem/schema.json index a48db421c..1636b581a 100644 --- a/packages/metadata/src/nftItem/schema.json +++ b/packages/metadata/src/nftItem/schema.json @@ -45,8 +45,7 @@ "properties": { "key": { "type": "string"}, "value": { "type": "string"}, - "displayType": { "type": "string"}, - "display_type": { "type": "string"} + "displayKey": { "type": "string"} }, "required": ["value", "key"] } diff --git a/packages/metadata/tests/nft-item/valid/full.json b/packages/metadata/tests/nft-item/valid/full.json index fc43ae62a..984613264 100644 --- a/packages/metadata/tests/nft-item/valid/full.json +++ b/packages/metadata/tests/nft-item/valid/full.json @@ -32,12 +32,14 @@ "quantity": 18, "terms": [ { - "key": "transferMethod", - "value": "safeTransferFrom(address,address,uint256)" - }, - { + "displayKey": "", "key": "transferDelay", "value": "15 days" + }, + { + "displayKey": "", + "key": "transferMethod", + "value": "safeTransferFrom(address,address,uint256)" } ] } diff --git a/packages/react-kit/package.json b/packages/react-kit/package.json index 6441460d5..05287b902 100644 --- a/packages/react-kit/package.json +++ b/packages/react-kit/package.json @@ -1,7 +1,7 @@ { "name": "@bosonprotocol/react-kit", "description": "React toolkit with smart components and hooks for building on top of the Boson Protocol.", - "version": "0.27.0", + "version": "0.27.1-alpha.0", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", "types": "./dist/cjs/index.d.ts", @@ -15,9 +15,9 @@ "license": "Apache-2.0", "dependencies": { "@bosonprotocol/chat-sdk": "^1.3.1-alpha.9", - "@bosonprotocol/core-sdk": "^1.37.0", - "@bosonprotocol/ethers-sdk": "^1.13.0", - "@bosonprotocol/ipfs-storage": "^1.11.1", + "@bosonprotocol/core-sdk": "^1.38.0-alpha.0", + "@bosonprotocol/ethers-sdk": "^1.13.1-alpha.0", + "@bosonprotocol/ipfs-storage": "^1.11.2-alpha.0", "@davatar/react": "1.11.1", "@ethersproject/units": "5.6.0", "@glidejs/glide": "3.6.0", diff --git a/packages/subgraph/package.json b/packages/subgraph/package.json index bde4679c2..12205f64b 100644 --- a/packages/subgraph/package.json +++ b/packages/subgraph/package.json @@ -1,6 +1,6 @@ { "name": "@bosonprotocol/subgraph", - "version": "1.31.0", + "version": "1.32.0-alpha.0", "dependencies": { "@graphprotocol/graph-cli": "0.26.0", "@graphprotocol/graph-ts": "^0.27.0" diff --git a/packages/subgraph/schema.graphql b/packages/subgraph/schema.graphql index 6bde9523c..1a6946f46 100644 --- a/packages/subgraph/schema.graphql +++ b/packages/subgraph/schema.graphql @@ -291,7 +291,7 @@ type Term @entity { id: ID! key: String! value: String! - displayType: String! + displayKey: String! } diff --git a/packages/subgraph/src/entities/metadata/utils.ts b/packages/subgraph/src/entities/metadata/utils.ts index 0ed986b1d..a4cbffae8 100644 --- a/packages/subgraph/src/entities/metadata/utils.ts +++ b/packages/subgraph/src/entities/metadata/utils.ts @@ -56,9 +56,9 @@ export function saveMetadataAttributes( export function getTermId( key: string, value: string, - displayType: string + displayKey: string ): string { - return `${key}-${value}-${displayType}`; + return `${key}-${value}-${displayKey}`; } export function saveTerms( @@ -70,11 +70,8 @@ export function saveTerms( const termsObj = termsArray[i]; const key = convertToString(termsObj.get("key")); const value = convertToString(termsObj.get("value")); - let displayType = convertToString(termsObj.get("displayType")); - if (!displayType) { - displayType = convertToString(termsObj.get("display_type")); - } - const termId = getTermId(key, value, displayType); + const displayKey = convertToString(termsObj.get("displayKey")); + const termId = getTermId(key, value, displayKey); let term = Term.load(termId); @@ -84,7 +81,7 @@ export function saveTerms( term.key = key; term.value = value; - term.displayType = displayType; + term.displayKey = displayKey; term.save(); savedTermsIds.push(termId); }