floCrypto v2.3.3b
- Added floCrypto.tmpID: generates a random floID with no private key (use this only for one-time id) - Added toFloID(address): returns equivalent floID (btc-segwit address NOT supported) - Fixed bug: legacy addresses of length 33 not working in verifyPubKey and validateAddr
This commit is contained in:
parent
36a4067d67
commit
6e5cdbd820
@ -1,4 +1,4 @@
|
|||||||
(function(EXPORTS) { //floCloudAPI v2.4.2b
|
(function(EXPORTS) { //floCloudAPI v2.4.2c
|
||||||
/* FLO Cloud operations to send/request application data*/
|
/* FLO Cloud operations to send/request application data*/
|
||||||
'use strict';
|
'use strict';
|
||||||
const floCloudAPI = EXPORTS;
|
const floCloudAPI = EXPORTS;
|
||||||
@ -384,7 +384,7 @@
|
|||||||
if (!address)
|
if (!address)
|
||||||
return;
|
return;
|
||||||
var bytes;
|
var bytes;
|
||||||
if (address.length == 34) { //legacy encoding
|
if (address.length == 33 || address.length == 34) { //legacy encoding
|
||||||
let decode = bitjs.Base58.decode(address);
|
let decode = bitjs.Base58.decode(address);
|
||||||
bytes = decode.slice(0, decode.length - 4);
|
bytes = decode.slice(0, decode.length - 4);
|
||||||
let checksum = decode.slice(decode.length - 4),
|
let checksum = decode.slice(decode.length - 4),
|
||||||
|
|||||||
61
floCrypto.js
61
floCrypto.js
@ -1,4 +1,4 @@
|
|||||||
(function(EXPORTS) { //floCrypto v2.3.3a
|
(function(EXPORTS) { //floCrypto v2.3.3b
|
||||||
/* FLO Crypto Operators */
|
/* FLO Crypto Operators */
|
||||||
'use strict';
|
'use strict';
|
||||||
const floCrypto = EXPORTS;
|
const floCrypto = EXPORTS;
|
||||||
@ -148,8 +148,23 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Object.defineProperty(floCrypto, 'newID', {
|
Object.defineProperties(floCrypto, {
|
||||||
get: () => generateNewID()
|
newID: {
|
||||||
|
get: () => generateNewID()
|
||||||
|
},
|
||||||
|
tmpID: {
|
||||||
|
get: () => {
|
||||||
|
let bytes = Crypto.util.randomBytes(20);
|
||||||
|
bytes.unshift(bitjs.pub);
|
||||||
|
var hash = Crypto.SHA256(Crypto.SHA256(bytes, {
|
||||||
|
asBytes: true
|
||||||
|
}), {
|
||||||
|
asBytes: true
|
||||||
|
});
|
||||||
|
var checksum = hash.slice(0, 4);
|
||||||
|
return bitjs.Base58.encode(bytes.concat(checksum));
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
//Returns public-key from private-key
|
//Returns public-key from private-key
|
||||||
@ -230,7 +245,7 @@
|
|||||||
|
|
||||||
//Check if the given address (any blockchain) is valid or not
|
//Check if the given address (any blockchain) is valid or not
|
||||||
floCrypto.validateAddr = function(address, std = true, bech = true) {
|
floCrypto.validateAddr = function(address, std = true, bech = true) {
|
||||||
if (address.length == 34) { //legacy or segwit encoding
|
if (address.length == 33 || address.length == 34) { //legacy or segwit encoding
|
||||||
if (std === false)
|
if (std === false)
|
||||||
return false;
|
return false;
|
||||||
let decode = bitjs.Base58.decode(address);
|
let decode = bitjs.Base58.decode(address);
|
||||||
@ -262,11 +277,12 @@
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Check the public-key for the address (any blockchain)
|
||||||
floCrypto.verifyPubKey = function(pubKeyHex, address) {
|
floCrypto.verifyPubKey = function(pubKeyHex, address) {
|
||||||
let pub_hash = Crypto.util.bytesToHex(ripemd160(Crypto.SHA256(Crypto.util.hexToBytes(pubKeyHex), {
|
let pub_hash = Crypto.util.bytesToHex(ripemd160(Crypto.SHA256(Crypto.util.hexToBytes(pubKeyHex), {
|
||||||
asBytes: true
|
asBytes: true
|
||||||
})));
|
})));
|
||||||
if (address.length == 34) { //legacy encoding
|
if (address.length == 33 || address.length == 34) { //legacy encoding
|
||||||
let decode = bitjs.Base58.decode(address);
|
let decode = bitjs.Base58.decode(address);
|
||||||
var raw = decode.slice(0, decode.length - 4),
|
var raw = decode.slice(0, decode.length - 4),
|
||||||
checksum = decode.slice(decode.length - 4);
|
checksum = decode.slice(decode.length - 4);
|
||||||
@ -291,6 +307,41 @@
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Convert the given address (any blockchain) to equivalent floID
|
||||||
|
floCrypto.toFloID = function(address) {
|
||||||
|
if (!address)
|
||||||
|
return;
|
||||||
|
var bytes;
|
||||||
|
if (address.length == 33 || address.length == 34) { //legacy encoding
|
||||||
|
let decode = bitjs.Base58.decode(address);
|
||||||
|
bytes = decode.slice(0, decode.length - 4);
|
||||||
|
let checksum = decode.slice(decode.length - 4),
|
||||||
|
hash = Crypto.SHA256(Crypto.SHA256(bytes, {
|
||||||
|
asBytes: true
|
||||||
|
}), {
|
||||||
|
asBytes: true
|
||||||
|
});
|
||||||
|
hash[0] != checksum[0] || hash[1] != checksum[1] || hash[2] != checksum[2] || hash[3] != checksum[3] ?
|
||||||
|
bytes = undefined : bytes.shift();
|
||||||
|
} else if (address.length == 42) { //bech encoding
|
||||||
|
let decode = coinjs.bech32_decode(address);
|
||||||
|
if (decode) {
|
||||||
|
bytes = decode.data;
|
||||||
|
bytes.shift();
|
||||||
|
bytes = coinjs.bech32_convert(bytes, 5, 8, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!bytes)
|
||||||
|
return;
|
||||||
|
bytes.unshift(bitjs.pub);
|
||||||
|
let hash = Crypto.SHA256(Crypto.SHA256(bytes, {
|
||||||
|
asBytes: true
|
||||||
|
}), {
|
||||||
|
asBytes: true
|
||||||
|
});
|
||||||
|
return bitjs.Base58.encode(bytes.concat(hash.slice(0, 4)));
|
||||||
|
}
|
||||||
|
|
||||||
//Split the str using shamir's Secret and Returns the shares
|
//Split the str using shamir's Secret and Returns the shares
|
||||||
floCrypto.createShamirsSecretShares = function(str, total_shares, threshold_limit) {
|
floCrypto.createShamirsSecretShares = function(str, total_shares, threshold_limit) {
|
||||||
try {
|
try {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user