Merge pull request #21 from mosaicnetworks/dev

Dev
mosaicnetworks · Sep 17, 2019 · 9fdbe99 · 9fdbe99
2 parents 08c03bf + 8727a49
commit 9fdbe99
Show file tree

Hide file tree

Showing 16 changed files with 68 additions and 23 deletions.
diff --git a/lerna.json b/lerna.json
@@ -8,9 +8,8 @@
 			"exact": true
 		},
 		"publish": {
-			"message": "chore(release): publish",
-			"push": false,
-			"exact": true
+			"ignoreChanges": ["**/*.md", "**/example/**", "**/test/**"],
+			"message": "chore(release): publish"
 		}
 	}
 }
diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v1.3.2
+
+-   No changes
+
 ## v1.3.1
 
 ### Changed

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -2,7 +2,7 @@
 	"name": "evm-lite-client",
 	"namespace": "mosaicnetworks",
 	"author": "Danu Kumanan",
-	"version": "1.3.1",
+	"version": "1.3.2",
 	"license": "MIT",
 	"main": "./dist/index.js",
 	"typings": "./dist/typings/index.d.ts",

diff --git a/packages/consensus/CHANGELOG.md b/packages/consensus/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v1.3.2
+
+-   No changes
+
 ## v1.3.1
 
 ### Added

diff --git a/packages/consensus/package.json b/packages/consensus/package.json
@@ -2,7 +2,7 @@
 	"name": "evm-lite-consensus",
 	"namespace": "mosaicnetworks",
 	"author": "Danu Kumanan",
-	"version": "1.3.1",
+	"version": "1.3.2",
 	"license": "MIT",
 	"main": "./dist/index.js",
 	"typings": "./dist/typings/index.d.ts",
@@ -15,7 +15,7 @@
 		"doc": "rm -rf docs/ && typedoc"
 	},
 	"dependencies": {
-		"evm-lite-client": "^1.3.1",
+		"evm-lite-client": "^1.3.2",
 		"json-bigint": "^0.3.0"
 	},
 	"repository": {

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v1.3.2
+
+### Changed
+
+-   `Account.balance` is now a `Currency` object
+-   Exports `IEVMAccount` which has `balance` attribute as currency
+-   Add `^` to `evm-lite-*` modules
+
 ## v1.3.1
 
 ### Added

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -2,7 +2,7 @@
 	"name": "evm-lite-core",
 	"namespace": "mosaicnetworks",
 	"author": "Danu Kumanan",
-	"version": "1.3.1",
+	"version": "1.3.2",
 	"license": "MIT",
 	"main": "./dist/index.js",
 	"typings": "./dist/typings/index.d.ts",
@@ -16,9 +16,9 @@
 	},
 	"dependencies": {
 		"eth-lib": "0.2.8",
-		"evm-lite-client": "^1.3.1",
-		"evm-lite-consensus": "^1.3.1",
-		"evm-lite-utils": "^1.3.1",
+		"evm-lite-client": "^1.3.2",
+		"evm-lite-consensus": "^1.3.2",
+		"evm-lite-utils": "^1.3.3",
 		"json-bigint": "^0.3.0",
 		"web3": "0.20.6",
 		"web3-eth-iban": "1.0.0-beta.46",

diff --git a/packages/core/src/Account.ts b/packages/core/src/Account.ts
@@ -3,7 +3,7 @@ import * as ethlib from 'eth-lib';
 // @ts-ignore
 import * as EthLibAccount from 'eth-lib/lib/account';
 
-import utils from 'evm-lite-utils';
+import utils, { Currency } from 'evm-lite-utils';
 
 import { ISignedTx, ITransaction } from './Transaction';
 
@@ -15,7 +15,7 @@ export interface IAccount {
 	privateKey: string;
 
 	// account data
-	balance: number;
+	balance: Currency;
 	nonce: number;
 
 	// sign transaction method
@@ -33,7 +33,10 @@ export default class Account implements IAccount {
 	public static fromPrivateKey(privateKey: string) {
 		privateKey = utils.cleanAddress(privateKey);
 
-		return new Account(EthLibAccount.fromPrivate(privateKey));
+		const account = new Account(EthLibAccount.fromPrivate(privateKey));
+		account.balance = new Currency(0);
+
+		return account;
 	}
 
 	/**
@@ -52,7 +55,7 @@ export default class Account implements IAccount {
 	public readonly address: string;
 	public readonly privateKey: string;
 
-	public balance: number = 0;
+	public balance: Currency = new Currency(0);
 	public nonce: number = 0;
 
 	constructor({

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -1,5 +1,7 @@
 import Node from './Node';
 
+export { IEVMAccount } from './Node';
+
 export { ITransaction, ISignedTx, default as Transaction } from './Transaction';
 export { default as Account, IAccount } from './Account';
 export { default as Contract, IAbstractSchema } from './Contract';

diff --git a/packages/datadir/CHANGELOG.md b/packages/datadir/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v1.3.3
+
+### Changed
+
+-   Add `^` to `evm-lite-*` modules
+
 ## v1.3.2
 
 ### Added

diff --git a/packages/datadir/package.json b/packages/datadir/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "evm-lite-datadir",
 	"namespace": "mosaicnetworks",
-	"version": "1.3.2",
+	"version": "1.3.3",
 	"license": "MIT",
 	"main": "./dist/index.js",
 	"typings": "./dist/typings/index.d.ts",
@@ -13,8 +13,8 @@
 		"prepublish": "tsc"
 	},
 	"dependencies": {
-		"evm-lite-keystore": "^1.3.1",
-		"evm-lite-utils": "^1.3.1",
+		"evm-lite-keystore": "^1.3.2",
+		"evm-lite-utils": "^1.3.3",
 		"mkdirp": "^0.5.1",
 		"toml": "^3.0.0",
 		"tomlify-j0.4": "^3.0.0"

diff --git a/packages/keystore/CHANGELOG.md b/packages/keystore/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v1.3.2
+
+### Changed
+
+-   Add `^` to `evm-lite-*` modules
+
 ## v1.3.1
 
 ### Changed

diff --git a/packages/keystore/package.json b/packages/keystore/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "evm-lite-keystore",
 	"namespace": "mosaicnetworks",
-	"version": "1.3.1",
+	"version": "1.3.2",
 	"license": "MIT",
 	"main": "./dist/index.js",
 	"typings": "./dist/typings/index.d.ts",
@@ -17,9 +17,9 @@
 		"browserify-cipher": "^1.0.1",
 		"crypto-random-hex": "^1.0.0",
 		"eth-lib": "^0.2.8",
-		"evm-lite-client": "^1.3.1",
-		"evm-lite-core": "^1.3.1",
-		"evm-lite-utils": "^1.3.1",
+		"evm-lite-client": "^1.3.2",
+		"evm-lite-core": "^1.3.2",
+		"evm-lite-utils": "^1.3.3",
 		"json-bigint": "0.3.0",
 		"keccak256": "^1.0.0",
 		"mkdirp": "^0.5.1",

diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v1.3.3
+
+### Changed
+
+-   `Currency.plus` now returns `Currency` object instead of `BigNumber`
+
 ## v1.3.2
 
 ### Changed

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -2,7 +2,7 @@
 	"name": "evm-lite-utils",
 	"namespace": "mosaicnetworks",
 	"author": "Danu Kumanan",
-	"version": "1.3.2",
+	"version": "1.3.3",
 	"license": "MIT",
 	"main": "./dist/index.js",
 	"typings": "./dist/typings/index.d.ts",

diff --git a/packages/utils/src/Currency.ts b/packages/utils/src/Currency.ts
@@ -99,12 +99,19 @@ class Currency extends BN {
 	}
 
 	// Return currency object
-	public times(n: number): Currency {
+	public times(n: Currency): Currency {
 		const bn = super.times(n, 10);
 
 		return new Currency(bn);
 	}
 
+	// Return currency object
+	public plus(n: Currency): Currency {
+		const bn = super.plus(n, 10);
+
+		return new Currency(bn);
+	}
+
 	private convert(to: IUnits) {
 		// starting unit is always a BN due `evm-lite` always
 		// returning balance in atto tokens