@sentio/sdk 1.40.3-rc.1 → 1.40.3-rc.2

package/lib/utils/price.d.ts

@@ -1,3 +1,4 @@
+import { CoinID } from '@sentio/protos/lib/service/price/protos/price';
 import { RetryOptions } from 'nice-grpc-client-middleware-retry';
 export declare function getPriceClient(address?: string): import("nice-grpc").RawClient<import("nice-grpc/lib/service-definitions/ts-proto").FromTsProtoServiceDefinition<{
     readonly name: "PriceService";
@@ -37,13 +38,7 @@ export declare function getPriceClient(address?: string): import("nice-grpc").Ra
         };
     };
 }>, RetryOptions>;
-/**
- *
- * @param chainId chain id refers to CHAIN_MAP
- * @param coinType
- * @param date
- */
-export declare function getPriceByType(chainId: string, coinType: string, date: Date): Promise<number>;
+export declare function getPriceByTypeOrSymbol(date: Date, coinId: CoinID): Promise<number>;
 /**
  *
  * @param symbol token symbol like BTC, etc

package/lib/utils/price.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPriceBySymbol = exports.getPriceByType = exports.getPriceClient = void 0;
+exports.getPriceBySymbol = exports.getPriceByTypeOrSymbol = exports.getPriceClient = void 0;
 const price_1 = require("@sentio/protos/lib/service/price/protos/price");
 const nice_grpc_1 = require("nice-grpc");
 const nice_grpc_client_middleware_retry_1 = require("nice-grpc-client-middleware-retry");
@@ -15,70 +15,67 @@ function getPriceClient(address) {
 exports.getPriceClient = getPriceClient;
 const priceMap = new Map();
 let priceClient;
-/**
- *
- * @param chainId chain id refers to CHAIN_MAP
- * @param coinType
- * @param date
- */
-async function getPriceByType(chainId, coinType, date) {
+async function getPriceByTypeOrSymbol(date, coinId) {
     if (!priceClient) {
         priceClient = getPriceClient();
     }
     const dateStr = dateString(date);
-    const key = `${coinType}-${dateStr}`;
+    const todayDateString = dateString(new Date());
+    let key;
+    if (coinId.symbol) {
+        key = `${coinId.symbol}-${dateStr}`;
+    }
+    else {
+        key = `${coinId.address?.address}-${coinId.address?.chain}-${dateStr}`;
+    }
     let price = priceMap.get(key);
     if (price) {
         return price;
     }
-    const response = await priceClient.getPrice({
+    const response = priceClient.getPrice({
         timestamp: date,
-        coinId: {
-            address: {
-                chain: chainId,
-                address: coinType,
-            },
-        },
+        coinId,
     }, {
         retry: true,
         retryMaxAttempts: 8,
     });
-    price = response.price;
-    if (response.timestamp && dateString(response.timestamp) === dateStr) {
-        priceMap.set(key, price);
-    }
+    price = response.then((res) => {
+        if (res.timestamp) {
+            const responseDateString = dateString(res.timestamp);
+            if (responseDateString !== dateStr || responseDateString !== todayDateString) {
+                priceMap.delete(key);
+            }
+        }
+        else {
+            priceMap.delete(key);
+        }
+        return res.price;
+    });
+    priceMap.set(key, price);
     return price;
 }
-exports.getPriceByType = getPriceByType;
+exports.getPriceByTypeOrSymbol = getPriceByTypeOrSymbol;
 /**
  *
- * @param symbol token symbol like BTC, etc
+ * @param chainId chain id refers to CHAIN_MAP
+ * @param coinType
  * @param date
  */
-async function getPriceBySymbol(symbol, date) {
-    if (!priceClient) {
-        priceClient = getPriceClient();
-    }
-    const dateStr = dateString(date);
-    const key = `${symbol}-${dateStr}`;
-    let price = priceMap.get(key);
-    if (price) {
-        return price;
-    }
-    const response = await priceClient.getPrice({
-        timestamp: date,
-        coinId: {
-            symbol,
+async function getPriceByType(chainId, coinType, date) {
+    return getPriceByTypeOrSymbol(date, {
+        address: {
+            chain: chainId,
+            address: coinType,
         },
-    }, {
-        retry: true,
-        retryMaxAttempts: 8,
     });
-    price = response.price;
-    if (response.timestamp && dateString(response.timestamp) === dateStr) {
-        priceMap.set(key, price);
-    }
-    return price;
+}
+/**
+ *
+ * @param symbol token symbol like BTC, etc
+ * @param date
+ */
+async function getPriceBySymbol(symbol, date) {
+    return getPriceByTypeOrSymbol(date, { symbol });
 }
 exports.getPriceBySymbol = getPriceBySymbol;
 function dateString(date) {

package/lib/utils/price.js.map

@@ -1 +1 @@
-{"version":3,"file":"price.js","sourceRoot":"","sources":["../../src/utils/price.ts"],"names":[],"mappings":"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","sourcesContent":["import { PriceServiceClient, PriceServiceDefinition } from '@sentio/protos/lib/service/price/protos/price'\nimport { createChannel, createClientFactory } from 'nice-grpc'\nimport { retryMiddleware, RetryOptions } from 'nice-grpc-client-middleware-retry'\nimport { Endpoints } from '@sentio/runtime'\n\nexport function getPriceClient(address?: string) {\n  if (!address) {\n    address = Endpoints.INSTANCE.priceFeedAPI\n  }\n  const channel = createChannel(address)\n\n  return createClientFactory().use(retryMiddleware).create(PriceServiceDefinition, channel)\n}\n\nconst priceMap = new Map<string, number>()\nlet priceClient: PriceServiceClient<RetryOptions>\n\n/**\n *\n * @param chainId chain id refers to CHAIN_MAP\n * @param coinType\n * @param date\n */\nexport async function getPriceByType(chainId: string, coinType: string, date: Date): Promise<number> {\n  if (!priceClient) {\n    priceClient = getPriceClient()\n  }\n\n  const dateStr = dateString(date)\n  const key = `${coinType}-${dateStr}`\n  let price = priceMap.get(key)\n  if (price) {\n    return price\n  }\n\n  const response = await priceClient.getPrice(\n    {\n      timestamp: date,\n      coinId: {\n        address: {\n          chain: chainId,\n          address: coinType,\n        },\n      },\n    },\n    {\n      retry: true,\n      retryMaxAttempts: 8,\n    }\n  )\n  price = response.price\n  if (response.timestamp && dateString(response.timestamp) === dateStr) {\n    priceMap.set(key, price)\n  }\n  return price\n}\n\n/**\n *\n * @param symbol token symbol like BTC, etc\n * @param date\n */\nexport async function getPriceBySymbol(symbol: string, date: Date): Promise<number> {\n  if (!priceClient) {\n    priceClient = getPriceClient()\n  }\n\n  const dateStr = dateString(date)\n  const key = `${symbol}-${dateStr}`\n  let price = priceMap.get(key)\n  if (price) {\n    return price\n  }\n\n  const response = await priceClient.getPrice(\n    {\n      timestamp: date,\n      coinId: {\n        symbol,\n      },\n    },\n    {\n      retry: true,\n      retryMaxAttempts: 8,\n    }\n  )\n  price = response.price\n  if (response.timestamp && dateString(response.timestamp) === dateStr) {\n    priceMap.set(key, price)\n  }\n  return price\n}\n\nfunction dateString(date: Date) {\n  return [date.getUTCDate(), date.getUTCMonth() + 1, date.getUTCFullYear()].join('-')\n}\n"]}
+{"version":3,"file":"price.js","sourceRoot":"","sources":["../../src/utils/price.ts"],"names":[],"mappings":";;;AAAA,yEAAkH;AAClH,yCAA8D;AAC9D,yFAAiF;AACjF,6CAA2C;AAE3C,SAAgB,cAAc,CAAC,OAAgB;IAC7C,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,GAAG,mBAAS,CAAC,QAAQ,CAAC,YAAY,CAAA;KAC1C;IACD,MAAM,OAAO,GAAG,IAAA,yBAAa,EAAC,OAAO,CAAC,CAAA;IAEtC,OAAO,IAAA,+BAAmB,GAAE,CAAC,GAAG,CAAC,mDAAe,CAAC,CAAC,MAAM,CAAC,8BAAsB,EAAE,OAAO,CAAC,CAAA;AAC3F,CAAC;AAPD,wCAOC;AAED,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA2B,CAAA;AACnD,IAAI,WAA6C,CAAA;AAE1C,KAAK,UAAU,sBAAsB,CAAC,IAAU,EAAE,MAAc;IACrE,IAAI,CAAC,WAAW,EAAE;QAChB,WAAW,GAAG,cAAc,EAAE,CAAA;KAC/B;IAED,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,CAAA;IAChC,MAAM,eAAe,GAAG,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC,CAAA;IAE9C,IAAI,GAAW,CAAA;IACf,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,GAAG,GAAG,GAAG,MAAM,CAAC,MAAM,IAAI,OAAO,EAAE,CAAA;KACpC;SAAM;QACL,GAAG,GAAG,GAAG,MAAM,CAAC,OAAO,EAAE,OAAO,IAAI,MAAM,CAAC,OAAO,EAAE,KAAK,IAAI,OAAO,EAAE,CAAA;KACvE;IACD,IAAI,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAC7B,IAAI,KAAK,EAAE;QACT,OAAO,KAAK,CAAA;KACb;IAED,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CACnC;QACE,SAAS,EAAE,IAAI;QACf,MAAM;KACP,EACD;QACE,KAAK,EAAE,IAAI;QACX,gBAAgB,EAAE,CAAC;KACpB,CACF,CAAA;IACD,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;QAC5B,IAAI,GAAG,CAAC,SAAS,EAAE;YACjB,MAAM,kBAAkB,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YACpD,IAAI,kBAAkB,KAAK,OAAO,IAAI,kBAAkB,KAAK,eAAe,EAAE;gBAC5E,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;aACrB;SACF;aAAM;YACL,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;SACrB;QACD,OAAO,GAAG,CAAC,KAAK,CAAA;IAClB,CAAC,CAAC,CAAA;IACF,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IACxB,OAAO,KAAK,CAAA;AACd,CAAC;AA1CD,wDA0CC;AAED;;;;;GAKG;AACH,KAAK,UAAU,cAAc,CAAC,OAAe,EAAE,QAAgB,EAAE,IAAU;IACzE,OAAO,sBAAsB,CAAC,IAAI,EAAE;QAClC,OAAO,EAAE;YACP,KAAK,EAAE,OAAO;YACd,OAAO,EAAE,QAAQ;SAClB;KACF,CAAC,CAAA;AACJ,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,gBAAgB,CAAC,MAAc,EAAE,IAAU;IAC/D,OAAO,sBAAsB,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;AACjD,CAAC;AAFD,4CAEC;AAED,SAAS,UAAU,CAAC,IAAU;IAC5B,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACrF,CAAC","sourcesContent":["import { CoinID, PriceServiceClient, PriceServiceDefinition } from '@sentio/protos/lib/service/price/protos/price'\nimport { createChannel, createClientFactory } from 'nice-grpc'\nimport { retryMiddleware, RetryOptions } from 'nice-grpc-client-middleware-retry'\nimport { Endpoints } from '@sentio/runtime'\n\nexport function getPriceClient(address?: string) {\n  if (!address) {\n    address = Endpoints.INSTANCE.priceFeedAPI\n  }\n  const channel = createChannel(address)\n\n  return createClientFactory().use(retryMiddleware).create(PriceServiceDefinition, channel)\n}\n\nconst priceMap = new Map<string, Promise<number>>()\nlet priceClient: PriceServiceClient<RetryOptions>\n\nexport async function getPriceByTypeOrSymbol(date: Date, coinId: CoinID): Promise<number> {\n  if (!priceClient) {\n    priceClient = getPriceClient()\n  }\n\n  const dateStr = dateString(date)\n  const todayDateString = dateString(new Date())\n\n  let key: string\n  if (coinId.symbol) {\n    key = `${coinId.symbol}-${dateStr}`\n  } else {\n    key = `${coinId.address?.address}-${coinId.address?.chain}-${dateStr}`\n  }\n  let price = priceMap.get(key)\n  if (price) {\n    return price\n  }\n\n  const response = priceClient.getPrice(\n    {\n      timestamp: date,\n      coinId,\n    },\n    {\n      retry: true,\n      retryMaxAttempts: 8,\n    }\n  )\n  price = response.then((res) => {\n    if (res.timestamp) {\n      const responseDateString = dateString(res.timestamp)\n      if (responseDateString !== dateStr || responseDateString !== todayDateString) {\n        priceMap.delete(key)\n      }\n    } else {\n      priceMap.delete(key)\n    }\n    return res.price\n  })\n  priceMap.set(key, price)\n  return price\n}\n\n/**\n *\n * @param chainId chain id refers to CHAIN_MAP\n * @param coinType\n * @param date\n */\nasync function getPriceByType(chainId: string, coinType: string, date: Date): Promise<number> {\n  return getPriceByTypeOrSymbol(date, {\n    address: {\n      chain: chainId,\n      address: coinType,\n    },\n  })\n}\n\n/**\n *\n * @param symbol token symbol like BTC, etc\n * @param date\n */\nexport async function getPriceBySymbol(symbol: string, date: Date): Promise<number> {\n  return getPriceByTypeOrSymbol(date, { symbol })\n}\n\nfunction dateString(date: Date) {\n  return [date.getUTCDate(), date.getUTCMonth() + 1, date.getUTCFullYear()].join('-')\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "1.40.3-rc.1",
+  "version": "1.40.3-rc.2",
   "scripts": {
     "compile_target": "yarn tsc -b src/target-ethers-sentio/tsconfig.json",
     "compile": "tsc -p . && cp src/utils/*.csv lib/utils",
@@ -18,8 +18,8 @@
   },
   "dependencies": {
     "@ethersproject/providers": "~5.7.0",
-    "@sentio/protos": "^1.40.3-rc.1",
-    "@sentio/runtime": "^1.40.3-rc.1",
+    "@sentio/protos": "^1.40.3-rc.2",
+    "@sentio/runtime": "^1.40.3-rc.2",
     "@typechain/ethers-v5": "^10.0.0",
     "bignumber.js": "^9.1.0",
     "command-line-args": "^5.2.1",
@@ -51,5 +51,5 @@
   "typedoc": {
     "entryPoint": "./src/index.ts"
   },
-  "gitHead": "f6ee979f5b6c6c1fac64b3bbaef24ccf4a2570f5"
+  "gitHead": "0b4f1ccc0717ddeabddff5cfec3e9a8b4e3c99c3"
 }

package/src/utils/price.ts

@@ -1,4 +1,4 @@
-import { PriceServiceClient, PriceServiceDefinition } from '@sentio/protos/lib/service/price/protos/price'
+import { CoinID, PriceServiceClient, PriceServiceDefinition } from '@sentio/protos/lib/service/price/protos/price'
 import { createChannel, createClientFactory } from 'nice-grpc'
 import { retryMiddleware, RetryOptions } from 'nice-grpc-client-middleware-retry'
 import { Endpoints } from '@sentio/runtime'
@@ -12,83 +12,75 @@ export function getPriceClient(address?: string) {
   return createClientFactory().use(retryMiddleware).create(PriceServiceDefinition, channel)
 }
 
-const priceMap = new Map<string, number>()
+const priceMap = new Map<string, Promise<number>>()
 let priceClient: PriceServiceClient<RetryOptions>
 
-/**
- *
- * @param chainId chain id refers to CHAIN_MAP
- * @param coinType
- * @param date
- */
-export async function getPriceByType(chainId: string, coinType: string, date: Date): Promise<number> {
+export async function getPriceByTypeOrSymbol(date: Date, coinId: CoinID): Promise<number> {
   if (!priceClient) {
     priceClient = getPriceClient()
   }
 
   const dateStr = dateString(date)
-  const key = `${coinType}-${dateStr}`
+  const todayDateString = dateString(new Date())
+
+  let key: string
+  if (coinId.symbol) {
+    key = `${coinId.symbol}-${dateStr}`
+  } else {
+    key = `${coinId.address?.address}-${coinId.address?.chain}-${dateStr}`
+  }
   let price = priceMap.get(key)
   if (price) {
     return price
   }
 
-  const response = await priceClient.getPrice(
+  const response = priceClient.getPrice(
     {
       timestamp: date,
-      coinId: {
-        address: {
-          chain: chainId,
-          address: coinType,
-        },
-      },
+      coinId,
     },
     {
       retry: true,
       retryMaxAttempts: 8,
     }
   )
-  price = response.price
-  if (response.timestamp && dateString(response.timestamp) === dateStr) {
-    priceMap.set(key, price)
-  }
+  price = response.then((res) => {
+    if (res.timestamp) {
+      const responseDateString = dateString(res.timestamp)
+      if (responseDateString !== dateStr || responseDateString !== todayDateString) {
+        priceMap.delete(key)
+      }
+    } else {
+      priceMap.delete(key)
+    }
+    return res.price
+  })
+  priceMap.set(key, price)
   return price
 }
 
+/**
+ *
+ * @param chainId chain id refers to CHAIN_MAP
+ * @param coinType
+ * @param date
+ */
+async function getPriceByType(chainId: string, coinType: string, date: Date): Promise<number> {
+  return getPriceByTypeOrSymbol(date, {
+    address: {
+      chain: chainId,
+      address: coinType,
+    },
+  })
+}
+
 /**
  *
  * @param symbol token symbol like BTC, etc
  * @param date
  */
 export async function getPriceBySymbol(symbol: string, date: Date): Promise<number> {
-  if (!priceClient) {
-    priceClient = getPriceClient()
-  }
-
-  const dateStr = dateString(date)
-  const key = `${symbol}-${dateStr}`
-  let price = priceMap.get(key)
-  if (price) {
-    return price
-  }
-
-  const response = await priceClient.getPrice(
-    {
-      timestamp: date,
-      coinId: {
-        symbol,
-      },
-    },
-    {
-      retry: true,
-      retryMaxAttempts: 8,
-    }
-  )
-  price = response.price
-  if (response.timestamp && dateString(response.timestamp) === dateStr) {
-    priceMap.set(key, price)
-  }
-  return price
+  return getPriceByTypeOrSymbol(date, { symbol })
 }
 
 function dateString(date: Date) {