Merge pull request #19 from CityOfZion/CU-86a0ryajp

CU-86a0ryajp - General fixes related to Ethereum testing
CityOfZion · Sep 20, 2023 · db6bbf6 · db6bbf6
2 parents e279503 + 11304f4
commit db6bbf6
Show file tree

Hide file tree

Showing 12 changed files with 442 additions and 421 deletions.
diff --git a/common/config/rush/npm-shrinkwrap.json b/common/config/rush/npm-shrinkwrap.json
diff --git a/packages/blockchain-service/package.json b/packages/blockchain-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/blockchain-service",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",

diff --git a/packages/bs-asteroid-sdk/package.json b/packages/bs-asteroid-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-asteroid-sdk",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",

diff --git a/packages/bs-ethereum/package.json b/packages/bs-ethereum/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-ethereum",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "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.2",
     "ethers": "5.7.2",
     "@urql/core": "~4.1.1",
     "graphql": "~16.8.0",

diff --git a/packages/bs-ethereum/src/BitqueryBDSEthereum.ts b/packages/bs-ethereum/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 {
@@ -34,7 +34,7 @@ export class BitqueryBDSEthereum extends RpcBDSEthereum {
 
     this.client = new Client({
       url: BITQUERY_URL,
-      exchanges: [cacheExchange, fetchExchange],
+      exchanges: [fetchExchange],
       fetch,
       fetchOptions: {
         headers: {
@@ -93,7 +93,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>()

diff --git a/packages/bs-ethereum/src/BitqueryEDSEthereum.ts b/packages/bs-ethereum/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: {

diff --git a/packages/bs-ethereum/src/__tests__/BDSEthereum.spec.ts b/packages/bs-ethereum/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({

diff --git a/packages/bs-ethereum/src/graphql.ts b/packages/bs-ethereum/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

diff --git a/packages/bs-neo-legacy/package.json b/packages/bs-neo-legacy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo-legacy",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Coz",
@@ -10,8 +10,8 @@
     "test": "jest --config jest.config.ts"
   },
   "dependencies": {
-    "@cityofzion/blockchain-service": "0.7.1",
-    "@cityofzion/bs-asteroid-sdk": "0.7.1",
+    "@cityofzion/blockchain-service": "0.7.2",
+    "@cityofzion/bs-asteroid-sdk": "0.7.2",
     "@cityofzion/dora-ts": "0.0.11",
     "@cityofzion/neon-js": "4.8.3"
   },

diff --git a/packages/bs-neo-legacy/src/DoraBDSNeoLegacy.ts b/packages/bs-neo-legacy/src/DoraBDSNeoLegacy.ts
@@ -149,7 +149,7 @@ export class DoraBDSNeoLegacy implements BlockchainDataService, BDSClaimable {
       } catch {}
 
       return {
-        amount: (Number(balance.balance) / 10 ** token.decimals).toFixed(token.decimals),
+        amount: Number(balance.balance).toFixed(token.decimals),
         token,
       }
     })

diff --git a/packages/bs-neo3/package.json b/packages/bs-neo3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo3",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -17,8 +17,8 @@
     "@cityofzion/neo3-invoker": "1.6.0",
     "@cityofzion/neon-parser": "1.6.2",
     "@cityofzion/neo3-parser": "1.6.0",
-    "@cityofzion/blockchain-service": "0.7.1",
-    "@cityofzion/bs-asteroid-sdk": "0.7.1",
+    "@cityofzion/blockchain-service": "0.7.2",
+    "@cityofzion/bs-asteroid-sdk": "0.7.2",
     "@cityofzion/dora-ts": "0.0.11",
     "query-string": "7.1.3"
   },

diff --git a/packages/bs-react-native-decrypt/package.json b/packages/bs-react-native-decrypt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-react-native-decrypt",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Native Decrypt for Neo Blockchain",
   "main": "dist/commonjs/index",
   "module": "dist/module/index",