@eluvio/elv-client-js 4.0.4 → 4.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.0.4",
+  "version": "4.0.6",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",
@@ -60,7 +60,7 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.8.4",
-    "@eluvio/crypto": ">=1.0.8",
+    "@eluvio/crypto": ">=1.0.12",
     "@eluvio/elv-abr-profile": "^1.0.0",
     "@sindresorhus/slugify": "^1.1.0",
     "babel-loader": "^8.0.6",
@@ -78,6 +78,7 @@
     "fraction.js": "^4.0.12",
     "hash.js": "^1.1.7",
     "image-type": "^4.1.0",
+    "isarray": "^2.0.5",
     "js-polyfills": "^0.1.42",
     "jsonpath-plus": "^6.0.1",
     "kind-of": "^6.0.3",

package/src/Crypto.js

@@ -1,4 +1,4 @@
-if(typeof Buffer === "undefined") { Buffer = require("buffer/").Buffer; }
+require("buffer");
 
 const bs58 = require("bs58");
 const Stream = require("stream");

package/src/ElvClient.js

@@ -1,6 +1,4 @@
-if(typeof Buffer === "undefined") {
-  Buffer = require("buffer/").Buffer;
-}
+require("buffer");
 
 const URI = require("urijs");
 const Ethers = require("ethers");

package/src/Utils.js

@@ -1,4 +1,4 @@
-if(typeof Buffer === "undefined") { Buffer = require("buffer/").Buffer; }
+require("buffer");
 
 const bs58 = require("bs58");
 const BigNumber = require("bignumber.js").default;

package/src/walletClient/ClientMethods.js

@@ -66,7 +66,7 @@ exports.UserWalletBalance = async function(checkOnboard=false) {
   if(!this.loggedIn) { return; }
 
   // eslint-disable-next-line no-unused-vars
-  const { balance, usage_hold, payout_hold, stripe_id, stripe_payouts_enabled } = await this.client.utils.ResponseToJson(
+  const { balance, usage_hold, payout_hold, locked_offer_balance, stripe_id, stripe_payouts_enabled } = await this.client.utils.ResponseToJson(
     await this.client.authClient.MakeAuthServiceRequest({
       path: UrlJoin("as", "wlt", "mkt", "bal"),
       method: "GET",
@@ -79,9 +79,10 @@ exports.UserWalletBalance = async function(checkOnboard=false) {
   const userStripeId = stripe_id;
   const userStripeEnabled = stripe_payouts_enabled;
   const totalWalletBalance = parseFloat(balance || 0);
-  const availableWalletBalance = Math.max(0, totalWalletBalance - parseFloat(usage_hold || 0));
+  const lockedWalletBalance = parseFloat(locked_offer_balance || 0);
+  const availableWalletBalance = Math.max(0, totalWalletBalance - parseFloat(usage_hold || 0) - lockedWalletBalance);
   const pendingWalletBalance = Math.max(0, totalWalletBalance - availableWalletBalance);
-  const withdrawableWalletBalance = Math.max(0, totalWalletBalance - parseFloat(payout_hold || 0));
+  const withdrawableWalletBalance = Math.max(0, totalWalletBalance - parseFloat(Math.max(payout_hold, lockedWalletBalance) || 0));
 
   if(checkOnboard && stripe_id && !stripe_payouts_enabled) {
     // Refresh stripe enabled flag
@@ -106,6 +107,7 @@ exports.UserWalletBalance = async function(checkOnboard=false) {
   let balances = {
     totalWalletBalance,
     availableWalletBalance,
+    lockedWalletBalance,
     pendingWalletBalance,
     withdrawableWalletBalance,
   };
@@ -355,14 +357,20 @@ exports.UserTransfers = async function({userAddress, sortBy="created", sortDesc=
  */
 exports.TenantConfiguration = async function({tenantId, contractAddress}) {
   try {
-    return await Utils.ResponseToJson(
-      this.client.authClient.MakeAuthServiceRequest({
-        path: contractAddress ?
-          UrlJoin("as", "config", "nft", contractAddress) :
-          UrlJoin("as", "config", "tnt", tenantId),
-        method: "GET",
-      })
-    );
+    contractAddress = contractAddress ? Utils.FormatAddress(contractAddress) : undefined;
+
+    if(!this.tenantConfigs[contractAddress || tenantId]) {
+      this.tenantConfigs[contractAddress || tenantId] = await Utils.ResponseToJson(
+        this.client.authClient.MakeAuthServiceRequest({
+          path: contractAddress ?
+            UrlJoin("as", "config", "nft", contractAddress) :
+            UrlJoin("as", "config", "tnt", tenantId),
+          method: "GET",
+        })
+      );
+    }
+
+    return this.tenantConfigs[contractAddress || tenantId];
   } catch(error) {
     this.Log("Failed to load tenant configuration", true, error);
 
@@ -1291,3 +1299,117 @@ exports.DropStatus = async function({marketplace, eventId, dropId}) {
     return "";
   }
 };
+
+
+/* OFFERS */
+// TODO: Document
+
+exports.MarketplaceOffers = async function({contractAddress, tokenId, buyerAddress, sellerAddress, statuses, start=0, limit=10}) {
+  let path = UrlJoin("as", "mkt", "offers", "ls");
+  if(buyerAddress) {
+    path = UrlJoin(path, "b", Utils.FormatAddress(buyerAddress));
+  } else if(sellerAddress) {
+    path = UrlJoin(path, "s", Utils.FormatAddress(sellerAddress));
+  }
+
+  if(contractAddress) {
+    path = UrlJoin(path, "c", Utils.FormatAddress(contractAddress));
+
+    if(tokenId) {
+      path = UrlJoin(path, "t", tokenId);
+    }
+  }
+
+  let queryParams = {
+    start,
+    limit
+  };
+
+  if(statuses && statuses.length > 0) {
+    queryParams.include = statuses.join(",");
+  }
+
+  const offers = await Utils.ResponseToJson(
+    this.client.authClient.MakeAuthServiceRequest({
+      path: path,
+      method: "GET",
+      queryParams
+    })
+  );
+
+  return offers
+    .map(offer => ({
+      ...offer,
+      created: offer.created * 1000,
+      updated: offer.updated * 1000,
+      expiration: offer.expiration * 1000
+    }));
+};
+
+exports.CreateMarketplaceOffer = async function({contractAddress, tokenId, offerId, price, expiresAt}) {
+  let response;
+  if(offerId) {
+    response = await Utils.ResponseToJson(
+      this.client.authClient.MakeAuthServiceRequest({
+        path: UrlJoin("as", "wlt", "mkt", "offers", offerId),
+        method: "PUT",
+        body: {
+          price,
+          expiration: Math.floor(expiresAt / 1000)
+        },
+        headers: {
+          Authorization: `Bearer ${this.AuthToken()}`
+        }
+      })
+    );
+  } else {
+    response = await Utils.ResponseToJson(
+      this.client.authClient.MakeAuthServiceRequest({
+        path: UrlJoin("as", "wlt", "mkt", "offers", contractAddress, tokenId),
+        method: "POST",
+        body: {
+          contract: contractAddress,
+          token: tokenId,
+          price,
+          expiration: Math.floor(expiresAt / 1000)
+        },
+        headers: {
+          Authorization: `Bearer ${this.AuthToken()}`
+        }
+      })
+    );
+  }
+
+  return response.offer_id;
+};
+
+exports.RemoveMarketplaceOffer = async function({offerId}) {
+  return await this.client.authClient.MakeAuthServiceRequest({
+    path: UrlJoin("as", "wlt", "mkt", "offers", offerId),
+    method: "DELETE",
+    headers: {
+      Authorization: `Bearer ${this.AuthToken()}`
+    }
+  });
+};
+
+
+exports.AcceptMarketplaceOffer = async function({offerId}) {
+  return await this.client.authClient.MakeAuthServiceRequest({
+    path: UrlJoin("as", "wlt", "mkt", "offers", "accept", offerId),
+    method: "PUT",
+    headers: {
+      Authorization: `Bearer ${this.AuthToken()}`
+    }
+  });
+};
+
+exports.RejectMarketplaceOffer = async function({offerId}) {
+  return await this.client.authClient.MakeAuthServiceRequest({
+    path: UrlJoin("as", "wlt", "mkt", "offers", "decline", offerId),
+    method: "PUT",
+    headers: {
+      Authorization: `Bearer ${this.AuthToken()}`
+    }
+  });
+};

package/src/walletClient/index.js

@@ -44,6 +44,7 @@ class ElvWalletClient {
     this.availableMarketplaces = {};
     this.availableMarketplacesById = {};
     this.marketplaceHashes = {};
+    this.tenantConfigs = {};
 
     this.stateStoreUrls = Configuration[network].stateStoreUrls;
     this.stateStoreClient = new HTTPClient({uris: this.stateStoreUrls});

package/testScripts/Test.js

@@ -6,7 +6,6 @@ const ethers = require("ethers");
 
 const Test = async () => {
   try {
-
     const client = await ElvClient.FromNetworkName({
       networkName: "demo"
     });