oceanprotocol/ocean.js
1
0
Fork 0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00
Code Releases Activity

add ocean token & any token balance to Account

Browse Source
This commit is contained in:
alexcos20 2020-07-15 03:25:01 -07:00
parent 13095ce710
commit a03c9b888f
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/ocean/Account.ts
View File

@ -79,7 +79,7 @@ export default class Account extends Instantiable {
* Balance of Any Token (converted from wei).
* @return {Promise<string>}
*/
public async getTokenBalance(TokenAdress: string): Promise<number> {
public async getTokenBalance(TokenAdress: string): Promise<string> {
if (TokenAdress === null) return null
const minABI = [
{
@ -117,10 +117,10 @@ export default class Account extends Instantiable {
}
/**
* Balance of Ocean Token.
* Balance of Ocean Token. (converted from wei).
* @return {Promise<string>}
*/
public async getOceanBalance(): Promise<number> {
public async getOceanBalance(): Promise<string> {
return this.getTokenBalance(this.config.oceanTokenAddress)
}
@ -134,17 +134,11 @@ export default class Account extends Instantiable {
}
/**
* Balance of Ether.
* @return {Promise<number>}
* Balance of Ether.(converted from wei).
* @return {Promise<string>}
*/
public async getEtherBalance(): Promise<number> {
// TO DO
/* return this.web3.eth
.getBalance(this.id, 'latest')
.then((balance: string): number => {
return new BigNumber(balance).toNumber()
})
*/
return 0
public async getEtherBalance(): Promise<string> {
const result = await this.web3.eth.getBalance(this.id, 'latest')
return this.web3.utils.fromWei(result)
}
}

12
src/ocean/Accounts.ts
View File

@ -34,27 +34,27 @@ export class Accounts extends Instantiable {
* Return account balance for a given ERC20 token
* @param {String} TokenAddress .
* @param {Account} account Account instance.
* @return {Promise<Balance>} Ether and Ocean Token balance.
* @return {Promise<String>} Token balance.
*/
public getTokenBalance(TokenAddress: string, account: Account): Promise<number> {
public getTokenBalance(TokenAddress: string, account: Account): Promise<string> {
return account.getTokenBalance(TokenAddress)
}
/**
* Return account balance for a Ocean Tokens
* @param {Account} account Account instance.
* @return {Promise<Balance>} Ether and Ocean Token balance.
* @return {Promise<String>} Ocean Token balance.
*/
public getOceanBalance(account: Account): Promise<number> {
public getOceanBalance(account: Account): Promise<string> {
return account.getOceanBalance()
}
/**
* Return account balance in ETH
* @param {Account} account Account instance.
* @return {Promise<Balance>} Ether and Ocean Token balance.
* @return {Promise<String>} Ether balance.
*/
public getEtherBalance(account: Account): Promise<number> {
public getEtherBalance(account: Account): Promise<string> {
return account.getEtherBalance()
}
}