Skip to content

Convert analytics to ts #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thgreasi wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Convert analytics to ts #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a95671
rename analytics to ts
thgreasi May 16, 2018
312b8f1
convert analytics to ts
thgreasi May 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions basic/analytics.js → basic/analytics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var Web3 = require('web3');
import Web3 from 'web3';
import { Block, TransactionReceipt } from 'web3/types';

////////////////////////////////////////////////////////////////////////////
////////////////////////// GLOBAL VARIABLES ////////////////////////////////
Expand All @@ -7,6 +8,16 @@ var Web3 = require('web3');
var web3 = new Web3();
web3.setProvider(new web3.providers.HttpProvider('http://localhost:8100'));

interface ExtendedBlock extends Block {
time: string;
}

interface ExtendedTransactionReceipt extends TransactionReceipt {
input: string;
gasPrice: string;
gas: number;
}

// DATABASE TO BE
var dbBlocks = []; // ARRAY OF BLOCKS
// var dbTrans = [];
Expand Down Expand Up @@ -743,7 +754,7 @@ export const getBalancePerBlockOfAccount = function(
const getBlockInfoMinimalNoChecks = function(blockNumber) {
return web3.eth
.getBlock(blockNumber, true)
.then(bl => {
.then((bl: ExtendedBlock) => {
// bl.timestamp = this.decodeTime(bl.timestamp);
bl.time = decodeTime(bl.timestamp);
return bl;
Expand All @@ -763,7 +774,7 @@ export const getBlockInfoMinimal = function(blockNumber) {
var check = searchFor(blockNumber);

if (check === -1) {
web3.eth.getBlock(blockNumber, true).then(bl => {
web3.eth.getBlock(blockNumber, true).then((bl: ExtendedBlock) => {
// console.log("GET BLOCK: " + blockNumber);
// SAVE TO DB
bl.timestamp = decodeTime(bl.timestamp);
Expand All @@ -784,7 +795,7 @@ export const getBlockInfoMinimal = function(blockNumber) {
}
} else {
// console.log("VVVVVVVVVVVVV");
web3.eth.getBlock(res, true).then(bl => {
web3.eth.getBlock(res, true).then((bl: ExtendedBlock) => {
// console.log("IN IFFFF GET BLOCK: " + res);
// SAVE TO DB
dbBlocks.push(bl);
Expand Down Expand Up @@ -970,7 +981,7 @@ export const getNumberOfTranscationsOfAccountPerBlock = function(
const getTranscationInfo = function(e) {
return web3.eth
.getTransactionReceipt(e.hash)
.then(res => {
.then((res: ExtendedTransactionReceipt) => {
if (res !== null) {
// console.log("Input: " + rs.input);
res.input = e.input;
Expand Down Expand Up @@ -1001,7 +1012,7 @@ export const getTranscationInfoHash = function(hash) {
if (rs !== null) {
web3.eth
.getTransactionReceipt(rs.hash)
.then(res => {
.then((res: ExtendedTransactionReceipt) => {
if (res !== null) {
// console.log("Input: " + rs.input);
res.input = rs.input;
Expand Down Expand Up @@ -1761,7 +1772,7 @@ export const getContractDetails = function(startBlockNumber, endBlockNumber) {
});
};

const getBalance = function(account, block) {
const getBalance = function(account, block?) {
return new Promise((resolve, reject) => {
if (block) {
web3.eth
Expand Down