@leofcoin/endpoint-clients 0.2.7 → 0.2.9

package/exports/direct.js

@@ -1,3 +1,5 @@
+import { formatUnits, BigNumber } from '@leofcoin/utils';
+
 class Client {
     url;
     networkVersion;
@@ -8,15 +10,17 @@ class Client {
     }
     get pubsub() {
         return {
-            publish: peernet.pubsub.publish,
-            subscribe: peernet.pubsub.subscribe
+            publish: globalThis.pubsub.publish,
+            subscribe: globalThis.pubsub.subscribe
         };
     }
     balances() {
         return chain.balances;
     }
-    balanceOf(address, format) {
-        return chain.balanceOf(address, format);
+    async balanceOf(address, format) {
+        const balances = await chain.balances;
+        const balance = balances[address];
+        return format ? formatUnits(balance) : balance;
     }
     selectedAccount() {
         return chain.selectedAccount;
@@ -28,22 +32,22 @@ class Client {
         return chain.accounts;
     }
     hasTransactionToHandle() {
-        return chain.hasTransactionToHandle;
+        return chain.hasTransactionToHandle();
     }
     getBlock(index) {
         return chain.getBlock(index);
     }
     blocks(amount) {
-        return chain.blocks(amount);
+        return chain.blocks.slice(amount);
     }
     sendTransaction(transaction) {
         return chain.sendTransaction(transaction);
     }
     peerId() {
-        return chain.peerId;
+        return peernet.peerId;
     }
     peers() {
-        return chain.peers;
+        return peernet.peers;
     }
     validators() {
         return chain.validators;
@@ -76,16 +80,16 @@ class Client {
         return chain.totalTransactions;
     }
     poolTransactions() {
-        return chain.poolTransactions;
+        return transactionPoolStore.get();
     }
     transactionsInPool() {
-        return chain.transactionsInPool;
+        return transactionPoolStore.length();
     }
     transactionPoolSize() {
-        return chain.transactionPoolSize;
+        return transactionPoolStore.size();
     }
     totalBlocks() {
-        return chain.totalBlocks;
+        return chain.blocks.length;
     }
     nativeCalls() {
         return chain.nativeCalls;
@@ -105,12 +109,44 @@ class Client {
     network() {
         return chain.network;
     }
-    networkStats() {
-        return chain.networkStats;
+    async networkStats() {
+        let accountsHolding = 0;
+        let accountsHoldingAmount = BigNumber.from(0);
+        let topHolders = [];
+        const balances = Object.entries(await chain.balances)
+            .map(([holder, amount]) => {
+            amount = BigNumber.from(amount);
+            return { holder, amount };
+        })
+            .sort((a, b) => formatUnits(b.amount.sub(a.amount)));
+        for (let { holder, amount } of balances) {
+            if (amount.gt(0)) {
+                accountsHoldingAmount = accountsHoldingAmount.add(amount);
+                accountsHolding += 1;
+                topHolders.length < 100 && topHolders.push({ holder, amount: formatUnits(amount) });
+            }
+        }
+        return {
+            version: peernet.networkVersion,
+            peers: peernet.peers.map(([id, peer]) => id),
+            accounts: await accountsStore.length(),
+            accountsHolding,
+            accountsHoldingAmount: formatUnits(accountsHoldingAmount).toString(),
+            topHolders
+        };
     }
     getNonce(address) {
         return chain.getNonce(address);
     }
+    lastBlock() {
+        return chain.lastBlock;
+    }
+    blockHashMap() {
+        return chain.blockHashMap;
+    }
+    bootstrap() {
+        return chain.blockHashMap;
+    }
 }
 
 export { Client as default };

package/exports/http.js

@@ -121,6 +121,15 @@ class Client {
     getNonce(address) {
         return this._fetchNumber('getNonce', { address });
     }
+    lastBlock() {
+        return this._fetch('lastBlock');
+    }
+    blockHashMap() {
+        return this._fetch('blockHashMap');
+    }
+    bootstrap() {
+        return this._fetch('blockHashMap');
+    }
 }
 
 export { Client as default };

package/exports/index.js

@@ -1,3 +1,5 @@
 export { default as ws } from './ws.js';
 export { default as http } from './http.js';
+export { default as direct } from './direct.js';
 import 'socket-request-client';
+import '@leofcoin/utils';

package/exports/types/direct.d.ts

@@ -8,7 +8,7 @@ export default class Client {
         subscribe: any;
     };
     balances(): any;
-    balanceOf(address: string, format: boolean): any;
+    balanceOf(address: string, format: boolean): Promise<any>;
     selectedAccount(): any;
     selectAccount(address: any): any;
     accounts(): any;
@@ -38,11 +38,16 @@ export default class Client {
     createContractAddress(owner: string, code: string, params: {}): {};
     deployContract(code: string, params: {}): {};
     network(): any;
-    networkStats(): {
+    networkStats(): Promise<{
         version: string;
         peers: {}[];
         accounts: number;
         accountsHolding: number;
-    };
+        accountsHoldingAmount: number;
+        topHolders: any[];
+    }>;
     getNonce(address: string): any;
+    lastBlock(): any;
+    blockHashMap(): any;
+    bootstrap(): any;
 }

package/exports/types/http.d.ts

@@ -47,5 +47,8 @@ export default class Client {
         accountsHolding: number;
     }>;
     getNonce(address: string): Promise<number>;
+    lastBlock(): Promise<any>;
+    blockHashMap(): Promise<any>;
+    bootstrap(): Promise<any>;
 }
 export {};

package/exports/types/index.d.ts

@@ -1,2 +1,3 @@
 export { default as ws } from './ws.js';
 export { default as http } from './http.js';
+export { default as direct } from './direct.js';

package/exports/types/ws.d.ts

@@ -1,51 +1,54 @@
-import socketRequestClient from 'socket-request-client';
+import ClientConnection from 'socket-request-client/connection';
 export default class Client {
     url: string;
     networkVersion: string;
-    client: socketRequestClient;
+    client: ClientConnection;
     constructor(url?: string, networkVersion?: string);
     init(): Promise<void>;
     get pubsub(): {
-        publish: any;
-        subscribe: any;
+        publish: (topic: string, value: any) => Promise<any>;
+        subscribe: (topic: string, cb: any) => Promise<any>;
     };
-    request(url: string, params?: {}): any;
-    balances(): any;
-    balanceOf(address: string, format: boolean): any;
-    selectedAccount(): any;
-    selectAccount(address: any): any;
-    accounts(): any;
-    hasTransactionToHandle(): any;
-    getBlock(index: number): any;
-    blocks(amount: number): any;
-    sendTransaction(transaction: any): any;
-    peerId(): any;
-    peers(): any;
-    validators(): any;
-    lookup(name: string): any;
-    staticCall(contract: string, method: string, params: {}): any;
-    nativeBurns(): number;
-    contracts(): number;
-    nativeMints(): number;
-    nativeToken(): number;
-    nativeTransfers(): number;
-    totalSize(): number;
-    totalTransactions(): number;
-    poolTransactions(): any;
-    transactionsInPool(): any;
-    transactionPoolSize(): any;
-    totalBlocks(): number;
-    nativeCalls(): number;
-    participating(): boolean;
+    request(url: string, params?: {}): Promise<any>;
+    balances(): Promise<any>;
+    balanceOf(address: string, format: boolean): Promise<any>;
+    selectedAccount(): Promise<any>;
+    selectAccount(address: any): Promise<any>;
+    accounts(): Promise<any>;
+    hasTransactionToHandle(): Promise<any>;
+    getBlock(index: number): Promise<any>;
+    blocks(amount: number): Promise<any>;
+    sendTransaction(transaction: any): Promise<any>;
+    peerId(): Promise<any>;
+    peers(): Promise<any>;
+    validators(): Promise<any>;
+    lookup(name: string): Promise<any>;
+    staticCall(contract: string, method: string, params: {}): Promise<any>;
+    nativeBurns(): Promise<number>;
+    contracts(): Promise<number>;
+    nativeMints(): Promise<number>;
+    nativeToken(): Promise<number>;
+    nativeTransfers(): Promise<number>;
+    totalSize(): Promise<number>;
+    totalTransactions(): Promise<number>;
+    poolTransactions(): Promise<any>;
+    transactionsInPool(): Promise<any>;
+    transactionPoolSize(): Promise<any>;
+    totalBlocks(): Promise<number>;
+    nativeCalls(): Promise<number>;
+    participating(): Promise<boolean>;
     participate(address: string): {};
     createContractAddress(owner: string, code: string, params: {}): {};
     deployContract(code: string, params: {}): {};
-    network(): any;
-    networkStats(): {
+    network(): Promise<any>;
+    networkStats(): Promise<{
         version: string;
         peers: {}[];
         accounts: number;
         accountsHolding: number;
-    };
-    getNonce(address: string): any;
+    }>;
+    getNonce(address: string): Promise<any>;
+    lastBlock(): Promise<any>;
+    blockHashMap(): Promise<any>;
+    bootstrap(): Promise<any>;
 }

package/exports/ws.js

@@ -1,4 +1,4 @@
-import socketRequestClient from 'socket-request-client';
+import { SocketRequestClient } from 'socket-request-client';
 
 class Client {
     url;
@@ -9,7 +9,8 @@ class Client {
         this.networkVersion = networkVersion;
     }
     async init() {
-        this.client = await socketRequestClient(this.url, this.networkVersion);
+        const client = new SocketRequestClient(this.url, this.networkVersion);
+        this.client = await client.init();
     }
     get pubsub() {
         return {
@@ -119,6 +120,15 @@ class Client {
     getNonce(address) {
         return this.request('getNonce', { address });
     }
+    lastBlock() {
+        return this.request('lastBlock');
+    }
+    blockHashMap() {
+        return this.request('blockHashMap');
+    }
+    bootstrap() {
+        return this.request('blockHashMap');
+    }
 }
 
 export { Client as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/endpoint-clients",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "",
   "exports": {
     ".": {
@@ -46,6 +46,7 @@
     "tslib": "^2.5.0"
   },
   "dependencies": {
-    "socket-request-client": "^1.7.3"
+    "@leofcoin/utils": "^1.1.7",
+    "socket-request-client": "^2.0.0"
   }
 }

package/src/direct.ts

@@ -1,5 +1,9 @@
+import {formatUnits, BigNumber} from '@leofcoin/utils'
+
 declare var chain
 declare var peernet
+declare var transactionPoolStore
+declare var accountsStore
 
 export default class Client {
   url: string
@@ -13,8 +17,8 @@ export default class Client {
 
   get pubsub() {
     return {
-      publish: peernet.pubsub.publish,
-      subscribe: peernet.pubsub.subscribe
+      publish: globalThis.pubsub.publish,
+      subscribe: globalThis.pubsub.subscribe
     }
   }
 
@@ -22,8 +26,10 @@ export default class Client {
     return chain.balances
   }
     
-  balanceOf(address: string, format: boolean) {
-    return chain.balanceOf(address, format)
+  async balanceOf(address: string, format: boolean) {
+    const balances = await chain.balances
+    const balance = balances[address]
+    return format ? formatUnits(balance) : balance
   }
 
   selectedAccount() {
@@ -39,24 +45,24 @@ export default class Client {
   }
     
   hasTransactionToHandle() {
-    return chain.hasTransactionToHandle
+    return chain.hasTransactionToHandle()
   }
 
   getBlock(index: number) {
     return chain.getBlock(index)
   }
   blocks(amount: number) {
-    return chain.blocks(amount)
+    return chain.blocks.slice(amount)
   }
 
   sendTransaction(transaction) {
     return chain.sendTransaction(transaction)
   }
   peerId() {
-    return chain.peerId
+    return peernet.peerId
   }
   peers() {
-    return chain.peers
+    return peernet.peers
   }
   validators() {
     return chain.validators
@@ -90,16 +96,16 @@ export default class Client {
     return chain.totalTransactions
   }
   poolTransactions() {
-      return chain.poolTransactions
+      return transactionPoolStore.get()
   }
   transactionsInPool() {
-      return chain.transactionsInPool
+      return transactionPoolStore.length()
   }
   transactionPoolSize() {
-      return chain.transactionPoolSize
+      return transactionPoolStore.size()
   }
   totalBlocks(): number {
-    return chain.totalBlocks
+    return chain.blocks.length
   }
   nativeCalls(): number {
     return chain.nativeCalls
@@ -120,11 +126,48 @@ export default class Client {
     return chain.network
   }
 
-  networkStats(): { version: string; peers: {}[]; accounts: number; accountsHolding: number } {
-    return chain.networkStats
+  async networkStats(): Promise<{ version: string; peers: {}[]; accounts: number; accountsHolding: number, accountsHoldingAmount: number, topHolders: any[] }> {
+    let accountsHolding = 0
+    let accountsHoldingAmount = BigNumber.from(0)
+    let topHolders = []
+    const balances = Object.entries(await chain.balances)
+      .map(([holder, amount]): {holder: string, amount: BigNumber} => {
+        amount = BigNumber.from(amount)
+        return {holder, amount}
+      })
+      .sort((a, b) => formatUnits(b.amount.sub(a.amount)))
+  
+    for (let {holder, amount} of balances) {
+      if (amount.gt(0)) {
+        accountsHoldingAmount = accountsHoldingAmount.add(amount)
+        accountsHolding += 1
+        topHolders.length < 100 && topHolders.push({holder, amount: formatUnits(amount)})
+      }
+    }
+    
+    return {
+      version: peernet.networkVersion,
+      peers: peernet.peers.map(([id, peer]) => id),
+      accounts: await accountsStore.length(),
+      accountsHolding,
+      accountsHoldingAmount: formatUnits(accountsHoldingAmount).toString(),
+      topHolders
+    }
   }
 
   getNonce(address: string) {
     return chain.getNonce(address)
   } 
+
+  lastBlock() {
+    return chain.lastBlock
+  }
+
+  blockHashMap() {
+    return chain.blockHashMap
+  }
+
+  bootstrap() {
+    return chain.blockHashMap
+  }
 }

package/src/http.ts

@@ -145,4 +145,16 @@ export default class Client {
   getNonce(address: string) {
     return this._fetchNumber('getNonce', { address })
   }
+
+  lastBlock() {
+    return this._fetch('lastBlock')
+  }
+
+  blockHashMap() {
+    return this._fetch('blockHashMap')
+  }
+
+  bootstrap() {
+    return this._fetch('blockHashMap')
+  }
 }

package/src/index.ts

@@ -1,2 +1,3 @@
 export {default as ws} from './ws.js'
-export {default as http} from './http.js'
+export {default as http} from './http.js'
+export {default as direct} from './direct.js'

package/src/ws.ts

@@ -1,9 +1,10 @@
-import socketRequestClient from 'socket-request-client'
+import { SocketRequestClient } from 'socket-request-client'
+import ClientConnection from 'socket-request-client/connection'
 
 export default class Client {
   url: string
   networkVersion: string
-  client: socketRequestClient
+  client: ClientConnection
 
   constructor(url = 'ws://localhost:4040', networkVersion = 'leofcoin-peach') {
     this.url = url
@@ -11,7 +12,8 @@ export default class Client {
   }
 
   async init() {
-    this.client = await socketRequestClient(this.url, this.networkVersion)
+    const client = new SocketRequestClient(this.url, this.networkVersion)
+    this.client = await client.init() as ClientConnection
   }
 
   get pubsub() {
@@ -75,25 +77,25 @@ export default class Client {
   staticCall(contract: string, method: string, params: {}) {
     return this.request('staticCall', {contract, method, params})
   }
-  nativeBurns(): number {
+  nativeBurns(): Promise<number> {
     return this.request('nativeBurns')
   }
-  contracts(): number {
+  contracts(): Promise<number> {
     return this.request('contracts')
   }
-  nativeMints(): number {
+  nativeMints(): Promise<number> {
     return this.request('nativeMints')
   }
-  nativeToken(): number {
+  nativeToken(): Promise<number> {
     return this.request('nativeToken')
   }
-  nativeTransfers(): number {
+  nativeTransfers(): Promise<number> {
     return this.request('nativeTransfers')
   }
-  totalSize(): number {
+  totalSize(): Promise<number> {
     return this.request('totalSize')
   }
-  totalTransactions(): number {
+  totalTransactions(): Promise<number> {
     return this.request('totalTransactions')
   }
   poolTransactions() {
@@ -105,13 +107,13 @@ export default class Client {
   transactionPoolSize() {
       return this.request('transactionPoolSize')
   }
-  totalBlocks(): number {
+  totalBlocks(): Promise<number> {
     return this.request('totalBlocks')
   }
-  nativeCalls(): number {
+  nativeCalls(): Promise<number> {
     return this.request('nativeCalls')
   }
-  participating(): boolean {
+  participating(): Promise<boolean> {
     return this.request('participating')
   }
   participate(address: string): {} {
@@ -127,11 +129,23 @@ export default class Client {
     return this.request('network')
   }
 
-  networkStats(): { version: string; peers: {}[]; accounts: number; accountsHolding: number } {
+  networkStats(): Promise<{ version: string; peers: {}[]; accounts: number; accountsHolding: number }> {
     return this.request('networkStats')
   }
 
   getNonce(address: string) {
     return this.request('getNonce', { address })
-  } 
+  }
+
+  lastBlock() {
+    return this.request('lastBlock')
+  }
+
+  blockHashMap() {
+    return this.request('blockHashMap')
+  }
+
+  bootstrap() {
+    return this.request('blockHashMap')
+  }
 }

package/test/index.js

@@ -1,6 +1,7 @@
 import { needsImplementations } from './spec.js';
 import WsClient from './../exports/ws.js'
 import HttpClient from './../exports/http.js'
+import DirectClient from './../exports/direct.js'
 
 try {
   const wsNeeds = needsImplementations(new WsClient())
@@ -8,6 +9,9 @@ try {
 
   const httpNeeds = needsImplementations(new HttpClient())
   if (httpNeeds.length > 0) throw new Error(`http: missing implementations ${httpNeeds.length > 2 ? httpNeeds.join(', ') : httpNeeds.join(' & ')}`)
+
+  const directNeeds = needsImplementations(new DirectClient())
+  if (directNeeds.length > 0) throw new Error(`direct: missing implementations ${directNeeds.length > 2 ? directNeeds.join(', ') : directNeeds.join(' & ')}`)
 } catch (error) {
   console.error(error);
 }

package/test/spec.js

@@ -26,7 +26,8 @@ export const implementations = [
   'totalBlocks',
   'totalSize',
   'totalTransactions',
-  'validators'
+  'validators',
+  'lastBlock'
 ]
 
 export const needsImplementations = (client) => {
@@ -39,5 +40,6 @@ export const needsImplementations = (client) => {
     }
     
   }
+  console.log(needs);
   return needs
 }

package/tsconfig.json

@@ -12,6 +12,5 @@
   },
   "include": [
     "./src/**/*"
-  ],
-  "exclude": ["./node_modules"]
+  ]
 }