use public accessors explicitly

Author: phmatray

.eslintrc.js

@@ -11,6 +11,7 @@ module.exports = {
   },
   rules: {
     // Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs
-    // e.g. "@typescript-eslint/explicit-function-return-type": "off",
+    '@typescript-eslint/explicit-function-return-type': 'off',
+    '@typescript-eslint/no-non-null-assertion': 'off',
   },
 };

src/app/miner.ts

@@ -6,19 +6,19 @@ import TransactionPool from '../wallet/transaction-pool';
 import P2pServer from './p2p-server';
 
 export default class Miner {
-  blockchain: Blockchain;
-  transactionPool: TransactionPool;
-  wallet: Wallet;
-  p2pServer: P2pServer;
+  public blockchain: Blockchain;
+  public transactionPool: TransactionPool;
+  public wallet: Wallet;
+  public p2pServer: P2pServer;
 
-  constructor(blockchain: Blockchain, transactionPool: TransactionPool, wallet: Wallet, p2pServer: P2pServer) {
+  public constructor(blockchain: Blockchain, transactionPool: TransactionPool, wallet: Wallet, p2pServer: P2pServer) {
     this.blockchain = blockchain;
     this.transactionPool = transactionPool;
     this.wallet = wallet;
     this.p2pServer = p2pServer;
   }
 
-  mine(): Block {
+  public mine(): Block {
     const validTransactions = this.transactionPool.validTransactions();
     validTransactions.push(Transaction.rewardTransaction(this.wallet, Wallet.blockchainWallet()));
     const block = this.blockchain.addBlock(validTransactions);

src/app/p2p-server.ts

@@ -9,21 +9,21 @@ const peers = process.env.PEERS ? process.env.PEERS.split(',') : [];
 const MESSAGE_TYPES = {
   chain: 'CHAIN',
   transaction: 'TRANSACTION',
-  clear_transactions: 'CLEAR_TRANSACTIONS',
+  clearTransactions: 'CLEAR_TRANSACTIONS',
 };
 
 export default class P2pServer {
-  blockchain: Blockchain;
-  transactionPool: TransactionPool;
-  sockets: Websocket[];
+  public blockchain: Blockchain;
+  public transactionPool: TransactionPool;
+  public sockets: Websocket[];
 
-  constructor(blockchain: Blockchain, transactionPool: TransactionPool) {
+  public constructor(blockchain: Blockchain, transactionPool: TransactionPool) {
     this.blockchain = blockchain;
     this.transactionPool = transactionPool;
     this.sockets = [];
   }
 
-  listen(): void {
+  public listen(): void {
     const server = new Websocket.Server({ port: P2P_PORT });
     server.on('connection', socket => this.connectSocket(socket));
 
@@ -32,15 +32,15 @@ export default class P2pServer {
     console.log(`Listening for peer-to-peer connections on: ${P2P_PORT}`);
   }
 
-  connectToPeers(): void {
+  public connectToPeers(): void {
     peers.forEach(_ => {
       const socket = new Websocket(_);
 
       socket.on('open', () => this.connectSocket(socket));
     });
   }
 
-  connectSocket(socket: Websocket): void {
+  public connectSocket(socket: Websocket): void {
     this.sockets.push(socket);
     console.log('Socket connected');
 
@@ -49,7 +49,7 @@ export default class P2pServer {
     this.sendChain(socket);
   }
 
-  messageHandler(socket: Websocket): void {
+  public messageHandler(socket: Websocket): void {
     socket.on('message', message => {
       const data = JSON.parse(message as string);
       switch (data.type) {
@@ -59,14 +59,14 @@ export default class P2pServer {
         case MESSAGE_TYPES.transaction:
           this.transactionPool.updateOrAddTransaction(data.transaction);
           break;
-        case MESSAGE_TYPES.clear_transactions:
+        case MESSAGE_TYPES.clearTransactions:
           this.transactionPool.clear();
           break;
       }
     });
   }
 
-  sendChain(socket: Websocket): void {
+  public sendChain(socket: Websocket): void {
     socket.send(
       JSON.stringify({
         type: MESSAGE_TYPES.chain,
@@ -75,7 +75,7 @@ export default class P2pServer {
     );
   }
 
-  sendTransaction(socket: Websocket, transaction: Transaction): void {
+  public sendTransaction(socket: Websocket, transaction: Transaction): void {
     socket.send(
       JSON.stringify({
         type: MESSAGE_TYPES.transaction,
@@ -84,19 +84,19 @@ export default class P2pServer {
     );
   }
 
-  syncChains(): void {
+  public syncChains(): void {
     this.sockets.forEach(socket => this.sendChain(socket));
   }
 
-  broadcastTransaction(transaction: Transaction): void {
+  public broadcastTransaction(transaction: Transaction): void {
     this.sockets.forEach(socket => this.sendTransaction(socket, transaction));
   }
 
-  broadcastClearTransactions(): void {
+  public broadcastClearTransactions(): void {
     this.sockets.forEach(socket =>
       socket.send(
         JSON.stringify({
-          type: MESSAGE_TYPES.clear_transactions,
+          type: MESSAGE_TYPES.clearTransactions,
         }),
       ),
     );

src/blockchain/block.ts

@@ -3,14 +3,14 @@ import { DIFFICULTY, MINE_RATE } from '../config';
 import Transaction from '../wallet/transaction';
 
 export default class Block {
-  timestamp: number;
-  lastHash: string;
-  hash: string;
-  data: Transaction[];
-  nonce: number;
-  difficulty: number;
+  public timestamp: number;
+  public lastHash: string;
+  public hash: string;
+  public data: Transaction[];
+  public nonce: number;
+  public difficulty: number;
 
-  constructor(
+  public constructor(
     timestamp: number,
     lastHash: string,
     hash: string,
@@ -26,7 +26,7 @@ export default class Block {
     this.difficulty = difficulty || DIFFICULTY;
   }
 
-  toString(): string {
+  public toString(): string {
     return `Block -
       Timestamp : ${this.timestamp}
       Last Hash : ${this.lastHash.substring(0, 10)}
@@ -36,13 +36,13 @@ export default class Block {
       Data      : ${this.data}`;
   }
 
-  static genesis(): Block {
+  public static genesis(): Block {
     // TODO: Replace '0' by 'Genesis time'
     return new this(0, '-----', 'f1r57-h45h', [], 0, DIFFICULTY);
     // return new this('Genesis time', '-----', 'f1r57-h45h', [], 0, DIFFICULTY);
   }
 
-  static mineBlock(lastBlock: Block, data: any): Block {
+  public static mineBlock(lastBlock: Block, data: any): Block {
     let hash;
     let timestamp;
     const lastHash = lastBlock.hash;
@@ -59,16 +59,16 @@ export default class Block {
     return new this(timestamp, lastHash, hash, data, nonce, difficulty);
   }
 
-  static hash(timestamp: number, lastHash: string, data: any, nonce: number, difficulty: number): string {
+  public static hash(timestamp: number, lastHash: string, data: any, nonce: number, difficulty: number): string {
     return ChainUtil.hash(`${timestamp}${lastHash}${data}${nonce}${difficulty}`).toString();
   }
 
-  static blockHash(block: Block): string {
+  public static blockHash(block: Block): string {
     const { timestamp, lastHash, data, nonce, difficulty } = block;
     return Block.hash(timestamp, lastHash, data, nonce, difficulty);
   }
 
-  static adjustDifficulty(lastBlock: Block, currentTime: number): number {
+  public static adjustDifficulty(lastBlock: Block, currentTime: number): number {
     let { difficulty } = lastBlock;
     difficulty = lastBlock.timestamp + MINE_RATE > currentTime ? difficulty + 1 : difficulty - 1;
     return difficulty;

src/blockchain/index.ts

@@ -1,24 +1,24 @@
 import Block from './block';
 
 export default class Blockchain {
-  chain: Block[];
+  public chain: Block[];
 
-  constructor() {
+  public constructor() {
     this.chain = [Block.genesis()];
   }
 
-  addBlock(data: any): Block {
+  public addBlock(data: any): Block {
     const block = Block.mineBlock(this.getLastBlock(), data);
     this.chain.push(block);
 
     return block;
   }
 
-  getLastBlock(): Block {
+  public getLastBlock(): Block {
     return this.chain[this.chain.length - 1];
   }
 
-  isValidChain(chain: Block[]): boolean {
+  public isValidChain(chain: Block[]): boolean {
     if (JSON.stringify(chain[0]) !== JSON.stringify(Block.genesis())) {
       return false;
     }
@@ -35,7 +35,7 @@ export default class Blockchain {
     return true;
   }
 
-  replaceChain(newChain: Block[]): void {
+  public replaceChain(newChain: Block[]): void {
     if (newChain.length <= this.chain.length) {
       console.log('Received chain is not longer than the current chain.');
       return;

src/chain-util.ts

@@ -5,19 +5,19 @@ import uuidV1 from 'uuid/v1';
 const ecInstance = new ec('secp256k1');
 
 export default class ChainUtil {
-  static genKeyPair(): ec.KeyPair {
+  public static genKeyPair(): ec.KeyPair {
     return ecInstance.genKeyPair();
   }
 
-  static id(): string {
+  public static id(): string {
     return uuidV1();
   }
 
-  static hash(data: any): string {
+  public static hash(data: any): string {
     return SHA256(JSON.stringify(data)).toString();
   }
 
-  static verifySignature(publicKey: string, signature: ec.Signature, dataHash: string): boolean {
+  public static verifySignature(publicKey: string, signature: ec.Signature, dataHash: string): boolean {
     return ecInstance.keyFromPublic(publicKey, 'hex').verify(dataHash, signature);
   }
 }

src/config.ts

@@ -1,4 +1,4 @@
-export const DIFFICULTY: number = 4;
-export const MINE_RATE: number = 3000;
-export const INITIAL_BALANCE: number = 500;
-export const MINING_REWARD: number = 66;
+export const DIFFICULTY = 4;
+export const MINE_RATE = 3000;
+export const INITIAL_BALANCE = 500;
+export const MINING_REWARD = 66;

src/errors.ts

@@ -1,7 +1,7 @@
 export class InvalidTransactionException extends Error {
-  address: string;
+  public address: string;
 
-  constructor(address: string) {
+  public constructor(address: string) {
     const message = `Invalid transaction from ${address}.`;
 
     super(message);
@@ -12,9 +12,9 @@ export class InvalidTransactionException extends Error {
 }
 
 export class InvalidSignatureException extends Error {
-  address: string;
+  public address: string;
 
-  constructor(address: string) {
+  public constructor(address: string) {
     const message = `Invalid signature from ${address}.`;
 
     super(message);
@@ -25,10 +25,10 @@ export class InvalidSignatureException extends Error {
 }
 
 export class AmountExceedBalanceException extends Error {
-  amount: number;
-  balance?: number;
+  public amount: number;
+  public balance?: number;
 
-  constructor(amount: number, balance?: number) {
+  public constructor(amount: number, balance?: number) {
     const message =
       balance === undefined
         ? `Amount: ${amount} exceeds balance.`

src/wallet/index.ts

@@ -8,29 +8,29 @@ import Transaction from './transaction';
 import TransactionPool from './transaction-pool';
 
 export default class Wallet {
-  balance: number;
-  keyPair: ec.KeyPair;
-  publicKey: string;
-  address: string;
+  public balance: number;
+  public keyPair: ec.KeyPair;
+  public publicKey: string;
+  public address: string;
 
-  constructor() {
+  public constructor() {
     this.balance = INITIAL_BALANCE;
     this.keyPair = ChainUtil.genKeyPair();
     this.publicKey = this.keyPair.getPublic().encode('hex');
     this.address = '';
   }
 
-  toString(): string {
+  public toString(): string {
     return `Wallet -
       publicKey: ${this.publicKey.toString()}
       balance  : ${this.balance}`;
   }
 
-  sign(dataHash: any): ec.Signature {
+  public sign(dataHash: any): ec.Signature {
     return this.keyPair.sign(dataHash);
   }
 
-  createTransaction(
+  public createTransaction(
     recipient: string,
     amount: number,
     blockchain: Blockchain,
@@ -54,7 +54,7 @@ export default class Wallet {
     return transaction;
   }
 
-  calculateBalance(blockchain: Blockchain): number {
+  public calculateBalance(blockchain: Blockchain): number {
     let balance = this.balance;
     let transactions: Transaction[] = [];
     blockchain.chain.forEach(block =>
@@ -76,11 +76,6 @@ export default class Wallet {
       startTime = recentInput.input.timestamp;
     }
 
-    // transactions
-    //   .filter((transaction) => transaction.input.timestamp > startTime)
-    //   .filter((transaction) => output.address === this.publicKey)
-    //   .forEach((transaction)=> {balance += transaction})
-
     transactions.forEach(transaction => {
       if (transaction.input.timestamp > startTime) {
         transaction.outputs.forEach(output => {
@@ -94,7 +89,7 @@ export default class Wallet {
     return balance;
   }
 
-  static blockchainWallet(): Wallet {
+  public static blockchainWallet(): Wallet {
     const blockchainWallet = new this();
     blockchainWallet.address = 'blockchain-wallet';
     return blockchainWallet;