@eluvio/elv-client-js 3.1.83 → 3.1.84

package/dist/src/RemoteSigner.js

@@ -54,7 +54,7 @@ function (_Ethers$Signer) {
   _createClass(RemoteSigner, [{
     key: "Initialize",
     value: function Initialize() {
-      var _ref2, addr, eth, token, keys;
+      var _ref2, addr, eth, token, keys, address;
 
       return _regeneratorRuntime.async(function Initialize$(_context) {
         while (1) {
@@ -91,7 +91,7 @@ function (_Ethers$Signer) {
 
             case 10:
               if (this.address) {
-                _context.next = 15;
+                _context.next = 16;
                 break;
               }
 
@@ -106,13 +106,19 @@ function (_Ethers$Signer) {
 
             case 13:
               keys = _context.sent;
-              this.address = Utils.HashToAddress(keys.eth[0]);
+              address = keys.eth[0];
 
-            case 15:
+              if (address && address.startsWith("0x")) {
+                this.address = address;
+              } else {
+                this.address = Utils.HashToAddress(keys.eth[0]);
+              }
+
+            case 16:
               this.id = this.address ? "ikms".concat(Utils.AddressToHash(this.address)) : undefined;
               this.signer = this.provider.getSigner(this.address);
 
-            case 17:
+            case 18:
             case "end":
               return _context.stop();
           }

package/dist/src/Utils.js

@@ -21,6 +21,8 @@ var BigNumber = require("bignumber.js")["default"];
 var VarInt = require("varint");
 
 var URI = require("urijs");
+
+var keccak256 = require("ethers").utils.keccak256;
 /**
  * @namespace
  * @description This is a utility namespace mostly containing functions for managing
@@ -163,11 +165,13 @@ var Utils = {
    * Convert contract address to multiformat hash
    *
    * @param {string} address - Address of contract
+   * @param {boolean} key - Whether or not the first param is a public key. Defaults to address type
    *
    * @returns {string} - Hash of contract address
    */
   AddressToHash: function AddressToHash(address) {
-    address = address.replace("0x", "");
+    var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    address = address.replace(key ? "0x04" : "0x", "");
     return bs58.encode(Buffer.from(address, "hex"));
   },
 
@@ -208,12 +212,14 @@ var Utils = {
    * Convert any content fabric ID to the corresponding contract address
    *
    * @param {string} hash - Hash to convert to address
+   * @param {boolean} key - Whether or not the first param is a key. Defaults to address type
    *
    * @returns {string} - Contract address of item
    */
   HashToAddress: function HashToAddress(hash) {
-    hash = hash.substr(4);
-    return Utils.FormatAddress("0x" + bs58.decode(hash).toString("hex"));
+    var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    hash = key ? hash : hash.substr(4);
+    return Utils.FormatAddress((key ? "0x04" : "0x") + bs58.decode(hash).toString("hex"));
   },
 
   /**
@@ -667,6 +673,20 @@ var Utils = {
         return JSON.parse(JSON.stringify(value));
     }
   },
+
+  /**
+   * Converts the given string to a public address
+   *
+   * @param key - Public key to convert to a public address
+   *
+   * @returns {string} - the public address
+   */
+  PublicKeyToAddress: function PublicKeyToAddress(key) {
+    var keyData = new Uint8Array(Buffer.from(key.replace("0x04", ""), "hex"));
+    var keccakHash = keccak256(keyData);
+    var address = "0x" + keccakHash.slice(26);
+    return Utils.FormatAddress(address);
+  },
   PLATFORM_NODE: "node",
   PLATFORM_WEB: "web",
   PLATFORM_REACT_NATIVE: "react-native",

package/dist/src/client/ContentManagement.js

@@ -32,8 +32,7 @@ var _require = require("../Validation"),
     ValidateVersion = _require.ValidateVersion,
     ValidateWriteToken = _require.ValidateWriteToken,
     ValidateParameters = _require.ValidateParameters,
-    ValidatePresence = _require.ValidatePresence,
-    ValidateAddress = _require.ValidateAddress;
+    ValidatePresence = _require.ValidatePresence;
 
 exports.SetVisibility = function _callee(_ref) {
   var id, visibility, hasSetVisibility, event;
@@ -1246,7 +1245,6 @@ exports.CopyContentObject = function _callee12(_ref15) {
  * @param {string} libraryId - ID of the library
  * @param {string} objectId - ID of the object
  * @param {string} publicKey - Public key for the target cap
- * @param {string} publicAddress - Public address for the target cap key
  * @param {string} writeToken - Write token for the content object - If specified, info will be retrieved from the write draft instead of creating a new draft and finalizing
  *
  * @returns {Promise<Object>}
@@ -1254,37 +1252,37 @@ exports.CopyContentObject = function _callee12(_ref15) {
 
 
 exports.CreateNonOwnerCap = function _callee13(_ref17) {
-  var objectId, libraryId, publicKey, publicAddress, writeToken, userCapKey, userCapValue, userConk, targetUserCapKey, targetUserCapValue, finalize;
+  var objectId, libraryId, publicKey, writeToken, userCapKey, userCapValue, userConk, publicAddress, targetUserCapKey, targetUserCapValue, finalize;
   return _regeneratorRuntime.async(function _callee13$(_context14) {
     while (1) {
       switch (_context14.prev = _context14.next) {
         case 0:
-          objectId = _ref17.objectId, libraryId = _ref17.libraryId, publicKey = _ref17.publicKey, publicAddress = _ref17.publicAddress, writeToken = _ref17.writeToken;
-          publicAddress = ValidateAddress(publicAddress);
+          objectId = _ref17.objectId, libraryId = _ref17.libraryId, publicKey = _ref17.publicKey, writeToken = _ref17.writeToken;
           userCapKey = "eluv.caps.iusr".concat(this.utils.AddressToHash(this.signer.address));
-          _context14.next = 5;
+          _context14.next = 4;
           return _regeneratorRuntime.awrap(this.ContentObjectMetadata({
             objectId: objectId,
             libraryId: libraryId,
             metadataSubtree: userCapKey
           }));
 
-        case 5:
+        case 4:
           userCapValue = _context14.sent;
 
           if (userCapValue) {
-            _context14.next = 8;
+            _context14.next = 7;
             break;
           }
 
           throw Error("No user cap found for current user");
 
-        case 8:
-          _context14.next = 10;
+        case 7:
+          _context14.next = 9;
           return _regeneratorRuntime.awrap(this.Crypto.DecryptCap(userCapValue, this.signer.signingKey.privateKey));
 
-        case 10:
+        case 9:
           userConk = _context14.sent;
+          publicAddress = this.utils.PublicKeyToAddress(publicKey);
           targetUserCapKey = "eluv.caps.iusr".concat(this.utils.AddressToHash(publicAddress));
           _context14.next = 14;
           return _regeneratorRuntime.awrap(this.Crypto.EncryptConk(userConk, publicKey));

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "3.1.83",
+  "version": "3.1.84",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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

package/src/RemoteSigner.js

@@ -55,7 +55,13 @@ class RemoteSigner extends Ethers.Signer {
         })
       );
 
-      this.address = Utils.HashToAddress(keys.eth[0]);
+      const address = keys.eth[0];
+
+      if(address && address.startsWith("0x")) {
+        this.address = address;
+      } else {
+        this.address = Utils.HashToAddress(keys.eth[0]);
+      }
     }
 
     this.id = this.address ? `ikms${Utils.AddressToHash(this.address)}` : undefined;

package/src/Utils.js

@@ -5,6 +5,10 @@ const BigNumber = require("bignumber.js").default;
 const VarInt = require("varint");
 const URI = require("urijs");
 
+const {
+  keccak256
+} = require("ethers").utils;
+
 /**
  * @namespace
  * @description This is a utility namespace mostly containing functions for managing
@@ -149,11 +153,12 @@ const Utils = {
    * Convert contract address to multiformat hash
    *
    * @param {string} address - Address of contract
+   * @param {boolean} key - Whether or not the first param is a public key. Defaults to address type
    *
    * @returns {string} - Hash of contract address
    */
-  AddressToHash: (address) => {
-    address = address.replace("0x", "");
+  AddressToHash: (address, key=false) => {
+    address = address.replace(key ? "0x04" : "0x", "");
     return bs58.encode(Buffer.from(address, "hex"));
   },
 
@@ -194,12 +199,13 @@ const Utils = {
    * Convert any content fabric ID to the corresponding contract address
    *
    * @param {string} hash - Hash to convert to address
+   * @param {boolean} key - Whether or not the first param is a key. Defaults to address type
    *
    * @returns {string} - Contract address of item
    */
-  HashToAddress: (hash) => {
-    hash = hash.substr(4);
-    return Utils.FormatAddress("0x" + bs58.decode(hash).toString("hex"));
+  HashToAddress: (hash, key=false) => {
+    hash = key ? hash : hash.substr(4);
+    return Utils.FormatAddress((key ? "0x04" : "0x") + bs58.decode(hash).toString("hex"));
   },
 
   /**
@@ -505,6 +511,21 @@ const Utils = {
     }
   },
 
+  /**
+   * Converts the given string to a public address
+   *
+   * @param key - Public key to convert to a public address
+   *
+   * @returns {string} - the public address
+   */
+  PublicKeyToAddress: (key) => {
+    const keyData = new Uint8Array(Buffer.from(key.replace("0x04", ""), "hex"));
+    const keccakHash = keccak256(keyData);
+    const address = "0x" + keccakHash.slice(26);
+
+    return Utils.FormatAddress(address);
+  },
+
   PLATFORM_NODE: "node",
   PLATFORM_WEB: "web",
   PLATFORM_REACT_NATIVE: "react-native",

package/src/client/ContentManagement.js

@@ -22,7 +22,6 @@ const {
   ValidateWriteToken,
   ValidateParameters,
   ValidatePresence,
-  ValidateAddress
 } = require("../Validation");
 
 exports.SetVisibility = async function({id, visibility}) {
@@ -691,13 +690,11 @@ exports.CopyContentObject = async function({libraryId, originalVersionHash, opti
  * @param {string} libraryId - ID of the library
  * @param {string} objectId - ID of the object
  * @param {string} publicKey - Public key for the target cap
- * @param {string} publicAddress - Public address for the target cap key
  * @param {string} writeToken - Write token for the content object - If specified, info will be retrieved from the write draft instead of creating a new draft and finalizing
  *
  * @returns {Promise<Object>}
  */
-exports.CreateNonOwnerCap = async function({objectId, libraryId, publicKey, publicAddress, writeToken}) {
-  publicAddress = ValidateAddress(publicAddress);
+exports.CreateNonOwnerCap = async function({objectId, libraryId, publicKey, writeToken}) {
   const userCapKey = `eluv.caps.iusr${this.utils.AddressToHash(this.signer.address)}`;
   const userCapValue = await this.ContentObjectMetadata({objectId, libraryId, metadataSubtree: userCapKey});
 
@@ -707,6 +704,8 @@ exports.CreateNonOwnerCap = async function({objectId, libraryId, publicKey, publ
 
   const userConk = await this.Crypto.DecryptCap(userCapValue, this.signer.signingKey.privateKey);
 
+  const publicAddress = this.utils.PublicKeyToAddress(publicKey);
+
   const targetUserCapKey = `eluv.caps.iusr${this.utils.AddressToHash(publicAddress)}`;
   const targetUserCapValue = await this.Crypto.EncryptConk(userConk, publicKey);
 

package/testScripts/InitializeTenant.js

@@ -16,7 +16,6 @@ const reportTypes = [
 
 const liveTypes = [
   { name: "Eluvio LIVE Drop Event Site", spec: require("../typeSpecs/DropEventSite") },
-  { name: "Eluvio LIVE Event Site", spec: require("../typeSpecs/EventSite") },
   { name: "Eluvio LIVE Marketplace", spec: require("../typeSpecs/Marketplace") },
   { name: "Eluvio LIVE Tenant", spec: require("../typeSpecs/EventTenant") },
   { name: "NFT Collection", spec: require("../typeSpecs/NFTCollection") },