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

package/dist/solana/builtin/types.d.ts

@@ -87,8 +87,8 @@ export declare const InitializeMultisig: import("superstruct").Struct<{
 export type Transfer = Infer<typeof Transfer>;
 export declare const Transfer: import("superstruct").Struct<{
     amount: string | number;
-    destination: String;
     source: String;
+    destination: String;
     signers?: String[] | undefined;
     authority?: String | undefined;
     multisigAuthority?: String | undefined;
@@ -227,9 +227,9 @@ export declare const ThawAccount: import("superstruct").Struct<{
 }>;
 export type TransferChecked = Infer<typeof TransferChecked>;
 export declare const TransferChecked: import("superstruct").Struct<{
+    source: String;
     mint: String;
     destination: String;
-    source: String;
     tokenAmount: {
         amount: string;
         decimals: number;
@@ -257,8 +257,8 @@ export declare const TransferChecked: import("superstruct").Struct<{
 }>;
 export type ApproveChecked = Infer<typeof ApproveChecked>;
 export declare const ApproveChecked: import("superstruct").Struct<{
-    mint: String;
     source: String;
+    mint: String;
     delegate: String;
     tokenAmount: {
         amount: string;
@@ -721,9 +721,9 @@ export type DepositConfidentialTransfer = Infer<typeof DepositConfidentialTransf
 export declare const DepositConfidentialTransfer: import("superstruct").Struct<{
     amount: string | number;
     decimals: number;
+    source: String;
     mint: String;
     destination: String;
-    source: String;
     owner?: String | undefined;
     signers?: String[] | undefined;
     multisigOwner?: String | undefined;
@@ -741,9 +741,9 @@ export type WithdrawConfidentialTransfer = Infer<typeof WithdrawConfidentialTran
 export declare const WithdrawConfidentialTransfer: import("superstruct").Struct<{
     amount: string | number;
     decimals: number;
+    source: String;
     mint: String;
     destination: String;
-    source: String;
     equalityProofInstructionOffset: number;
     newDecryptableAvailableBalance: string;
     rangeProofInstructionOffset: number;
@@ -775,9 +775,9 @@ export declare const WithdrawConfidentialTransfer: import("superstruct").Struct<
 }>;
 export type ConfidentialTransfer = Infer<typeof ConfidentialTransfer>;
 export declare const ConfidentialTransfer: import("superstruct").Struct<{
+    source: String;
     mint: String;
     destination: String;
-    source: String;
     equalityProofInstructionOffset: number;
     rangeProofInstructionOffset: number;
     ciphertextValidityProofInstructionOffset: number;
@@ -813,9 +813,9 @@ export declare const ConfidentialTransfer: import("superstruct").Struct<{
 }>;
 export type ConfidentialTransferWithFee = Infer<typeof ConfidentialTransferWithFee>;
 export declare const ConfidentialTransferWithFee: import("superstruct").Struct<{
+    source: String;
     mint: String;
     destination: String;
-    source: String;
     equalityProofInstructionOffset: number;
     rangeProofInstructionOffset: number;
     newSourceDecryptableAvailableBalance: string;
@@ -892,8 +892,8 @@ export declare const ConfidentialTransferCreditsToggle: import("superstruct").St
 export type ConfigureConfidentialAccountWithRegistry = Infer<typeof ConfigureConfidentialAccountWithRegistry>;
 export declare const ConfigureConfidentialAccountWithRegistry: import("superstruct").Struct<{
     account: String;
-    mint: String;
     registry: String;
+    mint: String;
 }, {
     account: import("superstruct").Struct<String, null>;
     mint: import("superstruct").Struct<String, null>;
@@ -901,8 +901,8 @@ export declare const ConfigureConfidentialAccountWithRegistry: import("superstru
 }>;
 export type WithdrawExcessLamports = Infer<typeof WithdrawExcessLamports>;
 export declare const WithdrawExcessLamports: import("superstruct").Struct<{
-    destination: String;
     source: String;
+    destination: String;
     signers?: String[] | undefined;
     authority?: String | undefined;
     multisigAuthority?: String | undefined;
@@ -1023,8 +1023,8 @@ export declare const IX_STRUCTS: {
         source: import("superstruct").Struct<String, null>;
     }>;
     approve2: import("superstruct").Struct<{
-        mint: String;
         source: String;
+        mint: String;
         delegate: String;
         tokenAmount: {
             amount: string;
@@ -1052,8 +1052,8 @@ export declare const IX_STRUCTS: {
         }>;
     }>;
     approveChecked: import("superstruct").Struct<{
-        mint: String;
         source: String;
+        mint: String;
         delegate: String;
         tokenAmount: {
             amount: string;
@@ -1172,9 +1172,9 @@ export declare const IX_STRUCTS: {
         signers: import("superstruct").Struct<String[] | undefined, import("superstruct").Struct<String, null>>;
     }>;
     confidentialTransfer: import("superstruct").Struct<{
+        source: String;
         mint: String;
         destination: String;
-        source: String;
         equalityProofInstructionOffset: number;
         rangeProofInstructionOffset: number;
         ciphertextValidityProofInstructionOffset: number;
@@ -1209,9 +1209,9 @@ export declare const IX_STRUCTS: {
         source: import("superstruct").Struct<String, null>;
     }>;
     confidentialTransferWithFee: import("superstruct").Struct<{
+        source: String;
         mint: String;
         destination: String;
-        source: String;
         equalityProofInstructionOffset: number;
         rangeProofInstructionOffset: number;
         newSourceDecryptableAvailableBalance: string;
@@ -1259,8 +1259,8 @@ export declare const IX_STRUCTS: {
     }>;
     configureConfidentialAccountWithRegistry: import("superstruct").Struct<{
         account: String;
-        mint: String;
         registry: String;
+        mint: String;
     }, {
         account: import("superstruct").Struct<String, null>;
         mint: import("superstruct").Struct<String, null>;
@@ -1312,9 +1312,9 @@ export declare const IX_STRUCTS: {
     depositConfidentialTransfer: import("superstruct").Struct<{
         amount: string | number;
         decimals: number;
+        source: String;
         mint: String;
         destination: String;
-        source: String;
         owner?: String | undefined;
         signers?: String[] | undefined;
         multisigOwner?: String | undefined;
@@ -1748,8 +1748,8 @@ export declare const IX_STRUCTS: {
     }>;
     transfer: import("superstruct").Struct<{
         amount: string | number;
-        destination: String;
         source: String;
+        destination: String;
         signers?: String[] | undefined;
         authority?: String | undefined;
         multisigAuthority?: String | undefined;
@@ -1762,9 +1762,9 @@ export declare const IX_STRUCTS: {
         source: import("superstruct").Struct<String, null>;
     }>;
     transfer2: import("superstruct").Struct<{
+        source: String;
         mint: String;
         destination: String;
-        source: String;
         tokenAmount: {
             amount: string;
             decimals: number;
@@ -1791,9 +1791,9 @@ export declare const IX_STRUCTS: {
         }>;
     }>;
     transferChecked: import("superstruct").Struct<{
+        source: String;
         mint: String;
         destination: String;
-        source: String;
         tokenAmount: {
             amount: string;
             decimals: number;
@@ -1927,9 +1927,9 @@ export declare const IX_STRUCTS: {
     withdrawConfidentialTransfer: import("superstruct").Struct<{
         amount: string | number;
         decimals: number;
+        source: String;
         mint: String;
         destination: String;
-        source: String;
         equalityProofInstructionOffset: number;
         newDecryptableAvailableBalance: string;
         rangeProofInstructionOffset: number;
@@ -1960,8 +1960,8 @@ export declare const IX_STRUCTS: {
         source: import("superstruct").Struct<String, null>;
     }>;
     withdrawExcessLamports: import("superstruct").Struct<{
-        destination: String;
         source: String;
+        destination: String;
         signers?: String[] | undefined;
         authority?: String | undefined;
         multisigAuthority?: String | undefined;

package/dist/utils/price.d.ts

@@ -1,8 +1,8 @@
 import { type CoinID } from '@sentio/protos';
 import { ChainId } from '@sentio/chain';
-import { PriceService } from '@sentio/api';
-export declare function getPriceClient(basePath?: string): typeof PriceService;
-type PriceApi = typeof PriceService;
+import { type Client, PriceService } from '@sentio/api';
+export declare function getPriceClient(basePath?: string): PriceApi;
+type PriceApi = Client<typeof PriceService>;
 interface PriceOptions {
     toleranceInDays?: number;
 }
@@ -22,9 +22,13 @@ export declare function getPriceByType(chainId: ChainId, coinType: string, date:
  */
 export declare function getPriceBySymbol(symbol: string, date: Date, options?: PriceOptions): Promise<number | undefined>;
 /**
- * get coins that has price, return results are list of coin id with both symbol and address field set
+ * get coins that has price, return results as a list of `{ symbol, coin }`
+ * pairs where `coin` is the address-keyed CoinID for that symbol on the chain
  * @param chainId
  */
-export declare function getCoinsThatHasPrice(chainId: ChainId): Promise<import("@sentio/api").PriceServiceCoinId[]>;
+export declare function getCoinsThatHasPrice(chainId: ChainId): Promise<{
+    symbol: string;
+    coin: import("@sentio/api/gen/service/price/protos/price_pb.js").CoinID;
+}[]>;
 export {};
 //# sourceMappingURL=price.d.ts.map

package/dist/utils/price.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"price.d.ts","sourceRoot":"","sources":["../../src/utils/price.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,gBAAgB,CAAA;AAG1D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC,OAAO,EAAU,YAAY,EAAE,MAAM,aAAa,CAAA;AAalD,wBAAgB,cAAc,CAAC,QAAQ,SAAkC,uBAYxE;AAOD,KAAK,QAAQ,GAAG,OAAO,YAAY,CAAA;AAGnC,UAAU,YAAY;IACpB,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB;AAQD,wBAAsB,8BAA8B,CAClD,WAAW,EAAE,QAAQ,EACrB,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAiE7B;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAc7B;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE7B;AAMD;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,OAAO,uDAkB1D"}
+{"version":3,"file":"price.d.ts","sourceRoot":"","sources":["../../src/utils/price.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,gBAAgB,CAAA;AAI1D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC,OAAO,EAAE,KAAK,MAAM,EAAsB,YAAY,EAAE,MAAM,aAAa,CAAA;AAc3E,wBAAgB,cAAc,CAAC,QAAQ,SAAkC,GAAG,QAAQ,CAWnF;AAOD,KAAK,QAAQ,GAAG,MAAM,CAAC,OAAO,YAAY,CAAC,CAAA;AAG3C,UAAU,YAAY;IACpB,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB;AAQD,wBAAsB,8BAA8B,CAClD,WAAW,EAAE,QAAQ,EACrB,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgE7B;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAc7B;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE7B;AAMD;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,OAAO;;;KAU1D"}

package/dist/utils/price.js

@@ -1,8 +1,10 @@
 import { CoinIDSchema } from '@sentio/protos';
 import { create } from '@bufbuild/protobuf';
+import { timestampDate, timestampFromDate } from '@bufbuild/protobuf/wkt';
 import { Endpoints, processMetrics } from '@sentio/runtime';
 import { LRUCache } from 'lru-cache';
-import { client, PriceService } from '@sentio/api';
+import { createSentioClient, PriceService } from '@sentio/api';
+import { Code, ConnectError } from '@connectrpc/connect';
 import path from 'path';
 import fs from 'fs';
 import os from 'os';
@@ -21,11 +23,10 @@ export function getPriceClient(basePath = Endpoints.INSTANCE.priceFeedAPI) {
     if (basePath.endsWith('/')) {
         basePath = basePath.slice(0, -1);
     }
-    client.setConfig({
+    return createSentioClient(PriceService, {
         baseUrl: basePath || 'https://api.sentio.xyz',
-        auth: getApiKey()
+        apiKey: getApiKey()
     });
-    return PriceService;
 }
 const priceMap = new LRUCache({
     max: 100000,
@@ -56,18 +57,17 @@ export async function getPriceByTypeOrSymbolInternal(priceClient, date, coinId,
     }
     processMetrics.process_pricecall_count.add(1);
     const response = priceClient.getPrice({
-        query: {
-            timestamp: date.toISOString(),
-            'coinId.symbol': symbol,
-            'coinId.address.address': address?.address,
-            'coinId.address.chain': address?.chain
+        timestamp: timestampFromDate(date),
+        coinId: {
+            id: symbol
+                ? { case: 'symbol', value: symbol }
+                : { case: 'address', value: { address: address?.address ?? '', chain: address?.chain ?? '' } }
         }
     });
     price = response
         .then((res) => {
-        const { data } = res;
-        if (data?.timestamp) {
-            const responseDate = new Date(data.timestamp);
+        if (res.timestamp) {
+            const responseDate = timestampDate(res.timestamp);
             const responseDateString = dateString(responseDate);
             if (responseDateString === todayDateString) {
                 priceMap.delete(key);
@@ -86,13 +86,13 @@ export async function getPriceByTypeOrSymbolInternal(priceClient, date, coinId,
         else {
             priceMap.delete(key);
         }
-        return data?.price;
+        return res.price;
     })
         .catch((e) => {
         setTimeout(() => {
             priceMap.delete(key);
         }, 1000);
-        if (e.response?.status === 404) {
+        if (e instanceof ConnectError && e.code === Code.NotFound) {
             console.error('price not found for ', JSON.stringify(coinId), ' at ', dateStr);
             return undefined;
         }
@@ -133,25 +133,18 @@ function dateString(date) {
     return [date.getHours(), date.getUTCDate(), date.getUTCMonth() + 1, date.getUTCFullYear()].join('-');
 }
 /**
- * get coins that has price, return results are list of coin id with both symbol and address field set
+ * get coins that has price, return results as a list of `{ symbol, coin }`
+ * pairs where `coin` is the address-keyed CoinID for that symbol on the chain
  * @param chainId
  */
 export async function getCoinsThatHasPrice(chainId) {
     if (!priceClient) {
         priceClient = getPriceClient();
     }
-    const { data } = await priceClient.priceListCoins({
-        query: {
-            chain: chainId,
-            limit: 1000
-        }
-    });
-    if (!data?.coinAddressesInChain) {
-        return [];
-    }
-    return Object.entries(data.coinAddressesInChain).map(([symbol, coin]) => {
-        coin.symbol = symbol;
-        return coin;
+    const res = await priceClient.listCoins({
+        chain: chainId,
+        limit: 1000
     });
+    return Object.entries(res.coinAddressesInChain).map(([symbol, coin]) => ({ symbol, coin }));
 }
 //# sourceMappingURL=price.js.map

package/dist/utils/price.js.map

@@ -1 +1 @@
-{"version":3,"file":"price.js","sourceRoot":"","sources":["../../src/utils/price.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"price.js","sourceRoot":"","sources":["../../src/utils/price.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentio/sdk",
-  "version": "4.1.0-rc.1",
+  "version": "4.1.0-rc.2",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -65,12 +65,12 @@
     "@anchor-lang/core": "^1.0.2",
     "@aptos-labs/ts-sdk": "~7.1.0",
     "@bufbuild/protobuf": "^2.12.0",
-    "@connectrpc/connect": "^2.0.0",
+    "@connectrpc/connect": "^2.1.2",
     "@iota/iota-sdk": "~1.14.0",
     "@mysten/sui": "~2.20.0",
     "@prettier/sync": "^0.6.0",
     "@protobuf-ts/grpcweb-transport": "^2.11.1",
-    "@sentio/api": "1.0.2",
+    "@sentio/api": "~2.0.3",
     "@sentio/bigdecimal": "9.1.1-patch.3",
     "@sentio/chain": "~3.4.29",
     "@sentio/ethers-v6": "^1.0.29",
@@ -97,8 +97,8 @@
     "typechain": "^8.3.2",
     "utility-types": "^3.11.0",
     "yaml": "^2.3.4",
-    "@sentio/protos": "4.1.0-rc.1",
-    "@sentio/runtime": "^4.1.0-rc.1"
+    "@sentio/protos": "4.1.0-rc.2",
+    "@sentio/runtime": "^4.1.0-rc.2"
   },
   "peerDependencies": {
     "tsdown": "^0.22.3"

package/src/utils/price.ts

@@ -1,9 +1,11 @@
 import { type CoinID, CoinIDSchema } from '@sentio/protos'
 import { create } from '@bufbuild/protobuf'
+import { timestampDate, timestampFromDate } from '@bufbuild/protobuf/wkt'
 import { Endpoints, processMetrics } from '@sentio/runtime'
 import { ChainId } from '@sentio/chain'
 import { LRUCache } from 'lru-cache'
-import { client, PriceService } from '@sentio/api'
+import { type Client, createSentioClient, PriceService } from '@sentio/api'
+import { Code, ConnectError } from '@connectrpc/connect'
 import path from 'path'
 import fs from 'fs'
 import os from 'os'
@@ -16,18 +18,17 @@ function getApiKey() {
   } catch (e) {}
 }
 
-export function getPriceClient(basePath = Endpoints.INSTANCE.priceFeedAPI) {
+export function getPriceClient(basePath = Endpoints.INSTANCE.priceFeedAPI): PriceApi {
   if (basePath && !basePath.startsWith('http')) {
     basePath = 'http://' + basePath
   }
   if (basePath.endsWith('/')) {
     basePath = basePath.slice(0, -1)
   }
-  client.setConfig({
+  return createSentioClient(PriceService, {
     baseUrl: basePath || 'https://api.sentio.xyz',
-    auth: getApiKey()
+    apiKey: getApiKey()
   })
-  return PriceService
 }
 
 const priceMap = new LRUCache<string, Promise<number | undefined>>({
@@ -35,7 +36,7 @@ const priceMap = new LRUCache<string, Promise<number | undefined>>({
   ttl: 1000 * 60 * 5 // 5 minutes
 })
 
-type PriceApi = typeof PriceService
+type PriceApi = Client<typeof PriceService>
 let priceClient: PriceApi
 
 interface PriceOptions {
@@ -73,18 +74,17 @@ export async function getPriceByTypeOrSymbolInternal(
 
   processMetrics.process_pricecall_count.add(1)
   const response = priceClient.getPrice({
-    query: {
-      timestamp: date.toISOString(),
-      'coinId.symbol': symbol,
-      'coinId.address.address': address?.address,
-      'coinId.address.chain': address?.chain
+    timestamp: timestampFromDate(date),
+    coinId: {
+      id: symbol
+        ? { case: 'symbol', value: symbol }
+        : { case: 'address', value: { address: address?.address ?? '', chain: address?.chain ?? '' } }
     }
   })
   price = response
     .then((res) => {
-      const { data } = res
-      if (data?.timestamp) {
-        const responseDate = new Date(data.timestamp)
+      if (res.timestamp) {
+        const responseDate = timestampDate(res.timestamp)
         const responseDateString = dateString(responseDate)
         if (responseDateString === todayDateString) {
           priceMap.delete(key)
@@ -101,14 +101,14 @@ export async function getPriceByTypeOrSymbolInternal(
       } else {
         priceMap.delete(key)
       }
-      return data?.price
+      return res.price
     })
     .catch((e) => {
       setTimeout(() => {
         priceMap.delete(key)
       }, 1000)
 
-      if (e.response?.status === 404) {
+      if (e instanceof ConnectError && e.code === Code.NotFound) {
         console.error('price not found for ', JSON.stringify(coinId), ' at ', dateStr)
         return undefined
       }
@@ -166,25 +166,18 @@ function dateString(date: Date) {
 }
 
 /**
- * get coins that has price, return results are list of coin id with both symbol and address field set
+ * get coins that has price, return results as a list of `{ symbol, coin }`
+ * pairs where `coin` is the address-keyed CoinID for that symbol on the chain
  * @param chainId
  */
 export async function getCoinsThatHasPrice(chainId: ChainId) {
   if (!priceClient) {
     priceClient = getPriceClient()
   }
-  const { data } = await priceClient.priceListCoins({
-    query: {
-      chain: chainId,
-      limit: 1000
-    }
+  const res = await priceClient.listCoins({
+    chain: chainId,
+    limit: 1000
   })
 
-  if (!data?.coinAddressesInChain) {
-    return []
-  }
-  return Object.entries(data.coinAddressesInChain).map(([symbol, coin]) => {
-    coin.symbol = symbol
-    return coin
-  })
+  return Object.entries(res.coinAddressesInChain).map(([symbol, coin]) => ({ symbol, coin }))
 }