Skip to content

Commit

Permalink
switch to main net address format
Browse files Browse the repository at this point in the history
  • Loading branch information
Rovak committed May 31, 2018
1 parent feaa400 commit d871b1f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tronscan/client",
"version": "0.1.1",
"version": "0.2.0",
"description": "Tronscan API Client",
"main": "src/index.js",
"homepage": "https://api.tronscan.org/",
Expand Down
9 changes: 7 additions & 2 deletions src/utils/address.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
const ADDRESS_PREFIX = "a0";
const ADDRESS_SIZE = 42;
let isTestNet = process.env.NET === 'testnet';

const ADDRESS_SIZE = 42;
const ADDRESS_PREFIX = isTestNet ? "a0" : "41";
const ADDRESS_PREFIX_BYTE = isTestNet ? 0xa0 : 0x41;

function isAddressValid(address) {

Expand All @@ -21,4 +23,7 @@ function isAddressValid(address) {

module.exports = {
isAddressValid,
ADDRESS_SIZE,
ADDRESS_PREFIX,
ADDRESS_PREFIX_BYTE,
};
9 changes: 3 additions & 6 deletions src/utils/crypto.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const {ADDRESS_PREFIX, ADDRESS_PREFIX_BYTE} = require("./address");
const base64EncodeToString = require("../lib/code").base64EncodeToString;
const {base64DecodeFromString, hexStr2byteArray} = require("../lib/code");
const {encode58, decode58} = require("../lib/base58");
Expand All @@ -6,10 +7,6 @@ const { keccak256 } = require('js-sha3');
const jsSHA = require("../lib/sha256");
const { byte2hexStr, byteArray2hexStr } = require("./bytes");

const add_pre_fix = 'a0'; //a0 + address ,a0 is version
const add_pre_fix_byte = 0xa0; //a0 + address ,a0 is version


/**
* Sign A Transaction by priKey.
* signature is 65 bytes, r[32] || s[32] || id[1](<27)
Expand Down Expand Up @@ -84,7 +81,7 @@ function computeAddress(pubBytes) {

var hash = keccak256(pubBytes).toString();
var addressHex = hash.substring(24);
addressHex = add_pre_fix + addressHex;
addressHex = ADDRESS_PREFIX + addressHex;
var addressBytes = hexStr2byteArray(addressHex);
return addressBytes;
}
Expand Down Expand Up @@ -140,7 +137,7 @@ function isAddressValid(base58Sting) {
if (address.length != 25) {
return false;
}
if (address[0] != add_pre_fix_byte) {
if (address[0] != ADDRESS_PREFIX_BYTE) {
return false;
}
var checkSum = address.slice(21);
Expand Down

0 comments on commit d871b1f

Please sign in to comment.