@cityofzion/bs-ethereum 0.7.1 → 0.7.3

package/.rush/temp/package-deps_build.json

@@ -2,23 +2,23 @@
   "files": {
     "packages/bs-ethereum/jest.config.ts": "d944475db93cbe41a9339187fd94b9962e411c43",
     "packages/bs-ethereum/jest.setup.ts": "9a1976a32050616d4d2ee95b1aa21041bc4daca3",
-    "packages/bs-ethereum/package.json": "bc413e80daf25edafffbc30138ce3900d4bcfa5c",
+    "packages/bs-ethereum/package.json": "2388bfb836c6ba67fe7af26bcffb3668306b0a61",
     "packages/bs-ethereum/src/BSEthereum.ts": "ea8070202977445b77ff67135f7fc7093f0ed2b9",
-    "packages/bs-ethereum/src/BitqueryBDSEthereum.ts": "811c83c0610f64e44318ea8edce5ac9d1390ebc4",
-    "packages/bs-ethereum/src/BitqueryEDSEthereum.ts": "69c8a010389fa636fbbfb6eb2772daa0bde910a7",
+    "packages/bs-ethereum/src/BitqueryBDSEthereum.ts": "aee408a61b1accc750723ce6addf8c99f365c8a4",
+    "packages/bs-ethereum/src/BitqueryEDSEthereum.ts": "c04aa2be223166140f3b98e01390a6f5f7ded8df",
     "packages/bs-ethereum/src/GhostMarketNDSEthereum.ts": "145273284b3c27494eea0e80c0c1de8001b11c57",
-    "packages/bs-ethereum/src/RpcBDSEthereum.ts": "d5e1ec436231894672fee3e677a8dc2f56628b0e",
-    "packages/bs-ethereum/src/__tests__/BDSEthereum.spec.ts": "ef43b385d3a26181ed0ebf8ef07c643476d5d364",
+    "packages/bs-ethereum/src/RpcBDSEthereum.ts": "6cbca256420b09cef7182cbc485eb4799ff9b614",
+    "packages/bs-ethereum/src/__tests__/BDSEthereum.spec.ts": "8b66ba80d8457601fac69819cc1fae4d7bc7b08a",
     "packages/bs-ethereum/src/__tests__/BSEthereum.spec.ts": "0da33cb4c9f89a3b6c2c8445d800ff4ddb41d161",
     "packages/bs-ethereum/src/__tests__/BitqueryEDSEthereum.spec.ts": "8e26084a00916be48eeeb65d3918e5eed6368f0c",
     "packages/bs-ethereum/src/__tests__/GhostMarketNDSEthereum.spec.ts": "f5c9ba8f6c866b97bcf647d105bfa2d5f140180d",
     "packages/bs-ethereum/src/assets/tokens/common.json": "4dbbf3a3b38422e743cf631ffb6c39231777b88d",
     "packages/bs-ethereum/src/constants.ts": "40862a7cc04298a21e380ecdf02e09349897a6f5",
-    "packages/bs-ethereum/src/graphql.ts": "06c16fa064a6b0ec523e6917f142ed4abb5214e0",
+    "packages/bs-ethereum/src/graphql.ts": "aadff73a44a9d12cc65ebe1b0b161f1ecc4f6021",
     "packages/bs-ethereum/src/index.ts": "69ca9c23acdd0afd70f7eaa0a840b07b62bdb07a",
     "packages/bs-ethereum/tsconfig.build.json": "4dc23fb9c4c5e4d19a9bc3947a47c523f4bd967c",
     "packages/bs-ethereum/tsconfig.json": "93e09769572b58e642d4990e9552c70a8b85e142",
-    "common/config/rush/npm-shrinkwrap.json": "4994dce94cedd11a678400d92e08741ac7bc9d3f"
+    "common/config/rush/npm-shrinkwrap.json": "c7f58d681afa54f5c08d809a1ace9947b56fb633"
   },
   "arguments": "tsc --project tsconfig.build.json "
 }

package/dist/BitqueryBDSEthereum.d.ts

@@ -3,6 +3,7 @@ import { RpcBDSEthereum } from './RpcBDSEthereum';
 export declare class BitqueryBDSEthereum extends RpcBDSEthereum {
     private readonly client;
     private readonly networkType;
+    maxTimeToConfirmTransactionInMs: number;
     constructor(network: Network);
     getTransaction(hash: string): Promise<TransactionResponse>;
     getTransactionsByAddress({ address, page, }: TransactionsByAddressParams): Promise<TransactionsByAddressResponse>;

package/dist/BitqueryBDSEthereum.js

@@ -21,12 +21,13 @@ const RpcBDSEthereum_1 = require("./RpcBDSEthereum");
 class BitqueryBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
     constructor(network) {
         super(network);
+        this.maxTimeToConfirmTransactionInMs = 1000 * 60 * 8;
         if (network.type === 'custom')
             throw new Error('Custom network not supported');
         this.networkType = network.type;
         this.client = new core_1.Client({
             url: constants_1.BITQUERY_URL,
-            exchanges: [core_1.cacheExchange, core_1.fetchExchange],
+            exchanges: [core_1.fetchExchange],
             fetch: node_fetch_1.default,
             fetchOptions: {
                 headers: {
@@ -76,7 +77,7 @@ class BitqueryBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                 throw new Error(result.error.message);
             if (!result.data)
                 throw new Error('Address does not have transactions');
-            const totalCount = ((_a = result.data.ethereum.sentCount.count) !== null && _a !== void 0 ? _a : 0) + ((_b = result.data.ethereum.receiverCount.count) !== null && _b !== void 0 ? _b : 0);
+            const totalCount = ((_a = result.data.ethereum.sentCount[0].count) !== null && _a !== void 0 ? _a : 0) + ((_b = result.data.ethereum.receiverCount[0].count) !== null && _b !== void 0 ? _b : 0);
             const mixedTransfers = [...((_e = (_d = (_c = result === null || result === void 0 ? void 0 : result.data) === null || _c === void 0 ? void 0 : _c.ethereum) === null || _d === void 0 ? void 0 : _d.sent) !== null && _e !== void 0 ? _e : []), ...((_h = (_g = (_f = result === null || result === void 0 ? void 0 : result.data) === null || _f === void 0 ? void 0 : _f.ethereum) === null || _g === void 0 ? void 0 : _g.received) !== null && _h !== void 0 ? _h : [])];
             const transactions = new Map();
             mixedTransfers.forEach(transfer => {

package/dist/BitqueryEDSEthereum.js

@@ -25,7 +25,7 @@ class BitqueryEDSEthereum {
         this.networkType = networkType;
         this.client = new core_1.Client({
             url: constants_1.BITQUERY_URL,
-            exchanges: [core_1.cacheExchange, core_1.fetchExchange],
+            exchanges: [core_1.fetchExchange],
             fetch: node_fetch_1.default,
             fetchOptions: {
                 headers: {

package/dist/RpcBDSEthereum.d.ts

@@ -1,6 +1,7 @@
 import { BalanceResponse, BlockchainDataService, ContractResponse, Network, Token, TransactionResponse, TransactionsByAddressParams, TransactionsByAddressResponse } from '@cityofzion/blockchain-service';
 export declare class RpcBDSEthereum implements BlockchainDataService {
     private readonly network;
+    maxTimeToConfirmTransactionInMs: number;
     constructor(network: Network);
     getTransaction(hash: string): Promise<TransactionResponse>;
     getTransactionsByAddress(_params: TransactionsByAddressParams): Promise<TransactionsByAddressResponse>;

package/dist/RpcBDSEthereum.js

@@ -14,6 +14,7 @@ const ethers_1 = require("ethers");
 const constants_1 = require("./constants");
 class RpcBDSEthereum {
     constructor(network) {
+        this.maxTimeToConfirmTransactionInMs = 1000 * 60 * 5;
         this.network = network;
     }
     getTransaction(hash) {

package/dist/graphql.d.ts

@@ -32,10 +32,10 @@ type BitQueryGetTransactionsByAddressResponse = {
         received: BitqueryTransaction[];
         sentCount: {
             count: number;
-        };
+        }[];
         receiverCount: {
             count: number;
-        };
+        }[];
     };
 };
 type BitQueryGetTransactionsByAddressVariables = {

package/dist/graphql.js

@@ -5,7 +5,10 @@ const core_1 = require("@urql/core");
 exports.bitqueryGetTransactionsByAddressQuery = (0, core_1.gql) `
   query getTransactions($address: String!, $limit: Int!, $offset: Int!, $network: EthereumNetwork!) {
     ethereum(network: $network) {
-      sent: transfers(options: { limit: $limit, offset: $offset }, sender: { is: $address }) {
+      sent: transfers(
+        options: { limit: $limit, offset: $offset, desc: "block.timestamp.unixtime" }
+        sender: { is: $address }
+      ) {
         block {
           timestamp {
             unixtime
@@ -32,7 +35,10 @@ exports.bitqueryGetTransactionsByAddressQuery = (0, core_1.gql) `
         }
         entityId
       }
-      received: transfers(options: { limit: $limit, offset: $offset }, receiver: { is: $address }) {
+      received: transfers(
+        options: { limit: $limit, offset: $offset, desc: "block.timestamp.unixtime" }
+        receiver: { is: $address }
+      ) {
         block {
           timestamp {
             unixtime

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-ethereum",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -11,7 +11,7 @@
     "test": "jest --config jest.config.ts"
   },
   "dependencies": {
-    "@cityofzion/blockchain-service": "0.7.1",
+    "@cityofzion/blockchain-service": "0.7.3",
     "ethers": "5.7.2",
     "@urql/core": "~4.1.1",
     "graphql": "~16.8.0",

package/src/BitqueryBDSEthereum.ts

@@ -10,7 +10,7 @@ import {
   TransactionTransferNft,
   Network,
 } from '@cityofzion/blockchain-service'
-import { Client, cacheExchange, fetchExchange, gql } from '@urql/core'
+import { Client, fetchExchange } from '@urql/core'
 import fetch from 'node-fetch'
 import { BITQUERY_API_KEY, BITQUERY_NETWORK_BY_NETWORK_TYPE, BITQUERY_URL, TOKENS } from './constants'
 import {
@@ -26,6 +26,8 @@ export class BitqueryBDSEthereum extends RpcBDSEthereum {
   private readonly client: Client
   private readonly networkType: Exclude<NetworkType, 'custom'>
 
+  maxTimeToConfirmTransactionInMs: number = 1000 * 60 * 8
+
   constructor(network: Network) {
     super(network)
 
@@ -34,7 +36,7 @@ export class BitqueryBDSEthereum extends RpcBDSEthereum {
 
     this.client = new Client({
       url: BITQUERY_URL,
-      exchanges: [cacheExchange, fetchExchange],
+      exchanges: [fetchExchange],
       fetch,
       fetchOptions: {
         headers: {
@@ -93,7 +95,8 @@ export class BitqueryBDSEthereum extends RpcBDSEthereum {
     if (result.error) throw new Error(result.error.message)
     if (!result.data) throw new Error('Address does not have transactions')
 
-    const totalCount = (result.data.ethereum.sentCount.count ?? 0) + (result.data.ethereum.receiverCount.count ?? 0)
+    const totalCount =
+      (result.data.ethereum.sentCount[0].count ?? 0) + (result.data.ethereum.receiverCount[0].count ?? 0)
     const mixedTransfers = [...(result?.data?.ethereum?.sent ?? []), ...(result?.data?.ethereum?.received ?? [])]
 
     const transactions = new Map<string, TransactionResponse>()

package/src/BitqueryEDSEthereum.ts

@@ -1,5 +1,5 @@
 import { Currency, ExchangeDataService, NetworkType, TokenPricesResponse } from '@cityofzion/blockchain-service'
-import { Client, cacheExchange, fetchExchange, gql } from '@urql/core'
+import { Client, fetchExchange } from '@urql/core'
 import fetch from 'node-fetch'
 import { BITQUERY_API_KEY, BITQUERY_URL } from './constants'
 import dayjs from 'dayjs'
@@ -16,7 +16,7 @@ export class BitqueryEDSEthereum implements ExchangeDataService {
 
     this.client = new Client({
       url: BITQUERY_URL,
-      exchanges: [cacheExchange, fetchExchange],
+      exchanges: [fetchExchange],
       fetch,
       fetchOptions: {
         headers: {

package/src/RpcBDSEthereum.ts

@@ -14,6 +14,8 @@ import { TOKENS } from './constants'
 export class RpcBDSEthereum implements BlockchainDataService {
   private readonly network: Network
 
+  maxTimeToConfirmTransactionInMs: number = 1000 * 60 * 5
+
   constructor(network: Network) {
     this.network = network
   }

package/src/__tests__/BDSEthereum.spec.ts

@@ -41,6 +41,7 @@ describe('BDSEthereum', () => {
     async (BDSEthereum: BlockchainDataService) => {
       const address = '0x82B5Cd984880C8A821429cFFf89f36D35BaeBE89'
       const response = await BDSEthereum.getTransactionsByAddress({ address: address, page: 1 })
+      expect(response.totalCount).toBeGreaterThan(0)
       response.transactions.forEach(transaction => {
         expect(transaction).toEqual(
           expect.objectContaining({

package/src/graphql.ts

@@ -36,10 +36,10 @@ type BitQueryGetTransactionsByAddressResponse = {
     received: BitqueryTransaction[]
     sentCount: {
       count: number
-    }
+    }[]
     receiverCount: {
       count: number
-    }
+    }[]
   }
 }
 
@@ -56,7 +56,10 @@ export const bitqueryGetTransactionsByAddressQuery = gql<
 >`
   query getTransactions($address: String!, $limit: Int!, $offset: Int!, $network: EthereumNetwork!) {
     ethereum(network: $network) {
-      sent: transfers(options: { limit: $limit, offset: $offset }, sender: { is: $address }) {
+      sent: transfers(
+        options: { limit: $limit, offset: $offset, desc: "block.timestamp.unixtime" }
+        sender: { is: $address }
+      ) {
         block {
           timestamp {
             unixtime
@@ -83,7 +86,10 @@ export const bitqueryGetTransactionsByAddressQuery = gql<
         }
         entityId
       }
-      received: transfers(options: { limit: $limit, offset: $offset }, receiver: { is: $address }) {
+      received: transfers(
+        options: { limit: $limit, offset: $offset, desc: "block.timestamp.unixtime" }
+        receiver: { is: $address }
+      ) {
         block {
           timestamp {
             unixtime