Merge branch 'main' into phygitals

bosonprotocol · Mar 5, 2024 · 554daac · 554daac
2 parents 65f2ca2 + e4e7a6d
commit 554daac
Show file tree

Hide file tree

Showing 19 changed files with 137 additions and 148 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -271,7 +271,7 @@ fragment BaseOfferFields on Offer {
           terms {
             key
             value
-            displayType
+            displayKey
           }
           quantity
           attributes {