@eluvio/elv-client-js 4.0.92 → 4.0.93

package/dist/src/client/ContentManagement.js

@@ -1761,14 +1761,14 @@ exports.PublishContentVersion = /*#__PURE__*/function () {
           throw Error("Pending version hash mismatch on ".concat(objectId, ": expected ").concat(objectHash, ", currently ").concat(pendingHash));
         case 19:
           if (!awaitCommitConfirmation) {
-            _context21.next = 34;
+            _context21.next = 48;
             break;
           }
           this.Log("Awaiting commit confirmation for ".concat(objectHash));
           pollingInterval = this.ethClient.Provider().pollingInterval || 500; // eslint-disable-next-line no-constant-condition
         case 22:
           if (!true) {
-            _context21.next = 34;
+            _context21.next = 48;
             break;
           }
           _context21.next = 25;
@@ -1776,15 +1776,37 @@ exports.PublishContentVersion = /*#__PURE__*/function () {
             return setTimeout(resolve, pollingInterval);
           });
         case 25:
-          _context21.next = 27;
-          return this.ContractEvents({
-            contractAddress: this.utils.HashToAddress(objectId),
-            abi: abi,
-            fromBlock: fromBlock,
-            topics: [Ethers.utils.id("VersionConfirm(address,address,string)")],
-            count: 1000
+          _context21.t0 = this;
+          _context21.t1 = this.utils.HashToAddress(objectId);
+          _context21.t2 = abi;
+          _context21.t3 = fromBlock;
+          _context21.next = 31;
+          return this.authClient.IsV3({
+            id: objectId
           });
-        case 27:
+        case 31:
+          if (!_context21.sent) {
+            _context21.next = 35;
+            break;
+          }
+          _context21.t4 = Ethers.utils.id("VersionConfirm(address,address,string)");
+          _context21.next = 36;
+          break;
+        case 35:
+          _context21.t4 = Ethers.utils.id("VersionConfirm(address,string)");
+        case 36:
+          _context21.t5 = _context21.t4;
+          _context21.t6 = [_context21.t5];
+          _context21.t7 = {
+            contractAddress: _context21.t1,
+            abi: _context21.t2,
+            fromBlock: _context21.t3,
+            topics: _context21.t6,
+            count: 1000
+          };
+          _context21.next = 41;
+          return _context21.t0.ContractEvents.call(_context21.t0, _context21.t7);
+        case 41:
           events = _context21.sent;
           confirmEvent = events.find(function (blockEvents) {
             return blockEvents.find(function (event) {
@@ -1792,72 +1814,72 @@ exports.PublishContentVersion = /*#__PURE__*/function () {
             });
           });
           if (!confirmEvent) {
-            _context21.next = 32;
+            _context21.next = 46;
             break;
           }
           // Found confirmation
           this.Log("Commit confirmed on chain: ".concat(objectHash));
-          return _context21.abrupt("break", 34);
-        case 32:
+          return _context21.abrupt("break", 48);
+        case 46:
           _context21.next = 22;
           break;
-        case 34:
+        case 48:
           if (!awaitCommitConfirmation) {
-            _context21.next = 62;
+            _context21.next = 76;
             break;
           }
           _pollingInterval = 500; // ms
           tries = 20;
-        case 37:
+        case 51:
           if (!(tries > 0)) {
-            _context21.next = 62;
+            _context21.next = 76;
             break;
           }
           h = void 0;
-          _context21.prev = 39;
-          _context21.next = 42;
+          _context21.prev = 53;
+          _context21.next = 56;
           return this.LatestVersionHashV2({
             objectId: objectId
           });
-        case 42:
+        case 56:
           h = _context21.sent;
           if (!(h === versionHash)) {
-            _context21.next = 48;
+            _context21.next = 62;
             break;
           }
           this.Log("Commit confirmed on fabric node: ".concat(versionHash));
-          return _context21.abrupt("break", 62);
-        case 48:
+          return _context21.abrupt("break", 76);
+        case 62:
           tries--;
-          _context21.next = 51;
+          _context21.next = 65;
           return new Promise(function (resolve) {
             return setTimeout(resolve, _pollingInterval);
           });
-        case 51:
-          _context21.next = 60;
+        case 65:
+          _context21.next = 74;
           break;
-        case 53:
-          _context21.prev = 53;
-          _context21.t0 = _context21["catch"](39);
-          if (!(_context21.t0.status !== 404)) {
-            _context21.next = 57;
+        case 67:
+          _context21.prev = 67;
+          _context21.t8 = _context21["catch"](53);
+          if (!(_context21.t8.status !== 404)) {
+            _context21.next = 71;
             break;
           }
-          throw _context21.t0;
-        case 57:
+          throw _context21.t8;
+        case 71:
           tries--;
-          _context21.next = 60;
+          _context21.next = 74;
           return new Promise(function (resolve) {
             return setTimeout(resolve, _pollingInterval);
           });
-        case 60:
-          _context21.next = 37;
+        case 74:
+          _context21.next = 51;
           break;
-        case 62:
+        case 76:
         case "end":
           return _context21.stop();
       }
-    }, _callee21, this, [[39, 53]]);
+    }, _callee21, this, [[53, 67]]);
   }));
   return function (_x20) {
     return _ref38.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.0.92",
+  "version": "4.0.93",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",

package/src/client/ContentManagement.js

@@ -1050,7 +1050,11 @@ exports.PublishContentVersion = async function({objectId, versionHash, awaitComm
         contractAddress: this.utils.HashToAddress(objectId),
         abi,
         fromBlock,
-        topics: [ Ethers.utils.id("VersionConfirm(address,address,string)") ],
+        topics: [
+          await this.authClient.IsV3({id: objectId}) ?
+            Ethers.utils.id("VersionConfirm(address,address,string)") :
+            Ethers.utils.id("VersionConfirm(address,string)")
+        ],
         count: 1000
       });