@eluvio/elv-client-js 3.2.45 → 4.0.1

package/src/ElvClient.js

@@ -130,7 +130,8 @@ class ElvClient {
    * @param {number} fabricVersion - The version of the target content fabric
    * @param {Array<string>} fabricURIs - A list of full URIs to content fabric nodes
    * @param {Array<string>} ethereumURIs - A list of full URIs to ethereum nodes
-   * @param {Array<string>} ethereumURIs - A list of full URIs to auth service endpoints
+   * @param {Array<string>} authServiceURIs - A list of full URIs to auth service endpoints
+   * @param {Array<string>=} searchURIs - A list of full URIs to search service endpoints
    * @param {number=} ethereumContractTimeout=10 - Number of seconds to wait for contract calls
    * @param {string=} trustAuthorityId - (OAuth) The ID of the trust authority to use for OAuth authentication
    * @param {string=} staticToken - Static token that will be used for all authorization in place of normal auth
@@ -147,6 +148,7 @@ class ElvClient {
     fabricURIs,
     ethereumURIs,
     authServiceURIs,
+    searchURIs,
     ethereumContractTimeout = 10,
     trustAuthorityId,
     staticToken,
@@ -169,6 +171,7 @@ class ElvClient {
     this.fabricURIs = fabricURIs;
     this.authServiceURIs = authServiceURIs;
     this.ethereumURIs = ethereumURIs;
+    this.searchURIs = searchURIs;
     this.ethereumContractTimeout = ethereumContractTimeout;
 
     this.trustAuthorityId = trustAuthorityId;
@@ -230,6 +233,8 @@ class ElvClient {
         authServiceURIs = authServiceURIs.filter(filterHTTPS);
       }
 
+      const searchURIs = fabricInfo.network.services.search || [];
+
       const fabricVersion = Math.max(...(fabricInfo.network.api_versions || [2]));
 
       return {
@@ -241,6 +246,7 @@ class ElvClient {
         ethereumURIs,
         authServiceURIs,
         kmsURIs: kmsUrls,
+        searchURIs,
         fabricVersion
       };
     } catch(error) {
@@ -326,6 +332,7 @@ class ElvClient {
       fabricURIs,
       ethereumURIs,
       authServiceURIs,
+      searchURIs,
       fabricVersion
     } = await ElvClient.Configuration({
       configUrl,
@@ -340,6 +347,7 @@ class ElvClient {
       fabricURIs,
       ethereumURIs,
       authServiceURIs,
+      searchURIs,
       ethereumContractTimeout,
       trustAuthorityId,
       staticToken,
@@ -421,7 +429,7 @@ class ElvClient {
       throw Error("Unable to change region: Configuration URL not set");
     }
 
-    const {fabricURIs, ethereumURIs, authServiceURIs} = await ElvClient.Configuration({
+    const {fabricURIs, ethereumURIs, authServiceURIs, searchURIs} = await ElvClient.Configuration({
       configUrl: this.configUrl,
       region
     });
@@ -429,6 +437,7 @@ class ElvClient {
     this.authServiceURIs = authServiceURIs;
     this.fabricURIs = fabricURIs;
     this.ethereumURIs = ethereumURIs;
+    this.searchURIs = searchURIs;
 
     this.HttpClient.uris = fabricURIs;
     this.HttpClient.uriIndex = 0;
@@ -438,7 +447,8 @@ class ElvClient {
 
     return {
       fabricURIs,
-      ethereumURIs
+      ethereumURIs,
+      searchURIs
     };
   }
 
@@ -998,7 +1008,7 @@ class ElvClient {
 
     ValidatePresence("message", message);
 
-    return await this.Crypto.EncryptConk(message, publicKey || this.signer.signingKey.keyPair.publicKey);
+    return await this.Crypto.EncryptConk(message, publicKey || this.signer._signingKey().publicKey);
   }
 
   /**
@@ -1016,7 +1026,7 @@ class ElvClient {
 
     ValidatePresence("message", message);
 
-    return await this.Crypto.DecryptCap(message, this.signer.signingKey.privateKey);
+    return await this.Crypto.DecryptCap(message, this.signer._signingKey().privateKey);
   }
 
   /**
@@ -1061,6 +1071,7 @@ class ElvClient {
       "GenerateWallet",
       "InitializeClients",
       "Log",
+      "PersonalSign",
       "SetRemoteSigner",
       "SetSigner",
       "SetSignerFromWeb3Provider",

package/src/ElvWallet.js

@@ -7,8 +7,6 @@ class ElvWallet {
    * NOTE: It is recommended to initialize wallets from the ElvClient, not using this constructor
    *
    * @see ElvClient#GenerateWallet()
-   *
-   * @param {string} providerUrl - URL of blockchain provider
    */
   constructor(provider) {
     this.provider = provider;
@@ -21,7 +19,7 @@ class ElvWallet {
    * @returns {string} - Space-separated list of random words
    */
   GenerateMnemonic() {
-    return Ethers.utils.HDNode.entropyToMnemonic(Ethers.utils.randomBytes(16));
+    return Ethers.Wallet.createRandom().mnemonic.phrase;
   }
 
   /**

package/src/EthClient.js

@@ -39,7 +39,7 @@ class EthClient {
     // HTTP client for making misc calls to elv-master
     this.HttpClient = new HttpClient({uris: this.ethereumURIs, debug: this.debug});
 
-    Ethers.errors.setLogLevel("error");
+    //Ethers.errors.setLogLevel("error");
   }
 
   SetEthereumURIs(uris) {
@@ -234,7 +234,7 @@ class EthClient {
 
     contract = contract || this.Contract({contractAddress, abi, cacheContract, overrideCachedContract});
 
-    abi = contract.interface.abi;
+    abi = contract.interface.fragments;
 
     // Automatically format contract arguments
     if(formatArguments) {
@@ -262,7 +262,7 @@ class EthClient {
         Args: [${methodArgs.join(", ")}]`
     );
 
-    const methodAbi = contract.interface.abi.find(method => method.name === methodName);
+    const methodAbi = contract.interface.fragments.find(method => method.name === methodName);
 
     // Lock if performing a transaction
     if(!methodAbi || !methodAbi.constant) {
@@ -278,7 +278,7 @@ class EthClient {
       let success = false;
       while(!success) {
         try {
-          result = await contract.functions[methodName](...methodArgs, overrides);
+          result = await contract[methodName](...methodArgs, overrides);
           success = true;
         } catch(error) {
           if(error.code === -32000 || error.code === "REPLACEMENT_UNDERPRICED") {
@@ -343,9 +343,15 @@ class EthClient {
 
       if(methodEvent) {
         methodEvent.logs = methodEvent.logs.map(log => {
+          let parsedLogs = {};
+          try {
+            parsedLogs = contract.interface.parseLog(log);
+          // eslint-disable-next-line no-empty
+          } catch(error) {}
+
           return {
             ...log,
-            ...(contract.interface.parseLog(log))
+            ...parsedLogs
           };
         });
 
@@ -378,10 +384,13 @@ class EthClient {
     const contractInterface = new Ethers.utils.Interface(abi);
     // Loop through logs to find the desired log
     for(const log of event.logs) {
-      const parsedLog = contractInterface.parseLog(log);
-      if(parsedLog && parsedLog.name === eventName) {
-        return parsedLog;
-      }
+      try {
+        const parsedLog = contractInterface.parseLog(log);
+        if(parsedLog && parsedLog.name === eventName) {
+          return parsedLog;
+        }
+      // eslint-disable-next-line no-empty
+      } catch(error) {}
     }
   }
 
@@ -400,7 +409,7 @@ class EthClient {
       throw Error(`${methodName} failed - Log not present in transaction`);
     }
 
-    const newContractAddress = eventLog.values[eventValue];
+    const newContractAddress = eventLog.args[eventValue];
 
     return {
       contractAddress: Utils.FormatAddress(newContractAddress),

package/src/FrameClient.js

@@ -243,7 +243,7 @@ class FrameClient {
       "DeleteUserMetadata",
       "MergeUserMetadata",
       "ReplaceUserMetadata",
-      "UserMetadata"
+      "UserMetadata",
     ];
   }
 
@@ -268,6 +268,13 @@ class FrameClient {
     ];
   }
 
+  // List of methods that are defined separately in FrameClient
+  OverriddenMethods() {
+    return [
+      "UploadFiles"
+    ];
+  }
+
   // List of allowed methods available to frames
   // This should match ElvClient.FrameAvailableMethods()
   // ElvClient will also reject any disallowed methods
@@ -334,6 +341,7 @@ class FrameClient {
       "CreateContentObject",
       "CreateContentType",
       "CreateEncryptionConk",
+      "CreateFabricToken",
       "CreateFileDirectories",
       "CreateFileUploadJob",
       "CreateLinks",
@@ -377,6 +385,7 @@ class FrameClient {
       "FinalizeUploadJob",
       "FormatContractArguments",
       "GenerateStateChannelToken",
+      "GenerateSignedLinkToken",
       "GetBalance",
       "InitializeAuthPolicy",
       "IssueNTPCode",
@@ -440,7 +449,6 @@ class FrameClient {
       "UpdateContentObjectGraph",
       "UpdateNTPInstance",
       "UploadFileData",
-      /*"UploadFiles",*/ //Override
       "UploadFilesFromS3",
       "UploadJobStatus",
       "UploadPart",

package/src/HttpClient.js

@@ -14,8 +14,8 @@ class HttpClient {
     this.draftURIs = {};
   }
 
-  BaseURI() {
-    return new URI(this.uris[this.uriIndex]);
+  BaseURI(url) {
+    return new URI(url || this.uris[this.uriIndex]);
   }
 
   static Fetch(url, params={}) {
@@ -49,9 +49,11 @@ class HttpClient {
     headers={},
     attempts=0,
     failover=true,
-    forceFailover=false
+    forceFailover=false,
+    nodeUrl
   }) {
-    let baseURI = this.BaseURI();
+    // if nodeUrl passed in, restrict communication to that node only (unless previously recorded write token is found in next step)
+    let baseURI = this.BaseURI(nodeUrl);
 
     // If URL contains a write token, it must go to the correct server and can not fail over
     const writeTokenMatch = path.replace(/^\//, "").match(/(qlibs\/ilib[a-zA-Z0-9]+|q|qid)\/(tqw__[a-zA-Z0-9]+)/);
@@ -105,7 +107,7 @@ class HttpClient {
 
     if(!response.ok) {
       // Fail over if not a write token request, the response was a server error, and we haven't tried all available nodes
-      if(!writeToken && ((failover && parseInt(response.status) >= 500) || forceFailover) && attempts < this.uris.length) {
+      if(!writeToken && !nodeUrl && ((failover && parseInt(response.status) >= 500) || forceFailover) && attempts < this.uris.length) {
         // Server error - Try next node
         this.Log(`HttpClient failing over from ${this.BaseURI()}: ${attempts + 1} attempts`, true);
         this.uriIndex = (this.uriIndex + 1) % this.uris.length;

package/src/client/ContentAccess.js

@@ -2372,7 +2372,7 @@ exports.CreateEncryptionConk = async function({libraryId, objectId, versionHash,
     });
 
   if(existingUserCap) {
-    this.encryptionConks[objectId] = await this.Crypto.DecryptCap(existingUserCap, this.signer.signingKey.privateKey);
+    this.encryptionConks[objectId] = await this.Crypto.DecryptCap(existingUserCap, this.signer._signingKey().privateKey);
   } else {
     this.encryptionConks[objectId] = await this.Crypto.GeneratePrimaryConk({
       spaceId: this.contentSpaceId,
@@ -2384,7 +2384,7 @@ exports.CreateEncryptionConk = async function({libraryId, objectId, versionHash,
       objectId,
       writeToken,
       metadataSubtree: capKey,
-      metadata: await this.Crypto.EncryptConk(this.encryptionConks[objectId], this.signer.signingKey.publicKey)
+      metadata: await this.Crypto.EncryptConk(this.encryptionConks[objectId], this.signer._signingKey().publicKey)
     });
   }
 
@@ -2475,7 +2475,7 @@ exports.EncryptionConk = async function({libraryId, objectId, versionHash, write
       });
 
     if(existingUserCap) {
-      this.encryptionConks[objectId] = await this.Crypto.DecryptCap(existingUserCap, this.signer.signingKey.privateKey);
+      this.encryptionConks[objectId] = await this.Crypto.DecryptCap(existingUserCap, this.signer._signingKey().privateKey);
     } else if(writeToken) {
       await this.CreateEncryptionConk({libraryId, objectId, versionHash, writeToken, createKMSConk: false});
     } else {

package/src/client/ContentManagement.js

@@ -656,7 +656,7 @@ exports.CopyContentObject = async function({libraryId, originalVersionHash, opti
   const userCapKey = `eluv.caps.iusr${this.utils.AddressToHash(this.signer.address)}`;
 
   if(metadata[userCapKey]) {
-    const userConkKey = await this.Crypto.DecryptCap(metadata[userCapKey], this.signer.signingKey.privateKey);
+    const userConkKey = await this.Crypto.DecryptCap(metadata[userCapKey], this.signer._signingKey().privateKey);
     userConkKey.qid = objectId;
 
     await this.ReplaceMetadata({
@@ -664,7 +664,7 @@ exports.CopyContentObject = async function({libraryId, originalVersionHash, opti
       objectId,
       writeToken,
       metadataSubtree: userCapKey,
-      metadata: await this.Crypto.EncryptConk(userConkKey, this.signer.signingKey.publicKey)
+      metadata: await this.Crypto.EncryptConk(userConkKey, this.signer._signingKey().publicKey)
     });
   }
 
@@ -709,7 +709,7 @@ exports.CreateNonOwnerCap = async function({objectId, libraryId, publicKey, writ
     throw Error("No user cap found for current user");
   }
 
-  const userConk = await this.Crypto.DecryptCap(userCapValue, this.signer.signingKey.privateKey);
+  const userConk = await this.Crypto.DecryptCap(userCapValue, this.signer._signingKey().privateKey);
 
   const publicAddress = this.utils.PublicKeyToAddress(publicKey);
 
@@ -749,6 +749,7 @@ exports.CreateNonOwnerCap = async function({objectId, libraryId, publicKey, writ
  * @param {object=} options -
  * meta: New metadata for the object - will be merged into existing metadata if specified
  * type: New type for the object - Object ID, version hash or name of type
+ * nodeUrl: Node URL to use in HTTP call
  *
  * @returns {Promise<object>} - Response containing the object ID and write token of the draft, as well as URL of node handling the draft
  */
@@ -778,7 +779,8 @@ exports.EditContentObject = async function({libraryId, objectId, options={}}) {
     headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true}),
     method: "POST",
     path: path,
-    body: options
+    body: options,
+    nodeUrl: options.nodeUrl
   });
 
   const actualUrl = new URL(rawEditResponse.url);
@@ -1052,7 +1054,7 @@ exports.PublishContentVersion = async function({objectId, versionHash, awaitComm
       });
 
       const confirmEvent = events.find(blockEvents =>
-        blockEvents.find(event => objectHash === (event && event.values && event.values.objectHash))
+        blockEvents.find(event => objectHash === (event && event.args && event.args.objectHash))
       );
 
       if(confirmEvent) {

package/src/client/Contracts.js

@@ -455,7 +455,7 @@ exports.ExtractEventFromLogs = function({abi, event, eventName}) {
  */
 exports.ExtractValueFromEvent = function({abi, event, eventName, eventValue}) {
   const eventLog = this.ethClient.ExtractEventFromLogs({abi, event, eventName, eventValue});
-  return eventLog ? eventLog.values[eventValue] : undefined;
+  return eventLog ? eventLog.args[eventValue] : undefined;
 };
 
 exports.FormatBlockNumbers = async function({fromBlock, toBlock, count=10}) {

package/testScripts/Test.js

@@ -2,50 +2,21 @@ const { ElvClient } = require("../src/ElvClient");
 const { ElvWalletClient } = require("../src/walletClient/index");
 const ClientConfiguration = require("../TestConfiguration.json");
 
+const ethers = require("ethers");
+
 const Test = async () => {
   try {
-    /*
-    const client = await ElvClient.FromConfigurationUrl({
-      configUrl: ClientConfiguration["config-url"]
+
+    const client = await ElvClient.FromNetworkName({
+      networkName: "demo"
     });
 
-    let wallet = client.GenerateWallet();
-    let signer = wallet.AddAccount({
+    const wallet = client.GenerateWallet();
+    const signer = wallet.AddAccount({
       privateKey: process.env.PRIVATE_KEY
     });
 
     client.SetSigner({signer});
-
-     */
-    //const idToken = "eyJraWQiOiJjcGltY29yZV8wOTI1MjAxNSIsInZlciI6IjEuMCIsInppcCI6IkRlZmxhdGUiLCJzZXIiOiIxLjAifQ..-hVeBqfPm9f0dsZ_.h7ECJlFBsX1y8rfAVanFXoper2YBRd_yH3HyJiyV5fZJ-GGxMJR8y7gP_YIWS1D-zps4fR2QkFZ1j7DZKHQwZH0kOkCq-OYyNvLDHulF-uIY1HW9U-yfpyPO2K6Ukr0QcUvGASB7RyqqVLhvDAxCBYTpm4vEHo9DQrVal--9YlkdGogeF6HLLfYoFFCGdjb5korzaQIKyWTP4LsDDTZXITcCjHaCR9GC8rNHOybLy58IbEjukvJzooKpaRxzp20OuKr96-TDApKpklpCDCgiCsCvnOj5-CxhI10rs4frsFKF4s4d2RAa93RLplzy2SLJkg9zRe6cyezp9APZYGRUHb2wjEK8YXH0-_Uus48OIfPJQIbA-BatMHZUMTUJ9ZnYRCIL2FrIRu3QcaBR1KL2DYOJLVC3uQvNwUYV0_Yxr4CgooP2e6wb0Y61d5qU_O649XjIXIqHn0slr9lcAufIrG1or5D9Gc-yliF9BCoRZQi3Zgm80L6T3imO0XT8J3abTJpBJ9PtoW5cADPKEXz5GAENkjjay3YUyC4ZX_3u0ZdaNTOd8JAL6wKQRI3lBfJS_77MkTk8ea2JDCX4MJjYCIVOpIo_YVNOmx9cQEPSZiQ5.ZPc2LOM-vuHeZBrETCCOaA";
-    //const idToken = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Inlwd1ZUbXJkWENkYU5tcjAzVGRDaCJ9.eyJodHRwczovL2F1dGguY29udGVudGZhYnJpYy5pby9nZW8iOnsiY291bnRyeV9jb2RlIjoiVVMiLCJjb3VudHJ5X2NvZGUzIjoiVVNBIiwiY291bnRyeV9uYW1lIjoiVW5pdGVkIFN0YXRlcyIsImNpdHlfbmFtZSI6IkZvbHNvbSIsImxhdGl0dWRlIjozOC42NzExLCJsb25naXR1ZGUiOi0xMjEuMTQ5NSwidGltZV96b25lIjoiQW1lcmljYS9Mb3NfQW5nZWxlcyIsImNvbnRpbmVudF9jb2RlIjoiTkEiLCJzdWJkaXZpc2lvbl9jb2RlIjoiQ0EiLCJzdWJkaXZpc2lvbl9uYW1lIjoiQ2FsaWZvcm5pYSJ9LCJuaWNrbmFtZSI6ImtldmluKzciLCJuYW1lIjoia2V2aW4rN0BlbHV2LmlvIiwicGljdHVyZSI6Imh0dHBzOi8vcy5ncmF2YXRhci5jb20vYXZhdGFyL2ZkNDMxN2Y4ZjdmMzBjNTVkZTA2YTI5Y2ExY2I2OWYxP3M9NDgwJnI9cGcmZD1odHRwcyUzQSUyRiUyRmNkbi5hdXRoMC5jb20lMkZhdmF0YXJzJTJGa2UucG5nIiwidXBkYXRlZF9hdCI6IjIwMjItMDctMjJUMjE6NTU6MjkuOTQ4WiIsImVtYWlsIjoia2V2aW4rN0BlbHV2LmlvIiwiZW1haWxfdmVyaWZpZWQiOmZhbHNlLCJpc3MiOiJodHRwczovL2F1dGguY29udGVudGZhYnJpYy5pby8iLCJzdWIiOiJhdXRoMHw2MTY2NzcxNzg5OWI5MjAwNzBmMzRhYzQiLCJhdWQiOiJPTnl1YlA5ckZJNUJIem1ZZ2xRS0JaMWJCYml5b0IzUyIsImlhdCI6MTY1ODUyNzA1NywiZXhwIjoxNjU4NTYzMDU3LCJub25jZSI6Ilh6a3pUakF1VW5CRFgwVTVkR1pxU0dWK2JHazFjVXArUlZOamJWTlhlbFZzUzJSSWFUZE9hSEJsT1E9PSJ9.nLH00sOatOcuIv-QPgCp6Pjm565RpLqqy3VOtzJt9p2rSsIBgJxfl6j1zuFQV_H5UquYTx15BNN3_WglqVXF7U-aCb7ozsYsQCl4nv8rjumkla2pRUGCFt89B7-NR8yGXr9eak6IgE6ADe6uqiM10CWmxp8BI3Z1PficNGVDUcwmrTW_IeDFyqTw_gedDVAeYcd79xMGR5exqiHD6P2AljXKAXzNaaAVrRbBp1FBrNZnuD97k-EDta6G6lr1qqN1Gc2oS2vTrfjPjmHMBtz99_UYSrfPjPSrRMpPi9Vt3YTzEBTb-BTOKG1SSfBVHkxOqIRO1ZlNxE_bPCMJXwhSVA"
-    //const idToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6Ilg1ZVhrNHh5b2pORnVtMWtsMll0djhkbE5QNC1jNTdkTzZRR1RWQndhTmsifQ.eyJleHAiOjE2NTg1MjkwMTQsIm5iZiI6MTY1ODUyODcxNCwidmVyIjoiMS4wIiwiaXNzIjoiaHR0cHM6Ly93ZGNiMmMuYjJjbG9naW4uY29tL3RmcC9mYWVhYTg5ZS02YTA1LTRjMzEtOGJkNS01MGRlNWNkNGQyZTEvYjJjXzFfbXNfc2lnbl91cF9pbi92Mi4wLyIsInN1YiI6IjVhYWIyOWNiLWRiZDMtNDM1ZS04MzViLTlmYmFkYTBkODg2MyIsImF1ZCI6ImFjYjQ3MjMzLTk3ZDUtNGFjMy04OWQzLTdkMTUzNjFjMjYzNiIsImlhdCI6MTY1ODUyODcxNCwiYXV0aF90aW1lIjoxNjU4NTI4NzAxLCJpZHAiOiJsaXZlLmNvbSIsImVtYWlscyI6WyJrZXZpbkBlbHV2LmlvIl0sInRmcCI6IkIyQ18xX21zX3NpZ25fdXBfaW4ifQ.H9-YrUQFDBM8potZpGJsNA1roQ15SiBUg40_C9XVy5LQ6thGKuM7TzxJj1ALViwLTEL1ytL5r6g8r0tVYWOiQwfU1W7m7m0rK4D6VJ-pby69o0f4jZaqdWLak-ALncxAl1IOaxtDD2vpmx8XTT8Qabp8DImzK9xzc0bAUirPERUK08lJ3LR8bZjH2TaLMvEii9i-Ss0kZoSvdZI_a4xQqXcU2knJ-2Ds-S-upAAq70lMnSlmG16-MGHM2ZGtz7w6O2FoS9CRs0QI9FBtziSEVMAVigKIMLtWcJwPOnFDeCv_qY2TpOabUzyjfm0DZDlcQRnNjV6i0LfwYLyNWGmcHg";
-    const idToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6Ilg1ZVhrNHh5b2pORnVtMWtsMll0djhkbE5QNC1jNTdkTzZRR1RWQndhTmsifQ.eyJleHAiOjE2NTg1MzAyMjYsIm5iZiI6MTY1ODUyOTkyNiwidmVyIjoiMS4wIiwiaXNzIjoiaHR0cHM6Ly93ZGNiMmMuYjJjbG9naW4uY29tL3RmcC9mYWVhYTg5ZS02YTA1LTRjMzEtOGJkNS01MGRlNWNkNGQyZTEvYjJjXzFfbXNfc2lnbl91cF9pbi92Mi4wLyIsInN1YiI6IjVhYWIyOWNiLWRiZDMtNDM1ZS04MzViLTlmYmFkYTBkODg2MyIsImF1ZCI6ImFjYjQ3MjMzLTk3ZDUtNGFjMy04OWQzLTdkMTUzNjFjMjYzNiIsImlhdCI6MTY1ODUyOTkyNiwiYXV0aF90aW1lIjoxNjU4NTI5OTA2LCJpZHAiOiJsaXZlLmNvbSIsImVtYWlscyI6WyJrZXZpbkBlbHV2LmlvIl0sInRmcCI6IkIyQ18xX21zX3NpZ25fdXBfaW4ifQ.H1rbbrKCzU2dkdWe62GCTlOHACLbr8IV8UDiL1nukyerGrBVq_LtguLJAOjKO1jBClyJDOTMgI9y1wGb1zHdF2tCeN75wNwXCUUC5hn_TcemLOgp-haAEMC7KFFdR-4K_5A7IUUW9IqOQciE5DKNCKRDOKVNsDoMg7eV3VFp8QSeSCp7OGWL9FI1dWLmD6D_uoHfyYxE96LPrB-VCveCThQgsLMb6QE072S05w8ZM8CGxbLXcgKWG3VVaKT95e1e0NlDWQYlQQGFMBirUISpA3D82q3Wm4QlrANfGv49oypdnj-T4Uclu6pVnNwLvCIisj5w2GLobiyyyqMhEEsI1Q";
-
-    const client = await ElvWalletClient.Initialize({
-      network: "demo",
-      mode: "staging"
-    });
-
-    /*
-    console.log(
-      await client.AuthenticateOAuth({
-        idToken,
-        signerURIs: [
-          "https://wlt.stg.svc.eluv.io"
-        ]
-      })
-    );
-
-     */
-
-    await client.Authenticate({
-      token: "DYxK5cLMW5ofVh3pU23TmbAzkpFAsYrQQLsantU3uHFCJgyAjNoRHE7HvSCbQzZx1F33JM65R6oWZ1ZLYPEUhfA3WrnN9emo69A6AAKyFNBecKSFn3T6PP5MxMMPZRwN6AgwmuRgZMJQthF1xo7cMUqVwZCXtdHARYSrTHoRe3QMPggd6EJ6MzK7WHv2Sb7MPGGyVCR8uC4mK9SbncNm77Fj4H2LWxQpQggnF579GWv3SwAYiUBhbtgnfw6WEzyo1ZmBTV8vSkMiDAyBoMC138nokWNZc6DkpBNkyn6z3GwszoPsdXezKv7vANEVF6rrD3odbjosJpRoWbeEoPkebjoVySTgU8ywJybCDzeoFcg2XC1FQ4nyBhv5o3UVyXWispw3hN7oNs65vt9DaXmXwy45HzG3vL7PNdK8qviBg5XttCHUxkQ2aeYXTXcUzBYJ34PgDTXPBUwrj7a5FBa3gyC42eu48DAyxaFtV6GC5SXJCczTgQW6DPTrXiwzyEkBbVCoyDbMepaAA5MWH5WmpeWWzuexbHhKd3qW2ukWMHyjJpwAy1aUMZXGrAx3eGjTTmev342DqsV8ECHw9zPuzKv7MufkU7A9N9Wgi6jWoZXZvbMySxuRo81CV7XQZ6Zvcfy2xXFbtu5rgYA1xxhZaGZBioMUgT3HwEo1eqJuvs7r1QW3t1mMx9zbAJDTJtHFsYu4nkvyrDHQwDgKvQmnzSDhUs7yxeKeVKeFi2wy4QkXz56VJKxp3CtB9gM8qMLP3eUg1B3BRaNH8uPmy7qVYn3wn9epwPA2fDwR6MbunU5C4kx7rTbZmiQtKW4VUVP8iL6MvVy6Wx3NEXCeTmaSDz2BAfkrv7zFmC9ERyeqfrPvCYDyeTV2PHA6vVmdh5cXo6meJWKCD6jc5QAd6J7D1hJw6PWP8gyUQZGtZ6Xd9v82v3cP1L6njMWc4kpivB41mUF7Q86Zy8EoZ2xYhFrU3MoUuNPV3ApVKRqUmcL4cpKhbcSCgPi8QvnhUCjZGyEtxLwzCaRhXa"
-    })
-
-    console.log(
-      await client.PersonalSign({message: "test"})
-    )
   } catch(error) {
     console.error(error);
     console.error(JSON.stringify(error, null, 2));

package/testScripts/abr_profile_both.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },

package/testScripts/abr_profile_clear_store_encrypted.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },

package/testScripts/abr_profile_clear_store_unencrypted.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },

package/testScripts/abr_profile_drm.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },

package/utilities/example_files/abr_profile_both.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },

package/utilities/example_files/abr_profile_clear_hls_only_store_encrypted.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },

package/utilities/example_files/abr_profile_clear_hls_only_store_unencrypted.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },

package/utilities/example_files/abr_profile_clear_store_encrypted.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },

package/utilities/example_files/abr_profile_clear_store_unencrypted.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },