Skip to content
This repository has been archived by the owner on Jul 23, 2024. It is now read-only.

Add hex prefix to address with Account #127

Merged
merged 1 commit into from
Oct 16, 2019
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const AccountKeyPublic = require('../accountKey/accountKeyPublic')
const AccountKeyMultiSig = require('../accountKey/accountKeyMultiSig')
const AccountKeyRoleBased = require('../accountKey/accountKeyRoleBased')
const isAddress = require('../../../../caver-utils/src/utils').isAddress
const addHexPrefix = require('../../../../caver-utils').addHexPrefix

class Account {
static fromObject(obj) { return new Account(obj.address, new AccountKeyPublic(obj.privateKey)) }
Expand All @@ -21,11 +22,13 @@ class Account {
if (!isAddress(address)) throw new Error(`Invalid address : ${address}`)
if (!Account.isAccountKey(accountKey)) throw new Error(`Invalid accountKey.`)

address = addHexPrefix(address)

Object.defineProperty(this, 'address', {
get: function () { return address },
set: function (addressInput) {
if (!isAddress(addressInput)) throw new Error(`Invalid address : ${addressInput}`)
address = addressInput
address = addHexPrefix(addressInput)
},
enumerable: true
})
Expand Down