From cfc36b80cdc201b96874f55af2a0a37c800f06a5 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Sat, 16 Jul 2022 03:30:03 +0530 Subject: [PATCH 01/42] Secure private key using capsule --- floCloudAPI.js | 95 ++++++++++++++------ floDapps.js | 235 +++++++++++++++++++++++++++++++++---------------- index.html | 3 +- 3 files changed, 229 insertions(+), 104 deletions(-) diff --git a/floCloudAPI.js b/floCloudAPI.js index ca31378..e06ba60 100644 --- a/floCloudAPI.js +++ b/floCloudAPI.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floCloudAPI v2.3.0 +(function(EXPORTS) { //floCloudAPI v2.4.0 /* FLO Cloud operations to send/request application data*/ 'use strict'; const floCloudAPI = EXPORTS; @@ -6,9 +6,32 @@ const DEFAULT = { SNStorageID: floGlobals.SNStorageID || "FNaN9McoBAEFUjkRmNQRYLmBF8SpS7Tgfk", adminID: floGlobals.adminID, - application: floGlobals.application + application: floGlobals.application, + callback: (d, e) => console.debug(d, e) }; + var user_id, user_public, user_private; + const user = { + get id() { + if (!user_id) + throw "User not set"; + return user_id; + }, + get public() { + if (!user_public) + throw "User not set"; + return user_public; + }, + sign(msg) { + if (!user_private) + throw "User not set"; + return floCrypto.signData(msg, user_private); + }, + clear() { + user_id = user_public = user_private = undefined; + } + } + Object.defineProperties(floCloudAPI, { SNStorageID: { get: () => DEFAULT.SNStorageID @@ -18,6 +41,21 @@ }, application: { get: () => DEFAULT.application + }, + user: { + set: priv => { + if (!priv) + user_id = user_public = user_private = undefined; + else { + user_public = floCrypto.getPubKeyHex(priv); + user_id = floCrypto.getFloID(user_public); + if (!user_public || !user_id || !floCrypto.verifyPrivKey(priv, user_id)) + user_id = user_public = user_private = undefined; + else + user_private = priv; + } + }, + get: () => user } }); @@ -392,19 +430,19 @@ })); } - //set status as online for myFloID + //set status as online for user_id floCloudAPI.setStatus = function(options = {}) { return new Promise((resolve, reject) => { - let callback = options.callback instanceof Function ? options.callback : (d, e) => console.debug(d, e); + let callback = options.callback instanceof Function ? options.callback : DEFAULT.callback; var request = { - floID: myFloID, + floID: user.id, application: options.application || DEFAULT.application, time: Date.now(), status: true, - pubKey: myPubKey + pubKey: user.public } let hashcontent = ["time", "application", "floID"].map(d => request[d]).join("|"); - request.sign = floCrypto.signData(hashcontent, myPrivKey); + request.sign = user.sign(hashcontent); liveRequest(options.refID || DEFAULT.adminID, request, callback) .then(result => resolve(result)) .catch(error => reject(error)) @@ -416,7 +454,7 @@ return new Promise((resolve, reject) => { if (!Array.isArray(trackList)) trackList = [trackList]; - let callback = options.callback instanceof Function ? options.callback : (d, e) => console.debug(d, e); + let callback = options.callback instanceof Function ? options.callback : DEFAULT.callback; let request = { status: false, application: options.application || DEFAULT.application, @@ -432,9 +470,9 @@ const sendApplicationData = floCloudAPI.sendApplicationData = function(message, type, options = {}) { return new Promise((resolve, reject) => { var data = { - senderID: myFloID, + senderID: user.id, receiverID: options.receiverID || DEFAULT.adminID, - pubKey: myPubKey, + pubKey: user.public, message: encodeMessage(message), time: Date.now(), application: options.application || DEFAULT.application, @@ -443,7 +481,7 @@ } let hashcontent = ["receiverID", "time", "application", "type", "message", "comment"] .map(d => data[d]).join("|") - data.sign = floCrypto.signData(hashcontent, myPrivKey); + data.sign = user.sign(hashcontent); singleRequest(data.receiverID, data) .then(result => resolve(result)) .catch(error => reject(error)) @@ -482,19 +520,20 @@ }) } - //(NEEDS UPDATE) delete data from supernode cloud (received only) + /*(NEEDS UPDATE) + //delete data from supernode cloud (received only) floCloudAPI.deleteApplicationData = function(vectorClocks, options = {}) { return new Promise((resolve, reject) => { var delreq = { - requestorID: myFloID, - pubKey: myPubKey, + requestorID: user.id, + pubKey: user.public, time: Date.now(), delete: (Array.isArray(vectorClocks) ? vectorClocks : [vectorClocks]), application: options.application || DEFAULT.application } let hashcontent = ["time", "application", "delete"] .map(d => delreq[d]).join("|") - delreq.sign = floCrypto.signData(hashcontent, myPrivKey) + delreq.sign = user.sign(hashcontent) singleRequest(delreq.requestorID, delreq).then(result => { let success = [], failed = []; @@ -507,8 +546,9 @@ }).catch(error => reject(error)) }) } - - //(NEEDS UPDATE) edit comment of data in supernode cloud (mutable comments only) + */ + /*(NEEDS UPDATE) + //edit comment of data in supernode cloud (mutable comments only) floCloudAPI.editApplicationData = function(vectorClock, newComment, oldData, options = {}) { return new Promise((resolve, reject) => { let p0 @@ -523,12 +563,12 @@ } }) p0.then(d => { - if (d.senderID != myFloID) + if (d.senderID != user.id) return reject("Invalid requestorID") else if (!d.comment.startsWith("EDIT:")) return reject("Data immutable") let data = { - requestorID: myFloID, + requestorID: user.id, receiverID: d.receiverID, time: Date.now(), application: d.application, @@ -542,29 +582,30 @@ "comment" ] .map(x => d[x]).join("|") - data.edit.sign = floCrypto.signData(hashcontent, myPrivKey) + data.edit.sign = user.sign(hashcontent) singleRequest(data.receiverID, data) .then(result => resolve("Data comment updated")) .catch(error => reject(error)) }) }) } + */ //tag data in supernode cloud (subAdmin access only) floCloudAPI.tagApplicationData = function(vectorClock, tag, options = {}) { return new Promise((resolve, reject) => { - if (!floGlobals.subAdmins.includes(myFloID)) + if (!floGlobals.subAdmins.includes(user.id)) return reject("Only subAdmins can tag data") var request = { receiverID: options.receiverID || DEFAULT.adminID, - requestorID: myFloID, - pubKey: myPubKey, + requestorID: user.id, + pubKey: user.public, time: Date.now(), vectorClock: vectorClock, tag: tag, } let hashcontent = ["time", "vectorClock", 'tag'].map(d => request[d]).join("|"); - request.sign = floCrypto.signData(hashcontent, myPrivKey); + request.sign = user.sign(hashcontent); singleRequest(request.receiverID, request) .then(result => resolve(result)) .catch(error => reject(error)) @@ -576,14 +617,14 @@ return new Promise((resolve, reject) => { var request = { receiverID: options.receiverID || DEFAULT.adminID, - requestorID: myFloID, - pubKey: myPubKey, + requestorID: user.id, + pubKey: user.public, time: Date.now(), vectorClock: vectorClock, note: note, } let hashcontent = ["time", "vectorClock", 'note'].map(d => request[d]).join("|"); - request.sign = floCrypto.signData(hashcontent, myPrivKey); + request.sign = user.sign(hashcontent); singleRequest(request.receiverID, request) .then(result => resolve(result)) .catch(error => reject(error)) diff --git a/floDapps.js b/floDapps.js index 0e92708..08e3dd4 100644 --- a/floDapps.js +++ b/floDapps.js @@ -1,8 +1,88 @@ -(function(EXPORTS) { //floDapps v2.2.1 +(function(EXPORTS) { //floDapps v2.3.0 /* General functions for FLO Dapps*/ - //'use strict'; + 'use strict'; const floDapps = EXPORTS; + const DEFAULT = { + get root() { + return "floDapps" + }, + application: floGlobals.application, + adminID: floGlobals.adminID + }; + + var raw_user_private; //private variable inside capsule + const raw_user = { + get private() { + if (!raw_user_private) + throw "User not logged in"; + return raw_user_private; + } + } + + var user_id, user_public, user_private; + const user = floDapps.user = { + get id() { + if (!user_id) + throw "User not logged in"; + return user_id; + }, + get public() { + if (!user_public) + throw "User not logged in"; + return user_public; + }, + get private() { + if (!user_private) + throw "User not logged in"; + else if (user_private instanceof Function) + return user_private(); + else + return user_private; + }, + get db_name() { + return "floDapps#" + user.id; + }, + clear() { + user_id = user_public = user_private = undefined; + raw_user_private = undefined; + delete user.contacts; + delete user.pubKeys; + delete user.messages; + } + }; + + Object.defineProperties(window, { + myFloID: { + get: () => user.id + }, + myPubKey: { + get: () => user.public + }, + myPrivKey: { + get: () => user.private + } + }); + + var subAdmins, settings + Object.defineProperties(floGlobals, { + subAdmins: { + get: () => subAdmins + }, + settings: { + get: () => settings + }, + contacts: { + get: () => user.contacts + }, + pubKeys: { + get: () => user.pubKeys + }, + messages: { + get: () => user.messages + } + }) + function initIndexedDB() { return new Promise((resolve, reject) => { var obs_g = { @@ -32,37 +112,37 @@ if (!(o in obs_a)) obs_a[o] = initIndexedDB.appObs[o] Promise.all([ - compactIDB.initDB(floGlobals.application, obs_a), - compactIDB.initDB("floDapps", obs_g) + compactIDB.initDB(DEFAULT.application, obs_a), + compactIDB.initDB(DEFAULT.root, obs_g) ]).then(result => { - compactIDB.setDefaultDB(floGlobals.application) + compactIDB.setDefaultDB(DEFAULT.application) resolve("IndexedDB App Storage Initated Successfully") }).catch(error => reject(error)); }) } - function initUserDB(floID) { + function initUserDB() { return new Promise((resolve, reject) => { var obs = { contacts: {}, pubKeys: {}, messages: {} } - compactIDB.initDB(`floDapps#${floID}`, obs).then(result => { + compactIDB.initDB(user.db_name, obs).then(result => { resolve("UserDB Initated Successfully") }).catch(error => reject('Init userDB failed')); }) } - function loadUserDB(floID) { + function loadUserDB() { return new Promise((resolve, reject) => { var loadData = ["contacts", "pubKeys", "messages"] var promises = [] for (var i = 0; i < loadData.length; i++) - promises[i] = compactIDB.readAllData(loadData[i], `floDapps#${floID}`) + promises[i] = compactIDB.readAllData(loadData[i], user.db_name) Promise.all(promises).then(results => { for (var i = 0; i < loadData.length; i++) - floGlobals[loadData[i]] = results[i] + user[loadData[i]] = results[i] resolve("Loaded Data from userDB") }).catch(error => reject('Load userDB failed')) }) @@ -72,7 +152,7 @@ startUpFunctions.push(function readSupernodeListFromAPI() { return new Promise((resolve, reject) => { - compactIDB.readData("lastTx", floCloudAPI.SNStorageID, "floDapps").then(lastTx => { + compactIDB.readData("lastTx", floCloudAPI.SNStorageID, DEFAULT.root).then(lastTx => { floBlockchainAPI.readData(floCloudAPI.SNStorageID, { ignoreOld: lastTx, sentOnly: true, @@ -81,12 +161,12 @@ for (var i = result.data.length - 1; i >= 0; i--) { var content = JSON.parse(result.data[i]).SuperNodeStorage; for (sn in content.removeNodes) - compactIDB.removeData("supernodes", sn, "floDapps"); + compactIDB.removeData("supernodes", sn, DEFAULT.root); for (sn in content.newNodes) - compactIDB.writeData("supernodes", content.newNodes[sn], sn, "floDapps"); + compactIDB.writeData("supernodes", content.newNodes[sn], sn, DEFAULT.root); } - compactIDB.writeData("lastTx", result.totalTxs, floCloudAPI.SNStorageID, "floDapps"); - compactIDB.readAllData("supernodes", "floDapps").then(result => { + compactIDB.writeData("lastTx", result.totalTxs, floCloudAPI.SNStorageID, DEFAULT.root); + compactIDB.readAllData("supernodes", DEFAULT.root).then(result => { floCloudAPI.init(result) .then(result => resolve("Loaded Supernode list\n" + result)) .catch(error => reject(error)) @@ -98,14 +178,14 @@ startUpFunctions.push(function readAppConfigFromAPI() { return new Promise((resolve, reject) => { - compactIDB.readData("lastTx", `${floGlobals.application}|${floGlobals.adminID}`, "floDapps").then(lastTx => { - floBlockchainAPI.readData(floGlobals.adminID, { + compactIDB.readData("lastTx", `${DEFAULT.application}|${DEFAULT.adminID}`, DEFAULT.root).then(lastTx => { + floBlockchainAPI.readData(DEFAULT.adminID, { ignoreOld: lastTx, sentOnly: true, - pattern: floGlobals.application + pattern: DEFAULT.application }).then(result => { for (var i = result.data.length - 1; i >= 0; i--) { - var content = JSON.parse(result.data[i])[floGlobals.application]; + var content = JSON.parse(result.data[i])[DEFAULT.application]; if (!content || typeof content !== "object") continue; if (Array.isArray(content.removeSubAdmin)) @@ -118,11 +198,11 @@ for (let l in content.settings) compactIDB.writeData("settings", content.settings[l], l) } - compactIDB.writeData("lastTx", result.totalTxs, `${floGlobals.application}|${floGlobals.adminID}`, "floDapps"); + compactIDB.writeData("lastTx", result.totalTxs, `${DEFAULT.application}|${DEFAULT.adminID}`, DEFAULT.root); compactIDB.readAllData("subAdmins").then(result => { - floGlobals.subAdmins = Object.keys(result); + subAdmins = Object.keys(result); compactIDB.readAllData("settings").then(result => { - floGlobals.settings = result; + settings = result; resolve("Read app configuration from blockchain"); }) }) @@ -153,7 +233,7 @@ resolve(inputVal) }); - function getCredentials() { + function getCredentials(invisible_key) { const readSharesFromIDB = indexArr => new Promise((resolve, reject) => { var promises = [] @@ -186,7 +266,7 @@ }); const getPrivateKeyCredentials = () => new Promise((resolve, reject) => { - var indexArr = localStorage.getItem(`${floGlobals.application}#privKey`) + var indexArr = localStorage.getItem(`${DEFAULT.application}#privKey`) if (indexArr) { readSharesFromIDB(JSON.parse(indexArr)) .then(result => resolve(result)) @@ -210,7 +290,7 @@ var shares = floCrypto.createShamirsSecretShares(privKey, threshold, threshold) writeSharesToIDB(shares).then(resultIndexes => { //store index keys in localStorage - localStorage.setItem(`${floGlobals.application}#privKey`, JSON.stringify(resultIndexes)) + localStorage.setItem(`${DEFAULT.application}#privKey`, JSON.stringify(resultIndexes)) //also add a dummy privatekey to the IDB var randomPrivKey = floCrypto.generateNewID().privKey var randomThreshold = floCrypto.randInt(10, 20) @@ -242,9 +322,13 @@ getPrivateKeyCredentials().then(key => { checkIfPinRequired(key).then(privKey => { try { - myPrivKey = privKey - myPubKey = floCrypto.getPubKeyHex(myPrivKey) - myFloID = floCrypto.getFloID(myPubKey) + user_public = floCrypto.getPubKeyHex(privKey); + user_id = floCrypto.getFloID(privKey); + floCloudAPI.user = privKey; //Set user for floCloudAPI + if (!invisible_key) + user_private = privKey; + else + user_private = () => checkIfPinRequired(key); resolve('Login Credentials loaded successful') } catch (error) { console.log(error) @@ -289,7 +373,7 @@ }) }); - floDapps.launchStartUp = function() { + floDapps.launchStartUp = function(options = {}) { return new Promise((resolve, reject) => { initIndexedDB().then(log => { console.log(log) @@ -304,9 +388,9 @@ }) }); let p2 = new Promise((res, rej) => { - callAndLog(getCredentials()).then(r => { - callAndLog(initUserDB(myFloID)).then(r => { - callAndLog(loadUserDB(myFloID)) + callAndLog(getCredentials(options.invisible_key)).then(r => { + callAndLog(initUserDB()).then(r => { + callAndLog(loadUserDB()) .then(r => res(true)) .catch(e => rej(false)) }).catch(e => rej(false)) @@ -333,8 +417,8 @@ return new Promise((resolve, reject) => { if (!floCrypto.validateAddr(floID)) return reject("Invalid floID!") - compactIDB.writeData("contacts", name, floID, `floDapps#${myFloID}`).then(result => { - floGlobals.contacts[floID] = name; + compactIDB.writeData("contacts", name, floID, user.db_name).then(result => { + user.contacts[floID] = name; resolve("Contact stored") }).catch(error => reject(error)) }); @@ -342,14 +426,14 @@ floDapps.storePubKey = function(floID, pubKey) { return new Promise((resolve, reject) => { - if (floID in floGlobals.pubKeys) + if (floID in user.pubKeys) return resolve("pubKey already stored") if (!floCrypto.validateAddr(floID)) return reject("Invalid floID!") if (floCrypto.getFloID(pubKey) != floID) return reject("Incorrect pubKey") - compactIDB.writeData("pubKeys", pubKey, floID, `floDapps#${myFloID}`).then(result => { - floGlobals.pubKeys[floID] = pubKey; + compactIDB.writeData("pubKeys", pubKey, floID, user.db_name).then(result => { + user.pubKeys[floID] = pubKey; resolve("pubKey stored") }).catch(error => reject(error)) }); @@ -359,11 +443,11 @@ return new Promise((resolve, reject) => { let options = { receiverID: floID, - application: "floDapps", - comment: floGlobals.application + application: DEFAULT.root, + comment: DEFAULT.application } - if (floID in floGlobals.pubKeys) - message = floCrypto.encryptData(JSON.stringify(message), floGlobals.pubKeys[floID]) + if (floID in user.pubKeys) + message = floCrypto.encryptData(JSON.stringify(message), user.pubKeys[floID]) floCloudAPI.sendApplicationData(message, "Message", options) .then(result => resolve(result)) .catch(error => reject(error)) @@ -372,20 +456,21 @@ floDapps.requestInbox = function(callback) { return new Promise((resolve, reject) => { - let lastVC = Object.keys(floGlobals.messages).sort().pop() + let lastVC = Object.keys(user.messages).sort().pop() let options = { - receiverID: myFloID, - application: "floDapps", + receiverID: user.id, + application: DEFAULT.root, lowerVectorClock: lastVC + 1 } + let privKey = raw_user.private; options.callback = (d, e) => { for (let v in d) { try { if (d[v].message instanceof Object && "secret" in d[v].message) - d[v].message = floCrypto.decryptData(d[v].message, myPrivKey) + d[v].message = floCrypto.decryptData(d[v].message, privKey) } catch (error) {} - compactIDB.writeData("messages", d[v], v, `floDapps#${myFloID}`) - floGlobals.messages[v] = d[v] + compactIDB.writeData("messages", d[v], v, user.db_name) + user.messages[v] = d[v] } if (callback instanceof Function) callback(d, e) @@ -404,14 +489,14 @@ if (!addList && !rmList && !settings) return reject("No configuration change") var floData = { - [floGlobals.application]: { + [DEFAULT.application]: { addSubAdmin: addList, removeSubAdmin: rmList, settings: settings } } var floID = floCrypto.getFloID(adminPrivKey) - if (floID != floGlobals.adminID) + if (floID != DEFAULT.adminID) reject('Access Denied for Admin privilege') else floBlockchainAPI.writeData(floID, JSON.stringify(floData), adminPrivKey) @@ -422,9 +507,9 @@ const clearCredentials = floDapps.clearCredentials = function() { return new Promise((resolve, reject) => { - compactIDB.clearData('credentials', floGlobals.application).then(result => { - localStorage.removeItem(`${floGlobals.application}#privKey`) - myPrivKey = myPubKey = myFloID = undefined; + compactIDB.clearData('credentials', DEFAULT.application).then(result => { + localStorage.removeItem(`${DEFAULT.application}#privKey`); + user.clear(); resolve("privKey credentials deleted!") }).catch(error => reject(error)) }) @@ -433,7 +518,7 @@ floDapps.deleteUserData = function(credentials = false) { return new Promise((resolve, reject) => { let p = [] - p.push(compactIDB.deleteDB(`floDapps#${myFloID}`)) + p.push(compactIDB.deleteDB(user.db_name)) if (credentials) p.push(clearCredentials()) Promise.all(p) @@ -444,10 +529,10 @@ floDapps.deleteAppData = function() { return new Promise((resolve, reject) => { - compactIDB.deleteDB(floGlobals.application).then(result => { - localStorage.removeItem(`${floGlobals.application}#privKey`) - myPrivKey = myPubKey = myFloID = undefined; - compactIDB.removeData('lastTx', `${floGlobals.application}|${floGlobals.adminID}`, 'floDapps') + compactIDB.deleteDB(DEFAULT.application).then(result => { + localStorage.removeItem(`${DEFAULT.application}#privKey`) + user.clear(); + compactIDB.removeData('lastTx', `${DEFAULT.application}|${DEFAULT.adminID}`, DEFAULT.root) .then(result => resolve("App database(local) deleted")) .catch(error => reject(error)) }).catch(error => reject(error)) @@ -455,17 +540,17 @@ } floDapps.securePrivKey = function(pwd) { - return new Promise((resolve, reject) => { - let indexArr = localStorage.getItem(`${floGlobals.application}#privKey`) + return new Promise(async (resolve, reject) => { + let indexArr = localStorage.getItem(`${DEFAULT.application}#privKey`) if (!indexArr) return reject("PrivKey not found"); indexArr = JSON.parse(indexArr) - let encryptedKey = Crypto.AES.encrypt(myPrivKey, pwd); + let encryptedKey = Crypto.AES.encrypt(await user.private, pwd); let threshold = indexArr.length; let shares = floCrypto.createShamirsSecretShares(encryptedKey, threshold, threshold) let promises = []; let overwriteFn = (share, index) => - compactIDB.writeData("credentials", share, index, floGlobals.application); + compactIDB.writeData("credentials", share, index, DEFAULT.application); for (var i = 0; i < threshold; i++) promises.push(overwriteFn(shares[i], indexArr[i])); Promise.all(promises) @@ -494,7 +579,7 @@ }) } return new Promise((resolve, reject) => { - var indexArr = localStorage.getItem(`${floGlobals.application}#privKey`) + var indexArr = localStorage.getItem(`${DEFAULT.application}#privKey`) console.info(indexArr) if (!indexArr) reject('No login credentials found') @@ -535,7 +620,7 @@ filteredResult[d] = JSON.parse(JSON.stringify(floGlobals.generalData[fk][d])) } if (options.decrypt) { - let decryptionKey = (options.decrypt === true) ? myPrivKey : options.decrypt; + let decryptionKey = (options.decrypt === true) ? raw_user.private : options.decrypt; if (!Array.isArray(decryptionKey)) decryptionKey = [decryptionKey]; for (let f in filteredResult) { @@ -561,14 +646,14 @@ syncData.oldDevice = () => new Promise((resolve, reject) => { let sync = { - contacts: floGlobals.contacts, - pubKeys: floGlobals.pubKeys, - messages: floGlobals.messages + contacts: user.contacts, + pubKeys: user.pubKeys, + messages: user.messages } - let message = Crypto.AES.encrypt(JSON.stringify(sync), myPrivKey) + let message = Crypto.AES.encrypt(JSON.stringify(sync), raw_user.private) let options = { - receiverID: myFloID, - application: "floDapps" + receiverID: user.id, + application: DEFAULT.root } floCloudAPI.sendApplicationData(message, "syncData", options) .then(result => resolve(result)) @@ -577,20 +662,20 @@ syncData.newDevice = () => new Promise((resolve, reject) => { var options = { - receiverID: myFloID, - senderID: myFloID, - application: "floDapps", + receiverID: user.id, + senderID: user.id, + application: DEFAULT.root, mostRecent: true, } floCloudAPI.requestApplicationData("syncData", options).then(response => { let vc = Object.keys(response).sort().pop() - let sync = JSON.parse(Crypto.AES.decrypt(response[vc].message, myPrivKey)) + let sync = JSON.parse(Crypto.AES.decrypt(response[vc].message, raw_user.private)) let promises = [] - let store = (key, val, obs) => promises.push(compactIDB.writeData(obs, val, key, `floDapps#${floID}`)); + let store = (key, val, obs) => promises.push(compactIDB.writeData(obs, val, key, user.db_name)); ["contacts", "pubKeys", "messages"].forEach(c => { for (let i in sync[c]) { store(i, sync[c][i], c) - floGlobals[c][i] = sync[c][i] + user[c][i] = sync[c][i] } }) Promise.all(promises) diff --git a/index.html b/index.html index 03ee1ba..c1999d7 100644 --- a/index.html +++ b/index.html @@ -24,8 +24,7 @@ //floDapps.addStartUpFunction('Sample', Promised Function) //floDapps.setAppObjectStores({sampleObs1:{}, sampleObs2:{options{autoIncrement:true, keyPath:'SampleKey'}, Indexes:{sampleIndex:{}}}}) //floDapps.setCustomPrivKeyInput( () => { FUNCTION BODY *must resolve private key* } ) - - floDapps.launchStartUp().then(result => { + floDapps.launchStartUp( /*{invisible_key: true}*/ ).then(result => { console.log(result) alert(`Welcome FLO_ID: ${myFloID}`) //App functions.... From 5ab0bc36f010fc9537826954c2677d69ccd8f515 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Sat, 16 Jul 2022 03:32:44 +0530 Subject: [PATCH 02/42] Update floCrypto.js - Removing explicit use of BigInteger in signing(/verify-sign) data --- floCrypto.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/floCrypto.js b/floCrypto.js index 4ab4d5c..7be6c5a 100644 --- a/floCrypto.js +++ b/floCrypto.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floCrypto v2.3.0a +(function(EXPORTS) { //floCrypto v2.3.1 /* FLO Crypto Operators */ 'use strict'; const floCrypto = EXPORTS; @@ -121,12 +121,8 @@ //Sign data using private-key floCrypto.signData = function(data, privateKeyHex) { var key = new Bitcoin.ECKey(privateKeyHex); - key.setCompressed(true); - var privateKeyArr = key.getBitcoinPrivateKeyByteArray(); - var privateKey = BigInteger.fromByteArrayUnsigned(privateKeyArr); var messageHash = Crypto.SHA256(data); - var messageHashBigInteger = new BigInteger(messageHash); - var messageSign = Bitcoin.ECDSA.sign(messageHashBigInteger, key.priv); + var messageSign = Bitcoin.ECDSA.sign(messageHash, key.priv); var sighex = Crypto.util.bytesToHex(messageSign); return sighex; } @@ -134,11 +130,9 @@ //Verify signatue of the data using public-key floCrypto.verifySign = function(data, signatureHex, publicKeyHex) { var msgHash = Crypto.SHA256(data); - var messageHashBigInteger = new BigInteger(msgHash); var sigBytes = Crypto.util.hexToBytes(signatureHex); - var signature = Bitcoin.ECDSA.parseSig(sigBytes); var publicKeyPoint = ecparams.getCurve().decodePointHex(publicKeyHex); - var verify = Bitcoin.ECDSA.verifyRaw(messageHashBigInteger, signature.r, signature.s, publicKeyPoint); + var verify = Bitcoin.ECDSA.verify(msgHash, sigBytes, publicKeyPoint); return verify; } From b80bd43313397af1c92669c0dc656ba281cab5ac Mon Sep 17 00:00:00 2001 From: sairajzero Date: Sun, 17 Jul 2022 17:02:27 +0530 Subject: [PATCH 03/42] floDapps, floCloudAPI: Secure private key - Store AES-encrypted private key in memory. (exploring memory of browser will not have raw private key) - floDapps lock/unlock (in user): locks or unlock the private key (ie, lock= Password required, unlock= password not required in returning private key) - floDapps.launchStartUp now accepts options object - to lock the private key on startup, pass {lock_key: true} in options objects of launchStartUp --- floCloudAPI.js | 19 +++++++++++-------- floDapps.js | 33 ++++++++++++++++++++++----------- index.html | 2 +- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/floCloudAPI.js b/floCloudAPI.js index e06ba60..9501ed9 100644 --- a/floCloudAPI.js +++ b/floCloudAPI.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floCloudAPI v2.4.0 +(function(EXPORTS) { //floCloudAPI v2.4.1 /* FLO Cloud operations to send/request application data*/ 'use strict'; const floCloudAPI = EXPORTS; @@ -10,7 +10,7 @@ callback: (d, e) => console.debug(d, e) }; - var user_id, user_public, user_private; + var user_id, user_public, user_private, aes_key; const user = { get id() { if (!user_id) @@ -25,10 +25,10 @@ sign(msg) { if (!user_private) throw "User not set"; - return floCrypto.signData(msg, user_private); + return floCrypto.signData(msg, Crypto.AES.decrypt(user_private, aes_key)); }, clear() { - user_id = user_public = user_private = undefined; + user_id = user_public = user_private = aes_key = undefined; } } @@ -45,14 +45,17 @@ user: { set: priv => { if (!priv) - user_id = user_public = user_private = undefined; + user_id = user_public = user_private = aes_key = undefined; else { user_public = floCrypto.getPubKeyHex(priv); user_id = floCrypto.getFloID(user_public); if (!user_public || !user_id || !floCrypto.verifyPrivKey(priv, user_id)) - user_id = user_public = user_private = undefined; - else - user_private = priv; + user_id = user_public = user_private = aes_key = undefined; + else { + let n = floCrypto.randInt(12, 20); + aes_key = floCrypto.randString(n); + user_private = Crypto.AES.encrypt(priv, aes_key); + } } }, get: () => user diff --git a/floDapps.js b/floDapps.js index 08e3dd4..157b37d 100644 --- a/floDapps.js +++ b/floDapps.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floDapps v2.3.0 +(function(EXPORTS) { //floDapps v2.3.1 /* General functions for FLO Dapps*/ 'use strict'; const floDapps = EXPORTS; @@ -11,12 +11,12 @@ adminID: floGlobals.adminID }; - var raw_user_private; //private variable inside capsule + var user_priv_raw, aes_key, user_priv_wrap; //private variable inside capsule const raw_user = { get private() { - if (!raw_user_private) + if (!user_priv_raw) throw "User not logged in"; - return raw_user_private; + return Crypto.AES.decrypt(user_priv_raw, aes_key); } } @@ -38,14 +38,21 @@ else if (user_private instanceof Function) return user_private(); else - return user_private; + return Crypto.AES.decrypt(user_private, aes_key); }, get db_name() { return "floDapps#" + user.id; }, + lock() { + user_private = user_priv_wrap; + }, + async unlock() { + if (await user.private === raw_user.private) + user_private = user_priv_raw; + }, clear() { user_id = user_public = user_private = undefined; - raw_user_private = undefined; + user_priv_raw = aes_key = undefined; delete user.contacts; delete user.pubKeys; delete user.messages; @@ -233,7 +240,7 @@ resolve(inputVal) }); - function getCredentials(invisible_key) { + function getCredentials(lock_key) { const readSharesFromIDB = indexArr => new Promise((resolve, reject) => { var promises = [] @@ -325,10 +332,14 @@ user_public = floCrypto.getPubKeyHex(privKey); user_id = floCrypto.getFloID(privKey); floCloudAPI.user = privKey; //Set user for floCloudAPI - if (!invisible_key) - user_private = privKey; + user_priv_wrap = () => checkIfPinRequired(key); + let n = floCrypto.randInt(12, 20); + aes_key = floCrypto.randString(n); + user_priv_raw = Crypto.AES.encrypt(privKey, aes_key); + if (!lock_key) + user_private = user_priv_raw; else - user_private = () => checkIfPinRequired(key); + user_private = user_priv_wrap; resolve('Login Credentials loaded successful') } catch (error) { console.log(error) @@ -388,7 +399,7 @@ }) }); let p2 = new Promise((res, rej) => { - callAndLog(getCredentials(options.invisible_key)).then(r => { + callAndLog(getCredentials(options.lock_key)).then(r => { callAndLog(initUserDB()).then(r => { callAndLog(loadUserDB()) .then(r => res(true)) diff --git a/index.html b/index.html index c1999d7..cef876c 100644 --- a/index.html +++ b/index.html @@ -24,7 +24,7 @@ //floDapps.addStartUpFunction('Sample', Promised Function) //floDapps.setAppObjectStores({sampleObs1:{}, sampleObs2:{options{autoIncrement:true, keyPath:'SampleKey'}, Indexes:{sampleIndex:{}}}}) //floDapps.setCustomPrivKeyInput( () => { FUNCTION BODY *must resolve private key* } ) - floDapps.launchStartUp( /*{invisible_key: true}*/ ).then(result => { + floDapps.launchStartUp( /*{lock_key: true}*/ ).then(result => { console.log(result) alert(`Welcome FLO_ID: ${myFloID}`) //App functions.... From fcc5f3ce4e6248b06d641a41b6a6e5f8f79f03a5 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Sun, 17 Jul 2022 17:04:03 +0530 Subject: [PATCH 04/42] Edit library to accept WIF of other versions --- .gitignore | 1 + lib.js | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..168b657 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.tmp* \ No newline at end of file diff --git a/lib.js b/lib.js index 80afa89..c6684f7 100644 --- a/lib.js +++ b/lib.js @@ -1,4 +1,4 @@ -(function(GLOBAL) { //lib v1.2.2a +(function(GLOBAL) { //lib v1.2.3 'use strict'; /* Utility Libraries required for Standard operations * All credits for these codes belong to their respective creators, moderators and owners. @@ -5016,12 +5016,12 @@ * * Returns the address as a base58-encoded string in the standardized format. */ - Bitcoin.Address.prototype.toString = function() { + Bitcoin.Address.prototype.toString = function(version = null) { // Get a copy of the hash var hash = this.hash.slice(0); // Version - hash.unshift(this.version); + hash.unshift(version !== null ? version : this.version); var checksum = Crypto.SHA256(Crypto.SHA256(hash, { asBytes: true }), { @@ -5130,7 +5130,7 @@ } var Q; - if (pubkey instanceof ec.PointFp) { + if (pubkey instanceof EllipticCurve.PointFp) { Q = pubkey; } else if (Bitcoin.Util.isArray(pubkey)) { Q = EllipticCurve.PointFp.decodeFrom(ecparams.getCurve(), pubkey); @@ -5444,9 +5444,8 @@ var bytes = null; try { - // This part is edited for FLO. FLO WIF are always compressed WIF. FLO WIF (private key) starts with R for mainnet and c for testnet. - if (((GLOBAL.cryptocoin == "FLO") && /^R[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{51}$/.test(input)) || - ((GLOBAL.cryptocoin == "FLO_TEST") && /^c[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{51}$/.test(input))) { + // This part is edited for FLO. FLO WIF are always compressed WIF (length of 52). + if ((/^[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{52}$/.test(input))) { bytes = ECKey.decodeCompressedWalletImportFormat(input); this.compressed = true; } else if (ECKey.isHexFormat(input)) { @@ -5673,9 +5672,11 @@ } var version = hash.shift(); + /* if (version != ECKey.privateKeyPrefix) { throw "Version " + version + " not supported!"; } + */ return hash; }; @@ -5697,9 +5698,11 @@ throw "Checksum validation failed!"; } var version = hash.shift(); + /* if (version != ECKey.privateKeyPrefix) { throw "Version " + version + " not supported!"; } + */ hash.pop(); return hash; }; From 0a74e393ed9c10f0a4cd8755d4e3cec0675e088c Mon Sep 17 00:00:00 2001 From: sairajzero Date: Tue, 19 Jul 2022 21:21:06 +0530 Subject: [PATCH 05/42] floCrypto v2.3.2: validate any address floCrypto.validateAddr: validate any blockchain address - Parameters: 1. address - address to validate 2. std - checks for legacy version (optional, default=true) (true: allow any, array: list of versions, value: one version only, false: allow none) 3. bech - checks for bech version (optional, default=false) (true: allow any, array: list of versions, value: one version only, false: allow none) - For validating only floID, use floCrypto.validateFloID(floID) --- README.md | 12 ++++++++++-- floBlockchainAPI.js | 10 +++++----- floCrypto.js | 46 ++++++++++++++++++++++++++++++++++++++++----- floDapps.js | 8 ++++---- 4 files changed, 60 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 536a71a..da60c69 100644 --- a/README.md +++ b/README.md @@ -216,9 +216,17 @@ In addition, we have these system variables outside FLO Globals but used globall 3. isfloID - boolean value (true: compare as flo ID, false: compare as public key) (optional, default is true) * Returns : boolen (true or false) +#### Validate Address + floCrypto.validateAddr(address, *std, *bech) +`validateAddr` check if the given Address (any blockchain) is valid or not +1. address - address to validate +2. std - checks for legacy version (optional, default=true) (true: allow any, array: list of versions, value: one version only, false: allow none) +3. bech - checks for bech version (optional, default=false) (true: allow any, array: list of versions, value: one version only, false: allow none) [requires additional library: [btc_api](https://ranchimall.github.io/btc-webwallet/lib_btc.js)] +* Returns : boolen (true or false) + #### Validate FLO ID - floCrypto.validateAddr(floID) -`validateAddr` check if the given Address is valid or not + floCrypto.validateFloID(floID) +`validateFloID` check if the given floID is valid or not 1. floID - flo ID to validate * Returns : boolen (true or false) diff --git a/floBlockchainAPI.js b/floBlockchainAPI.js index fcc73b9..8cf3a79 100644 --- a/floBlockchainAPI.js +++ b/floBlockchainAPI.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floBlockchainAPI v2.3.3 +(function(EXPORTS) { //floBlockchainAPI v2.3.3a /* FLO Blockchain Operator to send/receive data from blockchain using API calls*/ 'use strict'; const floBlockchainAPI = EXPORTS; @@ -125,9 +125,9 @@ return new Promise((resolve, reject) => { if (!floCrypto.validateASCII(floData)) return reject("Invalid FLO_Data: only printable ASCII characters are allowed"); - else if (!floCrypto.validateAddr(senderAddr)) + else if (!floCrypto.validateFloID(senderAddr)) return reject(`Invalid address : ${senderAddr}`); - else if (!floCrypto.validateAddr(receiverAddr)) + else if (!floCrypto.validateFloID(receiverAddr)) return reject(`Invalid address : ${receiverAddr}`); else if (privKey.length < 1 || !floCrypto.verifyPrivKey(privKey, senderAddr)) return reject("Invalid Private key!"); @@ -202,7 +202,7 @@ //merge all UTXOs of a given floID into a single UTXO floBlockchainAPI.mergeUTXOs = function(floID, privKey, floData = '') { return new Promise((resolve, reject) => { - if (!floCrypto.validateAddr(floID)) + if (!floCrypto.validateFloID(floID)) return reject(`Invalid floID`); if (!floCrypto.verifyPrivKey(privKey, floID)) return reject("Invalid Private Key"); @@ -326,7 +326,7 @@ } //Validate the receiver IDs and receive amount for (let floID in receivers) { - if (!floCrypto.validateAddr(floID)) + if (!floCrypto.validateFloID(floID)) invalids.InvalidReceiverIDs.push(floID); if (typeof receivers[floID] !== 'number' || receivers[floID] <= 0) invalids.InvalidReceiveAmountFor.push(floID); diff --git a/floCrypto.js b/floCrypto.js index 7be6c5a..1c47628 100644 --- a/floCrypto.js +++ b/floCrypto.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floCrypto v2.3.1 +(function(EXPORTS) { //floCrypto v2.3.2 /* FLO Crypto Operators */ 'use strict'; const floCrypto = EXPORTS; @@ -196,18 +196,54 @@ } } - //Check if the given Address is valid or not - floCrypto.validateFloID = floCrypto.validateAddr = function(inpAddr) { - if (!inpAddr) + //Check if the given flo-id is valid or not + floCrypto.validateFloID = function(floID) { + if (!floID) return false; try { - let addr = new Bitcoin.Address(inpAddr); + let addr = new Bitcoin.Address(floID); return true; } catch { return false; } } + //Check if the given address (any blockchain) is valid or not + floCrypto.validateAddr = function(address, std = true, bech = false) { + if (address.length == 34) { //legacy or segwit encoding + if (std === false) + return false; + let decode = bitjs.Base58.decode(address); + var raw = decode.slice(0, decode.length - 4), + checksum = decode.slice(decode.length - 4); + var hash = Crypto.SHA256(Crypto.SHA256(raw, { + asBytes: true + }), { + asBytes: true + }); + if (hash[0] != checksum[0] || hash[1] != checksum[1] || hash[2] != checksum[2] || hash[3] != checksum[3]) + return false; + else if (std === true || (!Array.isArray(std) && std === raw[0]) || (Array.isArray(std) && std.includes(raw[0]))) + return true; + else + return false; + } else if (address.length == 42 || address.length == 62) { //bech encoding + if (bech === false) + return false; + else if (typeof btc_api !== "object") + throw "btc_api library missing (lib_btc.js)"; + let decode = coinjs.bech32_decode(address); + if (!decode) + return false; + var raw = decode.data; + if (bech === true || (!Array.isArray(bech) && bech === raw[0]) || (Array.isArray(bech) && bech.includes(raw[0]))) + return true; + else + return false; + } else //unknown length + return false; + } + //Split the str using shamir's Secret and Returns the shares floCrypto.createShamirsSecretShares = function(str, total_shares, threshold_limit) { try { diff --git a/floDapps.js b/floDapps.js index 157b37d..e25ecf0 100644 --- a/floDapps.js +++ b/floDapps.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floDapps v2.3.1 +(function(EXPORTS) { //floDapps v2.3.1a /* General functions for FLO Dapps*/ 'use strict'; const floDapps = EXPORTS; @@ -284,7 +284,7 @@ if (!result) return reject("Empty Private Key") var floID = floCrypto.getFloID(result) - if (!floID || !floCrypto.validateAddr(floID)) + if (!floID || !floCrypto.validateFloID(floID)) return reject("Invalid Private Key") privKey = result; }).catch(error => { @@ -426,7 +426,7 @@ floDapps.storeContact = function(floID, name) { return new Promise((resolve, reject) => { - if (!floCrypto.validateAddr(floID)) + if (!floCrypto.validateFloID(floID)) return reject("Invalid floID!") compactIDB.writeData("contacts", name, floID, user.db_name).then(result => { user.contacts[floID] = name; @@ -439,7 +439,7 @@ return new Promise((resolve, reject) => { if (floID in user.pubKeys) return resolve("pubKey already stored") - if (!floCrypto.validateAddr(floID)) + if (!floCrypto.validateFloID(floID)) return reject("Invalid floID!") if (floCrypto.getFloID(pubKey) != floID) return reject("Incorrect pubKey") From fa3d790c6c3bacccc0c4fb088e76b5ae2867619a Mon Sep 17 00:00:00 2001 From: sairajzero Date: Sun, 24 Jul 2022 02:29:04 +0530 Subject: [PATCH 06/42] floDapps v2.3.2: lock privkey by default - Removed the options for launchStartUp - private-key is on lock mode by default - Added utility functions that uses private-key without entering password in .user .sign(message): signs message .decrypt(data): decrypts ciphertext in asymmetric .encipher(message): encrypts message in symmetric .decipher(data): decrypts ciphertext in symmetric --- floDapps.js | 25 +++++++++++++++++-------- index.html | 2 +- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/floDapps.js b/floDapps.js index e25ecf0..e5e2d6d 100644 --- a/floDapps.js +++ b/floDapps.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floDapps v2.3.1a +(function(EXPORTS) { //floDapps v2.3.2 /* General functions for FLO Dapps*/ 'use strict'; const floDapps = EXPORTS; @@ -40,6 +40,18 @@ else return Crypto.AES.decrypt(user_private, aes_key); }, + sign(message) { + return floCrypto.signData(message, raw_user.private); + }, + decrypt(data) { + return floCrypto.decryptData(data, raw_user.private); + }, + encipher(message) { + return Crypto.AES.encrypt(message, raw_user.private); + }, + decipher(data) { + return Crypto.AES.decrypt(data, raw_user.private); + }, get db_name() { return "floDapps#" + user.id; }, @@ -240,7 +252,7 @@ resolve(inputVal) }); - function getCredentials(lock_key) { + function getCredentials() { const readSharesFromIDB = indexArr => new Promise((resolve, reject) => { var promises = [] @@ -336,10 +348,7 @@ let n = floCrypto.randInt(12, 20); aes_key = floCrypto.randString(n); user_priv_raw = Crypto.AES.encrypt(privKey, aes_key); - if (!lock_key) - user_private = user_priv_raw; - else - user_private = user_priv_wrap; + user_private = user_priv_wrap; resolve('Login Credentials loaded successful') } catch (error) { console.log(error) @@ -384,7 +393,7 @@ }) }); - floDapps.launchStartUp = function(options = {}) { + floDapps.launchStartUp = function() { return new Promise((resolve, reject) => { initIndexedDB().then(log => { console.log(log) @@ -399,7 +408,7 @@ }) }); let p2 = new Promise((res, rej) => { - callAndLog(getCredentials(options.lock_key)).then(r => { + callAndLog(getCredentials()).then(r => { callAndLog(initUserDB()).then(r => { callAndLog(loadUserDB()) .then(r => res(true)) diff --git a/index.html b/index.html index cef876c..2b60d9d 100644 --- a/index.html +++ b/index.html @@ -24,7 +24,7 @@ //floDapps.addStartUpFunction('Sample', Promised Function) //floDapps.setAppObjectStores({sampleObs1:{}, sampleObs2:{options{autoIncrement:true, keyPath:'SampleKey'}, Indexes:{sampleIndex:{}}}}) //floDapps.setCustomPrivKeyInput( () => { FUNCTION BODY *must resolve private key* } ) - floDapps.launchStartUp( /*{lock_key: true}*/ ).then(result => { + floDapps.launchStartUp().then(result => { console.log(result) alert(`Welcome FLO_ID: ${myFloID}`) //App functions.... From 0526a1f29f0a609bbbbec19f2cdea3f014722d9d Mon Sep 17 00:00:00 2001 From: sairajzero Date: Sun, 24 Jul 2022 02:34:02 +0530 Subject: [PATCH 07/42] floCloudAPI v2.4.2: cross-blockchain receiverID - Accept any blockchain ID as receiverID and automatically convert it into floID --- floCloudAPI.js | 57 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/floCloudAPI.js b/floCloudAPI.js index 9501ed9..3a06e0b 100644 --- a/floCloudAPI.js +++ b/floCloudAPI.js @@ -1,9 +1,10 @@ -(function(EXPORTS) { //floCloudAPI v2.4.1 +(function(EXPORTS) { //floCloudAPI v2.4.2 /* FLO Cloud operations to send/request application data*/ 'use strict'; const floCloudAPI = EXPORTS; const DEFAULT = { + blockchainPrefix: 0x23, //Prefix version for FLO blockchain SNStorageID: floGlobals.SNStorageID || "FNaN9McoBAEFUjkRmNQRYLmBF8SpS7Tgfk", adminID: floGlobals.adminID, application: floGlobals.application, @@ -369,10 +370,54 @@ const filterKey = util.filterKey = function(type, options) { return type + (options.comment ? ':' + options.comment : '') + - '|' + (options.group || options.receiverID || DEFAULT.adminID) + + '|' + (options.group || toFloID(options.receiverID) || DEFAULT.adminID) + '|' + (options.application || DEFAULT.application); } + const toFloID = util.toFloID = function(address) { + if (!address) + return; + var bytes; + if (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 || address.length == 62) { //bech encoding + if (!(coinjs instanceof Object)) + throw "library missing (lib_btc.js)"; + let decode = coinjs.bech32_decode(address); + if (decode) { + bytes = decode.data; + bytes.shift(); + bytes = coinjs.bech32_convert(bytes, 5, 8, false); + if (address.length == 62) //for long bech, aggregate once more to get 160 bit + bytes = coinjs.bech32_convert(bytes, 5, 8, false); + } + } else if (address.length == 66) { //public key hex + bytes = ripemd160(Crypto.SHA256(Crypto.util.hexToBytes(address), { + asBytes: true + })); + } + if (!bytes) + throw "Invalid address: " + address; + else { + bytes.unshift(DEFAULT.blockchainPrefix); + let hash = Crypto.SHA256(Crypto.SHA256(bytes, { + asBytes: true + }), { + asBytes: true + }); + return bitjs.Base58.encode(bytes.concat(hash.slice(0, 4))); + } + } + const lastCommit = {}; Object.defineProperty(lastCommit, 'get', { value: objName => JSON.parse(lastCommit[objName]) @@ -474,7 +519,7 @@ return new Promise((resolve, reject) => { var data = { senderID: user.id, - receiverID: options.receiverID || DEFAULT.adminID, + receiverID: toFloID(options.receiverID) || DEFAULT.adminID, pubKey: user.public, message: encodeMessage(message), time: Date.now(), @@ -495,7 +540,7 @@ const requestApplicationData = floCloudAPI.requestApplicationData = function(type, options = {}) { return new Promise((resolve, reject) => { var request = { - receiverID: options.receiverID || DEFAULT.adminID, + receiverID: toFloID(options.receiverID) || DEFAULT.adminID, senderID: options.senderID || undefined, application: options.application || DEFAULT.application, type: type, @@ -600,7 +645,7 @@ if (!floGlobals.subAdmins.includes(user.id)) return reject("Only subAdmins can tag data") var request = { - receiverID: options.receiverID || DEFAULT.adminID, + receiverID: toFloID(options.receiverID) || DEFAULT.adminID, requestorID: user.id, pubKey: user.public, time: Date.now(), @@ -619,7 +664,7 @@ floCloudAPI.noteApplicationData = function(vectorClock, note, options = {}) { return new Promise((resolve, reject) => { var request = { - receiverID: options.receiverID || DEFAULT.adminID, + receiverID: toFloID(options.receiverID) || DEFAULT.adminID, requestorID: user.id, pubKey: user.public, time: Date.now(), From 8a211be84919ee772a9c4137ffc5dcc23a17a549 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Sun, 24 Jul 2022 20:33:45 +0530 Subject: [PATCH 08/42] Adding btcOperator module --- btcOperator.js | 324 ++++++ floCrypto.js | 4 +- lib.js | 2558 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 2881 insertions(+), 5 deletions(-) create mode 100644 btcOperator.js diff --git a/btcOperator.js b/btcOperator.js new file mode 100644 index 0000000..f79cdb5 --- /dev/null +++ b/btcOperator.js @@ -0,0 +1,324 @@ +(function(EXPORTS) { //btcOperator v1.0.6 + /* BTC Crypto and API Operator */ + const btcOperator = EXPORTS; + + //This library uses API provided by chain.so (https://chain.so/) + const URL = "https://chain.so/api/v2/"; + + const fetch_api = btcOperator.fetch = function(api) { + return new Promise((resolve, reject) => { + console.debug(URL + api); + fetch(URL + api).then(response => { + response.json() + .then(result => result.status === "success" ? resolve(result) : reject(result)) + .catch(error => reject(error)) + }).catch(error => reject(error)) + }) + }; + + const broadcast = btcOperator.broadcast = rawtx => new Promise((resolve, reject) => { + $.ajax({ + type: "POST", + url: URL + "send_tx/BTC/", + data: { + "tx_hex": rawtx + }, + dataType: "json", + error: e => reject(e.responseJSON), + success: r => r.status === "success" ? resolve(r.data) : reject(r) + }) + }); + + Object.defineProperties(btcOperator, { + newKeys: { + get: () => { + let r = coinjs.newKeys(); + r.segwitAddress = coinjs.segwitAddress(r.pubkey).address; + r.bech32Address = coinjs.bech32Address(r.pubkey).address; + return r; + } + }, + pubkey: { + value: key => key.length >= 66 ? key : (key.length == 64 ? coinjs.newPubkey(key) : coinjs.wif2pubkey(key).pubkey) + }, + address: { + value: (key, prefix = undefined) => coinjs.pubkey2address(btcOperator.pubkey(key), prefix) + }, + segwitAddress: { + value: key => coinjs.segwitAddress(btcOperator.pubkey(key)).address + }, + bech32Address: { + value: key => coinjs.bech32Address(btcOperator.pubkey(key)).address + } + }); + + coinjs.compressed = true; + + const verifyKey = btcOperator.verifyKey = function(addr, key) { + if (!addr || !key) + return undefined; + switch (coinjs.addressDecode(addr).type) { + case "standard": + return btcOperator.address(key) === addr; + case "multisig": + return btcOperator.segwitAddress(key) === addr; + case "bech32": + return btcOperator.bech32Address(key) === addr; + default: + return null; + } + } + + const validateAddress = btcOperator.validateAddress = function(addr) { + if (!addr) + return undefined; + let type = coinjs.addressDecode(addr).type; + if (["standard", "multisig", "bech32"].includes(type)) + return type; + else + return false; + } + + //convert from one blockchain to another blockchain (target version) + btcOperator.convert = {}; + + btcOperator.convert.wif = function(source_wif, target_version = coinjs.priv) { + let keyHex = decodeLegacy(source_wif).hex; + if (!keyHex || keyHex.length < 66 || !/01$/.test(keyHex)) + return null; + else + return encodeLegacy(keyHex, target_version); + } + + btcOperator.convert.legacy2legacy = function(source_addr, target_version = coinjs.pub) { + let rawHex = decodeLegacy(source_addr).hex; + if (!rawHex) + return null; + else + return encodeLegacy(rawHex, target_version); + } + + btcOperator.convert.legacy2bech = function(source_addr, target_version = coinjs.bech32.version, target_hrp = coinjs.bech32.hrp) { + let rawHex = decodeLegacy(source_addr).hex; + if (!rawHex) + return null; + else + return encodeBech32(rawHex, target_version, target_hrp); + } + + btcOperator.convert.bech2bech = function(source_addr, target_version = coinjs.bech32.version, target_hrp = coinjs.bech32.hrp) { + let rawHex = decodeBech32(source_addr).hex; + if (!rawHex) + return null; + else + return encodeBech32(rawHex, target_version, target_hrp); + } + + btcOperator.convert.bech2legacy = function(source_addr, target_version = coinjs.pub) { + let rawHex = decodeBech32(source_addr).hex; + if (!rawHex) + return null; + else + return encodeLegacy(rawHex, target_version); + } + + function decodeLegacy(source) { + var decode = coinjs.base58decode(source); + var raw = decode.slice(0, decode.length - 4), + checksum = decode.slice(decode.length - 4); + var hash = Crypto.SHA256(Crypto.SHA256(raw, { + asBytes: true + }), { + asBytes: true + }); + if (hash[0] != checksum[0] || hash[1] != checksum[1] || hash[2] != checksum[2] || hash[3] != checksum[3]) + return null; + let version = raw.shift(); + return { + version: version, + hex: Crypto.util.bytesToHex(raw) + } + } + + function encodeLegacy(hex, version) { + var bytes = Crypto.util.hexToBytes(hex); + bytes.unshift(version); + var hash = Crypto.SHA256(Crypto.SHA256(bytes, { + asBytes: true + }), { + asBytes: true + }); + var checksum = hash.slice(0, 4); + return coinjs.base58encode(bytes.concat(checksum)); + } + + function decodeBech32(source) { + let decode = coinjs.bech32_decode(source); + if (!decode) + return null; + var raw = decode.data; + let version = raw.shift(); + raw = coinjs.bech32_convert(raw, 5, 8, false); + return { + hrp: decode.hrp, + version: version, + hex: Crypto.util.bytesToHex(raw) + } + } + + function encodeBech32(hex, version, hrp) { + var bytes = Crypto.util.hexToBytes(hex); + bytes = coinjs.bech32_convert(bytes, 8, 5, true); + bytes.unshift(version) + return coinjs.bech32_encode(hrp, bytes); + } + + //BTC blockchain APIs + + btcOperator.getBalance = addr => new Promise((resolve, reject) => { + fetch_api(`get_address_balance/BTC/${addr}`) + .then(result => resolve(parseFloat(result.data.confirmed_balance))) + .catch(error => reject(error)) + }); + + function _redeemScript(addr, key) { + let decode = coinjs.addressDecode(addr); + switch (decode.type) { + case "standard": + return false; + case "multisig": + return coinjs.segwitAddress(btcOperator.pubkey(key)).redeemscript; + case "bech32": + return decode.redeemscript; + default: + return null; + } + } + + function addUTXOs(tx, senders, redeemScripts, required_amount, n = 0) { + return new Promise((resolve, reject) => { + required_amount = parseFloat(required_amount.toFixed(8)); + if (required_amount <= 0 || n >= senders.length) + return resolve(required_amount); + let addr = senders[n], + rs = redeemScripts[n]; + fetch_api(`get_tx_unspent/BTC/${addr}`).then(result => { + let utxos = result.data.txs; + console.debug("add-utxo", addr, rs, required_amount, utxos); + for (let i = 0; i < utxos.length && required_amount > 0; i++) { + if (!utxos[i].confirmations) //ignore unconfirmed utxo + continue; + required_amount -= parseFloat(utxos[i].value); + var script; + if (rs) { //redeemScript for segwit/bech32 + let s = coinjs.script(); + s.writeBytes(Crypto.util.hexToBytes(rs)); + s.writeOp(0); + s.writeBytes(coinjs.numToBytes((utxos[i].value * 100000000).toFixed(0), 8)); + script = Crypto.util.bytesToHex(s.buffer); + } else //legacy script + script = utxos[i].script_hex; + tx.addinput(utxos[i].txid, utxos[i].output_no, script, 0xfffffffd /*sequence*/ ); //0xfffffffd for Replace-by-fee + } + addUTXOs(tx, senders, redeemScripts, required_amount, n + 1) + .then(result => resolve(result)) + .catch(error => reject(error)) + }).catch(error => reject(error)) + }) + } + + btcOperator.sendTx = function(senders, privkeys, receivers, amounts, fee, change_addr = null) { + return new Promise((resolve, reject) => { + //Add values into array (if single values are passed) + if (!Array.isArray(senders)) + senders = [senders]; + if (!Array.isArray(privkeys)) + privkeys = [privkeys]; + if (!Array.isArray(receivers)) + receivers = [receivers]; + if (!Array.isArray(amounts)) + amounts = [amounts]; + + let invalids = []; + //validate tx-input parameters + if (senders.length != privkeys.length) + return reject("Array length for senders and privkeys should be equal"); + const redeemScripts = [], + wif_keys = []; + for (let i in senders) { + if (!verifyKey(senders[i], privkeys[i])) //verify private-key + invalids.push(senders[i]); + if (privkeys[i].length === 64) //convert Hex to WIF if needed + privkeys[i] = coinjs.privkey2wif(privkeys[i]); + let rs = _redeemScript(senders[i], privkeys[i]); //get redeem-script (segwit/bech32) + redeemScripts.push(rs); + rs === false ? wif_keys.unshift(privkeys[i]) : wif_keys.push(privkeys[i]); //sorting private-keys (wif) + } + if (invalids.length) + return reject("Invalid keys:" + invalids); + if (typeof fee !== "number" || fee <= 0) + return reject("Invalid fee:" + fee); + + //validate tx-output parameters + if (receivers.length != amounts.length) + return reject("Array length for receivers and amounts should be equal"); + let total_amount = 0; + for (let i in receivers) + if (!validateAddress(receivers[i])) + invalids.push(receivers[i]); + if (invalids.length) + return reject("Invalid receivers:" + invalids); + for (let i in amounts) { + if (typeof amounts[i] !== "number" || amounts[i] <= 0) + invalids.push(amounts[i]); + else + total_amount += amounts[i]; + } + if (invalids.length) + return reject("Invalid amounts:" + invalids); + if (change_addr && !validateAddress(change_addr)) + return reject("Invalid change_address:" + change_addr); + + //create transaction + var tx = coinjs.transaction(); + total_amount = parseFloat(total_amount.toFixed(8)); + addUTXOs(tx, senders, redeemScripts, total_amount + fee).then(result => { + if (result > 0) + return reject("Insufficient Balance"); + for (let i in receivers) + tx.addoutput(receivers[i], amounts[i]); + let change = parseFloat(Math.abs(result).toFixed(8)); + if (change > 0) + tx.addoutput(change_addr || senders[0], change); + console.debug("amounts (total, fee, change):", total_amount, fee, change); + console.debug("Unsigned:", tx.serialize()); + new Set(wif_keys).forEach(key => console.debug("Signing key:", key, tx.sign(key, 1 /*sighashtype*/ ))); //Sign the tx using private key WIF + + console.debug("Signed:", tx.serialize()); + debugger; + broadcast(tx.serialize()) + .then(result => resolve(result)) + .catch(error => reject(error)); + }).catch(error => reject(error)) + }) + }; + + btcOperator.getTx = txid => new Promise((resolve, reject) => { + fetch_api(`get_tx/BTC/${txid}`) + .then(result => resolve(result.data)) + .catch(error => reject(error)) + }); + + btcOperator.getAddressData = addr => new Promise((resolve, reject) => { + fetch_api(`address/BTC/${addr}`) + .then(result => resolve(result.data)) + .catch(error => reject(error)) + }); + + btcOperator.getBlock = block => new Promise((resolve, reject) => { + fetch_api(`get_block/BTC/${block}`) + .then(result => resolve(result.data)) + .catch(error => reject(error)) + }); + +})('object' === typeof module ? module.exports : window.btcOperator = {}); \ No newline at end of file diff --git a/floCrypto.js b/floCrypto.js index 1c47628..064c060 100644 --- a/floCrypto.js +++ b/floCrypto.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floCrypto v2.3.2 +(function(EXPORTS) { //floCrypto v2.3.2a /* FLO Crypto Operators */ 'use strict'; const floCrypto = EXPORTS; @@ -230,8 +230,6 @@ } else if (address.length == 42 || address.length == 62) { //bech encoding if (bech === false) return false; - else if (typeof btc_api !== "object") - throw "btc_api library missing (lib_btc.js)"; let decode = coinjs.bech32_decode(address); if (!decode) return false; diff --git a/lib.js b/lib.js index c6684f7..a7e41fe 100644 --- a/lib.js +++ b/lib.js @@ -1,4 +1,4 @@ -(function(GLOBAL) { //lib v1.2.3 +(function(GLOBAL) { //lib v1.3.0 'use strict'; /* Utility Libraries required for Standard operations * All credits for these codes belong to their respective creators, moderators and owners. @@ -6017,6 +6017,2561 @@ })("secp256k1"); })(); + //sha512.js + (function() { + /* + A JavaScript implementation of the SHA family of hashes, as defined in FIPS + PUB 180-2 as well as the corresponding HMAC implementation as defined in + FIPS PUB 198a + + Copyright Brian Turek 2008-2012 + Distributed under the BSD License + See http://caligatio.github.com/jsSHA/ for more information + + Several functions taken from Paul Johnson + */ + function n(a) { + throw a; + } + var q = null; + + function s(a, b) { + this.a = a; + this.b = b + } + + function u(a, b) { + var d = [], + h = (1 << b) - 1, + f = a.length * b, + g; + for (g = 0; g < f; g += b) d[g >>> 5] |= (a.charCodeAt(g / b) & h) << 32 - b - g % 32; + return { + value: d, + binLen: f + } + } + + function x(a) { + var b = [], + d = a.length, + h, f; + 0 !== d % 2 && n("String of HEX type must be in byte increments"); + for (h = 0; h < d; h += 2) f = parseInt(a.substr(h, 2), 16), isNaN(f) && n("String of HEX type contains invalid characters"), b[h >>> 3] |= f << 24 - 4 * (h % 8); + return { + value: b, + binLen: 4 * d + } + } + + function B(a) { + var b = [], + d = 0, + h, f, g, k, m; - 1 === a.search(/^[a-zA-Z0-9=+\/]+$/) && n("Invalid character in base-64 string"); + h = a.indexOf("="); + a = a.replace(/\=/g, ""); - 1 !== h && h < a.length && n("Invalid '=' found in base-64 string"); + for (f = 0; f < a.length; f += 4) { + m = a.substr(f, 4); + for (g = k = 0; g < m.length; g += 1) h = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".indexOf(m[g]), k |= h << 18 - 6 * g; + for (g = 0; g < m.length - 1; g += 1) b[d >> 2] |= (k >>> 16 - 8 * g & 255) << 24 - 8 * (d % 4), d += 1 + } + return { + value: b, + binLen: 8 * d + } + } + + function E(a, b) { + var d = "", + h = 4 * a.length, + f, g; + for (f = 0; f < h; f += 1) g = a[f >>> 2] >>> 8 * (3 - f % 4), d += "0123456789abcdef".charAt(g >>> 4 & 15) + "0123456789abcdef".charAt(g & 15); + return b.outputUpper ? d.toUpperCase() : d + } + + function F(a, b) { + var d = "", + h = 4 * a.length, + f, g, k; + for (f = 0; f < h; f += 3) { + k = (a[f >>> 2] >>> 8 * (3 - f % 4) & 255) << 16 | (a[f + 1 >>> 2] >>> 8 * (3 - (f + 1) % 4) & 255) << 8 | a[f + 2 >>> 2] >>> 8 * (3 - (f + 2) % 4) & 255; + for (g = 0; 4 > g; g += 1) d = 8 * f + 6 * g <= 32 * a.length ? d + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(k >>> 6 * (3 - g) & 63) : d + b.b64Pad + } + return d + } + + function G(a) { + var b = { + outputUpper: !1, + b64Pad: "=" + }; + try { + a.hasOwnProperty("outputUpper") && (b.outputUpper = a.outputUpper), a.hasOwnProperty("b64Pad") && (b.b64Pad = a.b64Pad) + } catch (d) {} + "boolean" !== typeof b.outputUpper && n("Invalid outputUpper formatting option"); + "string" !== typeof b.b64Pad && n("Invalid b64Pad formatting option"); + return b + } + + function H(a, b) { + var d = q, + d = new s(a.a, a.b); + return d = 32 >= b ? new s(d.a >>> b | d.b << 32 - b & 4294967295, d.b >>> b | d.a << 32 - b & 4294967295) : new s(d.b >>> b - 32 | d.a << 64 - b & 4294967295, d.a >>> b - 32 | d.b << 64 - b & 4294967295) + } + + function I(a, b) { + var d = q; + return d = 32 >= b ? new s(a.a >>> b, a.b >>> b | a.a << 32 - b & 4294967295) : new s(0, a.a >>> b - 32) + } + + function J(a, b, d) { + return new s(a.a & b.a ^ ~a.a & d.a, a.b & b.b ^ ~a.b & d.b) + } + + function U(a, b, d) { + return new s(a.a & b.a ^ a.a & d.a ^ b.a & d.a, a.b & b.b ^ a.b & d.b ^ b.b & d.b) + } + + function V(a) { + var b = H(a, 28), + d = H(a, 34); + a = H(a, 39); + return new s(b.a ^ d.a ^ a.a, b.b ^ d.b ^ a.b) + } + + function W(a) { + var b = H(a, 14), + d = H(a, 18); + a = H(a, 41); + return new s(b.a ^ d.a ^ a.a, b.b ^ d.b ^ a.b) + } + + function X(a) { + var b = H(a, 1), + d = H(a, 8); + a = I(a, 7); + return new s(b.a ^ d.a ^ a.a, b.b ^ d.b ^ a.b) + } + + function Y(a) { + var b = H(a, 19), + d = H(a, 61); + a = I(a, 6); + return new s(b.a ^ d.a ^ a.a, b.b ^ d.b ^ a.b) + } + + function Z(a, b) { + var d, h, f; + d = (a.b & 65535) + (b.b & 65535); + h = (a.b >>> 16) + (b.b >>> 16) + (d >>> 16); + f = (h & 65535) << 16 | d & 65535; + d = (a.a & 65535) + (b.a & 65535) + (h >>> 16); + h = (a.a >>> 16) + (b.a >>> 16) + (d >>> 16); + return new s((h & 65535) << 16 | d & 65535, f) + } + + function aa(a, b, d, h) { + var f, g, k; + f = (a.b & 65535) + (b.b & 65535) + (d.b & 65535) + (h.b & 65535); + g = (a.b >>> 16) + (b.b >>> 16) + (d.b >>> 16) + (h.b >>> 16) + (f >>> 16); + k = (g & 65535) << 16 | f & 65535; + f = (a.a & 65535) + (b.a & 65535) + (d.a & 65535) + (h.a & 65535) + (g >>> 16); + g = (a.a >>> 16) + (b.a >>> 16) + (d.a >>> 16) + (h.a >>> 16) + (f >>> 16); + return new s((g & 65535) << 16 | f & 65535, k) + } + + function ba(a, b, d, h, f) { + var g, k, m; + g = (a.b & 65535) + (b.b & 65535) + (d.b & 65535) + (h.b & 65535) + (f.b & 65535); + k = (a.b >>> 16) + (b.b >>> 16) + (d.b >>> 16) + (h.b >>> 16) + (f.b >>> 16) + (g >>> 16); + m = (k & 65535) << 16 | g & 65535; + g = (a.a & 65535) + (b.a & 65535) + (d.a & 65535) + (h.a & 65535) + (f.a & 65535) + (k >>> 16); + k = (a.a >>> 16) + (b.a >>> 16) + (d.a >>> 16) + (h.a >>> 16) + (f.a >>> 16) + (g >>> 16); + return new s((k & 65535) << 16 | g & 65535, m) + } + + function $(a, b, d) { + var h, f, g, k, m, j, A, C, K, e, L, v, l, M, t, p, y, z, r, N, O, P, Q, R, c, S, w = [], + T, D; + "SHA-384" === d || "SHA-512" === d ? (L = 80, h = (b + 128 >>> 10 << 5) + 31, M = 32, t = 2, c = s, p = Z, y = aa, z = ba, r = X, N = Y, O = V, P = W, R = U, Q = J, S = [new c(1116352408, 3609767458), new c(1899447441, 602891725), new c(3049323471, 3964484399), new c(3921009573, 2173295548), new c(961987163, 4081628472), new c(1508970993, 3053834265), new c(2453635748, 2937671579), new c(2870763221, 3664609560), new c(3624381080, 2734883394), new c(310598401, 1164996542), new c(607225278, 1323610764), + new c(1426881987, 3590304994), new c(1925078388, 4068182383), new c(2162078206, 991336113), new c(2614888103, 633803317), new c(3248222580, 3479774868), new c(3835390401, 2666613458), new c(4022224774, 944711139), new c(264347078, 2341262773), new c(604807628, 2007800933), new c(770255983, 1495990901), new c(1249150122, 1856431235), new c(1555081692, 3175218132), new c(1996064986, 2198950837), new c(2554220882, 3999719339), new c(2821834349, 766784016), new c(2952996808, 2566594879), new c(3210313671, 3203337956), new c(3336571891, + 1034457026), new c(3584528711, 2466948901), new c(113926993, 3758326383), new c(338241895, 168717936), new c(666307205, 1188179964), new c(773529912, 1546045734), new c(1294757372, 1522805485), new c(1396182291, 2643833823), new c(1695183700, 2343527390), new c(1986661051, 1014477480), new c(2177026350, 1206759142), new c(2456956037, 344077627), new c(2730485921, 1290863460), new c(2820302411, 3158454273), new c(3259730800, 3505952657), new c(3345764771, 106217008), new c(3516065817, 3606008344), new c(3600352804, 1432725776), new c(4094571909, + 1467031594), new c(275423344, 851169720), new c(430227734, 3100823752), new c(506948616, 1363258195), new c(659060556, 3750685593), new c(883997877, 3785050280), new c(958139571, 3318307427), new c(1322822218, 3812723403), new c(1537002063, 2003034995), new c(1747873779, 3602036899), new c(1955562222, 1575990012), new c(2024104815, 1125592928), new c(2227730452, 2716904306), new c(2361852424, 442776044), new c(2428436474, 593698344), new c(2756734187, 3733110249), new c(3204031479, 2999351573), new c(3329325298, 3815920427), new c(3391569614, + 3928383900), new c(3515267271, 566280711), new c(3940187606, 3454069534), new c(4118630271, 4000239992), new c(116418474, 1914138554), new c(174292421, 2731055270), new c(289380356, 3203993006), new c(460393269, 320620315), new c(685471733, 587496836), new c(852142971, 1086792851), new c(1017036298, 365543100), new c(1126000580, 2618297676), new c(1288033470, 3409855158), new c(1501505948, 4234509866), new c(1607167915, 987167468), new c(1816402316, 1246189591) + ], e = "SHA-384" === d ? [new c(3418070365, 3238371032), new c(1654270250, 914150663), + new c(2438529370, 812702999), new c(355462360, 4144912697), new c(1731405415, 4290775857), new c(41048885895, 1750603025), new c(3675008525, 1694076839), new c(1203062813, 3204075428) + ] : [new c(1779033703, 4089235720), new c(3144134277, 2227873595), new c(1013904242, 4271175723), new c(2773480762, 1595750129), new c(1359893119, 2917565137), new c(2600822924, 725511199), new c(528734635, 4215389547), new c(1541459225, 327033209)]) : n("Unexpected error in SHA-2 implementation"); + a[b >>> 5] |= 128 << 24 - b % 32; + a[h] = b; + T = a.length; + for (v = 0; v < + T; v += M) { + b = e[0]; + h = e[1]; + f = e[2]; + g = e[3]; + k = e[4]; + m = e[5]; + j = e[6]; + A = e[7]; + for (l = 0; l < L; l += 1) w[l] = 16 > l ? new c(a[l * t + v], a[l * t + v + 1]) : y(N(w[l - 2]), w[l - 7], r(w[l - 15]), w[l - 16]), C = z(A, P(k), Q(k, m, j), S[l], w[l]), K = p(O(b), R(b, h, f)), A = j, j = m, m = k, k = p(g, C), g = f, f = h, h = b, b = p(C, K); + e[0] = p(b, e[0]); + e[1] = p(h, e[1]); + e[2] = p(f, e[2]); + e[3] = p(g, e[3]); + e[4] = p(k, e[4]); + e[5] = p(m, e[5]); + e[6] = p(j, e[6]); + e[7] = p(A, e[7]) + } + "SHA-384" === d ? D = [e[0].a, e[0].b, e[1].a, e[1].b, e[2].a, e[2].b, e[3].a, e[3].b, e[4].a, e[4].b, e[5].a, e[5].b] : "SHA-512" === d ? D = [e[0].a, e[0].b, + e[1].a, e[1].b, e[2].a, e[2].b, e[3].a, e[3].b, e[4].a, e[4].b, e[5].a, e[5].b, e[6].a, e[6].b, e[7].a, e[7].b + ] : n("Unexpected error in SHA-2 implementation"); + return D + } + GLOBAL.jsSHA = function(a, b, d) { + var h = q, + f = q, + g = 0, + k = [0], + m = 0, + j = q, + m = "undefined" !== typeof d ? d : 8; + 8 === m || 16 === m || n("charSize must be 8 or 16"); + "HEX" === b ? (0 !== a.length % 2 && n("srcString of HEX type must be in byte increments"), j = x(a), g = j.binLen, k = j.value) : "ASCII" === b || "TEXT" === b ? (j = u(a, m), g = j.binLen, k = j.value) : "B64" === b ? (j = B(a), g = j.binLen, k = j.value) : n("inputFormat must be HEX, TEXT, ASCII, or B64"); + this.getHash = function(a, b, d) { + var e = q, + m = k.slice(), + j = ""; + switch (b) { + case "HEX": + e = E; + break; + case "B64": + e = F; + break; + default: + n("format must be HEX or B64") + } + "SHA-384" === + a ? (q === h && (h = $(m, g, a)), j = e(h, G(d))) : "SHA-512" === a ? (q === f && (f = $(m, g, a)), j = e(f, G(d))) : n("Chosen SHA variant is not supported"); + return j + }; + this.getHMAC = function(a, b, d, e, f) { + var h, l, j, t, p, y = [], + z = [], + r = q; + switch (e) { + case "HEX": + h = E; + break; + case "B64": + h = F; + break; + default: + n("outputFormat must be HEX or B64") + } + "SHA-384" === d ? (j = 128, p = 384) : "SHA-512" === d ? (j = 128, p = 512) : n("Chosen SHA variant is not supported"); + "HEX" === b ? (r = x(a), t = r.binLen, l = r.value) : "ASCII" === b || "TEXT" === b ? (r = u(a, m), t = r.binLen, l = r.value) : "B64" === b ? (r = B(a), + t = r.binLen, l = r.value) : n("inputFormat must be HEX, TEXT, ASCII, or B64"); + a = 8 * j; + b = j / 4 - 1; + j < t / 8 ? (l = $(l, t, d), l[b] &= 4294967040) : j > t / 8 && (l[b] &= 4294967040); + for (j = 0; j <= b; j += 1) y[j] = l[j] ^ 909522486, z[j] = l[j] ^ 1549556828; + d = $(z.concat($(y.concat(k), a + g, d)), a + p, d); + return h(d, G(f)) + } + }; + })(); + + //coin.js + (function() { + /* + Coinjs 0.01 beta by OutCast3k{at}gmail.com + A bitcoin framework. + http://github.com/OutCast3k/coinjs or http://coinb.in/coinjs + */ + var coinjs = GLOBAL.coinjs = function() {}; + + /* public vars */ + coinjs.pub = 0x00; + coinjs.priv = 0x80; + coinjs.multisig = 0x05; + coinjs.hdkey = { + 'prv': 0x0488ade4, + 'pub': 0x0488b21e + }; + coinjs.bech32 = { + 'charset': 'qpzry9x8gf2tvdw0s3jn54khce6mua7l', + 'version': 0, + 'hrp': 'bc' + }; + + coinjs.compressed = false; + + /* other vars */ + coinjs.developer = '33tht1bKDgZVxb39MnZsWa8oxHXHvUYE4G'; //bitcoin + + /* bit(coinb.in) api vars */ + coinjs.hostname = ((document.location.hostname.split(".")[(document.location.hostname.split(".")).length - 1]) == 'onion') ? 'coinbin3ravkwb24f7rmxx6w3snkjw45jhs5lxbh3yfeg3vpt6janwqd.onion' : 'coinb.in'; + coinjs.host = ('https:' == document.location.protocol ? 'https://' : 'http://') + coinjs.hostname + '/api/'; + coinjs.uid = '1'; + coinjs.key = '12345678901234567890123456789012'; + + /* start of address functions */ + + /* generate a private and public keypair, with address and WIF address */ + coinjs.newKeys = function(input) { + var privkey = (input) ? Crypto.SHA256(input) : this.newPrivkey(); + var pubkey = this.newPubkey(privkey); + return { + 'privkey': privkey, + 'pubkey': pubkey, + 'address': this.pubkey2address(pubkey), + 'wif': this.privkey2wif(privkey), + 'compressed': this.compressed + }; + } + + /* generate a new random private key */ + coinjs.newPrivkey = function() { + var x = GLOBAL.location; + x += (GLOBAL.screen.height * GLOBAL.screen.width * GLOBAL.screen.colorDepth); + x += coinjs.random(64); + x += (GLOBAL.screen.availHeight * GLOBAL.screen.availWidth * GLOBAL.screen.pixelDepth); + x += navigator.language; + x += GLOBAL.history.length; + x += coinjs.random(64); + x += navigator.userAgent; + x += 'coinb.in'; + x += (Crypto.util.randomBytes(64)).join(""); + x += x.length; + var dateObj = new Date(); + x += dateObj.getTimezoneOffset(); + x += coinjs.random(64); + x += (document.getElementById("entropybucket")) ? document.getElementById("entropybucket").innerHTML : ''; + x += x + '' + x; + var r = x; + for (i = 0; i < (x).length / 25; i++) { + r = Crypto.SHA256(r.concat(x)); + } + var checkrBigInt = new BigInteger(r); + var orderBigInt = new BigInteger("fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141"); + while (checkrBigInt.compareTo(orderBigInt) >= 0 || checkrBigInt.equals(BigInteger.ZERO) || checkrBigInt.equals(BigInteger.ONE)) { + r = Crypto.SHA256(r.concat(x)); + checkrBigInt = new BigInteger(r); + } + return r; + } + + /* generate a public key from a private key */ + coinjs.newPubkey = function(hash) { + var privateKeyBigInt = BigInteger.fromByteArrayUnsigned(Crypto.util.hexToBytes(hash)); + var curve = EllipticCurve.getSECCurveByName("secp256k1"); + + var curvePt = curve.getG().multiply(privateKeyBigInt); + var x = curvePt.getX().toBigInteger(); + var y = curvePt.getY().toBigInteger(); + + var publicKeyBytes = EllipticCurve.integerToBytes(x, 32); + publicKeyBytes = publicKeyBytes.concat(EllipticCurve.integerToBytes(y, 32)); + publicKeyBytes.unshift(0x04); + + if (coinjs.compressed == true) { + var publicKeyBytesCompressed = EllipticCurve.integerToBytes(x, 32) + if (y.isEven()) { + publicKeyBytesCompressed.unshift(0x02) + } else { + publicKeyBytesCompressed.unshift(0x03) + } + return Crypto.util.bytesToHex(publicKeyBytesCompressed); + } else { + return Crypto.util.bytesToHex(publicKeyBytes); + } + } + + /* provide a public key and return address */ + coinjs.pubkey2address = function(h, byte) { + var r = ripemd160(Crypto.SHA256(Crypto.util.hexToBytes(h), { + asBytes: true + })); + r.unshift(byte || coinjs.pub); + var hash = Crypto.SHA256(Crypto.SHA256(r, { + asBytes: true + }), { + asBytes: true + }); + var checksum = hash.slice(0, 4); + return coinjs.base58encode(r.concat(checksum)); + } + + /* provide a scripthash and return address */ + coinjs.scripthash2address = function(h) { + var x = Crypto.util.hexToBytes(h); + x.unshift(coinjs.pub); + var r = x; + r = Crypto.SHA256(Crypto.SHA256(r, { + asBytes: true + }), { + asBytes: true + }); + var checksum = r.slice(0, 4); + return coinjs.base58encode(x.concat(checksum)); + } + + /* new multisig address, provide the pubkeys AND required signatures to release the funds */ + coinjs.pubkeys2MultisigAddress = function(pubkeys, required) { + var s = coinjs.script(); + s.writeOp(81 + (required * 1) - 1); //OP_1 + for (var i = 0; i < pubkeys.length; ++i) { + s.writeBytes(Crypto.util.hexToBytes(pubkeys[i])); + } + s.writeOp(81 + pubkeys.length - 1); //OP_1 + s.writeOp(174); //OP_CHECKMULTISIG + var x = ripemd160(Crypto.SHA256(s.buffer, { + asBytes: true + }), { + asBytes: true + }); + x.unshift(coinjs.multisig); + var r = x; + r = Crypto.SHA256(Crypto.SHA256(r, { + asBytes: true + }), { + asBytes: true + }); + var checksum = r.slice(0, 4); + var redeemScript = Crypto.util.bytesToHex(s.buffer); + var address = coinjs.base58encode(x.concat(checksum)); + + if (s.buffer.length > 520) { // too large + address = 'invalid'; + redeemScript = 'invalid'; + } + + return { + 'address': address, + 'redeemScript': redeemScript, + 'size': s.buffer.length + }; + } + + /* new time locked address, provide the pubkey and time necessary to unlock the funds. + when time is greater than 500000000, it should be a unix timestamp (seconds since epoch), + otherwise it should be the block height required before this transaction can be released. + + may throw a string on failure! + */ + coinjs.simpleHodlAddress = function(pubkey, checklocktimeverify) { + + if (checklocktimeverify < 0) { + throw "Parameter for OP_CHECKLOCKTIMEVERIFY is negative."; + } + + var s = coinjs.script(); + if (checklocktimeverify <= 16 && checklocktimeverify >= 1) { + s.writeOp(0x50 + checklocktimeverify); //OP_1 to OP_16 for minimal encoding + } else { + s.writeBytes(coinjs.numToScriptNumBytes(checklocktimeverify)); + } + s.writeOp(177); //OP_CHECKLOCKTIMEVERIFY + s.writeOp(117); //OP_DROP + s.writeBytes(Crypto.util.hexToBytes(pubkey)); + s.writeOp(172); //OP_CHECKSIG + + var x = ripemd160(Crypto.SHA256(s.buffer, { + asBytes: true + }), { + asBytes: true + }); + x.unshift(coinjs.multisig); + var r = x; + r = Crypto.SHA256(Crypto.SHA256(r, { + asBytes: true + }), { + asBytes: true + }); + var checksum = r.slice(0, 4); + var redeemScript = Crypto.util.bytesToHex(s.buffer); + var address = coinjs.base58encode(x.concat(checksum)); + + return { + 'address': address, + 'redeemScript': redeemScript + }; + } + + /* create a new segwit address */ + coinjs.segwitAddress = function(pubkey) { + var keyhash = [0x00, 0x14].concat(ripemd160(Crypto.SHA256(Crypto.util.hexToBytes(pubkey), { + asBytes: true + }), { + asBytes: true + })); + var x = ripemd160(Crypto.SHA256(keyhash, { + asBytes: true + }), { + asBytes: true + }); + x.unshift(coinjs.multisig); + var r = x; + r = Crypto.SHA256(Crypto.SHA256(r, { + asBytes: true + }), { + asBytes: true + }); + var checksum = r.slice(0, 4); + var address = coinjs.base58encode(x.concat(checksum)); + + return { + 'address': address, + 'type': 'segwit', + 'redeemscript': Crypto.util.bytesToHex(keyhash) + }; + } + + /* create a new segwit bech32 encoded address */ + coinjs.bech32Address = function(pubkey) { + var program = ripemd160(Crypto.SHA256(Crypto.util.hexToBytes(pubkey), { + asBytes: true + }), { + asBytes: true + }); + var address = coinjs.bech32_encode(coinjs.bech32.hrp, [coinjs.bech32.version].concat(coinjs.bech32_convert(program, 8, 5, true))); + return { + 'address': address, + 'type': 'bech32', + 'redeemscript': Crypto.util.bytesToHex(program) + }; + } + + /* extract the redeemscript from a bech32 address */ + coinjs.bech32redeemscript = function(address) { + var r = false; + var decode = coinjs.bech32_decode(address); + if (decode) { + decode.data.shift(); + return Crypto.util.bytesToHex(coinjs.bech32_convert(decode.data, 5, 8, false)); + } + return r; + } + + /* provide a privkey and return an WIF */ + coinjs.privkey2wif = function(h) { + var r = Crypto.util.hexToBytes(h); + + if (coinjs.compressed == true) { + r.push(0x01); + } + + r.unshift(coinjs.priv); + var hash = Crypto.SHA256(Crypto.SHA256(r, { + asBytes: true + }), { + asBytes: true + }); + var checksum = hash.slice(0, 4); + + return coinjs.base58encode(r.concat(checksum)); + } + + /* convert a wif key back to a private key */ + coinjs.wif2privkey = function(wif) { + var compressed = false; + var decode = coinjs.base58decode(wif); + var key = decode.slice(0, decode.length - 4); + key = key.slice(1, key.length); + if (key.length >= 33 && key[key.length - 1] == 0x01) { + key = key.slice(0, key.length - 1); + compressed = true; + } + return { + 'privkey': Crypto.util.bytesToHex(key), + 'compressed': compressed + }; + } + + /* convert a wif to a pubkey */ + coinjs.wif2pubkey = function(wif) { + var compressed = coinjs.compressed; + var r = coinjs.wif2privkey(wif); + coinjs.compressed = r['compressed']; + var pubkey = coinjs.newPubkey(r['privkey']); + coinjs.compressed = compressed; + return { + 'pubkey': pubkey, + 'compressed': r['compressed'] + }; + } + + /* convert a wif to a address */ + coinjs.wif2address = function(wif) { + var r = coinjs.wif2pubkey(wif); + return { + 'address': coinjs.pubkey2address(r['pubkey']), + 'compressed': r['compressed'] + }; + } + + /* decode or validate an address and return the hash */ + coinjs.addressDecode = function(addr) { + try { + var bytes = coinjs.base58decode(addr); + var front = bytes.slice(0, bytes.length - 4); + var back = bytes.slice(bytes.length - 4); + var checksum = Crypto.SHA256(Crypto.SHA256(front, { + asBytes: true + }), { + asBytes: true + }).slice(0, 4); + if (checksum + "" == back + "") { + + var o = {}; + o.bytes = front.slice(1); + o.version = front[0]; + + if (o.version == coinjs.pub) { // standard address + o.type = 'standard'; + + } else if (o.version == coinjs.multisig) { // multisig address + o.type = 'multisig'; + + } else if (o.version == coinjs.priv) { // wifkey + o.type = 'wifkey'; + + } else if (o.version == 42) { // stealth address + o.type = 'stealth'; + + o.option = front[1]; + if (o.option != 0) { + alert("Stealth Address option other than 0 is currently not supported!"); + return false; + }; + + o.scankey = Crypto.util.bytesToHex(front.slice(2, 35)); + o.n = front[35]; + + if (o.n > 1) { + alert("Stealth Multisig is currently not supported!"); + return false; + }; + + o.spendkey = Crypto.util.bytesToHex(front.slice(36, 69)); + o.m = front[69]; + o.prefixlen = front[70]; + + if (o.prefixlen > 0) { + alert("Stealth Address Prefixes are currently not supported!"); + return false; + }; + o.prefix = front.slice(71); + + } else { // everything else + o.type = 'other'; // address is still valid but unknown version + } + + return o; + } else { + throw "Invalid checksum"; + } + } catch (e) { + bech32rs = coinjs.bech32redeemscript(addr); + if (bech32rs) { + return { + 'type': 'bech32', + 'redeemscript': bech32rs + }; + } else { + return false; + } + } + } + + /* retreive the balance from a given address */ + coinjs.addressBalance = function(address, callback) { + coinjs.ajax(coinjs.host + '?uid=' + coinjs.uid + '&key=' + coinjs.key + '&setmodule=addresses&request=bal&address=' + address + '&r=' + Math.random(), callback, "GET"); + } + + /* decompress an compressed public key */ + coinjs.pubkeydecompress = function(pubkey) { + if ((typeof(pubkey) == 'string') && pubkey.match(/^[a-f0-9]+$/i)) { + var curve = EllipticCurve.getSECCurveByName("secp256k1"); + try { + var pt = curve.curve.decodePointHex(pubkey); + var x = pt.getX().toBigInteger(); + var y = pt.getY().toBigInteger(); + + var publicKeyBytes = EllipticCurve.integerToBytes(x, 32); + publicKeyBytes = publicKeyBytes.concat(EllipticCurve.integerToBytes(y, 32)); + publicKeyBytes.unshift(0x04); + return Crypto.util.bytesToHex(publicKeyBytes); + } catch (e) { + // console.log(e); + return false; + } + } + return false; + } + + coinjs.bech32_polymod = function(values) { + var chk = 1; + var BECH32_GENERATOR = [0x3b6a57b2, 0x26508e6d, 0x1ea119fa, 0x3d4233dd, 0x2a1462b3]; + for (var p = 0; p < values.length; ++p) { + var top = chk >> 25; + chk = (chk & 0x1ffffff) << 5 ^ values[p]; + for (var i = 0; i < 5; ++i) { + if ((top >> i) & 1) { + chk ^= BECH32_GENERATOR[i]; + } + } + } + return chk; + } + + coinjs.bech32_hrpExpand = function(hrp) { + var ret = []; + var p; + for (p = 0; p < hrp.length; ++p) { + ret.push(hrp.charCodeAt(p) >> 5); + } + ret.push(0); + for (p = 0; p < hrp.length; ++p) { + ret.push(hrp.charCodeAt(p) & 31); + } + return ret; + } + + coinjs.bech32_verifyChecksum = function(hrp, data) { + return coinjs.bech32_polymod(coinjs.bech32_hrpExpand(hrp).concat(data)) === 1; + } + + coinjs.bech32_createChecksum = function(hrp, data) { + var values = coinjs.bech32_hrpExpand(hrp).concat(data).concat([0, 0, 0, 0, 0, 0]); + var mod = coinjs.bech32_polymod(values) ^ 1; + var ret = []; + for (var p = 0; p < 6; ++p) { + ret.push((mod >> 5 * (5 - p)) & 31); + } + return ret; + } + + coinjs.bech32_encode = function(hrp, data) { + var combined = data.concat(coinjs.bech32_createChecksum(hrp, data)); + var ret = hrp + '1'; + for (var p = 0; p < combined.length; ++p) { + ret += coinjs.bech32.charset.charAt(combined[p]); + } + return ret; + } + + coinjs.bech32_decode = function(bechString) { + var p; + var has_lower = false; + var has_upper = false; + for (p = 0; p < bechString.length; ++p) { + if (bechString.charCodeAt(p) < 33 || bechString.charCodeAt(p) > 126) { + return null; + } + if (bechString.charCodeAt(p) >= 97 && bechString.charCodeAt(p) <= 122) { + has_lower = true; + } + if (bechString.charCodeAt(p) >= 65 && bechString.charCodeAt(p) <= 90) { + has_upper = true; + } + } + if (has_lower && has_upper) { + return null; + } + bechString = bechString.toLowerCase(); + var pos = bechString.lastIndexOf('1'); + if (pos < 1 || pos + 7 > bechString.length || bechString.length > 90) { + return null; + } + var hrp = bechString.substring(0, pos); + var data = []; + for (p = pos + 1; p < bechString.length; ++p) { + var d = coinjs.bech32.charset.indexOf(bechString.charAt(p)); + if (d === -1) { + return null; + } + data.push(d); + } + if (!coinjs.bech32_verifyChecksum(hrp, data)) { + return null; + } + return { + hrp: hrp, + data: data.slice(0, data.length - 6) + }; + } + + coinjs.bech32_convert = function(data, inBits, outBits, pad) { + var value = 0; + var bits = 0; + var maxV = (1 << outBits) - 1; + + var result = []; + for (var i = 0; i < data.length; ++i) { + value = (value << inBits) | data[i]; + bits += inBits; + + while (bits >= outBits) { + bits -= outBits; + result.push((value >> bits) & maxV); + } + } + + if (pad) { + if (bits > 0) { + result.push((value << (outBits - bits)) & maxV); + } + } else { + if (bits >= inBits) throw new Error('Excess padding'); + if ((value << (outBits - bits)) & maxV) throw new Error('Non-zero padding'); + } + + return result; + } + + coinjs.testdeterministicK = function() { + // https://github.com/bitpay/bitcore/blob/9a5193d8e94b0bd5b8e7f00038e7c0b935405a03/test/crypto/ecdsa.js + // Line 21 and 22 specify digest hash and privkey for the first 2 test vectors. + // Line 96-117 tells expected result. + + var tx = coinjs.transaction(); + + var test_vectors = [{ + 'message': 'test data', + 'privkey': 'fee0a1f7afebf9d2a5a80c0c98a31c709681cce195cbcd06342b517970c0be1e', + 'k_bad00': 'fcce1de7a9bcd6b2d3defade6afa1913fb9229e3b7ddf4749b55c4848b2a196e', + 'k_bad01': '727fbcb59eb48b1d7d46f95a04991fc512eb9dbf9105628e3aec87428df28fd8', + 'k_bad15': '398f0e2c9f79728f7b3d84d447ac3a86d8b2083c8f234a0ffa9c4043d68bd258' + }, + { + 'message': 'Everything should be made as simple as possible, but not simpler.', + 'privkey': '0000000000000000000000000000000000000000000000000000000000000001', + 'k_bad00': 'ec633bd56a5774a0940cb97e27a9e4e51dc94af737596a0c5cbb3d30332d92a5', + 'k_bad01': 'df55b6d1b5c48184622b0ead41a0e02bfa5ac3ebdb4c34701454e80aabf36f56', + 'k_bad15': 'def007a9a3c2f7c769c75da9d47f2af84075af95cadd1407393dc1e26086ef87' + }, + { + 'message': 'Satoshi Nakamoto', + 'privkey': '0000000000000000000000000000000000000000000000000000000000000002', + 'k_bad00': 'd3edc1b8224e953f6ee05c8bbf7ae228f461030e47caf97cde91430b4607405e', + 'k_bad01': 'f86d8e43c09a6a83953f0ab6d0af59fb7446b4660119902e9967067596b58374', + 'k_bad15': '241d1f57d6cfd2f73b1ada7907b199951f95ef5ad362b13aed84009656e0254a' + }, + { + 'message': 'Diffie Hellman', + 'privkey': '7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f', + 'k_bad00': 'c378a41cb17dce12340788dd3503635f54f894c306d52f6e9bc4b8f18d27afcc', + 'k_bad01': '90756c96fef41152ac9abe08819c4e95f16da2af472880192c69a2b7bac29114', + 'k_bad15': '7b3f53300ab0ccd0f698f4d67db87c44cf3e9e513d9df61137256652b2e94e7c' + }, + { + 'message': 'Japan', + 'privkey': '8080808080808080808080808080808080808080808080808080808080808080', + 'k_bad00': 'f471e61b51d2d8db78f3dae19d973616f57cdc54caaa81c269394b8c34edcf59', + 'k_bad01': '6819d85b9730acc876fdf59e162bf309e9f63dd35550edf20869d23c2f3e6d17', + 'k_bad15': 'd8e8bae3ee330a198d1f5e00ad7c5f9ed7c24c357c0a004322abca5d9cd17847' + }, + { + 'message': 'Bitcoin', + 'privkey': 'fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140', + 'k_bad00': '36c848ffb2cbecc5422c33a994955b807665317c1ce2a0f59c689321aaa631cc', + 'k_bad01': '4ed8de1ec952a4f5b3bd79d1ff96446bcd45cabb00fc6ca127183e14671bcb85', + 'k_bad15': '56b6f47babc1662c011d3b1f93aa51a6e9b5f6512e9f2e16821a238d450a31f8' + }, + { + 'message': 'i2FLPP8WEus5WPjpoHwheXOMSobUJVaZM1JPMQZq', + 'privkey': 'fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140', + 'k_bad00': '6e9b434fcc6bbb081a0463c094356b47d62d7efae7da9c518ed7bac23f4e2ed6', + 'k_bad01': 'ae5323ae338d6117ce8520a43b92eacd2ea1312ae514d53d8e34010154c593bb', + 'k_bad15': '3eaa1b61d1b8ab2f1ca71219c399f2b8b3defa624719f1e96fe3957628c2c4ea' + }, + { + 'message': 'lEE55EJNP7aLrMtjkeJKKux4Yg0E8E1SAJnWTCEh', + 'privkey': '3881e5286abc580bb6139fe8e83d7c8271c6fe5e5c2d640c1f0ed0e1ee37edc9', + 'k_bad00': '5b606665a16da29cc1c5411d744ab554640479dd8abd3c04ff23bd6b302e7034', + 'k_bad01': 'f8b25263152c042807c992eacd2ac2cc5790d1e9957c394f77ea368e3d9923bd', + 'k_bad15': 'ea624578f7e7964ac1d84adb5b5087dd14f0ee78b49072aa19051cc15dab6f33' + }, + { + 'message': '2SaVPvhxkAPrayIVKcsoQO5DKA8Uv5X/esZFlf+y', + 'privkey': '7259dff07922de7f9c4c5720d68c9745e230b32508c497dd24cb95ef18856631', + 'k_bad00': '3ab6c19ab5d3aea6aa0c6da37516b1d6e28e3985019b3adb388714e8f536686b', + 'k_bad01': '19af21b05004b0ce9cdca82458a371a9d2cf0dc35a813108c557b551c08eb52e', + 'k_bad15': '117a32665fca1b7137a91c4739ac5719fec0cf2e146f40f8e7c21b45a07ebc6a' + }, + { + 'message': '00A0OwO2THi7j5Z/jp0FmN6nn7N/DQd6eBnCS+/b', + 'privkey': '0d6ea45d62b334777d6995052965c795a4f8506044b4fd7dc59c15656a28f7aa', + 'k_bad00': '79487de0c8799158294d94c0eb92ee4b567e4dc7ca18addc86e49d31ce1d2db6', + 'k_bad01': '9561d2401164a48a8f600882753b3105ebdd35e2358f4f808c4f549c91490009', + 'k_bad15': 'b0d273634129ff4dbdf0df317d4062a1dbc58818f88878ffdb4ec511c77976c0' + } + ]; + + var result_txt = '\n----------------------\nResults\n----------------------\n\n'; + + for (i = 0; i < test_vectors.length; i++) { + var hash = Crypto.SHA256(test_vectors[i]['message'].split('').map(function(c) { + return c.charCodeAt(0); + }), { + asBytes: true + }); + var wif = coinjs.privkey2wif(test_vectors[i]['privkey']); + + var KBigInt = tx.deterministicK(wif, hash); + var KBigInt0 = tx.deterministicK(wif, hash, 0); + var KBigInt1 = tx.deterministicK(wif, hash, 1); + var KBigInt15 = tx.deterministicK(wif, hash, 15); + + var K = Crypto.util.bytesToHex(KBigInt.toByteArrayUnsigned()); + var K0 = Crypto.util.bytesToHex(KBigInt0.toByteArrayUnsigned()); + var K1 = Crypto.util.bytesToHex(KBigInt1.toByteArrayUnsigned()); + var K15 = Crypto.util.bytesToHex(KBigInt15.toByteArrayUnsigned()); + + if (K != test_vectors[i]['k_bad00']) { + result_txt += 'Failed Test #' + (i + 1) + '\n K = ' + K + '\nExpected = ' + test_vectors[i]['k_bad00'] + '\n\n'; + } else if (K0 != test_vectors[i]['k_bad00']) { + result_txt += 'Failed Test #' + (i + 1) + '\n K0 = ' + K0 + '\nExpected = ' + test_vectors[i]['k_bad00'] + '\n\n'; + } else if (K1 != test_vectors[i]['k_bad01']) { + result_txt += 'Failed Test #' + (i + 1) + '\n K1 = ' + K1 + '\nExpected = ' + test_vectors[i]['k_bad01'] + '\n\n'; + } else if (K15 != test_vectors[i]['k_bad15']) { + result_txt += 'Failed Test #' + (i + 1) + '\n K15 = ' + K15 + '\nExpected = ' + test_vectors[i]['k_bad15'] + '\n\n'; + }; + }; + + if (result_txt.length < 60) { + result_txt = 'All Tests OK!'; + }; + + return result_txt; + }; + + /* start of hd functions, thanks bip32.org */ + coinjs.hd = function(data) { + + var r = {}; + + /* some hd value parsing */ + r.parse = function() { + + var bytes = []; + + // some quick validation + if (typeof(data) == 'string') { + var decoded = coinjs.base58decode(data); + if (decoded.length == 82) { + var checksum = decoded.slice(78, 82); + var hash = Crypto.SHA256(Crypto.SHA256(decoded.slice(0, 78), { + asBytes: true + }), { + asBytes: true + }); + if (checksum[0] == hash[0] && checksum[1] == hash[1] && checksum[2] == hash[2] && checksum[3] == hash[3]) { + bytes = decoded.slice(0, 78); + } + } + } + + // actual parsing code + if (bytes && bytes.length > 0) { + r.version = coinjs.uint(bytes.slice(0, 4), 4); + r.depth = coinjs.uint(bytes.slice(4, 5), 1); + r.parent_fingerprint = bytes.slice(5, 9); + r.child_index = coinjs.uint(bytes.slice(9, 13), 4); + r.chain_code = bytes.slice(13, 45); + r.key_bytes = bytes.slice(45, 78); + + var c = coinjs.compressed; // get current default + coinjs.compressed = true; + + if (r.key_bytes[0] == 0x00) { + r.type = 'private'; + var privkey = (r.key_bytes).slice(1, 33); + var privkeyHex = Crypto.util.bytesToHex(privkey); + var pubkey = coinjs.newPubkey(privkeyHex); + + r.keys = { + 'privkey': privkeyHex, + 'pubkey': pubkey, + 'address': coinjs.pubkey2address(pubkey), + 'wif': coinjs.privkey2wif(privkeyHex) + }; + + } else if (r.key_bytes[0] == 0x02 || r.key_bytes[0] == 0x03) { + r.type = 'public'; + var pubkeyHex = Crypto.util.bytesToHex(r.key_bytes); + + r.keys = { + 'pubkey': pubkeyHex, + 'address': coinjs.pubkey2address(pubkeyHex) + }; + } else { + r.type = 'invalid'; + } + + r.keys_extended = r.extend(); + + coinjs.compressed = c; // reset to default + } + + return r; + } + + // extend prv/pub key + r.extend = function() { + var hd = coinjs.hd(); + return hd.make({ + 'depth': (this.depth * 1) + 1, + 'parent_fingerprint': this.parent_fingerprint, + 'child_index': this.child_index, + 'chain_code': this.chain_code, + 'privkey': this.keys.privkey, + 'pubkey': this.keys.pubkey + }); + } + + // derive from path + r.derive_path = function(path) { + + if (path == 'm' || path == 'M' || path == 'm\'' || path == 'M\'') return this; + + var p = path.split('/'); + var hdp = coinjs.clone(this); // clone hd path + + for (var i in p) { + + if (((i == 0) && c != 'm') || i == 'remove') { + continue; + } + + var c = p[i]; + + var use_private = (c.length > 1) && (c[c.length - 1] == '\''); + var child_index = parseInt(use_private ? c.slice(0, c.length - 1) : c) & 0x7fffffff; + if (use_private) + child_index += 0x80000000; + + hdp = hdp.derive(child_index); + var key = ((hdp.keys_extended.privkey) && hdp.keys_extended.privkey != '') ? hdp.keys_extended.privkey : hdp.keys_extended.pubkey; + hdp = coinjs.hd(key); + } + return hdp; + } + + // derive key from index + r.derive = function(i) { + + i = (i) ? i : 0; + var blob = (Crypto.util.hexToBytes(this.keys.pubkey)).concat(coinjs.numToBytes(i, 4).reverse()); + + var j = new jsSHA(Crypto.util.bytesToHex(blob), 'HEX'); + var hash = j.getHMAC(Crypto.util.bytesToHex(r.chain_code), "HEX", "SHA-512", "HEX"); + + var il = new BigInteger(hash.slice(0, 64), 16); + var ir = Crypto.util.hexToBytes(hash.slice(64, 128)); + + var ecparams = EllipticCurve.getSECCurveByName("secp256k1"); + var curve = ecparams.getCurve(); + + var k, key, pubkey, o; + + o = coinjs.clone(this); + o.chain_code = ir; + o.child_index = i; + + if (this.type == 'private') { + // derive key pair from from a xprv key + k = il.add(new BigInteger([0].concat(Crypto.util.hexToBytes(this.keys.privkey)))).mod(ecparams.getN()); + key = Crypto.util.bytesToHex(k.toByteArrayUnsigned()); + + pubkey = coinjs.newPubkey(key); + + o.keys = { + 'privkey': key, + 'pubkey': pubkey, + 'wif': coinjs.privkey2wif(key), + 'address': coinjs.pubkey2address(pubkey) + }; + + } else if (this.type == 'public') { + // derive xpub key from an xpub key + q = ecparams.curve.decodePointHex(this.keys.pubkey); + var curvePt = ecparams.getG().multiply(il).add(q); + + var x = curvePt.getX().toBigInteger(); + var y = curvePt.getY().toBigInteger(); + + var publicKeyBytesCompressed = EllipticCurve.integerToBytes(x, 32) + if (y.isEven()) { + publicKeyBytesCompressed.unshift(0x02) + } else { + publicKeyBytesCompressed.unshift(0x03) + } + pubkey = Crypto.util.bytesToHex(publicKeyBytesCompressed); + + o.keys = { + 'pubkey': pubkey, + 'address': coinjs.pubkey2address(pubkey) + } + } else { + // fail + } + + o.parent_fingerprint = (ripemd160(Crypto.SHA256(Crypto.util.hexToBytes(r.keys.pubkey), { + asBytes: true + }), { + asBytes: true + })).slice(0, 4); + o.keys_extended = o.extend(); + return o; + } + + // make a master hd xprv/xpub + r.master = function(pass) { + var seed = (pass) ? Crypto.SHA256(pass) : coinjs.newPrivkey(); + var hasher = new jsSHA(seed, 'HEX'); + var I = hasher.getHMAC("Bitcoin seed", "TEXT", "SHA-512", "HEX"); + + var privkey = Crypto.util.hexToBytes(I.slice(0, 64)); + var chain = Crypto.util.hexToBytes(I.slice(64, 128)); + + var hd = coinjs.hd(); + return hd.make({ + 'depth': 0, + 'parent_fingerprint': [0, 0, 0, 0], + 'child_index': 0, + 'chain_code': chain, + 'privkey': I.slice(0, 64), + 'pubkey': coinjs.newPubkey(I.slice(0, 64)) + }); + } + + // encode data to a base58 string + r.make = function(data) { // { (int) depth, (array) parent_fingerprint, (int) child_index, (byte array) chain_code, (hex str) privkey, (hex str) pubkey} + var k = []; + + //depth + k.push(data.depth * 1); + + //parent fingerprint + k = k.concat(data.parent_fingerprint); + + //child index + k = k.concat((coinjs.numToBytes(data.child_index, 4)).reverse()); + + //Chain code + k = k.concat(data.chain_code); + + var o = {}; // results + + //encode xprv key + if (data.privkey) { + var prv = (coinjs.numToBytes(coinjs.hdkey.prv, 4)).reverse(); + prv = prv.concat(k); + prv.push(0x00); + prv = prv.concat(Crypto.util.hexToBytes(data.privkey)); + var hash = Crypto.SHA256(Crypto.SHA256(prv, { + asBytes: true + }), { + asBytes: true + }); + var checksum = hash.slice(0, 4); + var ret = prv.concat(checksum); + o.privkey = coinjs.base58encode(ret); + } + + //encode xpub key + if (data.pubkey) { + var pub = (coinjs.numToBytes(coinjs.hdkey.pub, 4)).reverse(); + pub = pub.concat(k); + pub = pub.concat(Crypto.util.hexToBytes(data.pubkey)); + var hash = Crypto.SHA256(Crypto.SHA256(pub, { + asBytes: true + }), { + asBytes: true + }); + var checksum = hash.slice(0, 4); + var ret = pub.concat(checksum); + o.pubkey = coinjs.base58encode(ret); + } + return o; + } + + return r.parse(); + } + + + /* start of script functions */ + coinjs.script = function(data) { + var r = {}; + + if (!data) { + r.buffer = []; + } else if ("string" == typeof data) { + r.buffer = Crypto.util.hexToBytes(data); + } else if (coinjs.isArray(data)) { + r.buffer = data; + } else if (data instanceof coinjs.script) { + r.buffer = data.buffer; + } else { + r.buffer = data; + } + + /* parse buffer array */ + r.parse = function() { + + var self = this; + r.chunks = []; + var i = 0; + + function readChunk(n) { + self.chunks.push(self.buffer.slice(i, i + n)); + i += n; + }; + + while (i < this.buffer.length) { + var opcode = this.buffer[i++]; + if (opcode >= 0xF0) { + opcode = (opcode << 8) | this.buffer[i++]; + } + + var len; + if (opcode > 0 && opcode < 76) { //OP_PUSHDATA1 + readChunk(opcode); + } else if (opcode == 76) { //OP_PUSHDATA1 + len = this.buffer[i++]; + readChunk(len); + } else if (opcode == 77) { //OP_PUSHDATA2 + len = (this.buffer[i++] << 8) | this.buffer[i++]; + readChunk(len); + } else if (opcode == 78) { //OP_PUSHDATA4 + len = (this.buffer[i++] << 24) | (this.buffer[i++] << 16) | (this.buffer[i++] << 8) | this.buffer[i++]; + readChunk(len); + } else { + this.chunks.push(opcode); + } + + if (i < 0x00) { + break; + } + } + + return true; + }; + + /* decode the redeemscript of a multisignature transaction */ + r.decodeRedeemScript = function(script) { + var r = false; + try { + var s = coinjs.script(Crypto.util.hexToBytes(script)); + if ((s.chunks.length >= 3) && s.chunks[s.chunks.length - 1] == 174) { //OP_CHECKMULTISIG + r = {}; + r.signaturesRequired = s.chunks[0] - 80; + var pubkeys = []; + for (var i = 1; i < s.chunks.length - 2; i++) { + pubkeys.push(Crypto.util.bytesToHex(s.chunks[i])); + } + r.pubkeys = pubkeys; + var multi = coinjs.pubkeys2MultisigAddress(pubkeys, r.signaturesRequired); + r.address = multi['address']; + r.type = 'multisig__'; // using __ for now to differentiat from the other object .type == "multisig" + var rs = Crypto.util.bytesToHex(s.buffer); + r.redeemscript = rs; + + } else if ((s.chunks.length == 2) && (s.buffer[0] == 0 && s.buffer[1] == 20)) { // SEGWIT + r = {}; + r.type = "segwit__"; + var rs = Crypto.util.bytesToHex(s.buffer); + r.address = coinjs.pubkey2address(rs, coinjs.multisig); + r.redeemscript = rs; + + } else if (s.chunks.length == 5 && s.chunks[1] == 177 && s.chunks[2] == 117 && s.chunks[4] == 172) { + // ^ OP_CHECKLOCKTIMEVERIFY OP_DROP OP_CHECKSIG ^ + r = {} + r.pubkey = Crypto.util.bytesToHex(s.chunks[3]); + r.checklocktimeverify = coinjs.bytesToNum(s.chunks[0].slice()); + r.address = coinjs.simpleHodlAddress(r.pubkey, r.checklocktimeverify).address; + var rs = Crypto.util.bytesToHex(s.buffer); + r.redeemscript = rs; + r.type = "hodl__"; + } + } catch (e) { + // console.log(e); + r = false; + } + return r; + } + + /* create output script to spend */ + r.spendToScript = function(address) { + var addr = coinjs.addressDecode(address); + var s = coinjs.script(); + if (addr.type == "bech32") { + s.writeOp(0); + s.writeBytes(Crypto.util.hexToBytes(addr.redeemscript)); + } else if (addr.version == coinjs.multisig) { // multisig address + s.writeOp(169); //OP_HASH160 + s.writeBytes(addr.bytes); + s.writeOp(135); //OP_EQUAL + } else { // regular address + s.writeOp(118); //OP_DUP + s.writeOp(169); //OP_HASH160 + s.writeBytes(addr.bytes); + s.writeOp(136); //OP_EQUALVERIFY + s.writeOp(172); //OP_CHECKSIG + } + return s; + } + + /* geneate a (script) pubkey hash of the address - used for when signing */ + r.pubkeyHash = function(address) { + var addr = coinjs.addressDecode(address); + var s = coinjs.script(); + s.writeOp(118); //OP_DUP + s.writeOp(169); //OP_HASH160 + s.writeBytes(addr.bytes); + s.writeOp(136); //OP_EQUALVERIFY + s.writeOp(172); //OP_CHECKSIG + return s; + } + + /* write to buffer */ + r.writeOp = function(op) { + this.buffer.push(op); + this.chunks.push(op); + return true; + } + + /* write bytes to buffer */ + r.writeBytes = function(data) { + if (data.length < 76) { //OP_PUSHDATA1 + this.buffer.push(data.length); + } else if (data.length <= 0xff) { + this.buffer.push(76); //OP_PUSHDATA1 + this.buffer.push(data.length); + } else if (data.length <= 0xffff) { + this.buffer.push(77); //OP_PUSHDATA2 + this.buffer.push(data.length & 0xff); + this.buffer.push((data.length >>> 8) & 0xff); + } else { + this.buffer.push(78); //OP_PUSHDATA4 + this.buffer.push(data.length & 0xff); + this.buffer.push((data.length >>> 8) & 0xff); + this.buffer.push((data.length >>> 16) & 0xff); + this.buffer.push((data.length >>> 24) & 0xff); + } + this.buffer = this.buffer.concat(data); + this.chunks.push(data); + return true; + } + + r.parse(); + return r; + } + + /* start of transaction functions */ + + /* create a new transaction object */ + coinjs.transaction = function() { + + var r = {}; + r.version = 1; + r.lock_time = 0; + r.ins = []; + r.outs = []; + r.witness = false; + r.timestamp = null; + r.block = null; + + /* add an input to a transaction */ + r.addinput = function(txid, index, script, sequence) { + var o = {}; + o.outpoint = { + 'hash': txid, + 'index': index + }; + o.script = coinjs.script(script || []); + o.sequence = sequence || ((r.lock_time == 0) ? 4294967295 : 0); + return this.ins.push(o); + } + + /* add an output to a transaction */ + r.addoutput = function(address, value) { + var o = {}; + o.value = new BigInteger('' + Math.round((value * 1) * 1e8), 10); + var s = coinjs.script(); + o.script = s.spendToScript(address); + + return this.outs.push(o); + } + + /* add two outputs for stealth addresses to a transaction */ + r.addstealth = function(stealth, value) { + var ephemeralKeyBigInt = BigInteger.fromByteArrayUnsigned(Crypto.util.hexToBytes(coinjs.newPrivkey())); + var curve = EllipticCurve.getSECCurveByName("secp256k1"); + + var p = EllipticCurve.fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F"); + var a = BigInteger.ZERO; + var b = EllipticCurve.fromHex("7"); + var calccurve = new EllipticCurve.CurveFp(p, a, b); + + var ephemeralPt = curve.getG().multiply(ephemeralKeyBigInt); + var scanPt = calccurve.decodePointHex(stealth.scankey); + var sharedPt = scanPt.multiply(ephemeralKeyBigInt); + var stealthindexKeyBigInt = BigInteger.fromByteArrayUnsigned(Crypto.SHA256(sharedPt.getEncoded(true), { + asBytes: true + })); + + var stealthindexPt = curve.getG().multiply(stealthindexKeyBigInt); + var spendPt = calccurve.decodePointHex(stealth.spendkey); + var addressPt = spendPt.add(stealthindexPt); + + var sendaddress = coinjs.pubkey2address(Crypto.util.bytesToHex(addressPt.getEncoded(true))); + + + var OPRETBytes = [6].concat(Crypto.util.randomBytes(4)).concat(ephemeralPt.getEncoded(true)); // ephemkey data + var q = coinjs.script(); + q.writeOp(106); // OP_RETURN + q.writeBytes(OPRETBytes); + v = {}; + v.value = 0; + v.script = q; + + this.outs.push(v); + + var o = {}; + o.value = new BigInteger('' + Math.round((value * 1) * 1e8), 10); + var s = coinjs.script(); + o.script = s.spendToScript(sendaddress); + + return this.outs.push(o); + } + + /* add data to a transaction */ + r.adddata = function(data) { + var r = false; + if (((data.match(/^[a-f0-9]+$/gi)) && data.length < 160) && (data.length % 2) == 0) { + var s = coinjs.script(); + s.writeOp(106); // OP_RETURN + s.writeBytes(Crypto.util.hexToBytes(data)); + o = {}; + o.value = 0; + o.script = s; + return this.outs.push(o); + } + return r; + } + + /* list unspent transactions */ + r.listUnspent = function(address, callback) { + coinjs.ajax(coinjs.host + '?uid=' + coinjs.uid + '&key=' + coinjs.key + '&setmodule=addresses&request=unspent&address=' + address + '&r=' + Math.random(), callback, "GET"); + } + + /* list transaction data */ + r.getTransaction = function(txid, callback) { + coinjs.ajax(coinjs.host + '?uid=' + coinjs.uid + '&key=' + coinjs.key + '&setmodule=bitcoin&request=gettransaction&txid=' + txid + '&r=' + Math.random(), callback, "GET"); + } + + /* add unspent to transaction */ + r.addUnspent = function(address, callback, script, segwit, sequence) { + var self = this; + this.listUnspent(address, function(data) { + var s = coinjs.script(); + var value = 0; + var total = 0; + var x = {}; + + if (GLOBAL.DOMParser) { + parser = new DOMParser(); + xmlDoc = parser.parseFromString(data, "text/xml"); + } else { + xmlDoc = new ActiveXObject("Microsoft.XMLDOM"); + xmlDoc.async = false; + xmlDoc.loadXML(data); + } + + var unspent = xmlDoc.getElementsByTagName("unspent")[0]; + + if (unspent) { + for (i = 1; i <= unspent.childElementCount; i++) { + var u = xmlDoc.getElementsByTagName("unspent_" + i)[0] + var txhash = (u.getElementsByTagName("tx_hash")[0].childNodes[0].nodeValue).match(/.{1,2}/g).reverse().join("") + ''; + var n = u.getElementsByTagName("tx_output_n")[0].childNodes[0].nodeValue; + var scr = script || u.getElementsByTagName("script")[0].childNodes[0].nodeValue; + + if (segwit) { + /* this is a small hack to include the value with the redeemscript to make the signing procedure smoother. + It is not standard and removed during the signing procedure. */ + + s = coinjs.script(); + s.writeBytes(Crypto.util.hexToBytes(script)); + s.writeOp(0); + s.writeBytes(coinjs.numToBytes(u.getElementsByTagName("value")[0].childNodes[0].nodeValue * 1, 8)); + scr = Crypto.util.bytesToHex(s.buffer); + } + + var seq = sequence || false; + self.addinput(txhash, n, scr, seq); + value += u.getElementsByTagName("value")[0].childNodes[0].nodeValue * 1; + total++; + } + } + + x.result = xmlDoc.getElementsByTagName("result")[0].childNodes[0].nodeValue; + x.unspent = unspent; + x.value = value; + x.total = total; + x.response = xmlDoc.getElementsByTagName("response")[0].childNodes[0].nodeValue; + + return callback(x); + }); + } + + /* add unspent and sign */ + r.addUnspentAndSign = function(wif, callback) { + var self = this; + var address = coinjs.wif2address(wif); + self.addUnspent(address['address'], function(data) { + self.sign(wif); + return callback(data); + }); + } + + /* broadcast a transaction */ + r.broadcast = function(callback, txhex) { + var tx = txhex || this.serialize(); + coinjs.ajax(coinjs.host + '?uid=' + coinjs.uid + '&key=' + coinjs.key + '&setmodule=bitcoin&request=sendrawtransaction', callback, "POST", ["rawtx=" + tx]); + } + + /* generate the transaction hash to sign from a transaction input */ + r.transactionHash = function(index, sigHashType) { + + var clone = coinjs.clone(this); + var shType = sigHashType || 1; + + /* black out all other ins, except this one */ + for (var i = 0; i < clone.ins.length; i++) { + if (index != i) { + clone.ins[i].script = coinjs.script(); + } + } + + var extract = this.extractScriptKey(index); + clone.ins[index].script = coinjs.script(extract['script']); + + if ((clone.ins) && clone.ins[index]) { + + /* SIGHASH : For more info on sig hashs see https://en.bitcoin.it/wiki/OP_CHECKSIG + and https://bitcoin.org/en/developer-guide#signature-hash-type */ + + if (shType == 1) { + //SIGHASH_ALL 0x01 + + } else if (shType == 2) { + //SIGHASH_NONE 0x02 + clone.outs = []; + for (var i = 0; i < clone.ins.length; i++) { + if (index != i) { + clone.ins[i].sequence = 0; + } + } + + } else if (shType == 3) { + + //SIGHASH_SINGLE 0x03 + clone.outs.length = index + 1; + + for (var i = 0; i < index; i++) { + clone.outs[i].value = -1; + clone.outs[i].script.buffer = []; + } + + for (var i = 0; i < clone.ins.length; i++) { + if (index != i) { + clone.ins[i].sequence = 0; + } + } + + } else if (shType >= 128) { + //SIGHASH_ANYONECANPAY 0x80 + clone.ins = [clone.ins[index]]; + + if (shType == 129) { + // SIGHASH_ALL + SIGHASH_ANYONECANPAY + + } else if (shType == 130) { + // SIGHASH_NONE + SIGHASH_ANYONECANPAY + clone.outs = []; + + } else if (shType == 131) { + // SIGHASH_SINGLE + SIGHASH_ANYONECANPAY + clone.outs.length = index + 1; + for (var i = 0; i < index; i++) { + clone.outs[i].value = -1; + clone.outs[i].script.buffer = []; + } + } + } + + var buffer = Crypto.util.hexToBytes(clone.serialize()); + buffer = buffer.concat(coinjs.numToBytes(parseInt(shType), 4)); + var hash = Crypto.SHA256(buffer, { + asBytes: true + }); + var r = Crypto.util.bytesToHex(Crypto.SHA256(hash, { + asBytes: true + })); + return r; + } else { + return false; + } + } + + /* generate a segwit transaction hash to sign from a transaction input */ + r.transactionHashSegWitV0 = function(index, sigHashType) { + /* + Notice: coinb.in by default, deals with segwit transactions in a non-standard way. + Segwit transactions require that input values are included in the transaction hash. + To save wasting resources and potentially slowing down this service, we include the amount with the + redeem script to generate the transaction hash and remove it after its signed. + */ + + // start redeem script check + var extract = this.extractScriptKey(index); + if (extract['type'] != 'segwit') { + return { + 'result': 0, + 'fail': 'redeemscript', + 'response': 'redeemscript missing or not valid for segwit' + }; + } + + if (extract['value'] == -1) { + return { + 'result': 0, + 'fail': 'value', + 'response': 'unable to generate a valid segwit hash without a value' + }; + } + + var scriptcode = Crypto.util.hexToBytes(extract['script']); + + // end of redeem script check + + /* P2WPKH */ + if (scriptcode.length == 20) { + scriptcode = [0x00, 0x14].concat(scriptcode); + } + + if (scriptcode.length == 22) { + scriptcode = scriptcode.slice(1); + scriptcode.unshift(25, 118, 169); + scriptcode.push(136, 172); + } + + var value = coinjs.numToBytes(extract['value'], 8); + + // start + + var zero = coinjs.numToBytes(0, 32); + var version = coinjs.numToBytes(parseInt(this.version), 4); + + var bufferTmp = []; + if (!(sigHashType >= 80)) { // not sighash anyonecanpay + for (var i = 0; i < this.ins.length; i++) { + bufferTmp = bufferTmp.concat(Crypto.util.hexToBytes(this.ins[i].outpoint.hash).reverse()); + bufferTmp = bufferTmp.concat(coinjs.numToBytes(this.ins[i].outpoint.index, 4)); + } + } + var hashPrevouts = bufferTmp.length >= 1 ? Crypto.SHA256(Crypto.SHA256(bufferTmp, { + asBytes: true + }), { + asBytes: true + }) : zero; + + var bufferTmp = []; + if (!(sigHashType >= 80) && sigHashType != 2 && sigHashType != 3) { // not sighash anyonecanpay & single & none + for (var i = 0; i < this.ins.length; i++) { + bufferTmp = bufferTmp.concat(coinjs.numToBytes(this.ins[i].sequence, 4)); + } + } + var hashSequence = bufferTmp.length >= 1 ? Crypto.SHA256(Crypto.SHA256(bufferTmp, { + asBytes: true + }), { + asBytes: true + }) : zero; + + var outpoint = Crypto.util.hexToBytes(this.ins[index].outpoint.hash).reverse(); + outpoint = outpoint.concat(coinjs.numToBytes(this.ins[index].outpoint.index, 4)); + + var nsequence = coinjs.numToBytes(this.ins[index].sequence, 4); + var hashOutputs = zero; + var bufferTmp = []; + if (sigHashType != 2 && sigHashType != 3) { // not sighash single & none + for (var i = 0; i < this.outs.length; i++) { + bufferTmp = bufferTmp.concat(coinjs.numToBytes(this.outs[i].value, 8)); + bufferTmp = bufferTmp.concat(coinjs.numToVarInt(this.outs[i].script.buffer.length)); + bufferTmp = bufferTmp.concat(this.outs[i].script.buffer); + } + hashOutputs = Crypto.SHA256(Crypto.SHA256(bufferTmp, { + asBytes: true + }), { + asBytes: true + }); + + } else if ((sigHashType == 2) && index < this.outs.length) { // is sighash single + bufferTmp = bufferTmp.concat(coinjs.numToBytes(this.outs[index].value, 8)); + bufferTmp = bufferTmp.concat(coinjs.numToVarInt(this.outs[i].script.buffer.length)); + bufferTmp = bufferTmp.concat(this.outs[index].script.buffer); + hashOutputs = Crypto.SHA256(Crypto.SHA256(bufferTmp, { + asBytes: true + }), { + asBytes: true + }); + } + + var locktime = coinjs.numToBytes(this.lock_time, 4); + var sighash = coinjs.numToBytes(sigHashType, 4); + + var buffer = []; + buffer = buffer.concat(version); + buffer = buffer.concat(hashPrevouts); + buffer = buffer.concat(hashSequence); + buffer = buffer.concat(outpoint); + buffer = buffer.concat(scriptcode); + buffer = buffer.concat(value); + buffer = buffer.concat(nsequence); + buffer = buffer.concat(hashOutputs); + buffer = buffer.concat(locktime); + buffer = buffer.concat(sighash); + + var hash = Crypto.SHA256(buffer, { + asBytes: true + }); + return { + 'result': 1, + 'hash': Crypto.util.bytesToHex(Crypto.SHA256(hash, { + asBytes: true + })), + 'response': 'hash generated' + }; + } + + /* extract the scriptSig, used in the transactionHash() function */ + r.extractScriptKey = function(index) { + if (this.ins[index]) { + if ((this.ins[index].script.chunks.length == 5) && this.ins[index].script.chunks[4] == 172 && coinjs.isArray(this.ins[index].script.chunks[2])) { //OP_CHECKSIG + // regular scriptPubkey (not signed) + return { + 'type': 'scriptpubkey', + 'signed': 'false', + 'signatures': 0, + 'script': Crypto.util.bytesToHex(this.ins[index].script.buffer) + }; + } else if ((this.ins[index].script.chunks.length == 2) && this.ins[index].script.chunks[0][0] == 48 && this.ins[index].script.chunks[1].length == 5 && this.ins[index].script.chunks[1][1] == 177) { //OP_CHECKLOCKTIMEVERIFY + // hodl script (signed) + return { + 'type': 'hodl', + 'signed': 'true', + 'signatures': 1, + 'script': Crypto.util.bytesToHex(this.ins[index].script.buffer) + }; + } else if ((this.ins[index].script.chunks.length == 2) && this.ins[index].script.chunks[0][0] == 48) { + // regular scriptPubkey (probably signed) + return { + 'type': 'scriptpubkey', + 'signed': 'true', + 'signatures': 1, + 'script': Crypto.util.bytesToHex(this.ins[index].script.buffer) + }; + } else if (this.ins[index].script.chunks.length == 5 && this.ins[index].script.chunks[1] == 177) { //OP_CHECKLOCKTIMEVERIFY + // hodl script (not signed) + return { + 'type': 'hodl', + 'signed': 'false', + 'signatures': 0, + 'script': Crypto.util.bytesToHex(this.ins[index].script.buffer) + }; + } else if ((this.ins[index].script.chunks.length <= 3 && this.ins[index].script.chunks.length > 0) && ((this.ins[index].script.chunks[0].length == 22 && this.ins[index].script.chunks[0][0] == 0) || (this.ins[index].script.chunks[0].length == 20 && this.ins[index].script.chunks[1] == 0))) { + var signed = ((this.witness[index]) && this.witness[index].length == 2) ? 'true' : 'false'; + var sigs = (signed == 'true') ? 1 : 0; + var value = -1; // no value found + if ((this.ins[index].script.chunks[2]) && this.ins[index].script.chunks[2].length == 8) { + value = coinjs.bytesToNum(this.ins[index].script.chunks[2]); // value found encoded in transaction (THIS IS NON STANDARD) + } + return { + 'type': 'segwit', + 'signed': signed, + 'signatures': sigs, + 'script': Crypto.util.bytesToHex(this.ins[index].script.chunks[0]), + 'value': value + }; + } else if (this.ins[index].script.chunks[0] == 0 && this.ins[index].script.chunks[this.ins[index].script.chunks.length - 1][this.ins[index].script.chunks[this.ins[index].script.chunks.length - 1].length - 1] == 174) { // OP_CHECKMULTISIG + // multisig script, with signature(s) included + var sigcount = 0; + for (i = 1; i < this.ins[index].script.chunks.length - 1; i++) { + if (this.ins[index].script.chunks[i] != 0) { + sigcount++; + } + } + + return { + 'type': 'multisig', + 'signed': 'true', + 'signatures': sigcount, + 'script': Crypto.util.bytesToHex(this.ins[index].script.chunks[this.ins[index].script.chunks.length - 1]) + }; + } else if (this.ins[index].script.chunks[0] >= 80 && this.ins[index].script.chunks[this.ins[index].script.chunks.length - 1] == 174) { // OP_CHECKMULTISIG + // multisig script, without signature! + return { + 'type': 'multisig', + 'signed': 'false', + 'signatures': 0, + 'script': Crypto.util.bytesToHex(this.ins[index].script.buffer) + }; + } else if (this.ins[index].script.chunks.length == 0) { + // empty + //bech32 witness check + var signed = ((this.witness[index]) && this.witness[index].length == 2) ? 'true' : 'false'; + var sigs = (signed == 'true') ? 1 : 0; + return { + 'type': 'empty', + 'signed': signed, + 'signatures': sigs, + 'script': '' + }; + } else { + // something else + return { + 'type': 'unknown', + 'signed': 'false', + 'signatures': 0, + 'script': Crypto.util.bytesToHex(this.ins[index].script.buffer) + }; + } + } else { + return false; + } + } + + /* generate a signature from a transaction hash */ + r.transactionSig = function(index, wif, sigHashType, txhash) { + + function serializeSig(r, s) { + var rBa = r.toByteArraySigned(); + var sBa = s.toByteArraySigned(); + + var sequence = []; + sequence.push(0x02); // INTEGER + sequence.push(rBa.length); + sequence = sequence.concat(rBa); + + sequence.push(0x02); // INTEGER + sequence.push(sBa.length); + sequence = sequence.concat(sBa); + + sequence.unshift(sequence.length); + sequence.unshift(0x30); // SEQUENCE + + return sequence; + } + + var shType = sigHashType || 1; + var hash = txhash || Crypto.util.hexToBytes(this.transactionHash(index, shType)); + + if (hash) { + var curve = EllipticCurve.getSECCurveByName("secp256k1"); + var key = coinjs.wif2privkey(wif); + var priv = BigInteger.fromByteArrayUnsigned(Crypto.util.hexToBytes(key['privkey'])); + var n = curve.getN(); + var e = BigInteger.fromByteArrayUnsigned(hash); + var badrs = 0 + do { + var k = this.deterministicK(wif, hash, badrs); + var G = curve.getG(); + var Q = G.multiply(k); + var r = Q.getX().toBigInteger().mod(n); + var s = k.modInverse(n).multiply(e.add(priv.multiply(r))).mod(n); + badrs++ + } while (r.compareTo(BigInteger.ZERO) <= 0 || s.compareTo(BigInteger.ZERO) <= 0); + + // Force lower s values per BIP62 + var halfn = n.shiftRight(1); + if (s.compareTo(halfn) > 0) { + s = n.subtract(s); + }; + + var sig = serializeSig(r, s); + sig.push(parseInt(shType, 10)); + + return Crypto.util.bytesToHex(sig); + } else { + return false; + } + } + + // https://tools.ietf.org/html/rfc6979#section-3.2 + r.deterministicK = function(wif, hash, badrs) { + // if r or s were invalid when this function was used in signing, + // we do not want to actually compute r, s here for efficiency, so, + // we can increment badrs. explained at end of RFC 6979 section 3.2 + + // wif is b58check encoded wif privkey. + // hash is byte array of transaction digest. + // badrs is used only if the k resulted in bad r or s. + + // some necessary things out of the way for clarity. + badrs = badrs || 0; + var key = coinjs.wif2privkey(wif); + var x = Crypto.util.hexToBytes(key['privkey']) + var curve = EllipticCurve.getSECCurveByName("secp256k1"); + var N = curve.getN(); + + // Step: a + // hash is a byteArray of the message digest. so h1 == hash in our case + + // Step: b + var v = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]; + + // Step: c + var k = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; + + // Step: d + k = Crypto.HMAC(Crypto.SHA256, v.concat([0]).concat(x).concat(hash), k, { + asBytes: true + }); + + // Step: e + v = Crypto.HMAC(Crypto.SHA256, v, k, { + asBytes: true + }); + + // Step: f + k = Crypto.HMAC(Crypto.SHA256, v.concat([1]).concat(x).concat(hash), k, { + asBytes: true + }); + + // Step: g + v = Crypto.HMAC(Crypto.SHA256, v, k, { + asBytes: true + }); + + // Step: h1 + var T = []; + + // Step: h2 (since we know tlen = qlen, just copy v to T.) + v = Crypto.HMAC(Crypto.SHA256, v, k, { + asBytes: true + }); + T = v; + + // Step: h3 + var KBigInt = BigInteger.fromByteArrayUnsigned(T); + + // loop if KBigInt is not in the range of [1, N-1] or if badrs needs incrementing. + var i = 0 + while (KBigInt.compareTo(N) >= 0 || KBigInt.compareTo(BigInteger.ZERO) <= 0 || i < badrs) { + k = Crypto.HMAC(Crypto.SHA256, v.concat([0]), k, { + asBytes: true + }); + v = Crypto.HMAC(Crypto.SHA256, v, k, { + asBytes: true + }); + v = Crypto.HMAC(Crypto.SHA256, v, k, { + asBytes: true + }); + T = v; + KBigInt = BigInteger.fromByteArrayUnsigned(T); + i++ + }; + + return KBigInt; + }; + + /* sign a "standard" input */ + r.signinput = function(index, wif, sigHashType) { + var key = coinjs.wif2pubkey(wif); + var shType = sigHashType || 1; + var signature = this.transactionSig(index, wif, shType); + var s = coinjs.script(); + s.writeBytes(Crypto.util.hexToBytes(signature)); + s.writeBytes(Crypto.util.hexToBytes(key['pubkey'])); + this.ins[index].script = s; + return true; + } + + /* signs a time locked / hodl input */ + r.signhodl = function(index, wif, sigHashType) { + var shType = sigHashType || 1; + var signature = this.transactionSig(index, wif, shType); + var redeemScript = this.ins[index].script.buffer + var s = coinjs.script(); + s.writeBytes(Crypto.util.hexToBytes(signature)); + s.writeBytes(redeemScript); + this.ins[index].script = s; + return true; + } + + /* sign a multisig input */ + r.signmultisig = function(index, wif, sigHashType) { + + function scriptListPubkey(redeemScript) { + var r = {}; + for (var i = 1; i < redeemScript.chunks.length - 2; i++) { + r[i] = Crypto.util.hexToBytes(coinjs.pubkeydecompress(Crypto.util.bytesToHex(redeemScript.chunks[i]))); + } + return r; + } + + function scriptListSigs(scriptSig) { + var r = {}; + var c = 0; + if (scriptSig.chunks[0] == 0 && scriptSig.chunks[scriptSig.chunks.length - 1][scriptSig.chunks[scriptSig.chunks.length - 1].length - 1] == 174) { + for (var i = 1; i < scriptSig.chunks.length - 1; i++) { + if (scriptSig.chunks[i] != 0) { + c++; + r[c] = scriptSig.chunks[i]; + } + } + } + return r; + } + + var redeemScript = (this.ins[index].script.chunks[this.ins[index].script.chunks.length - 1] == 174) ? this.ins[index].script.buffer : this.ins[index].script.chunks[this.ins[index].script.chunks.length - 1]; + + var pubkeyList = scriptListPubkey(coinjs.script(redeemScript)); + var sigsList = scriptListSigs(this.ins[index].script); + + var shType = sigHashType || 1; + var sighash = Crypto.util.hexToBytes(this.transactionHash(index, shType)); + var signature = Crypto.util.hexToBytes(this.transactionSig(index, wif, shType)); + + sigsList[coinjs.countObject(sigsList) + 1] = signature; + + var s = coinjs.script(); + + s.writeOp(0); + + for (x in pubkeyList) { + for (y in sigsList) { + this.ins[index].script.buffer = redeemScript; + sighash = Crypto.util.hexToBytes(this.transactionHash(index, sigsList[y].slice(-1)[0] * 1)); + if (coinjs.verifySignature(sighash, sigsList[y], pubkeyList[x])) { + s.writeBytes(sigsList[y]); + } + } + } + + s.writeBytes(redeemScript); + this.ins[index].script = s; + return true; + } + + /* sign segwit input */ + r.signsegwit = function(index, wif, sigHashType) { + var shType = sigHashType || 1; + + var wif2 = coinjs.wif2pubkey(wif); + var segwit = coinjs.segwitAddress(wif2['pubkey']); + var bech32 = coinjs.bech32Address(wif2['pubkey']); + + if ((segwit['redeemscript'] == Crypto.util.bytesToHex(this.ins[index].script.chunks[0])) || (bech32['redeemscript'] == Crypto.util.bytesToHex(this.ins[index].script.chunks[0]))) { + var txhash = this.transactionHashSegWitV0(index, shType); + + if (txhash.result == 1) { + + var segwitHash = Crypto.util.hexToBytes(txhash.hash); + var signature = this.transactionSig(index, wif, shType, segwitHash); + + // remove any non standard data we store, i.e. input value + var script = coinjs.script(); + script.writeBytes(this.ins[index].script.chunks[0]); + this.ins[index].script = script; + + if (!coinjs.isArray(this.witness)) { + this.witness = new Array(this.ins.length); + this.witness.fill([]); + } + + this.witness[index] = ([signature, wif2['pubkey']]); + + // bech32, empty redeemscript + if (bech32['redeemscript'] == Crypto.util.bytesToHex(this.ins[index].script.chunks[0])) { + this.ins[index].script = coinjs.script(); + } + + /* attempt to reorder witness data as best as we can. + data can't be easily validated at this stage as + we dont have access to the inputs value and + making a web call will be too slow. */ + + /* + var witness_order = []; + var witness_used = []; + for (var i = 0; i < this.ins.length; i++) { + for (var y = 0; y < this.witness.length; y++) { + if (!witness_used.includes(y)) { + var sw = coinjs.segwitAddress(this.witness[y][1]); + var b32 = coinjs.bech32Address(this.witness[y][1]); + var rs = ''; + + if (this.ins[i].script.chunks.length >= 1) { + rs = Crypto.util.bytesToHex(this.ins[i].script.chunks[0]); + } else if (this.ins[i].script.chunks.length == 0) { + rs = b32['redeemscript']; + } + + if ((sw['redeemscript'] == rs) || (b32['redeemscript'] == rs)) { + witness_order.push(this.witness[y]); + witness_used.push(y); + + // bech32, empty redeemscript + if (b32['redeemscript'] == rs) { + this.ins[index].script = coinjs.script(); + } + break; + } + } + } + } + + this.witness = witness_order; + */ + } + } + return true; + } + + /* sign inputs */ + r.sign = function(wif, sigHashType) { + var shType = sigHashType || 1; + for (var i = 0; i < this.ins.length; i++) { + var d = this.extractScriptKey(i); + + var w2a = coinjs.wif2address(wif); + var script = coinjs.script(); + var pubkeyHash = script.pubkeyHash(w2a['address']); + + if (((d['type'] == 'scriptpubkey' && d['script'] == Crypto.util.bytesToHex(pubkeyHash.buffer)) || d['type'] == 'empty') && d['signed'] == "false") { + this.signinput(i, wif, shType); + + } else if (d['type'] == 'hodl' && d['signed'] == "false") { + this.signhodl(i, wif, shType); + + } else if (d['type'] == 'multisig') { + this.signmultisig(i, wif, shType); + + } else if (d['type'] == 'segwit') { + this.signsegwit(i, wif, shType); + + } else { + // could not sign + } + } + return this.serialize(); + } + + /* serialize a transaction */ + r.serialize = function() { + var buffer = []; + buffer = buffer.concat(coinjs.numToBytes(parseInt(this.version), 4)); + + if (coinjs.isArray(this.witness)) { + buffer = buffer.concat([0x00, 0x01]); + } + + buffer = buffer.concat(coinjs.numToVarInt(this.ins.length)); + for (var i = 0; i < this.ins.length; i++) { + var txin = this.ins[i]; + buffer = buffer.concat(Crypto.util.hexToBytes(txin.outpoint.hash).reverse()); + buffer = buffer.concat(coinjs.numToBytes(parseInt(txin.outpoint.index), 4)); + var scriptBytes = txin.script.buffer; + buffer = buffer.concat(coinjs.numToVarInt(scriptBytes.length)); + buffer = buffer.concat(scriptBytes); + buffer = buffer.concat(coinjs.numToBytes(parseInt(txin.sequence), 4)); + } + buffer = buffer.concat(coinjs.numToVarInt(this.outs.length)); + + for (var i = 0; i < this.outs.length; i++) { + var txout = this.outs[i]; + buffer = buffer.concat(coinjs.numToBytes(txout.value, 8)); + var scriptBytes = txout.script.buffer; + buffer = buffer.concat(coinjs.numToVarInt(scriptBytes.length)); + buffer = buffer.concat(scriptBytes); + } + + if ((coinjs.isArray(this.witness)) && this.witness.length >= 1) { + for (var i = 0; i < this.witness.length; i++) { + buffer = buffer.concat(coinjs.numToVarInt(this.witness[i].length)); + for (var x = 0; x < this.witness[i].length; x++) { + buffer = buffer.concat(coinjs.numToVarInt(Crypto.util.hexToBytes(this.witness[i][x]).length)); + buffer = buffer.concat(Crypto.util.hexToBytes(this.witness[i][x])); + } + } + } + + buffer = buffer.concat(coinjs.numToBytes(parseInt(this.lock_time), 4)); + return Crypto.util.bytesToHex(buffer); + } + + /* deserialize a transaction */ + r.deserialize = function(buffer) { + if (typeof buffer == "string") { + buffer = Crypto.util.hexToBytes(buffer) + } + + var pos = 0; + var witness = false; + + var readAsInt = function(bytes) { + if (bytes == 0) return 0; + pos++; + return buffer[pos - 1] + readAsInt(bytes - 1) * 256; + } + + var readVarInt = function() { + pos++; + if (buffer[pos - 1] < 253) { + return buffer[pos - 1]; + } + return readAsInt(buffer[pos - 1] - 251); + } + + var readBytes = function(bytes) { + pos += bytes; + return buffer.slice(pos - bytes, pos); + } + + var readVarString = function() { + var size = readVarInt(); + return readBytes(size); + } + + var obj = new coinjs.transaction(); + obj.version = readAsInt(4); + + if (buffer[pos] == 0x00 && buffer[pos + 1] == 0x01) { + // segwit transaction + witness = true; + obj.witness = []; + pos += 2; + } + + var ins = readVarInt(); + for (var i = 0; i < ins; i++) { + obj.ins.push({ + outpoint: { + hash: Crypto.util.bytesToHex(readBytes(32).reverse()), + index: readAsInt(4) + }, + script: coinjs.script(readVarString()), + sequence: readAsInt(4) + }); + } + + var outs = readVarInt(); + for (var i = 0; i < outs; i++) { + obj.outs.push({ + value: coinjs.bytesToNum(readBytes(8)), + script: coinjs.script(readVarString()) + }); + } + + if (witness == true) { + for (i = 0; i < ins; ++i) { + var count = readVarInt(); + var vector = []; + if (!coinjs.isArray(obj.witness[i])) { + obj.witness[i] = []; + } + for (var y = 0; y < count; y++) { + var slice = readVarInt(); + pos += slice; + obj.witness[i].push(Crypto.util.bytesToHex(buffer.slice(pos - slice, pos))); + } + } + } + + obj.lock_time = readAsInt(4); + return obj; + } + + r.size = function() { + return ((this.serialize()).length / 2).toFixed(0); + } + + return r; + } + + /* start of signature vertification functions */ + + coinjs.verifySignature = function(hash, sig, pubkey) { + + function parseSig(sig) { + var cursor; + if (sig[0] != 0x30) + throw new Error("Signature not a valid DERSequence"); + + cursor = 2; + if (sig[cursor] != 0x02) + throw new Error("First element in signature must be a DERInteger");; + + var rBa = sig.slice(cursor + 2, cursor + 2 + sig[cursor + 1]); + + cursor += 2 + sig[cursor + 1]; + if (sig[cursor] != 0x02) + throw new Error("Second element in signature must be a DERInteger"); + + var sBa = sig.slice(cursor + 2, cursor + 2 + sig[cursor + 1]); + + cursor += 2 + sig[cursor + 1]; + + var r = BigInteger.fromByteArrayUnsigned(rBa); + var s = BigInteger.fromByteArrayUnsigned(sBa); + + return { + r: r, + s: s + }; + } + + var r, s; + + if (coinjs.isArray(sig)) { + var obj = parseSig(sig); + r = obj.r; + s = obj.s; + } else if ("object" === typeof sig && sig.r && sig.s) { + r = sig.r; + s = sig.s; + } else { + throw "Invalid value for signature"; + } + + var Q; + if (coinjs.isArray(pubkey)) { + var ecparams = EllipticCurve.getSECCurveByName("secp256k1"); + Q = EllipticCurve.PointFp.decodeFrom(ecparams.getCurve(), pubkey); + } else { + throw "Invalid format for pubkey value, must be byte array"; + } + var e = BigInteger.fromByteArrayUnsigned(hash); + + return coinjs.verifySignatureRaw(e, r, s, Q); + } + + coinjs.verifySignatureRaw = function(e, r, s, Q) { + var ecparams = EllipticCurve.getSECCurveByName("secp256k1"); + var n = ecparams.getN(); + var G = ecparams.getG(); + + if (r.compareTo(BigInteger.ONE) < 0 || r.compareTo(n) >= 0) + return false; + + if (s.compareTo(BigInteger.ONE) < 0 || s.compareTo(n) >= 0) + return false; + + var c = s.modInverse(n); + + var u1 = e.multiply(c).mod(n); + var u2 = r.multiply(c).mod(n); + + var point = G.multiply(u1).add(Q.multiply(u2)); + + var v = point.getX().toBigInteger().mod(n); + + return v.equals(r); + } + + /* start of privates functions */ + + /* base58 encode function */ + coinjs.base58encode = function(buffer) { + var alphabet = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"; + var base = BigInteger.valueOf(58); + + var bi = BigInteger.fromByteArrayUnsigned(buffer); + var chars = []; + + while (bi.compareTo(base) >= 0) { + var mod = bi.mod(base); + chars.unshift(alphabet[mod.intValue()]); + bi = bi.subtract(mod).divide(base); + } + + chars.unshift(alphabet[bi.intValue()]); + for (var i = 0; i < buffer.length; i++) { + if (buffer[i] == 0x00) { + chars.unshift(alphabet[0]); + } else break; + } + return chars.join(''); + } + + /* base58 decode function */ + coinjs.base58decode = function(buffer) { + var alphabet = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"; + var base = BigInteger.valueOf(58); + var validRegex = /^[1-9A-HJ-NP-Za-km-z]+$/; + + var bi = BigInteger.valueOf(0); + var leadingZerosNum = 0; + for (var i = buffer.length - 1; i >= 0; i--) { + var alphaIndex = alphabet.indexOf(buffer[i]); + if (alphaIndex < 0) { + throw "Invalid character"; + } + bi = bi.add(BigInteger.valueOf(alphaIndex).multiply(base.pow(buffer.length - 1 - i))); + + if (buffer[i] == "1") leadingZerosNum++; + else leadingZerosNum = 0; + } + + var bytes = bi.toByteArrayUnsigned(); + while (leadingZerosNum-- > 0) bytes.unshift(0); + return bytes; + } + + /* raw ajax function to avoid needing bigger frame works like jquery, mootools etc */ + coinjs.ajax = function(u, f, m, a) { + var x = false; + try { + x = new ActiveXObject('Msxml2.XMLHTTP') + } catch (e) { + try { + x = new ActiveXObject('Microsoft.XMLHTTP') + } catch (e) { + x = new XMLHttpRequest() + } + } + + if (x == false) { + return false; + } + + x.open(m, u, true); + x.onreadystatechange = function() { + if ((x.readyState == 4) && f) + f(x.responseText); + }; + + if (m == 'POST') { + x.setRequestHeader('Content-type', 'application/x-www-form-urlencoded'); + } + + x.send(a); + } + + /* clone an object */ + coinjs.clone = function(obj) { + if (obj == null || typeof(obj) != 'object') return obj; + var temp = new obj.constructor(); + + for (var key in obj) { + if (obj.hasOwnProperty(key)) { + temp[key] = coinjs.clone(obj[key]); + } + } + return temp; + } + + coinjs.numToBytes = function(num, bytes) { + if (typeof bytes === "undefined") bytes = 8; + if (bytes == 0) { + return []; + } else if (num == -1) { + return Crypto.util.hexToBytes("ffffffffffffffff"); + } else { + return [num % 256].concat(coinjs.numToBytes(Math.floor(num / 256), bytes - 1)); + } + } + + function scriptNumSize(i) { + return i > 0x7fffffff ? 5 : + i > 0x7fffff ? 4 : + i > 0x7fff ? 3 : + i > 0x7f ? 2 : + i > 0x00 ? 1 : + 0; + } + + coinjs.numToScriptNumBytes = function(_number) { + var value = Math.abs(_number); + var size = scriptNumSize(value); + var result = []; + for (var i = 0; i < size; ++i) { + result.push(0); + } + var negative = _number < 0; + for (i = 0; i < size; ++i) { + result[i] = value & 0xff; + value = Math.floor(value / 256); + } + if (negative) { + result[size - 1] |= 0x80; + } + return result; + } + + coinjs.numToVarInt = function(num) { + if (num < 253) { + return [num]; + } else if (num < 65536) { + return [253].concat(coinjs.numToBytes(num, 2)); + } else if (num < 4294967296) { + return [254].concat(coinjs.numToBytes(num, 4)); + } else { + return [255].concat(coinjs.numToBytes(num, 8)); + } + } + + coinjs.bytesToNum = function(bytes) { + if (bytes.length == 0) return 0; + else return bytes[0] + 256 * coinjs.bytesToNum(bytes.slice(1)); + } + + coinjs.uint = function(f, size) { + if (f.length < size) + throw new Error("not enough data"); + var n = 0; + for (var i = 0; i < size; i++) { + n *= 256; + n += f[i]; + } + return n; + } + + coinjs.isArray = function(o) { + return Object.prototype.toString.call(o) === '[object Array]'; + } + + coinjs.countObject = function(obj) { + var count = 0; + var i; + for (i in obj) { + if (obj.hasOwnProperty(i)) { + count++; + } + } + return count; + } + + coinjs.random = function(length) { + var r = ""; + var l = length || 25; + var chars = "!$%^&*()_+{}:@~?><|\./;'#][=-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; + for (x = 0; x < l; x++) { + r += chars.charAt(Math.floor(Math.random() * 62)); + } + return r; + } + + })(); + //secrets.js (function() { //Shamir Secret Share by Alexander Stetsyuk - released under MIT License @@ -6786,5 +9341,4 @@ } })(); - })(typeof global !== "undefined" ? global : window); \ No newline at end of file From 2b8e77b5f783d24e47ccdf23e94dcdde66328f88 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Tue, 26 Jul 2022 15:16:22 +0530 Subject: [PATCH 09/42] Bug fixes - floCrypto.validateAddr: bech default=true - floCloudAPI: proxyID - commented coinjs api vars --- README.md | 2 +- floCloudAPI.js | 20 ++++++++++---------- floCrypto.js | 4 ++-- lib.js | 5 +++-- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index da60c69..17ff13a 100644 --- a/README.md +++ b/README.md @@ -221,7 +221,7 @@ In addition, we have these system variables outside FLO Globals but used globall `validateAddr` check if the given Address (any blockchain) is valid or not 1. address - address to validate 2. std - checks for legacy version (optional, default=true) (true: allow any, array: list of versions, value: one version only, false: allow none) -3. bech - checks for bech version (optional, default=false) (true: allow any, array: list of versions, value: one version only, false: allow none) [requires additional library: [btc_api](https://ranchimall.github.io/btc-webwallet/lib_btc.js)] +3. bech - checks for bech version (optional, default=true) (true: allow any, array: list of versions, value: one version only, false: allow none) * Returns : boolen (true or false) #### Validate FLO ID diff --git a/floCloudAPI.js b/floCloudAPI.js index 3a06e0b..7d2dad2 100644 --- a/floCloudAPI.js +++ b/floCloudAPI.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floCloudAPI v2.4.2 +(function(EXPORTS) { //floCloudAPI v2.4.2a /* FLO Cloud operations to send/request application data*/ 'use strict'; const floCloudAPI = EXPORTS; @@ -217,7 +217,7 @@ if (_inactive.size === kBucket.list.length) return reject('Cloud offline'); if (!(snID in supernodes)) - snID = kBucket.closestNode(snID); + snID = kBucket.closestNode(proxyID(snID)); ws_connect(snID) .then(node => resolve(node)) .catch(error => { @@ -255,7 +255,7 @@ if (_inactive.size === kBucket.list.length) return reject('Cloud offline'); if (!(snID in supernodes)) - snID = kBucket.closestNode(snID); + snID = kBucket.closestNode(proxyID(snID)); fetch_API(snID, data) .then(result => resolve(result)) .catch(error => { @@ -370,11 +370,11 @@ const filterKey = util.filterKey = function(type, options) { return type + (options.comment ? ':' + options.comment : '') + - '|' + (options.group || toFloID(options.receiverID) || DEFAULT.adminID) + + '|' + (options.group || options.receiverID || DEFAULT.adminID) + '|' + (options.application || DEFAULT.application); } - const toFloID = util.toFloID = function(address) { + const proxyID = util.proxyID = function(address) { if (!address) return; var bytes; @@ -390,7 +390,7 @@ 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 || address.length == 62) { //bech encoding - if (!(coinjs instanceof Object)) + if (typeof coinjs !== 'function') throw "library missing (lib_btc.js)"; let decode = coinjs.bech32_decode(address); if (decode) { @@ -519,7 +519,7 @@ return new Promise((resolve, reject) => { var data = { senderID: user.id, - receiverID: toFloID(options.receiverID) || DEFAULT.adminID, + receiverID: options.receiverID || DEFAULT.adminID, pubKey: user.public, message: encodeMessage(message), time: Date.now(), @@ -540,7 +540,7 @@ const requestApplicationData = floCloudAPI.requestApplicationData = function(type, options = {}) { return new Promise((resolve, reject) => { var request = { - receiverID: toFloID(options.receiverID) || DEFAULT.adminID, + receiverID: options.receiverID || DEFAULT.adminID, senderID: options.senderID || undefined, application: options.application || DEFAULT.application, type: type, @@ -645,7 +645,7 @@ if (!floGlobals.subAdmins.includes(user.id)) return reject("Only subAdmins can tag data") var request = { - receiverID: toFloID(options.receiverID) || DEFAULT.adminID, + receiverID: options.receiverID || DEFAULT.adminID, requestorID: user.id, pubKey: user.public, time: Date.now(), @@ -664,7 +664,7 @@ floCloudAPI.noteApplicationData = function(vectorClock, note, options = {}) { return new Promise((resolve, reject) => { var request = { - receiverID: toFloID(options.receiverID) || DEFAULT.adminID, + receiverID: options.receiverID || DEFAULT.adminID, requestorID: user.id, pubKey: user.public, time: Date.now(), diff --git a/floCrypto.js b/floCrypto.js index 064c060..e32882e 100644 --- a/floCrypto.js +++ b/floCrypto.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floCrypto v2.3.2a +(function(EXPORTS) { //floCrypto v2.3.2b /* FLO Crypto Operators */ 'use strict'; const floCrypto = EXPORTS; @@ -209,7 +209,7 @@ } //Check if the given address (any blockchain) is valid or not - floCrypto.validateAddr = function(address, std = true, bech = false) { + floCrypto.validateAddr = function(address, std = true, bech = true) { if (address.length == 34) { //legacy or segwit encoding if (std === false) return false; diff --git a/lib.js b/lib.js index a7e41fe..b55a81c 100644 --- a/lib.js +++ b/lib.js @@ -1,4 +1,4 @@ -(function(GLOBAL) { //lib v1.3.0 +(function(GLOBAL) { //lib v1.3.0a 'use strict'; /* Utility Libraries required for Standard operations * All credits for these codes belong to their respective creators, moderators and owners. @@ -6312,11 +6312,12 @@ /* other vars */ coinjs.developer = '33tht1bKDgZVxb39MnZsWa8oxHXHvUYE4G'; //bitcoin - /* bit(coinb.in) api vars */ + /* bit(coinb.in) api vars coinjs.hostname = ((document.location.hostname.split(".")[(document.location.hostname.split(".")).length - 1]) == 'onion') ? 'coinbin3ravkwb24f7rmxx6w3snkjw45jhs5lxbh3yfeg3vpt6janwqd.onion' : 'coinb.in'; coinjs.host = ('https:' == document.location.protocol ? 'https://' : 'http://') + coinjs.hostname + '/api/'; coinjs.uid = '1'; coinjs.key = '12345678901234567890123456789012'; + */ /* start of address functions */ From f673d3f37a075adfc22fb2ab76ec91a7a8eda14b Mon Sep 17 00:00:00 2001 From: sairajzero Date: Wed, 27 Jul 2022 22:16:52 +0530 Subject: [PATCH 10/42] floCrypto v2.3.3a floCrypto.verifyPubKey: verify public key of any blockchain address - Parameters: 1. pubKeyHex - public key hex 2. address - blockchain address floCrypto.getAddress: get address respective to the blockchain - Parameters: 1. privateKeyHex - private key (WIF) 2. strict - (optional, default=false) if false returns floID when no match of privatekey prefix found. --- floCrypto.js | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/floCrypto.js b/floCrypto.js index e32882e..b252169 100644 --- a/floCrypto.js +++ b/floCrypto.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floCrypto v2.3.2b +(function(EXPORTS) { //floCrypto v2.3.3a /* FLO Crypto Operators */ 'use strict'; const floCrypto = EXPORTS; @@ -7,6 +7,7 @@ const ecparams = EllipticCurve.getSECCurveByName("secp256k1"); const ascii_alternatives = `‘ '\n’ '\n“ "\n” "\n– --\n— ---\n≥ >=\n≤ <=\n≠ !=\n× *\n÷ /\n← <-\n→ ->\n↔ <->\n⇒ =>\n⇐ <=\n⇔ <=>`; const exponent1 = () => p.add(BigInteger.ONE).divide(BigInteger("4")); + coinjs.compressed = true; //defaulting coinjs compressed to true; function calculateY(x) { let exp = exponent1(); @@ -176,6 +177,25 @@ } } + floCrypto.getAddress = function(privateKeyHex, strict = false) { + if (!privateKeyHex) + return; + var key = new Bitcoin.ECKey(privateKeyHex); + if (key.priv == null) + return null; + key.setCompressed(true); + let pubKey = key.getPubKeyHex(), + version = bitjs.Base58.decode(privateKeyHex)[0]; + switch (version) { + case coinjs.priv: //BTC + return coinjs.bech32Address(pubKey).address; + case bitjs.priv: //FLO + return bitjs.pubkey2address(pubKey); + default: + return strict ? false : bitjs.pubkey2address(pubKey); //default to FLO address (if strict=false) + } + } + //Verify the private-key for the given public-key or flo-ID floCrypto.verifyPrivKey = function(privateKeyHex, pubKey_floID, isfloID = true) { if (!privateKeyHex || !pubKey_floID) @@ -242,6 +262,35 @@ return false; } + floCrypto.verifyPubKey = function(pubKeyHex, address) { + let pub_hash = Crypto.util.bytesToHex(ripemd160(Crypto.SHA256(Crypto.util.hexToBytes(pubKeyHex), { + asBytes: true + }))); + if (address.length == 34) { //legacy encoding + let decode = bitjs.Base58.decode(address); + var raw = decode.slice(0, decode.length - 4), + checksum = decode.slice(decode.length - 4); + var hash = Crypto.SHA256(Crypto.SHA256(raw, { + asBytes: true + }), { + asBytes: true + }); + if (hash[0] != checksum[0] || hash[1] != checksum[1] || hash[2] != checksum[2] || hash[3] != checksum[3]) + return false; + raw.shift(); + return pub_hash === Crypto.util.bytesToHex(raw); + } else if (address.length == 42 || address.length == 62) { //bech encoding + let decode = coinjs.bech32_decode(address); + if (!decode) + return false; + var raw = decode.data; + raw.shift(); + raw = coinjs.bech32_convert(raw, 5, 8, false); + return pub_hash === Crypto.util.bytesToHex(raw); + } else //unknown length + return false; + } + //Split the str using shamir's Secret and Returns the shares floCrypto.createShamirsSecretShares = function(str, total_shares, threshold_limit) { try { From 4bced4352d79b2f185dadd34cafa30b8363e7620 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Thu, 28 Jul 2022 02:24:26 +0530 Subject: [PATCH 11/42] floDapps, floCloudAPI: retain blkchain id on login floDapps login: - login to btc address when btc private key is entered - login to flo id when flo (or any other) private key is entered floCloudAPI user: - accept userID and private key for user set Others: - Fixed: minor bugs --- floCloudAPI.js | 76 +++++++++++++++++++++++++++----------------------- floDapps.js | 17 ++++++----- lib.js | 6 ++-- 3 files changed, 54 insertions(+), 45 deletions(-) diff --git a/floCloudAPI.js b/floCloudAPI.js index 7d2dad2..01560a1 100644 --- a/floCloudAPI.js +++ b/floCloudAPI.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floCloudAPI v2.4.2a +(function(EXPORTS) { //floCloudAPI v2.4.2b /* FLO Cloud operations to send/request application data*/ 'use strict'; const floCloudAPI = EXPORTS; @@ -12,27 +12,48 @@ }; var user_id, user_public, user_private, aes_key; - const user = { - get id() { - if (!user_id) - throw "User not set"; - return user_id; - }, - get public() { - if (!user_public) - throw "User not set"; - return user_public; - }, - sign(msg) { - if (!user_private) - throw "User not set"; - return floCrypto.signData(msg, Crypto.AES.decrypt(user_private, aes_key)); - }, - clear() { - user_id = user_public = user_private = aes_key = undefined; - } + + function user(id, priv) { + if (!priv || !id) + return user.clear(); + let pub = floCrypto.getPubKeyHex(priv); + if (!pub || !floCrypto.verifyPubKey(pub, id)) + return user.clear(); + let n = floCrypto.randInt(12, 20); + aes_key = floCrypto.randString(n); + user_private = Crypto.AES.encrypt(priv, aes_key); + user_public = pub; + user_id = id; + return user_id; } + Object.defineProperties(user, { + id: { + get: () => { + if (!user_id) + throw "User not set"; + return user_id; + } + }, + public: { + get: () => { + if (!user_public) + throw "User not set"; + return user_public; + } + }, + sign: { + value: msg => { + if (!user_private) + throw "User not set"; + return floCrypto.signData(msg, Crypto.AES.decrypt(user_private, aes_key)); + } + }, + clear: { + value: () => user_id = user_public = user_private = aes_key = undefined + } + }) + Object.defineProperties(floCloudAPI, { SNStorageID: { get: () => DEFAULT.SNStorageID @@ -44,21 +65,6 @@ get: () => DEFAULT.application }, user: { - set: priv => { - if (!priv) - user_id = user_public = user_private = aes_key = undefined; - else { - user_public = floCrypto.getPubKeyHex(priv); - user_id = floCrypto.getFloID(user_public); - if (!user_public || !user_id || !floCrypto.verifyPrivKey(priv, user_id)) - user_id = user_public = user_private = aes_key = undefined; - else { - let n = floCrypto.randInt(12, 20); - aes_key = floCrypto.randString(n); - user_private = Crypto.AES.encrypt(priv, aes_key); - } - } - }, get: () => user } }); diff --git a/floDapps.js b/floDapps.js index e5e2d6d..556e7fe 100644 --- a/floDapps.js +++ b/floDapps.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floDapps v2.3.2 +(function(EXPORTS) { //floDapps v2.3.2a /* General functions for FLO Dapps*/ 'use strict'; const floDapps = EXPORTS; @@ -75,6 +75,9 @@ myFloID: { get: () => user.id }, + myUserID: { + get: () => user.id + }, myPubKey: { get: () => user.public }, @@ -179,14 +182,14 @@ }).then(result => { for (var i = result.data.length - 1; i >= 0; i--) { var content = JSON.parse(result.data[i]).SuperNodeStorage; - for (sn in content.removeNodes) + for (let sn in content.removeNodes) compactIDB.removeData("supernodes", sn, DEFAULT.root); - for (sn in content.newNodes) + for (let sn in content.newNodes) compactIDB.writeData("supernodes", content.newNodes[sn], sn, DEFAULT.root); } compactIDB.writeData("lastTx", result.totalTxs, floCloudAPI.SNStorageID, DEFAULT.root); - compactIDB.readAllData("supernodes", DEFAULT.root).then(result => { - floCloudAPI.init(result) + compactIDB.readAllData("supernodes", DEFAULT.root).then(nodes => { + floCloudAPI.init(nodes) .then(result => resolve("Loaded Supernode list\n" + result)) .catch(error => reject(error)) }) @@ -342,8 +345,8 @@ checkIfPinRequired(key).then(privKey => { try { user_public = floCrypto.getPubKeyHex(privKey); - user_id = floCrypto.getFloID(privKey); - floCloudAPI.user = privKey; //Set user for floCloudAPI + user_id = floCrypto.getAddress(privKey); + floCloudAPI.user(user_id, privKey); //Set user for floCloudAPI user_priv_wrap = () => checkIfPinRequired(key); let n = floCrypto.randInt(12, 20); aes_key = floCrypto.randString(n); diff --git a/lib.js b/lib.js index b55a81c..26311f0 100644 --- a/lib.js +++ b/lib.js @@ -1,4 +1,4 @@ -(function(GLOBAL) { //lib v1.3.0a +(function(GLOBAL) { //lib v1.3.0b 'use strict'; /* Utility Libraries required for Standard operations * All credits for these codes belong to their respective creators, moderators and owners. @@ -6353,7 +6353,7 @@ x += (document.getElementById("entropybucket")) ? document.getElementById("entropybucket").innerHTML : ''; x += x + '' + x; var r = x; - for (i = 0; i < (x).length / 25; i++) { + for (let i = 0; i < (x).length / 25; i++) { r = Crypto.SHA256(r.concat(x)); } var checkrBigInt = new BigInteger(r); @@ -8565,7 +8565,7 @@ var r = ""; var l = length || 25; var chars = "!$%^&*()_+{}:@~?><|\./;'#][=-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; - for (x = 0; x < l; x++) { + for (let x = 0; x < l; x++) { r += chars.charAt(Math.floor(Math.random() * 62)); } return r; From 9dd132b145d9d7bb47178660509e140fa23f39a8 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Thu, 28 Jul 2022 02:45:56 +0530 Subject: [PATCH 12/42] Update README.md --- README.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 17ff13a..3c47aa3 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ We are offering methods simplifying access to inbuilt browser database IndexedDB Last but not the least, we are also providing methods for simplying common operations for FLO based Distributed Application Development. # IMPORTANT -We have two versions of cloud: old cloud version is 2.0.x in floCloudAPI, and new cloud version is 2.1.x in floCloudAPI. Please check that the version in floCloudAPI is 2.1.x whenever you use floCloudAPI as we are deprecating version 2.0.x +We have two versions of cloud: old cloud version is 2.0.x in floCloudAPI, and new cloud version is >2.1.0 in floCloudAPI. Please check that the version in floCloudAPI is >2.1.0 whenever you use floCloudAPI as we are deprecating version 2.0.x # Background on FLO Distributed Applications @@ -208,6 +208,13 @@ In addition, we have these system variables outside FLO Globals but used globall 1. publickey_or_privateKey - public key or private key hex value * Returns : floID (string) +#### Calculate Address + floCrypto.getAddress(privateKey, *strict) +`getAddress` returns respective address from given private-key +1. privateKey - private key in WIF format +2. strict - boolean value (optional, default=false) (false: return flo-id if no prefix match is found) +* Returns : address (string) + #### Verify Private Key floCrypto.verifyPrivKey(privateKey, pubKey_floID, *isfloID) `verifyPrivKey` verify the private-key for the given public-key or flo-ID @@ -230,6 +237,13 @@ In addition, we have these system variables outside FLO Globals but used globall 1. floID - flo ID to validate * Returns : boolen (true or false) +#### Verify Public Key + floCrypto.verifyPubKey(publicKey, address) +`verifyPubKey` verify the public key for the given address (any blockchain) +1. publicKey - public key +2. address - address to verify +* Returns : boolen (true or false) + #### Data Encryption floCrypto.encryptData(data, publicKey) `encryptData` encrypts the given data using public-key From 4244774635e6531d20e40b0a70f878651c74b98c Mon Sep 17 00:00:00 2001 From: sairajzero Date: Wed, 3 Aug 2022 03:54:58 +0530 Subject: [PATCH 13/42] btcOperator v1.0.7 - Added createTx: Create an unsigned tx (no privkey required) [segwit sender not supported for now as redeem-script needed] - Added createMultiSigTx: Create an unsigned tx for multisig address - Optimised sendTx to reuse code (no functional change) --- btcOperator.js | 206 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 151 insertions(+), 55 deletions(-) diff --git a/btcOperator.js b/btcOperator.js index f79cdb5..b3992b6 100644 --- a/btcOperator.js +++ b/btcOperator.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //btcOperator v1.0.6 +(function(EXPORTS) { //btcOperator v1.0.7 /* BTC Crypto and API Operator */ const btcOperator = EXPORTS; @@ -187,7 +187,7 @@ case "standard": return false; case "multisig": - return coinjs.segwitAddress(btcOperator.pubkey(key)).redeemscript; + return key ? coinjs.segwitAddress(btcOperator.pubkey(key)).redeemscript : null; case "bech32": return decode.redeemscript; default: @@ -195,6 +195,53 @@ } } + function validateTxParameters(parameters) { + let invalids = []; + //sender-ids + if (parameters.senders) { + if (!Array.isArray(parameters.senders)) + parameters.senders = [parameters.senders]; + parameters.senders.forEach(id => !validateAddress(id) ? invalids.push(id) : null); + if (invalids.length) + throw "Invalid senders:" + invalids; + } + if (parameters.privkeys) { + if (!Array.isArray(parameters.privkeys)) + parameters.privkeys = [parameters.privkeys]; + if (parameters.senders.length != parameters.privkeys.length) + throw "Array length for senders and privkeys should be equal"; + parameters.senders.forEach((id, i) => { + let key = parameters.privkeys[i]; + if (!verifyKey(id, key)) //verify private-key + invalids.push(id); + if (key.length === 64) //convert Hex to WIF if needed + parameters.privkeys[i] = coinjs.privkey2wif(key); + }); + if (invalids.length) + throw "Invalid keys:" + invalids; + } + //receiver-ids (and change-id) + if (!Array.isArray(parameters.receivers)) + parameters.receivers = [parameters.receivers]; + parameters.receivers.forEach(id => !validateAddress(id) ? invalids.push(id) : null); + if (invalids.length) + throw "Invalid receivers:" + invalids; + if (parameters.change_addr && !validateAddress(parameters.change_addr)) + throw "Invalid change_address:" + parameters.change_addr; + //fee and amounts + if (typeof parameters.fee !== "number" || parameters.fee <= 0) + throw "Invalid fee:" + parameters.fee; + if (!Array.isArray(parameters.amounts)) + parameters.amounts = [parameters.amounts]; + if (parameters.receivers.length != parameters.amounts.length) + throw "Array length for receivers and amounts should be equal"; + parameters.amounts.forEach(a => typeof a !== "number" || a <= 0 ? invalids.push(a) : null); + if (invalids.length) + throw "Invalid amounts:" + invalids; + //return + return parameters; + } + function addUTXOs(tx, senders, redeemScripts, required_amount, n = 0) { return new Promise((resolve, reject) => { required_amount = parseFloat(required_amount.toFixed(8)); @@ -227,70 +274,48 @@ }) } + function addOutputs(tx, receivers, amounts, change, change_addr) { + for (let i in receivers) + tx.addoutput(receivers[i], amounts[i]); + if (parseFloat(change.toFixed(8)) > 0) + tx.addoutput(change_addr || senders[0], change); + } + btcOperator.sendTx = function(senders, privkeys, receivers, amounts, fee, change_addr = null) { return new Promise((resolve, reject) => { - //Add values into array (if single values are passed) - if (!Array.isArray(senders)) - senders = [senders]; - if (!Array.isArray(privkeys)) - privkeys = [privkeys]; - if (!Array.isArray(receivers)) - receivers = [receivers]; - if (!Array.isArray(amounts)) - amounts = [amounts]; - - let invalids = []; - //validate tx-input parameters - if (senders.length != privkeys.length) - return reject("Array length for senders and privkeys should be equal"); - const redeemScripts = [], + try { + ({ + senders, + receivers, + amounts + } = validateTxParameters({ + senders, + privkeys, + receivers, + amounts, + fee, + change_addr + })); + } catch (e) { + return reject(e) + } + let total_amount = parseFloat(amounts.reduce((t, a) => t + a, 0).toFixed(8)), + redeemScripts = [], wif_keys = []; for (let i in senders) { - if (!verifyKey(senders[i], privkeys[i])) //verify private-key - invalids.push(senders[i]); - if (privkeys[i].length === 64) //convert Hex to WIF if needed - privkeys[i] = coinjs.privkey2wif(privkeys[i]); let rs = _redeemScript(senders[i], privkeys[i]); //get redeem-script (segwit/bech32) redeemScripts.push(rs); rs === false ? wif_keys.unshift(privkeys[i]) : wif_keys.push(privkeys[i]); //sorting private-keys (wif) } - if (invalids.length) - return reject("Invalid keys:" + invalids); - if (typeof fee !== "number" || fee <= 0) - return reject("Invalid fee:" + fee); - - //validate tx-output parameters - if (receivers.length != amounts.length) - return reject("Array length for receivers and amounts should be equal"); - let total_amount = 0; - for (let i in receivers) - if (!validateAddress(receivers[i])) - invalids.push(receivers[i]); - if (invalids.length) - return reject("Invalid receivers:" + invalids); - for (let i in amounts) { - if (typeof amounts[i] !== "number" || amounts[i] <= 0) - invalids.push(amounts[i]); - else - total_amount += amounts[i]; - } - if (invalids.length) - return reject("Invalid amounts:" + invalids); - if (change_addr && !validateAddress(change_addr)) - return reject("Invalid change_address:" + change_addr); + if (redeemScripts.includes(null)) //TODO: segwit + return reject("Unable to get redeem-script"); //create transaction - var tx = coinjs.transaction(); - total_amount = parseFloat(total_amount.toFixed(8)); + const tx = coinjs.transaction(); addUTXOs(tx, senders, redeemScripts, total_amount + fee).then(result => { if (result > 0) return reject("Insufficient Balance"); - for (let i in receivers) - tx.addoutput(receivers[i], amounts[i]); - let change = parseFloat(Math.abs(result).toFixed(8)); - if (change > 0) - tx.addoutput(change_addr || senders[0], change); - console.debug("amounts (total, fee, change):", total_amount, fee, change); + addOutputs(tx, receivers, amounts, Math.abs(result), change_addr || senders[0]) console.debug("Unsigned:", tx.serialize()); new Set(wif_keys).forEach(key => console.debug("Signing key:", key, tx.sign(key, 1 /*sighashtype*/ ))); //Sign the tx using private key WIF @@ -299,9 +324,80 @@ broadcast(tx.serialize()) .then(result => resolve(result)) .catch(error => reject(error)); - }).catch(error => reject(error)) + }); }) - }; + } + + btcOperator.createTx = function(senders, receivers, amounts, fee, change_addr = null) { + return new Promise((resolve, reject) => { + try { + ({ + senders, + receivers, + amounts + } = validateTxParameters({ + senders, + receivers, + amounts, + fee, + change_addr + })); + } catch (e) { + return reject(e) + } + let total_amount = parseFloat(amounts.reduce((t, a) => t + a, 0).toFixed(8)), + redeemScripts = senders.map(id => _redeemScript(id)); + if (redeemScripts.includes(null)) //TODO: segwit + return reject("Unable to get redeem-script"); + + //create transaction + const tx = coinjs.transaction(); + addUTXOs(tx, senders, redeemScripts, total_amount + fee).then(result => { + if (result > 0) + return reject("Insufficient Balance"); + addOutputs(tx, receivers, amounts, Math.abs(result), change_addr || senders[0]) + resolve(tx.serialize()); + }) + }) + } + + btcOperator.createMultiSigTx = function(sender, redeemScript, receivers, amounts, fee) { + return new Promise((resolve, reject) => { + + //validate tx parameters + if (validateAddress(sender) !== "multisig") + return reject("Invalid sender (multisig):" + sender); + else { + let script = coinjs.script(); + let decode = script.decodeRedeemScript(redeemScript); + if (!decode || decode.address !== sender) + return reject("Invalid redeem-script"); + } + try { + ({ + receivers, + amounts + } = validateTxParameters({ + receivers, + amounts, + fee, + change_addr + })); + } catch (e) { + return reject(e) + } + let total_amount = parseFloat(amounts.reduce((t, a) => t + a, 0).toFixed(8)) + + //create transaction + const tx = coinjs.transaction(); + addUTXOs(tx, senders, redeemScript, total_amount + fee).then(result => { + if (result > 0) + return reject("Insufficient Balance"); + addOutputs(tx, receivers, amounts, Math.abs(result), sender); + resolve(tx.serialize()); + }) + }) + } btcOperator.getTx = txid => new Promise((resolve, reject) => { fetch_api(`get_tx/BTC/${txid}`) From bc44405102096bc266ed2394e721647803d68c67 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Tue, 9 Aug 2022 03:16:51 +0530 Subject: [PATCH 14/42] btcOperator v1.0.7a - Adding auto fee calculation - Optimized the code - Fixed minor bugs --- btcOperator.js | 133 +++++++++++++++++++++++++++++++++++-------------- lib.js | 2 +- 2 files changed, 97 insertions(+), 38 deletions(-) diff --git a/btcOperator.js b/btcOperator.js index b3992b6..60f1bd9 100644 --- a/btcOperator.js +++ b/btcOperator.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //btcOperator v1.0.7 +(function(EXPORTS) { //btcOperator v1.0.7a /* BTC Crypto and API Operator */ const btcOperator = EXPORTS; @@ -16,6 +16,21 @@ }) }; + const SIGN_SIZE = 73; + + function get_fee_rate() { + return new Promise((resolve, reject) => { + fetch('https://api.blockchain.info/mempool/fees').then(response => { + if (response.ok) + response.json() + .then(result => resolve(result.regular)) + .catch(error => reject(error)); + else + reject(response); + }).catch(error => reject(error)) + }) + } + const broadcast = btcOperator.broadcast = rawtx => new Promise((resolve, reject) => { $.ajax({ type: "POST", @@ -229,7 +244,7 @@ if (parameters.change_addr && !validateAddress(parameters.change_addr)) throw "Invalid change_address:" + parameters.change_addr; //fee and amounts - if (typeof parameters.fee !== "number" || parameters.fee <= 0) + if ((typeof parameters.fee !== "number" || parameters.fee <= 0) && parameters.fee !== null) //fee = null (auto calc) throw "Invalid fee:" + parameters.fee; if (!Array.isArray(parameters.amounts)) parameters.amounts = [parameters.amounts]; @@ -242,6 +257,32 @@ return parameters; } + const TMP_FEE = 0.00001; + + function createTransaction(senders, redeemScripts, receivers, amounts, fee, change_addr) { + let auto_fee = false, + total_amount = parseFloat(amounts.reduce((t, a) => t + a, 0).toFixed(8)); + if (fee === null) { + auto_fee = true; + fee = TMP_FEE; + } + const tx = coinjs.transaction(); + addUTXOs(tx, senders, redeemScripts, total_amount + fee).then(result => { + if (result > 0) + return reject("Insufficient Balance"); + let change = addOutputs(tx, receivers, amounts, Math.abs(result), change_addr); + if (!auto_fee) + return resolve(tx); + autoFeeCalc(tx).then(fee_calc => { + fee = Math.round((fee * 1) * 1e8); //satoshi convertion + if (!change) + tx.addoutput(change_addr, 0); + editFee(tx, fee, fee_calc); + resolve(tx); + }).catch(error => reject(error)) + }) + } + function addUTXOs(tx, senders, redeemScripts, required_amount, n = 0) { return new Promise((resolve, reject) => { required_amount = parseFloat(required_amount.toFixed(8)); @@ -277,8 +318,47 @@ function addOutputs(tx, receivers, amounts, change, change_addr) { for (let i in receivers) tx.addoutput(receivers[i], amounts[i]); - if (parseFloat(change.toFixed(8)) > 0) - tx.addoutput(change_addr || senders[0], change); + if (parseFloat(change.toFixed(8)) > 0) { + tx.addoutput(change_addr, change); + return true; + } else + return false; + + } + + function autoFeeCalc(tx) { + return new Promise((resolve, reject) => { + get_fee_rate().then(fee_rate => { + let tx_size = tx.size(); + for (var i = 0; i < this.ins.length; i++) + switch (tx.extractScriptKey(i).type) { + case 'scriptpubkey': + tx_size += SIGN_SIZE; + break; + case 'segwit': + case 'multisig': + tx_size += SIGN_SIZE * 0.25; + break; + default: + console.warn('Unknown script-type'); + tx_size += SIGN_SIZE; + } + resolve(tx_size * fee_rate); + }).catch(error => reject(error)) + }) + } + + function editFee(tx, current_fee, target_fee, index = -1) { + //values are in satoshi + index = parseInt(index >= 0 ? index : tx.out.length - index); + if (index < 0 || index >= tx.out.length) + throw "Invalid index"; + let edit_value = parseInt(current_fee - target_fee), //rip of any decimal places + current_value = tx.out[index].value; //could be BigInterger + if (edit_value < 0 && edit_value > current_value) + throw "Insufficient value at vout"; + tx.out[index].value = current_value instanceof BigInteger ? + current_value.add(new BigInteger('' + edit_value)) : parseInt(current_value + edit_value); } btcOperator.sendTx = function(senders, privkeys, receivers, amounts, fee, change_addr = null) { @@ -299,8 +379,7 @@ } catch (e) { return reject(e) } - let total_amount = parseFloat(amounts.reduce((t, a) => t + a, 0).toFixed(8)), - redeemScripts = [], + let redeemScripts = [], wif_keys = []; for (let i in senders) { let rs = _redeemScript(senders[i], privkeys[i]); //get redeem-script (segwit/bech32) @@ -309,26 +388,20 @@ } if (redeemScripts.includes(null)) //TODO: segwit return reject("Unable to get redeem-script"); - //create transaction - const tx = coinjs.transaction(); - addUTXOs(tx, senders, redeemScripts, total_amount + fee).then(result => { - if (result > 0) - return reject("Insufficient Balance"); - addOutputs(tx, receivers, amounts, Math.abs(result), change_addr || senders[0]) + createTransaction(senders, redeemScripts, receivers, amounts, fee, change_addr || senders[0]).then(tx => { console.debug("Unsigned:", tx.serialize()); new Set(wif_keys).forEach(key => console.debug("Signing key:", key, tx.sign(key, 1 /*sighashtype*/ ))); //Sign the tx using private key WIF - console.debug("Signed:", tx.serialize()); debugger; broadcast(tx.serialize()) .then(result => resolve(result)) .catch(error => reject(error)); - }); + }).catch(error => reject(error)); }) } - btcOperator.createTx = function(senders, receivers, amounts, fee, change_addr = null) { + btcOperator.createTx = function(senders, receivers, amounts, fee = null, change_addr = null) { return new Promise((resolve, reject) => { try { ({ @@ -345,25 +418,18 @@ } catch (e) { return reject(e) } - let total_amount = parseFloat(amounts.reduce((t, a) => t + a, 0).toFixed(8)), - redeemScripts = senders.map(id => _redeemScript(id)); + let redeemScripts = senders.map(id => _redeemScript(id)); if (redeemScripts.includes(null)) //TODO: segwit return reject("Unable to get redeem-script"); - //create transaction - const tx = coinjs.transaction(); - addUTXOs(tx, senders, redeemScripts, total_amount + fee).then(result => { - if (result > 0) - return reject("Insufficient Balance"); - addOutputs(tx, receivers, amounts, Math.abs(result), change_addr || senders[0]) - resolve(tx.serialize()); - }) + createTransaction(senders, redeemScripts, receivers, amounts, fee, change_addr || senders[0]) + .then(tx => resolve(tx.serialize())) + .catch(error => reject(error)) }) } btcOperator.createMultiSigTx = function(sender, redeemScript, receivers, amounts, fee) { return new Promise((resolve, reject) => { - //validate tx parameters if (validateAddress(sender) !== "multisig") return reject("Invalid sender (multisig):" + sender); @@ -380,22 +446,15 @@ } = validateTxParameters({ receivers, amounts, - fee, - change_addr + fee })); } catch (e) { return reject(e) } - let total_amount = parseFloat(amounts.reduce((t, a) => t + a, 0).toFixed(8)) - //create transaction - const tx = coinjs.transaction(); - addUTXOs(tx, senders, redeemScript, total_amount + fee).then(result => { - if (result > 0) - return reject("Insufficient Balance"); - addOutputs(tx, receivers, amounts, Math.abs(result), sender); - resolve(tx.serialize()); - }) + createTransaction([sender], [redeemScript], receivers, amounts, fee, sender) + .then(tx => resolve(tx.serialize())) + .catch(error => reject(error)) }) } diff --git a/lib.js b/lib.js index 26311f0..d2fd11d 100644 --- a/lib.js +++ b/lib.js @@ -6676,7 +6676,7 @@ throw "Invalid checksum"; } } catch (e) { - bech32rs = coinjs.bech32redeemscript(addr); + let bech32rs = coinjs.bech32redeemscript(addr); if (bech32rs) { return { 'type': 'bech32', From 91e6b823872963c6f82d31b39192adc7c6be9aef Mon Sep 17 00:00:00 2001 From: sairajzero Date: Wed, 10 Aug 2022 02:58:36 +0530 Subject: [PATCH 15/42] btcOperator v1.0.7b - Added: signTx - Added multiSigAddress --- btcOperator.js | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/btcOperator.js b/btcOperator.js index 60f1bd9..170be20 100644 --- a/btcOperator.js +++ b/btcOperator.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //btcOperator v1.0.7a +(function(EXPORTS) { //btcOperator v1.0.7b /* BTC Crypto and API Operator */ const btcOperator = EXPORTS; @@ -94,6 +94,14 @@ return false; } + btcOperator.multiSigAddress = function(pubKeys, minRequired) { + if (!Array.isArray(pubKeys)) + throw "pubKeys must be an array of public keys"; + else if (pubKeys.length < minRequired) + throw "minimum required should be less than the number of pubKeys"; + return coinjs.pubkeys2MultisigAddress(pubKeys, minRequired); + } + //convert from one blockchain to another blockchain (target version) btcOperator.convert = {}; @@ -323,7 +331,6 @@ return true; } else return false; - } function autoFeeCalc(tx) { @@ -366,6 +373,7 @@ try { ({ senders, + privkeys, receivers, amounts } = validateTxParameters({ @@ -458,6 +466,25 @@ }) } + btcOperator.signTx = function(tx, privKeys) { + if (typeof tx === 'string' || Array.isArray(tx)) { + try { + tx = coinjs.transaction().deserialize(tx); + } catch { + throw "Invalid transaction hex"; + } + } else if (typeof tx !== 'object' || typeof tx.sign !== 'function') + throw "Invalid transaction object"; + + if (!Array.isArray(privkeys)) + privkeys = [privkeys]; + for (let i in privKeys) + if (privKeys[i].length === 64) + privkeys[i] = coinjs.privkey2wif(privKeys[i]); + new Set(privKeys).forEach(key => console.debug("Signing key:", key, tx.sign(key, 1 /*sighashtype*/ ))); //Sign the tx using private key WIF + return tx.serialize(); + } + btcOperator.getTx = txid => new Promise((resolve, reject) => { fetch_api(`get_tx/BTC/${txid}`) .then(result => resolve(result.data)) From 45878e6ebe3d8f8aecd81d02ad17fd977e7896ad Mon Sep 17 00:00:00 2001 From: sairajzero Date: Sun, 14 Aug 2022 18:38:29 +0530 Subject: [PATCH 16/42] Update floDapps.js - myFloID, myPubKey, myPrivKey will now return undefined when user not logged in --- floDapps.js | 50 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/floDapps.js b/floDapps.js index 556e7fe..e2435a8 100644 --- a/floDapps.js +++ b/floDapps.js @@ -1,16 +1,26 @@ -(function(EXPORTS) { //floDapps v2.3.2a +(function(EXPORTS) { //floDapps v2.3.2b /* General functions for FLO Dapps*/ 'use strict'; const floDapps = EXPORTS; const DEFAULT = { - get root() { - return "floDapps" - }, + root: "floDapps", application: floGlobals.application, adminID: floGlobals.adminID }; + Object.defineProperties(floDapps, { + application: { + get: () => DEFAULT.application + }, + adminID: { + get: () => DEFAULT.adminID + }, + root: { + get: () => DEFAULT.root + } + }); + var user_priv_raw, aes_key, user_priv_wrap; //private variable inside capsule const raw_user = { get private() { @@ -73,16 +83,40 @@ Object.defineProperties(window, { myFloID: { - get: () => user.id + get: () => { + try { + return user.id; + } catch { + return; + } + } }, myUserID: { - get: () => user.id + get: () => { + try { + return user.id; + } catch { + return; + } + } }, myPubKey: { - get: () => user.public + get: () => { + try { + return user.public; + } catch { + return; + } + } }, myPrivKey: { - get: () => user.private + get: () => { + try { + return user.private; + } catch { + return; + } + } } }); From 36a4067d67e321ee6e7df95d9ac11c5f40201932 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Tue, 16 Aug 2022 00:37:38 +0530 Subject: [PATCH 17/42] bug fix --- floDapps.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/floDapps.js b/floDapps.js index e2435a8..1da58b8 100644 --- a/floDapps.js +++ b/floDapps.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floDapps v2.3.2b +(function(EXPORTS) { //floDapps v2.3.2c /* General functions for FLO Dapps*/ 'use strict'; const floDapps = EXPORTS; @@ -164,7 +164,7 @@ } //add other given objectStores initIndexedDB.appObs = initIndexedDB.appObs || {} - for (o in initIndexedDB.appObs) + for (let o in initIndexedDB.appObs) if (!(o in obs_a)) obs_a[o] = initIndexedDB.appObs[o] Promise.all([ @@ -456,7 +456,10 @@ Promise.all([p1, p2]) .then(r => resolve('App Startup finished successful')) .catch(e => reject('App Startup failed')) - }).catch(error => reject("App database initiation failed")) + }).catch(error => { + startUpLog(false, error); + reject("App database initiation failed") + }) }) } From 6e5cdbd820008de1b54a3926932d1af846665d91 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Tue, 16 Aug 2022 03:08:02 +0530 Subject: [PATCH 18/42] 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 --- floCloudAPI.js | 4 ++-- floCrypto.js | 61 +++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/floCloudAPI.js b/floCloudAPI.js index 01560a1..402c0c5 100644 --- a/floCloudAPI.js +++ b/floCloudAPI.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floCloudAPI v2.4.2b +(function(EXPORTS) { //floCloudAPI v2.4.2c /* FLO Cloud operations to send/request application data*/ 'use strict'; const floCloudAPI = EXPORTS; @@ -384,7 +384,7 @@ if (!address) return; var bytes; - if (address.length == 34) { //legacy encoding + 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), diff --git a/floCrypto.js b/floCrypto.js index b252169..01921d1 100644 --- a/floCrypto.js +++ b/floCrypto.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floCrypto v2.3.3a +(function(EXPORTS) { //floCrypto v2.3.3b /* FLO Crypto Operators */ 'use strict'; const floCrypto = EXPORTS; @@ -148,8 +148,23 @@ } } - Object.defineProperty(floCrypto, 'newID', { - get: () => generateNewID() + Object.defineProperties(floCrypto, { + 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 @@ -230,7 +245,7 @@ //Check if the given address (any blockchain) is valid or not 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) return false; let decode = bitjs.Base58.decode(address); @@ -262,11 +277,12 @@ return false; } + //Check the public-key for the address (any blockchain) floCrypto.verifyPubKey = function(pubKeyHex, address) { let pub_hash = Crypto.util.bytesToHex(ripemd160(Crypto.SHA256(Crypto.util.hexToBytes(pubKeyHex), { asBytes: true }))); - if (address.length == 34) { //legacy encoding + if (address.length == 33 || address.length == 34) { //legacy encoding let decode = bitjs.Base58.decode(address); var raw = decode.slice(0, decode.length - 4), checksum = decode.slice(decode.length - 4); @@ -291,6 +307,41 @@ 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 floCrypto.createShamirsSecretShares = function(str, total_shares, threshold_limit) { try { From f0a48372225babfb87d466563e97d8d7da0b6ba5 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Tue, 16 Aug 2022 03:24:55 +0530 Subject: [PATCH 19/42] btcOperator v1.0.7c - Fixed: createTransaction not returning promise - Fixed: script not correctly added for multisig inputs - Fixed: signTx throwing syntax error - Added checkSigned(tx, bool?): check if the tx is signed or not. (bool is optional, default=true, if true returns a boolean value, else returns a detailed array of input's length) - Fixed minor bugs in lib.js --- btcOperator.js | 92 ++++++++++++++++++++++++++++++++++---------------- lib.js | 8 ++--- 2 files changed, 67 insertions(+), 33 deletions(-) diff --git a/btcOperator.js b/btcOperator.js index 170be20..591cd0a 100644 --- a/btcOperator.js +++ b/btcOperator.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //btcOperator v1.0.7b +(function(EXPORTS) { //btcOperator v1.0.7c /* BTC Crypto and API Operator */ const btcOperator = EXPORTS; @@ -268,26 +268,28 @@ const TMP_FEE = 0.00001; function createTransaction(senders, redeemScripts, receivers, amounts, fee, change_addr) { - let auto_fee = false, - total_amount = parseFloat(amounts.reduce((t, a) => t + a, 0).toFixed(8)); - if (fee === null) { - auto_fee = true; - fee = TMP_FEE; - } - const tx = coinjs.transaction(); - addUTXOs(tx, senders, redeemScripts, total_amount + fee).then(result => { - if (result > 0) - return reject("Insufficient Balance"); - let change = addOutputs(tx, receivers, amounts, Math.abs(result), change_addr); - if (!auto_fee) - return resolve(tx); - autoFeeCalc(tx).then(fee_calc => { - fee = Math.round((fee * 1) * 1e8); //satoshi convertion - if (!change) - tx.addoutput(change_addr, 0); - editFee(tx, fee, fee_calc); - resolve(tx); - }).catch(error => reject(error)) + return new Promise((resolve, reject) => { + let auto_fee = false, + total_amount = parseFloat(amounts.reduce((t, a) => t + a, 0).toFixed(8)); + if (fee === null) { + auto_fee = true; + fee = TMP_FEE; + } + const tx = coinjs.transaction(); + addUTXOs(tx, senders, redeemScripts, total_amount + fee).then(result => { + if (result > 0) + return reject("Insufficient Balance"); + let change = addOutputs(tx, receivers, amounts, Math.abs(result), change_addr); + if (!auto_fee) + return resolve(tx); + autoFeeCalc(tx).then(fee_calc => { + fee = Math.round((fee * 1) * 1e8); //satoshi convertion + if (!change) + tx.addoutput(change_addr, 0); + editFee(tx, fee, fee_calc); + resolve(tx); + }).catch(error => reject(error)) + }) }) } @@ -306,14 +308,17 @@ continue; required_amount -= parseFloat(utxos[i].value); var script; - if (rs) { //redeemScript for segwit/bech32 + if (!rs || !rs.length) //legacy script + script = utxos[i].script_hex; + else if (((rs.match(/^00/) && rs.length == 44)) || (rs.length == 40 && rs.match(/^[a-f0-9]+$/gi))) { + //redeemScript for segwit/bech32 let s = coinjs.script(); s.writeBytes(Crypto.util.hexToBytes(rs)); s.writeOp(0); s.writeBytes(coinjs.numToBytes((utxos[i].value * 100000000).toFixed(0), 8)); script = Crypto.util.bytesToHex(s.buffer); - } else //legacy script - script = utxos[i].script_hex; + } else //redeemScript for multisig + script = rs; tx.addinput(utxos[i].txid, utxos[i].output_no, script, 0xfffffffd /*sequence*/ ); //0xfffffffd for Replace-by-fee } addUTXOs(tx, senders, redeemScripts, required_amount, n + 1) @@ -466,7 +471,7 @@ }) } - btcOperator.signTx = function(tx, privKeys) { + function deserializeTx(tx) { if (typeof tx === 'string' || Array.isArray(tx)) { try { tx = coinjs.transaction().deserialize(tx); @@ -475,16 +480,45 @@ } } else if (typeof tx !== 'object' || typeof tx.sign !== 'function') throw "Invalid transaction object"; + return tx; + } + btcOperator.signTx = function(tx, privkeys, sighashtype = 1) { + tx = deserializeTx(tx); if (!Array.isArray(privkeys)) privkeys = [privkeys]; - for (let i in privKeys) - if (privKeys[i].length === 64) - privkeys[i] = coinjs.privkey2wif(privKeys[i]); - new Set(privKeys).forEach(key => console.debug("Signing key:", key, tx.sign(key, 1 /*sighashtype*/ ))); //Sign the tx using private key WIF + for (let i in privkeys) + if (privkeys[i].length === 64) + privkeys[i] = coinjs.privkey2wif(privkeys[i]); + new Set(privkeys).forEach(key => tx.sign(key, sighashtype)); //Sign the tx using private key WIF return tx.serialize(); } + btcOperator.checkSigned = function(tx, bool = true) { + tx = deserializeTx(tx); + let n = []; + for (let i in tx.ins) { + var s = tx.extractScriptKey(i); + if (s['type'] !== 'multisig') + n.push(s.signed == 'true' || (tx.witness[i] && tx.witness[i].length == 2)) + else { + var rs = coinjs.script().decodeRedeemScript(s.script); + let x = { + s: s['signatures'], + r: rs['signaturesRequired'], + t: rs['pubkeys'].length + }; + if (x.r > x.t) + throw "signaturesRequired is more than publicKeys"; + else if (x.s < x.r) + n.push(x); + else + n.push(true); + } + } + return bool ? !(n.filter(x => x !== true).length) : n; + } + btcOperator.getTx = txid => new Promise((resolve, reject) => { fetch_api(`get_tx/BTC/${txid}`) .then(result => resolve(result.data)) diff --git a/lib.js b/lib.js index d2fd11d..1ae4ca2 100644 --- a/lib.js +++ b/lib.js @@ -1,4 +1,4 @@ -(function(GLOBAL) { //lib v1.3.0b +(function(GLOBAL) { //lib v1.3.0c 'use strict'; /* Utility Libraries required for Standard operations * All credits for these codes belong to their respective creators, moderators and owners. @@ -7814,7 +7814,7 @@ } else if (this.ins[index].script.chunks[0] == 0 && this.ins[index].script.chunks[this.ins[index].script.chunks.length - 1][this.ins[index].script.chunks[this.ins[index].script.chunks.length - 1].length - 1] == 174) { // OP_CHECKMULTISIG // multisig script, with signature(s) included var sigcount = 0; - for (i = 1; i < this.ins[index].script.chunks.length - 1; i++) { + for (let i = 1; i < this.ins[index].script.chunks.length - 1; i++) { if (this.ins[index].script.chunks[i] != 0) { sigcount++; } @@ -8057,8 +8057,8 @@ s.writeOp(0); - for (x in pubkeyList) { - for (y in sigsList) { + for (let x in pubkeyList) { + for (let y in sigsList) { this.ins[index].script.buffer = redeemScript; sighash = Crypto.util.hexToBytes(this.transactionHash(index, sigsList[y].slice(-1)[0] * 1)); if (coinjs.verifySignature(sighash, sigsList[y], pubkeyList[x])) { From dc19a4e56570d6fc3e372f61b63382757a2b5690 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Tue, 16 Aug 2022 17:30:46 +0530 Subject: [PATCH 20/42] Bug fixes: floBlockchainAPI and lib.js --- floBlockchainAPI.js | 14 +++++++------- lib.js | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/floBlockchainAPI.js b/floBlockchainAPI.js index 8cf3a79..d250f86 100644 --- a/floBlockchainAPI.js +++ b/floBlockchainAPI.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floBlockchainAPI v2.3.3a +(function(EXPORTS) { //floBlockchainAPI v2.3.3b /* FLO Blockchain Operator to send/receive data from blockchain using API calls*/ 'use strict'; const floBlockchainAPI = EXPORTS; @@ -6,7 +6,7 @@ const DEFAULT = { blockchain: floGlobals.blockchain, apiURL: { - FLO: ['https://livenet.flocha.in/', 'https://flosight.duckdns.org/'], + FLO: ['https://flosight.duckdns.org/'], FLO_TEST: ['https://testnet-flosight.duckdns.org', 'https://testnet.flocha.in/'] }, sendAmt: 0.001, @@ -49,7 +49,7 @@ const allServerList = new Set(floGlobals.apiURL && floGlobals.apiURL[DEFAULT.blockchain] ? floGlobals.apiURL[DEFAULT.blockchain] : DEFAULT.apiURL[DEFAULT.blockchain]); var serverList = Array.from(allServerList); - var curPos = floCrypto.randInt(0, serverList - 1); + var curPos = floCrypto.randInt(0, serverList.length - 1); function fetch_retry(apicall, rm_flosight) { return new Promise((resolve, reject) => { @@ -371,18 +371,18 @@ }) //Calculate totalSentAmount and check if totalBalance is sufficient let totalSendAmt = totalFee; - for (floID in receivers) + for (let floID in receivers) totalSendAmt += receivers[floID]; if (totalBalance < totalSendAmt) return reject("Insufficient total Balance"); //Get the UTXOs of the senders let promises = []; - for (floID in senders) + for (let floID in senders) promises.push(promisedAPI(`api/addr/${floID}/utxo`)); Promise.all(promises).then(results => { let wifSeq = []; var trx = bitjs.transaction(); - for (floID in senders) { + for (let floID in senders) { let utxos = results.shift(); let sendAmt; if (preserveRatio) { @@ -406,7 +406,7 @@ if (change > 0) trx.addoutput(floID, change); } - for (floID in receivers) + for (let floID in receivers) trx.addoutput(floID, receivers[floID]); trx.addflodata(floData.replace(/\n/g, ' ')); for (let i = 0; i < wifSeq.length; i++) diff --git a/lib.js b/lib.js index 1ae4ca2..6fc8af8 100644 --- a/lib.js +++ b/lib.js @@ -1,4 +1,4 @@ -(function(GLOBAL) { //lib v1.3.0c +(function(GLOBAL) { //lib v1.3.0d 'use strict'; /* Utility Libraries required for Standard operations * All credits for these codes belong to their respective creators, moderators and owners. @@ -4782,8 +4782,8 @@ } else if (floDataCount < 253) { floDataCountString = floDataCount.toString(16); } else if (floDataCount <= 1040) { - floDataCountAdjusted = (floDataCount - 253) + parseInt("0xfd00fd"); - floDataCountStringAdjusted = floDataCountAdjusted.toString(16); + let floDataCountAdjusted = (floDataCount - 253) + parseInt("0xfd00fd"); + let floDataCountStringAdjusted = floDataCountAdjusted.toString(16); floDataCountString = floDataCountStringAdjusted.substr(0, 2) + floDataCountStringAdjusted.substr(4, 2) + floDataCountStringAdjusted.substr(2, 2); } else { floDataCountString = "Character Limit Exceeded"; From 67386fd69f45610c1c02912828d24ce9d654282c Mon Sep 17 00:00:00 2001 From: sairajzero Date: Tue, 16 Aug 2022 20:39:49 +0530 Subject: [PATCH 21/42] Update btcOperator.js - Added checkIfSameTx(tx1, tx2): checks if the transactions is of the same --- btcOperator.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/btcOperator.js b/btcOperator.js index 591cd0a..aff13ee 100644 --- a/btcOperator.js +++ b/btcOperator.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //btcOperator v1.0.7c +(function(EXPORTS) { //btcOperator v1.0.8 /* BTC Crypto and API Operator */ const btcOperator = EXPORTS; @@ -519,6 +519,20 @@ return bool ? !(n.filter(x => x !== true).length) : n; } + btcOperator.checkIfSameTx = function(tx1, tx2) { + tx1 = deserializeTx(tx1); + tx2 = deserializeTx(tx2); + if (tx1.ins.length !== tx2.ins.length || tx1.outs.length !== tx2.outs.length) + return false; + for (let i = 0; i < tx1.ins.length; i++) + if (tx1.ins[i].outpoint.hash !== tx2.ins[i].outpoint.hash || tx1.ins[i].outpoint.index !== tx2.ins[i].outpoint.index) + return false; + for (let i = 0; i < tx2.ins.length; i++) + if (tx1.outs[i].value !== tx2.outs[i].value || Crypto.util.bytesToHex(tx1.outs[i].script.buffer) !== Crypto.util.bytesToHex(tx2.outs[i].script.buffer)) + return false; + return true; + } + btcOperator.getTx = txid => new Promise((resolve, reject) => { fetch_api(`get_tx/BTC/${txid}`) .then(result => resolve(result.data)) From 7b5a5e6bfe369c4a58dfd0abcf64951747da9051 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Sun, 21 Aug 2022 21:14:29 +0530 Subject: [PATCH 22/42] Bug fixes and improvements floCrypto v2.3.3b floCloudAPI v2.4.2d floDapps v2.3.2d --- floCloudAPI.js | 5 +- floCrypto.js | 121 ++++++++++++++++++++++++------------------------- floDapps.js | 34 ++++++++++++-- 3 files changed, 90 insertions(+), 70 deletions(-) diff --git a/floCloudAPI.js b/floCloudAPI.js index 402c0c5..1fafb51 100644 --- a/floCloudAPI.js +++ b/floCloudAPI.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floCloudAPI v2.4.2c +(function(EXPORTS) { //floCloudAPI v2.4.2d /* FLO Cloud operations to send/request application data*/ 'use strict'; const floCloudAPI = EXPORTS; @@ -317,6 +317,7 @@ data => { data = objectifier(data); let filtered = {}, + proxy = proxyID(request.receiverID), r = request; for (let v in data) { let d = data[v]; @@ -325,7 +326,7 @@ (r.atVectorClock || !r.upperVectorClock || r.upperVectorClock >= v) && (!r.afterTime || r.afterTime < d.log_time) && r.application == d.application && - r.receiverID == d.receiverID && + (proxy == d.receiverID || proxy == d.proxyID) && (!r.comment || r.comment == d.comment) && (!r.type || r.type == d.type) && (!r.senderID || r.senderID.includes(d.senderID))) diff --git a/floCrypto.js b/floCrypto.js index 01921d1..025f698 100644 --- a/floCrypto.js +++ b/floCrypto.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floCrypto v2.3.3b +(function(EXPORTS) { //floCrypto v2.3.3c /* FLO Crypto Operators */ 'use strict'; const floCrypto = EXPORTS; @@ -245,101 +245,96 @@ //Check if the given address (any blockchain) is valid or not floCrypto.validateAddr = function(address, std = true, bech = true) { - if (address.length == 33 || address.length == 34) { //legacy or segwit encoding - if (std === false) + let raw = decodeAddress(address); + if (!raw) + return false; + if (typeof raw.version !== 'undefined') { //legacy or segwit + if (std == false) return false; - let decode = bitjs.Base58.decode(address); - var raw = decode.slice(0, decode.length - 4), - checksum = decode.slice(decode.length - 4); - var hash = Crypto.SHA256(Crypto.SHA256(raw, { - asBytes: true - }), { - asBytes: true - }); - if (hash[0] != checksum[0] || hash[1] != checksum[1] || hash[2] != checksum[2] || hash[3] != checksum[3]) - return false; - else if (std === true || (!Array.isArray(std) && std === raw[0]) || (Array.isArray(std) && std.includes(raw[0]))) + else if (std === true || (!Array.isArray(std) && std === raw.version) || (Array.isArray(std) && std.includes(raw.version))) return true; else return false; - } else if (address.length == 42 || address.length == 62) { //bech encoding + } else if (typeof raw.bech_version !== 'undefined') { //bech32 if (bech === false) return false; - let decode = coinjs.bech32_decode(address); - if (!decode) - return false; - var raw = decode.data; - if (bech === true || (!Array.isArray(bech) && bech === raw[0]) || (Array.isArray(bech) && bech.includes(raw[0]))) + else if (bech === true || (!Array.isArray(bech) && bech === raw.bech_version) || (Array.isArray(bech) && bech.includes(raw.bech_version))) return true; else return false; - } else //unknown length + } else //unknown return false; } //Check the public-key for the address (any blockchain) floCrypto.verifyPubKey = function(pubKeyHex, address) { - let pub_hash = Crypto.util.bytesToHex(ripemd160(Crypto.SHA256(Crypto.util.hexToBytes(pubKeyHex), { - asBytes: true - }))); - if (address.length == 33 || address.length == 34) { //legacy encoding - let decode = bitjs.Base58.decode(address); - var raw = decode.slice(0, decode.length - 4), - checksum = decode.slice(decode.length - 4); - var hash = Crypto.SHA256(Crypto.SHA256(raw, { + let raw = decodeAddress(address), + pub_hash = Crypto.util.bytesToHex(ripemd160(Crypto.SHA256(Crypto.util.hexToBytes(pubKeyHex), { asBytes: true - }), { - asBytes: true - }); - if (hash[0] != checksum[0] || hash[1] != checksum[1] || hash[2] != checksum[2] || hash[3] != checksum[3]) - return false; - raw.shift(); - return pub_hash === Crypto.util.bytesToHex(raw); - } else if (address.length == 42 || address.length == 62) { //bech encoding - let decode = coinjs.bech32_decode(address); - if (!decode) - return false; - var raw = decode.data; - raw.shift(); - raw = coinjs.bech32_convert(raw, 5, 8, false); - return pub_hash === Crypto.util.bytesToHex(raw); - } else //unknown length - return false; + }))); + return raw ? pub_hash === raw.hex : 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 raw = decodeAddress(address); + if (!raw) + return; + raw.bytes.unshift(bitjs.pub); + let hash = Crypto.SHA256(Crypto.SHA256(raw.bytes, { + asBytes: true + }), { + asBytes: true + }); + return bitjs.Base58.encode(raw.bytes.concat(hash.slice(0, 4))); + } + + //Checks if the given addresses (any blockchain) are same (w.r.t keys) + floCrypto.isSameAddr = function(addr1, addr2) { + if (!addr1 || !addr2) + return; + let raw1 = decodeAddress(addr1), + raw2 = decodeAddress(addr2); + if (!raw1 || !raw2) + return false; + else + return raw1.hex === raw2.hex; + } + + const decodeAddress = floCrypto.decodeAddr = function(address) { + if (!address) + return; + else if (address.length == 33 || address.length == 34) { //legacy encoding let decode = bitjs.Base58.decode(address); - bytes = decode.slice(0, decode.length - 4); + let 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(); + return (hash[0] != checksum[0] || hash[1] != checksum[1] || hash[2] != checksum[2] || hash[3] != checksum[3]) ? null : { + version: bytes.shift(), + hex: Crypto.util.bytesToHex(bytes), + bytes + } } else if (address.length == 42) { //bech encoding let decode = coinjs.bech32_decode(address); if (decode) { - bytes = decode.data; - bytes.shift(); + let bytes = decode.data; + let bech_version = bytes.shift(); bytes = coinjs.bech32_convert(bytes, 5, 8, false); - } + return { + bech_version, + hrp: decode.hrp, + hex: Crypto.util.bytesToHex(bytes), + bytes + } + } else + return null; } - 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 diff --git a/floDapps.js b/floDapps.js index 1da58b8..38ee0b4 100644 --- a/floDapps.js +++ b/floDapps.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floDapps v2.3.2c +(function(EXPORTS) { //floDapps v2.3.2d /* General functions for FLO Dapps*/ 'use strict'; const floDapps = EXPORTS; @@ -63,7 +63,7 @@ return Crypto.AES.decrypt(data, raw_user.private); }, get db_name() { - return "floDapps#" + user.id; + return "floDapps#" + floCrypto.toFloID(user.id); }, lock() { user_private = user_priv_wrap; @@ -72,6 +72,30 @@ if (await user.private === raw_user.private) user_private = user_priv_raw; }, + get_contact(id) { + if (!user.contacts) + throw "Contacts not available"; + else if (user.contacts[id]) + return user.contacts[id]; + else { + let id_raw = floCrypto.decodeAddr(id).hex; + for (let i in user.contacts) + if (floCrypto.decodeAddr(i).hex == id_raw) + return user.contacts[i]; + } + }, + get_pubKey(id) { + if (!user.pubKeys) + throw "Contacts not available"; + else if (user.pubKeys[id]) + return user.pubKeys[id]; + else { + let id_raw = floCrypto.decodeAddr(id).hex; + for (let i in user.pubKeys) + if (floCrypto.decodeAddr(i).hex == id_raw) + return user.pubKeys[i]; + } + }, clear() { user_id = user_public = user_private = undefined; user_priv_raw = aes_key = undefined; @@ -475,7 +499,7 @@ floDapps.storeContact = function(floID, name) { return new Promise((resolve, reject) => { - if (!floCrypto.validateFloID(floID)) + if (!floCrypto.validateAddr(floID)) return reject("Invalid floID!") compactIDB.writeData("contacts", name, floID, user.db_name).then(result => { user.contacts[floID] = name; @@ -488,9 +512,9 @@ return new Promise((resolve, reject) => { if (floID in user.pubKeys) return resolve("pubKey already stored") - if (!floCrypto.validateFloID(floID)) + if (!floCrypto.validateAddr(floID)) return reject("Invalid floID!") - if (floCrypto.getFloID(pubKey) != floID) + if (!floCrypto.verifyPubKey(pubKey, floID)) return reject("Incorrect pubKey") compactIDB.writeData("pubKeys", pubKey, floID, user.db_name).then(result => { user.pubKeys[floID] = pubKey; From 77ff76d787c0458795b9fe38c79a27c46a2b10bd Mon Sep 17 00:00:00 2001 From: sairajzero Date: Mon, 22 Aug 2022 22:06:14 +0530 Subject: [PATCH 23/42] Replacing Math.random with securedMathRandom --- floCrypto.js | 6 ++-- lib.js | 89 +++++++++++++++++++++++++++++----------------------- 2 files changed, 53 insertions(+), 42 deletions(-) diff --git a/floCrypto.js b/floCrypto.js index 025f698..6671ffa 100644 --- a/floCrypto.js +++ b/floCrypto.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floCrypto v2.3.3c +(function(EXPORTS) { //floCrypto v2.3.3d /* FLO Crypto Operators */ 'use strict'; const floCrypto = EXPORTS; @@ -81,7 +81,7 @@ floCrypto.randInt = function(min, max) { min = Math.ceil(min); max = Math.floor(max); - return Math.floor(Math.random() * (max - min + 1)) + min; + return Math.floor(securedMathRandom() * (max - min + 1)) + min; } //generate a random String within length (options : alphaNumeric chars only) @@ -90,7 +90,7 @@ var characters = alphaNumeric ? 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789' : 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_+-./*?@#&$<>=[]{}():'; for (var i = 0; i < length; i++) - result += characters.charAt(Math.floor(Math.random() * characters.length)); + result += characters.charAt(Math.floor(securedMathRandom() * characters.length)); return result; } diff --git a/lib.js b/lib.js index 6fc8af8..b435194 100644 --- a/lib.js +++ b/lib.js @@ -1,4 +1,4 @@ -(function(GLOBAL) { //lib v1.3.0d +(function(GLOBAL) { //lib v1.3.1 'use strict'; /* Utility Libraries required for Standard operations * All credits for these codes belong to their respective creators, moderators and owners. @@ -6,6 +6,37 @@ */ GLOBAL.cryptocoin = (typeof floGlobals === 'undefined' ? null : floGlobals.blockchain) || 'FLO'; + const getRandomBytes = (function() { + if (typeof require === 'function') { + const crypto = require('crypto'); + return function(buf) { + var bytes = crypto.randomBytes(buf.length); + buf.set(bytes); + return buf; + } + } else if (GLOBAL.crypto && GLOBAL.crypto.getRandomValues) { + return function(buf) { + return GLOBAL.crypto.getRandomValues(buf); + } + } else + throw Error('Unable to define getRandomBytes'); + })(); + + + GLOBAL.securedMathRandom = (function() { + if (typeof require === 'function') { + const crypto = require('crypto'); + return function() { + return crypto.randomBytes(4).readUInt32LE() / 0xffffffff; + } + } else if (GLOBAL.crypto && GLOBAL.crypto.getRandomValues) { + return function() { + return (GLOBAL.crypto.getRandomValues(new Uint32Array(1))[0] / 0xffffffff); + } + } else + throw Error('Unable to define securedMathRandom'); + })(); + //Crypto.js (function() { // Global Crypto object @@ -52,7 +83,7 @@ // Generate an array of any length of random bytes randomBytes: function(n) { for (var bytes = []; n > 0; n--) - bytes.push(Math.floor(Math.random() * 256)); + bytes.push(Math.floor(securedMathRandom() * 256)); return bytes; }, @@ -405,16 +436,6 @@ //SecureRandom.js (function() { - const getRandomValues = function(buf) { - if (typeof require === 'function') { - var bytes = require('crypto').randomBytes(buf.length); - buf.set(bytes) - return buf; - } else if (GLOBAL.crypto && GLOBAL.crypto.getRandomValues) - return GLOBAL.crypto.getRandomValues(buf); - else - return null; - } /*! * Random number generator with ArcFour PRNG @@ -446,10 +467,10 @@ // ba: byte array sr.prototype.nextBytes = function(ba) { var i; - if (getRandomValues && GLOBAL.Uint8Array) { + if (getRandomBytes && GLOBAL.Uint8Array) { try { var rvBytes = new Uint8Array(ba.length); - getRandomValues(rvBytes); + getRandomBytes(rvBytes); for (i = 0; i < ba.length; ++i) ba[i] = sr.getByte() ^ rvBytes[i]; return; @@ -549,23 +570,23 @@ sr.pool = new Array(); sr.pptr = 0; var t; - if (getRandomValues && GLOBAL.Uint8Array) { + if (getRandomBytes && GLOBAL.Uint8Array) { try { // Use webcrypto if available var ua = new Uint8Array(sr.poolSize); - getRandomValues(ua); + getRandomBytes(ua); for (t = 0; t < sr.poolSize; ++t) sr.pool[sr.pptr++] = ua[t]; } catch (e) { alert(e); } } - while (sr.pptr < sr.poolSize) { // extract some randomness from Math.random() - t = Math.floor(65536 * Math.random()); + while (sr.pptr < sr.poolSize) { // extract some randomness from securedMathRandom() + t = Math.floor(65536 * securedMathRandom()); sr.pool[sr.pptr++] = t >>> 8; sr.pool[sr.pptr++] = t & 255; } - sr.pptr = Math.floor(sr.poolSize * Math.random()); + sr.pptr = Math.floor(sr.poolSize * securedMathRandom()); sr.seedTime(); // entropy var entropyStr = ""; @@ -1654,7 +1675,7 @@ var a = nbi(); for (var i = 0; i < t; ++i) { //Pick bases at random, instead of starting at 2 - a.fromInt(lowprimes[Math.floor(Math.random() * lowprimes.length)]); + a.fromInt(lowprimes[Math.floor(securedMathRandom() * lowprimes.length)]); var y = a.modPow(r, this); if (y.compareTo(BigInteger.ONE) != 0 && y.compareTo(n1) != 0) { var j = 1; @@ -2612,7 +2633,7 @@ pad: function(cipher, message) { var reqd = _requiredPadding(cipher, message); for (var i = 1; i < reqd; i++) { - message.push(Math.floor(Math.random() * 256)); + message.push(Math.floor(securedMathRandom() * 256)); } message.push(reqd); }, @@ -6690,7 +6711,7 @@ /* retreive the balance from a given address */ coinjs.addressBalance = function(address, callback) { - coinjs.ajax(coinjs.host + '?uid=' + coinjs.uid + '&key=' + coinjs.key + '&setmodule=addresses&request=bal&address=' + address + '&r=' + Math.random(), callback, "GET"); + coinjs.ajax(coinjs.host + '?uid=' + coinjs.uid + '&key=' + coinjs.key + '&setmodule=addresses&request=bal&address=' + address + '&r=' + securedMathRandom(), callback, "GET"); } /* decompress an compressed public key */ @@ -7469,12 +7490,12 @@ /* list unspent transactions */ r.listUnspent = function(address, callback) { - coinjs.ajax(coinjs.host + '?uid=' + coinjs.uid + '&key=' + coinjs.key + '&setmodule=addresses&request=unspent&address=' + address + '&r=' + Math.random(), callback, "GET"); + coinjs.ajax(coinjs.host + '?uid=' + coinjs.uid + '&key=' + coinjs.key + '&setmodule=addresses&request=unspent&address=' + address + '&r=' + securedMathRandom(), callback, "GET"); } /* list transaction data */ r.getTransaction = function(txid, callback) { - coinjs.ajax(coinjs.host + '?uid=' + coinjs.uid + '&key=' + coinjs.key + '&setmodule=bitcoin&request=gettransaction&txid=' + txid + '&r=' + Math.random(), callback, "GET"); + coinjs.ajax(coinjs.host + '?uid=' + coinjs.uid + '&key=' + coinjs.key + '&setmodule=bitcoin&request=gettransaction&txid=' + txid + '&r=' + securedMathRandom(), callback, "GET"); } /* add unspent to transaction */ @@ -8566,7 +8587,7 @@ var l = length || 25; var chars = "!$%^&*()_+{}:@~?><|\./;'#][=-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; for (let x = 0; x < l; x++) { - r += chars.charAt(Math.floor(Math.random() * 62)); + r += chars.charAt(Math.floor(securedMathRandom() * 62)); } return r; } @@ -8595,7 +8616,7 @@ ], // warning for insecure PRNG - warning: 'WARNING:\nA secure random number generator was not found.\nUsing Math.random(), which is NOT cryptographically strong!' + warning: 'WARNING:\nA secure random number generator was not found.\nUsing securedMathRandom(), which is NOT cryptographically strong!' }; // Protected settings object @@ -8715,7 +8736,7 @@ str = null; while (str === null) { for (var i = 0; i < elems; i++) { - arr[i] = Math.floor(Math.random() * max + 1); + arr[i] = Math.floor(securedMathRandom() * max + 1); } str = construct(bits, arr, 10, bitsPerNum); } @@ -8724,7 +8745,7 @@ }; // Warn about using insecure rng. - // Called when Math.random() is being used. + // Called when securedMathRandom() is being used. function warn() { GLOBAL['console']['warn'](defaults.warning); if (typeof GLOBAL['alert'] === 'function' && config.alert) { @@ -9148,22 +9169,12 @@ //kbucket.js (function() { - const getRandomValues = function(buf) { - if (typeof require === 'function') { - var bytes = require('crypto').randomBytes(buf.length); - buf.set(bytes) - return buf; - } else if (GLOBAL.crypto && GLOBAL.crypto.getRandomValues) - return GLOBAL.crypto.getRandomValues(buf); - else - return null; - } // Kademlia DHT K-bucket implementation as a binary tree. // by 'Tristan Slominski' under 'MIT License' GLOBAL.BuildKBucket = function KBucket(options = {}) { if (!(this instanceof KBucket)) return new KBucket(options); - this.localNodeId = options.localNodeId || getRandomValues(new Uint8Array(20)) + this.localNodeId = options.localNodeId || getRandomBytes(new Uint8Array(20)) this.numberOfNodesPerKBucket = options.numberOfNodesPerKBucket || 20 this.numberOfNodesToPing = options.numberOfNodesToPing || 3 this.distance = options.distance || this.distance From 04aad2860052220995192e59e337d4b29baabc27 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Thu, 25 Aug 2022 03:04:56 +0530 Subject: [PATCH 24/42] Improved auto-fee calc - createTx and createMultiSigTx will now resolve an object with tx_hex and other values (amount, size, etc) --- btcOperator.js | 185 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 134 insertions(+), 51 deletions(-) diff --git a/btcOperator.js b/btcOperator.js index aff13ee..9593541 100644 --- a/btcOperator.js +++ b/btcOperator.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //btcOperator v1.0.8 +(function(EXPORTS) { //btcOperator v1.0.9 /* BTC Crypto and API Operator */ const btcOperator = EXPORTS; @@ -16,14 +16,14 @@ }) }; - const SIGN_SIZE = 73; + const SATOSHI_IN_BTC = 1e8; function get_fee_rate() { return new Promise((resolve, reject) => { fetch('https://api.blockchain.info/mempool/fees').then(response => { if (response.ok) response.json() - .then(result => resolve(result.regular)) + .then(result => resolve(parseFloat((result.regular / SATOSHI_IN_BTC).toFixed(8)))) .catch(error => reject(error)); else reject(response); @@ -204,6 +204,17 @@ .catch(error => reject(error)) }); + const BASE_TX_SIZE = 12, + BASE_INPUT_SIZE = 41, + LEGACY_INPUT_SIZE = 107, + BECH32_INPUT_SIZE = 27, + SEGWIT_INPUT_SIZE = 59, + MULTISIG_INPUT_SIZE_ES = 351, + BASE_OUTPUT_SIZE = 9, + LEGACY_OUTPUT_SIZE = 25, + BECH32_OUTPUT_SIZE = 23, + SEGWIT_OUTPUT_SIZE = 23; + function _redeemScript(addr, key) { let decode = coinjs.addressDecode(addr); switch (decode.type) { @@ -218,6 +229,39 @@ } } + function _sizePerInput(addr, rs) { + switch (coinjs.addressDecode(addr).type) { + case "standard": + return BASE_INPUT_SIZE + LEGACY_INPUT_SIZE; + case "bech32": + return BASE_INPUT_SIZE + BECH32_INPUT_SIZE; + case "multisig": + switch (coinjs.script().decodeRedeemScript(rs).type) { + case "segwit__": + return BASE_INPUT_SIZE + SEGWIT_INPUT_SIZE; + case "multisig__": + return BASE_INPUT_SIZE + MULTISIG_INPUT_SIZE_ES; + default: + return null; + }; + default: + return null; + } + } + + function _sizePerOutput(addr) { + switch (coinjs.addressDecode(addr).type) { + case "standard": + return BASE_OUTPUT_SIZE + LEGACY_OUTPUT_SIZE; + case "bech32": + return BASE_OUTPUT_SIZE + BECH32_OUTPUT_SIZE; + case "multisig": + return BASE_OUTPUT_SIZE + SEGWIT_OUTPUT_SIZE; + default: + return null; + } + } + function validateTxParameters(parameters) { let invalids = []; //sender-ids @@ -265,48 +309,71 @@ return parameters; } - const TMP_FEE = 0.00001; - function createTransaction(senders, redeemScripts, receivers, amounts, fee, change_addr) { return new Promise((resolve, reject) => { - let auto_fee = false, - total_amount = parseFloat(amounts.reduce((t, a) => t + a, 0).toFixed(8)); - if (fee === null) { - auto_fee = true; - fee = TMP_FEE; - } + let total_amount = parseFloat(amounts.reduce((t, a) => t + a, 0).toFixed(8)); const tx = coinjs.transaction(); - addUTXOs(tx, senders, redeemScripts, total_amount + fee).then(result => { - if (result > 0) - return reject("Insufficient Balance"); - let change = addOutputs(tx, receivers, amounts, Math.abs(result), change_addr); - if (!auto_fee) - return resolve(tx); - autoFeeCalc(tx).then(fee_calc => { - fee = Math.round((fee * 1) * 1e8); //satoshi convertion - if (!change) - tx.addoutput(change_addr, 0); - editFee(tx, fee, fee_calc); - resolve(tx); - }).catch(error => reject(error)) - }) + let output_size = addOutputs(tx, receivers, amounts, change_addr); + addInputs(tx, senders, redeemScripts, total_amount, fee, output_size).then(result => { + if (result.change_amount > 0) + tx.outs[tx.outs.length - 1].value = parseInt(result.change_amount * SATOSHI_IN_BTC); //values are in satoshi + else + tx.outs.pop(); //remove the change output if no change_amount + result.output_size = output_size; + result.output_amount = total_amount; + result.total_size = BASE_TX_SIZE + output_size + result.input_size; + result.transaction = tx; + resolve(result); + }).catch(error => reject(error)) }) } - function addUTXOs(tx, senders, redeemScripts, required_amount, n = 0) { + function addInputs(tx, senders, redeemScripts, total_amount, fee, output_size) { + return new Promise((resolve, reject) => { + if (fee !== null) { + addUTXOs(tx, senders, redeemScripts, total_amount + fee, false).then(result => { + result.fee = fee; + resolve(result); + }).catch(error => reject(error)) + } else { + get_fee_rate().then(fee_rate => { + let net_fee = BASE_TX_SIZE * fee_rate; + net_fee += (output_size * fee_rate); + addUTXOs(tx, senders, redeemScripts, total_amount + net_fee, fee_rate).then(result => { + result.fee_amount = parseFloat((net_fee + (result.input_size * fee_rate)).toFixed(8)); + result.fee_rate = fee_rate; + resolve(result); + }).catch(error => reject(error)) + }).catch(error => reject(error)) + } + }) + } + + function addUTXOs(tx, senders, redeemScripts, required_amount, fee_rate, rec_args = {}) { return new Promise((resolve, reject) => { required_amount = parseFloat(required_amount.toFixed(8)); - if (required_amount <= 0 || n >= senders.length) - return resolve(required_amount); - let addr = senders[n], - rs = redeemScripts[n]; + if (typeof rec_args.n === "undefined") { + rec_args.n = 0; + rec_args.input_size = 0; + rec_args.input_amount = 0; + } + if (required_amount <= 0) + return resolve({ + input_size: rec_args.input_size, + input_amount: rec_args.input_amount, + change_amount: required_amount * -1 //required_amount will be -ve of change_amount + }); + else if (rec_args.n >= senders.length) + return reject("Insufficient Balance"); + let addr = senders[rec_args.n], + rs = redeemScripts[rec_args.n]; + let size_per_input = _sizePerInput(addr, rs); fetch_api(`get_tx_unspent/BTC/${addr}`).then(result => { let utxos = result.data.txs; console.debug("add-utxo", addr, rs, required_amount, utxos); for (let i = 0; i < utxos.length && required_amount > 0; i++) { if (!utxos[i].confirmations) //ignore unconfirmed utxo continue; - required_amount -= parseFloat(utxos[i].value); var script; if (!rs || !rs.length) //legacy script script = utxos[i].script_hex; @@ -315,29 +382,38 @@ let s = coinjs.script(); s.writeBytes(Crypto.util.hexToBytes(rs)); s.writeOp(0); - s.writeBytes(coinjs.numToBytes((utxos[i].value * 100000000).toFixed(0), 8)); + s.writeBytes(coinjs.numToBytes((utxos[i].value * SATOSHI_IN_BTC).toFixed(0), 8)); script = Crypto.util.bytesToHex(s.buffer); } else //redeemScript for multisig script = rs; tx.addinput(utxos[i].txid, utxos[i].output_no, script, 0xfffffffd /*sequence*/ ); //0xfffffffd for Replace-by-fee + //update track values + rec_args.input_size += size_per_input; + rec_args.input_amount += parseFloat(utxos[i].value); + required_amount -= parseFloat(utxos[i].value); + if (fee_rate) //automatic fee calculation (dynamic) + required_amount += size_per_input * fee_rate; } - addUTXOs(tx, senders, redeemScripts, required_amount, n + 1) + rec_args.n += 1; + addUTXOs(tx, senders, redeemScripts, required_amount, fee_rate, rec_args) .then(result => resolve(result)) .catch(error => reject(error)) }).catch(error => reject(error)) }) } - function addOutputs(tx, receivers, amounts, change, change_addr) { - for (let i in receivers) + function addOutputs(tx, receivers, amounts, change_addr) { + let size = 0; + for (let i in receivers) { tx.addoutput(receivers[i], amounts[i]); - if (parseFloat(change.toFixed(8)) > 0) { - tx.addoutput(change_addr, change); - return true; - } else - return false; + size += _sizePerOutput(receivers[i]); + } + tx.addoutput(change_addr, 0); + size += _sizePerOutput(change_addr); + return size; } + /* function autoFeeCalc(tx) { return new Promise((resolve, reject) => { get_fee_rate().then(fee_rate => { @@ -362,16 +438,17 @@ function editFee(tx, current_fee, target_fee, index = -1) { //values are in satoshi - index = parseInt(index >= 0 ? index : tx.out.length - index); - if (index < 0 || index >= tx.out.length) + index = parseInt(index >= 0 ? index : tx.outs.length - index); + if (index < 0 || index >= tx.outs.length) throw "Invalid index"; let edit_value = parseInt(current_fee - target_fee), //rip of any decimal places - current_value = tx.out[index].value; //could be BigInterger + current_value = tx.outs[index].value; //could be BigInterger if (edit_value < 0 && edit_value > current_value) throw "Insufficient value at vout"; - tx.out[index].value = current_value instanceof BigInteger ? + tx.outs[index].value = current_value instanceof BigInteger ? current_value.add(new BigInteger('' + edit_value)) : parseInt(current_value + edit_value); } + */ btcOperator.sendTx = function(senders, privkeys, receivers, amounts, fee, change_addr = null) { return new Promise((resolve, reject) => { @@ -402,7 +479,8 @@ if (redeemScripts.includes(null)) //TODO: segwit return reject("Unable to get redeem-script"); //create transaction - createTransaction(senders, redeemScripts, receivers, amounts, fee, change_addr || senders[0]).then(tx => { + createTransaction(senders, redeemScripts, receivers, amounts, fee, change_addr || senders[0]).then(result => { + let tx = result.transaction; console.debug("Unsigned:", tx.serialize()); new Set(wif_keys).forEach(key => console.debug("Signing key:", key, tx.sign(key, 1 /*sighashtype*/ ))); //Sign the tx using private key WIF console.debug("Signed:", tx.serialize()); @@ -435,9 +513,11 @@ if (redeemScripts.includes(null)) //TODO: segwit return reject("Unable to get redeem-script"); //create transaction - createTransaction(senders, redeemScripts, receivers, amounts, fee, change_addr || senders[0]) - .then(tx => resolve(tx.serialize())) - .catch(error => reject(error)) + createTransaction(senders, redeemScripts, receivers, amounts, fee, change_addr || senders[0]).then(result => { + result.tx_hex = result.transaction.serialize(); + delete result.transaction; + resolve(result); + }).catch(error => reject(error)) }) } @@ -465,9 +545,12 @@ return reject(e) } //create transaction - createTransaction([sender], [redeemScript], receivers, amounts, fee, sender) - .then(tx => resolve(tx.serialize())) - .catch(error => reject(error)) + createTransaction([sender], [redeemScript], receivers, amounts, fee, sender).then(result => { + result.tx_hex = result.transaction.serialize(); + delete result.transaction; + resolve(result); + }).catch(error => reject(error)) + }) } From 39d34f6e8ca61fc368ebc74f6c8cc6f2c3a17241 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Sun, 4 Sep 2022 04:09:27 +0530 Subject: [PATCH 25/42] floCloudAPI v2.4.2e - Adding generalDataset to floGlobals: returns the filtered general data set. (Parameters type and options) --- floCloudAPI.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/floCloudAPI.js b/floCloudAPI.js index 1fafb51..98dbfa6 100644 --- a/floCloudAPI.js +++ b/floCloudAPI.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floCloudAPI v2.4.2d +(function(EXPORTS) { //floCloudAPI v2.4.2e /* FLO Cloud operations to send/request application data*/ 'use strict'; const floCloudAPI = EXPORTS; @@ -79,6 +79,9 @@ get: () => generalData, set: data => generalData = data }, + generalDataset: { + value: (type, options = {}) => generalData[filterKey(type, options)] + }, lastVC: { get: () => lastVC, set: vc => lastVC = vc @@ -375,7 +378,7 @@ return JSON.parse(decodeURIComponent(escape(atob(message)))) } - const filterKey = util.filterKey = function(type, options) { + const filterKey = util.filterKey = function(type, options = {}) { return type + (options.comment ? ':' + options.comment : '') + '|' + (options.group || options.receiverID || DEFAULT.adminID) + '|' + (options.application || DEFAULT.application); @@ -1025,7 +1028,6 @@ return obj; } - const findDiff = (lhs, rhs) => ({ added: addedDiff(lhs, rhs), deleted: deletedDiff(lhs, rhs), From 084ffe10e2dd609c3ef5a40cee1b93e6602e07b0 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Sun, 11 Sep 2022 22:36:50 +0530 Subject: [PATCH 26/42] btcOperator v1.0.10: parseTransaction - Added parseTransaction: parse the given transaction Parameters: tx : transaction hex (or tx object from coinjs.transaction) Resolves: parsed object --- btcOperator.js | 52 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/btcOperator.js b/btcOperator.js index 9593541..1d0147a 100644 --- a/btcOperator.js +++ b/btcOperator.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //btcOperator v1.0.9 +(function(EXPORTS) { //btcOperator v1.0.10 /* BTC Crypto and API Operator */ const btcOperator = EXPORTS; @@ -577,7 +577,7 @@ return tx.serialize(); } - btcOperator.checkSigned = function(tx, bool = true) { + const checkSigned = btcOperator.checkSigned = function(tx, bool = true) { tx = deserializeTx(tx); let n = []; for (let i in tx.ins) { @@ -616,6 +616,54 @@ return true; } + const getTxOutput = (txid, i) => new Promise((resolve, reject) => { + fetch_api(`get_tx_outputs/BTC/${txid}/${i}`) + .then(result => resolve(result.data.outputs)) + .catch(error => reject(error)) + }); + + btcOperator.parseTransaction = function(tx) { + return new Promise((resolve, reject) => { + tx = deserializeTx(tx); + let result = {}; + let promises = []; + //Parse Inputs + for (let i = 0; i < tx.ins.length; i++) + promises.push(getTxOutput(tx.ins[i].outpoint.hash, tx.ins[i].outpoint.index)); + Promise.all(promises).then(inputs => { + result.inputs = inputs.map(inp => Object({ + address: inp.address, + value: parseFloat(inp.value) + })); + let signed = checkSigned(tx, false); + result.inputs.forEach((inp, i) => inp.signed = signed[i]); + //Parse Outputs + result.outputs = tx.outs.map(out => { + var address; + switch (out.script.chunks[0]) { + case 0: //bech32 + address = encodeBech32(Crypto.util.bytesToHex(out.script.chunks[1]), coinjs.bech32.version, coinjs.bech32.hrp); + break; + case 169: //multisig, segwit + address = encodeLegacy(Crypto.util.bytesToHex(out.script.chunks[1]), coinjs.multisig); + break; + case 118: //legacy + address = encodeLegacy(Crypto.util.bytesToHex(out.script.chunks[2]), coinjs.pub); + } + return { + address, + value: parseFloat(out.value / SATOSHI_IN_BTC) + } + }); + //Parse Totals + result.total_input = parseFloat(result.inputs.reduce((a, inp) => a += inp.value, 0).toFixed(8)); + result.total_output = parseFloat(result.outputs.reduce((a, out) => a += out.value, 0).toFixed(8)); + result.fee = parseFloat((result.total_input - result.total_output).toFixed(8)); + resolve(result); + }).catch(error => reject(error)) + }) + } + btcOperator.getTx = txid => new Promise((resolve, reject) => { fetch_api(`get_tx/BTC/${txid}`) .then(result => resolve(result.data)) From 7d84ded4260c82cb02419e0cfcfc5d39ee242923 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Fri, 30 Sep 2022 05:11:09 +0530 Subject: [PATCH 27/42] btcOperator v1.0.10a: broadcastTx resolves txid - When broadcast is successful, txid is resolved - sendTx also resolves txid due to the above change --- btcOperator.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/btcOperator.js b/btcOperator.js index 1d0147a..7406ba2 100644 --- a/btcOperator.js +++ b/btcOperator.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //btcOperator v1.0.10 +(function(EXPORTS) { //btcOperator v1.0.10a /* BTC Crypto and API Operator */ const btcOperator = EXPORTS; @@ -31,16 +31,16 @@ }) } - const broadcast = btcOperator.broadcast = rawtx => new Promise((resolve, reject) => { + const broadcastTx = btcOperator.broadcastTx = rawTxHex => new Promise((resolve, reject) => { $.ajax({ type: "POST", url: URL + "send_tx/BTC/", data: { - "tx_hex": rawtx + "tx_hex": rawTxHex }, dataType: "json", error: e => reject(e.responseJSON), - success: r => r.status === "success" ? resolve(r.data) : reject(r) + success: r => r.status === "success" ? resolve(r.data.txid) : reject(r) }) }); @@ -485,8 +485,8 @@ new Set(wif_keys).forEach(key => console.debug("Signing key:", key, tx.sign(key, 1 /*sighashtype*/ ))); //Sign the tx using private key WIF console.debug("Signed:", tx.serialize()); debugger; - broadcast(tx.serialize()) - .then(result => resolve(result)) + broadcastTx(tx.serialize()) + .then(txid => resolve(txid)) .catch(error => reject(error)); }).catch(error => reject(error)); }) From c38b7257cfd9836da6a98955704c203f148aff46 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Fri, 14 Oct 2022 23:11:05 +0530 Subject: [PATCH 28/42] Minor fixes floCrypto v2.3.3e - Adding options args to toFloID function. options object accept std and/or bech properties. if specified only converts if given address are from specified version floBlockchainAPI v2.3.3c - Fixed: tx failing due to dust amount in change value - readData: when passes tx option as true, now also gives senders and receivers (Set) btcOperator v1.0.10b - Fixed: minor bugs --- btcOperator.js | 46 ++++++++++++++++----------------- floBlockchainAPI.js | 33 +++++++++++++----------- floCrypto.js | 62 +++++++++++++++++++++++++-------------------- 3 files changed, 75 insertions(+), 66 deletions(-) diff --git a/btcOperator.js b/btcOperator.js index 7406ba2..9fc39d2 100644 --- a/btcOperator.js +++ b/btcOperator.js @@ -1,11 +1,11 @@ -(function(EXPORTS) { //btcOperator v1.0.10a +(function (EXPORTS) { //btcOperator v1.0.10b /* BTC Crypto and API Operator */ const btcOperator = EXPORTS; //This library uses API provided by chain.so (https://chain.so/) const URL = "https://chain.so/api/v2/"; - const fetch_api = btcOperator.fetch = function(api) { + const fetch_api = btcOperator.fetch = function (api) { return new Promise((resolve, reject) => { console.debug(URL + api); fetch(URL + api).then(response => { @@ -23,8 +23,8 @@ fetch('https://api.blockchain.info/mempool/fees').then(response => { if (response.ok) response.json() - .then(result => resolve(parseFloat((result.regular / SATOSHI_IN_BTC).toFixed(8)))) - .catch(error => reject(error)); + .then(result => resolve(parseFloat((result.regular / SATOSHI_IN_BTC).toFixed(8)))) + .catch(error => reject(error)); else reject(response); }).catch(error => reject(error)) @@ -69,7 +69,7 @@ coinjs.compressed = true; - const verifyKey = btcOperator.verifyKey = function(addr, key) { + const verifyKey = btcOperator.verifyKey = function (addr, key) { if (!addr || !key) return undefined; switch (coinjs.addressDecode(addr).type) { @@ -84,7 +84,7 @@ } } - const validateAddress = btcOperator.validateAddress = function(addr) { + const validateAddress = btcOperator.validateAddress = function (addr) { if (!addr) return undefined; let type = coinjs.addressDecode(addr).type; @@ -94,7 +94,7 @@ return false; } - btcOperator.multiSigAddress = function(pubKeys, minRequired) { + btcOperator.multiSigAddress = function (pubKeys, minRequired) { if (!Array.isArray(pubKeys)) throw "pubKeys must be an array of public keys"; else if (pubKeys.length < minRequired) @@ -105,7 +105,7 @@ //convert from one blockchain to another blockchain (target version) btcOperator.convert = {}; - btcOperator.convert.wif = function(source_wif, target_version = coinjs.priv) { + btcOperator.convert.wif = function (source_wif, target_version = coinjs.priv) { let keyHex = decodeLegacy(source_wif).hex; if (!keyHex || keyHex.length < 66 || !/01$/.test(keyHex)) return null; @@ -113,7 +113,7 @@ return encodeLegacy(keyHex, target_version); } - btcOperator.convert.legacy2legacy = function(source_addr, target_version = coinjs.pub) { + btcOperator.convert.legacy2legacy = function (source_addr, target_version = coinjs.pub) { let rawHex = decodeLegacy(source_addr).hex; if (!rawHex) return null; @@ -121,7 +121,7 @@ return encodeLegacy(rawHex, target_version); } - btcOperator.convert.legacy2bech = function(source_addr, target_version = coinjs.bech32.version, target_hrp = coinjs.bech32.hrp) { + btcOperator.convert.legacy2bech = function (source_addr, target_version = coinjs.bech32.version, target_hrp = coinjs.bech32.hrp) { let rawHex = decodeLegacy(source_addr).hex; if (!rawHex) return null; @@ -129,7 +129,7 @@ return encodeBech32(rawHex, target_version, target_hrp); } - btcOperator.convert.bech2bech = function(source_addr, target_version = coinjs.bech32.version, target_hrp = coinjs.bech32.hrp) { + btcOperator.convert.bech2bech = function (source_addr, target_version = coinjs.bech32.version, target_hrp = coinjs.bech32.hrp) { let rawHex = decodeBech32(source_addr).hex; if (!rawHex) return null; @@ -137,7 +137,7 @@ return encodeBech32(rawHex, target_version, target_hrp); } - btcOperator.convert.bech2legacy = function(source_addr, target_version = coinjs.pub) { + btcOperator.convert.bech2legacy = function (source_addr, target_version = coinjs.pub) { let rawHex = decodeBech32(source_addr).hex; if (!rawHex) return null; @@ -340,7 +340,7 @@ let net_fee = BASE_TX_SIZE * fee_rate; net_fee += (output_size * fee_rate); addUTXOs(tx, senders, redeemScripts, total_amount + net_fee, fee_rate).then(result => { - result.fee_amount = parseFloat((net_fee + (result.input_size * fee_rate)).toFixed(8)); + result.fee = parseFloat((net_fee + (result.input_size * fee_rate)).toFixed(8)); result.fee_rate = fee_rate; resolve(result); }).catch(error => reject(error)) @@ -386,7 +386,7 @@ script = Crypto.util.bytesToHex(s.buffer); } else //redeemScript for multisig script = rs; - tx.addinput(utxos[i].txid, utxos[i].output_no, script, 0xfffffffd /*sequence*/ ); //0xfffffffd for Replace-by-fee + tx.addinput(utxos[i].txid, utxos[i].output_no, script, 0xfffffffd /*sequence*/); //0xfffffffd for Replace-by-fee //update track values rec_args.input_size += size_per_input; rec_args.input_amount += parseFloat(utxos[i].value); @@ -450,7 +450,7 @@ } */ - btcOperator.sendTx = function(senders, privkeys, receivers, amounts, fee, change_addr = null) { + btcOperator.sendTx = function (senders, privkeys, receivers, amounts, fee, change_addr = null) { return new Promise((resolve, reject) => { try { ({ @@ -482,7 +482,7 @@ createTransaction(senders, redeemScripts, receivers, amounts, fee, change_addr || senders[0]).then(result => { let tx = result.transaction; console.debug("Unsigned:", tx.serialize()); - new Set(wif_keys).forEach(key => console.debug("Signing key:", key, tx.sign(key, 1 /*sighashtype*/ ))); //Sign the tx using private key WIF + new Set(wif_keys).forEach(key => console.debug("Signing key:", key, tx.sign(key, 1 /*sighashtype*/))); //Sign the tx using private key WIF console.debug("Signed:", tx.serialize()); debugger; broadcastTx(tx.serialize()) @@ -492,7 +492,7 @@ }) } - btcOperator.createTx = function(senders, receivers, amounts, fee = null, change_addr = null) { + btcOperator.createTx = function (senders, receivers, amounts, fee = null, change_addr = null) { return new Promise((resolve, reject) => { try { ({ @@ -521,7 +521,7 @@ }) } - btcOperator.createMultiSigTx = function(sender, redeemScript, receivers, amounts, fee) { + btcOperator.createMultiSigTx = function (sender, redeemScript, receivers, amounts, fee) { return new Promise((resolve, reject) => { //validate tx parameters if (validateAddress(sender) !== "multisig") @@ -566,7 +566,7 @@ return tx; } - btcOperator.signTx = function(tx, privkeys, sighashtype = 1) { + btcOperator.signTx = function (tx, privkeys, sighashtype = 1) { tx = deserializeTx(tx); if (!Array.isArray(privkeys)) privkeys = [privkeys]; @@ -577,7 +577,7 @@ return tx.serialize(); } - const checkSigned = btcOperator.checkSigned = function(tx, bool = true) { + const checkSigned = btcOperator.checkSigned = function (tx, bool = true) { tx = deserializeTx(tx); let n = []; for (let i in tx.ins) { @@ -602,7 +602,7 @@ return bool ? !(n.filter(x => x !== true).length) : n; } - btcOperator.checkIfSameTx = function(tx1, tx2) { + btcOperator.checkIfSameTx = function (tx1, tx2) { tx1 = deserializeTx(tx1); tx2 = deserializeTx(tx2); if (tx1.ins.length !== tx2.ins.length || tx1.outs.length !== tx2.outs.length) @@ -622,7 +622,7 @@ .catch(error => reject(error)) }); - btcOperator.parseTransaction = function(tx) { + btcOperator.parseTransaction = function (tx) { return new Promise((resolve, reject) => { tx = deserializeTx(tx); let result = {}; @@ -665,7 +665,7 @@ } btcOperator.getTx = txid => new Promise((resolve, reject) => { - fetch_api(`get_tx/BTC/${txid}`) + fetch_api(`tx/BTC/${txid}`) .then(result => resolve(result.data)) .catch(error => reject(error)) }); diff --git a/floBlockchainAPI.js b/floBlockchainAPI.js index d250f86..5bb3cbb 100644 --- a/floBlockchainAPI.js +++ b/floBlockchainAPI.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floBlockchainAPI v2.3.3b +(function (EXPORTS) { //floBlockchainAPI v2.3.3c /* FLO Blockchain Operator to send/receive data from blockchain using API calls*/ 'use strict'; const floBlockchainAPI = EXPORTS; @@ -11,6 +11,7 @@ }, sendAmt: 0.001, fee: 0.0005, + minChangeAmt: 0.0005, receiverID: floGlobals.adminID }; @@ -102,7 +103,7 @@ }); //Promised function to get data from API - const promisedAPI = floBlockchainAPI.promisedAPI = floBlockchainAPI.fetch = function(apicall) { + const promisedAPI = floBlockchainAPI.promisedAPI = floBlockchainAPI.fetch = function (apicall) { return new Promise((resolve, reject) => { //console.log(apicall); fetch_api(apicall) @@ -112,7 +113,7 @@ } //Get balance for the given Address - const getBalance = floBlockchainAPI.getBalance = function(addr) { + const getBalance = floBlockchainAPI.getBalance = function (addr) { return new Promise((resolve, reject) => { promisedAPI(`api/addr/${addr}/balance`) .then(balance => resolve(parseFloat(balance))) @@ -121,7 +122,7 @@ } //Send Tx to blockchain - const sendTx = floBlockchainAPI.sendTx = function(senderAddr, receiverAddr, sendAmt, privKey, floData = '', strict_utxo = true) { + const sendTx = floBlockchainAPI.sendTx = function (senderAddr, receiverAddr, sendAmt, privKey, floData = '', strict_utxo = true) { return new Promise((resolve, reject) => { if (!floCrypto.validateASCII(floData)) return reject("Invalid FLO_Data: only printable ASCII characters are allowed"); @@ -171,7 +172,7 @@ else { trx.addoutput(receiverAddr, sendAmt); var change = utxoAmt - sendAmt - fee; - if (change > 0) + if (change > DEFAULT.minChangeAmt) trx.addoutput(senderAddr, change); trx.addflodata(floData.replace(/\n/g, ' ')); var signedTxHash = trx.sign(privKey, 1); @@ -187,7 +188,7 @@ } //Write Data into blockchain - floBlockchainAPI.writeData = function(senderAddr, data, privKey, receiverAddr = DEFAULT.receiverID, options = {}) { + floBlockchainAPI.writeData = function (senderAddr, data, privKey, receiverAddr = DEFAULT.receiverID, options = {}) { let strict_utxo = options.strict_utxo === false ? false : true, sendAmt = isNaN(options.sendAmt) ? DEFAULT.sendAmt : options.sendAmt; return new Promise((resolve, reject) => { @@ -200,7 +201,7 @@ } //merge all UTXOs of a given floID into a single UTXO - floBlockchainAPI.mergeUTXOs = function(floID, privKey, floData = '') { + floBlockchainAPI.mergeUTXOs = function (floID, privKey, floData = '') { return new Promise((resolve, reject) => { if (!floCrypto.validateFloID(floID)) return reject(`Invalid floID`); @@ -234,7 +235,7 @@ * @param {boolean} preserveRatio (optional) preserve ratio or equal contribution * @return {Promise} */ - floBlockchainAPI.writeDataMultiple = function(senderPrivKeys, data, receivers = [DEFAULT.receiverID], preserveRatio = true) { + floBlockchainAPI.writeDataMultiple = function (senderPrivKeys, data, receivers = [DEFAULT.receiverID], preserveRatio = true) { return new Promise((resolve, reject) => { if (!Array.isArray(senderPrivKeys)) return reject("Invalid senderPrivKeys: SenderPrivKeys must be Array"); @@ -266,7 +267,7 @@ * @param {string} floData FLO data of the txn * @return {Promise} */ - const sendTxMultiple = floBlockchainAPI.sendTxMultiple = function(senderPrivKeys, receivers, floData = '') { + const sendTxMultiple = floBlockchainAPI.sendTxMultiple = function (senderPrivKeys, receivers, floData = '') { return new Promise((resolve, reject) => { if (!floCrypto.validateASCII(floData)) return reject("Invalid FLO_Data: only printable ASCII characters are allowed"); @@ -421,7 +422,7 @@ } //Broadcast signed Tx in blockchain using API - const broadcastTx = floBlockchainAPI.broadcastTx = function(signedTxHash) { + const broadcastTx = floBlockchainAPI.broadcastTx = function (signedTxHash) { return new Promise((resolve, reject) => { if (signedTxHash.length < 1) return reject("Empty Signature"); @@ -441,7 +442,7 @@ }) } - floBlockchainAPI.getTx = function(txid) { + floBlockchainAPI.getTx = function (txid) { return new Promise((resolve, reject) => { promisedAPI(`api/tx/${txid}`) .then(response => resolve(response)) @@ -450,7 +451,7 @@ } //Read Txs of Address between from and to - const readTxs = floBlockchainAPI.readTxs = function(addr, from, to) { + const readTxs = floBlockchainAPI.readTxs = function (addr, from, to) { return new Promise((resolve, reject) => { promisedAPI(`api/addrs/${addr}/txs?from=${from}&to=${to}`) .then(response => resolve(response)) @@ -459,7 +460,7 @@ } //Read All Txs of Address (newest first) - floBlockchainAPI.readAllTxs = function(addr) { + floBlockchainAPI.readAllTxs = function (addr) { return new Promise((resolve, reject) => { promisedAPI(`api/addrs/${addr}/txs?from=0&to=1`).then(response => { promisedAPI(`api/addrs/${addr}/txs?from=0&to=${response.totalItems}0`) @@ -481,7 +482,7 @@ sender : flo-id(s) of sender receiver : flo-id(s) of receiver */ - floBlockchainAPI.readData = function(addr, options = {}) { + floBlockchainAPI.readData = function (addr, options = {}) { options.limit = options.limit || 0; options.ignoreOld = options.ignoreOld || 0; if (typeof options.sender === "string") options.sender = [options.sender]; @@ -489,7 +490,7 @@ return new Promise((resolve, reject) => { promisedAPI(`api/addrs/${addr}/txs?from=0&to=1`).then(response => { var newItems = response.totalItems - options.ignoreOld; - promisedAPI(`api/addrs/${addr}/txs?from=0&to=${newItems*2}`).then(response => { + promisedAPI(`api/addrs/${addr}/txs?from=0&to=${newItems * 2}`).then(response => { if (options.limit <= 0) options.limit = response.items.length; var filteredData = []; @@ -555,6 +556,8 @@ d.txid = response.items[i].txid; d.time = response.items[i].time; d.blockheight = response.items[i].blockheight; + d.senders = new Set(response.items[i].vin.map(v => v.addr)); + d.receivers = new Set(response.items[i].vout.map(v => v.scriptPubKey.addresses[0])); d.data = response.items[i].floData; filteredData.push(d); } else diff --git a/floCrypto.js b/floCrypto.js index 6671ffa..563d77f 100644 --- a/floCrypto.js +++ b/floCrypto.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floCrypto v2.3.3d +(function (EXPORTS) { //floCrypto v2.3.3e /* FLO Crypto Operators */ 'use strict'; const floCrypto = EXPORTS; @@ -78,14 +78,14 @@ } //generate a random Interger within range - floCrypto.randInt = function(min, max) { + floCrypto.randInt = function (min, max) { min = Math.ceil(min); max = Math.floor(max); return Math.floor(securedMathRandom() * (max - min + 1)) + min; } //generate a random String within length (options : alphaNumeric chars only) - floCrypto.randString = function(length, alphaNumeric = true) { + floCrypto.randString = function (length, alphaNumeric = true) { var result = ''; var characters = alphaNumeric ? 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789' : 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_+-./*?@#&$<>=[]{}():'; @@ -95,7 +95,7 @@ } //Encrypt Data using public-key - floCrypto.encryptData = function(data, receiverPublicKeyHex) { + floCrypto.encryptData = function (data, receiverPublicKeyHex) { var senderECKeyData = getSenderPublicKeyString(); var senderDerivedKey = deriveSharedKeySender(receiverPublicKeyHex, senderECKeyData.privateKey); let senderKey = senderDerivedKey.XValue + senderDerivedKey.YValue; @@ -107,7 +107,7 @@ } //Decrypt Data using private-key - floCrypto.decryptData = function(data, privateKeyHex) { + floCrypto.decryptData = function (data, privateKeyHex) { var receiverECKeyData = {}; if (typeof privateKeyHex !== "string") throw new Error("No private key found."); let privateKey = wifToDecimal(privateKeyHex, true); @@ -120,7 +120,7 @@ } //Sign data using private-key - floCrypto.signData = function(data, privateKeyHex) { + floCrypto.signData = function (data, privateKeyHex) { var key = new Bitcoin.ECKey(privateKeyHex); var messageHash = Crypto.SHA256(data); var messageSign = Bitcoin.ECDSA.sign(messageHash, key.priv); @@ -129,7 +129,7 @@ } //Verify signatue of the data using public-key - floCrypto.verifySign = function(data, signatureHex, publicKeyHex) { + floCrypto.verifySign = function (data, signatureHex, publicKeyHex) { var msgHash = Crypto.SHA256(data); var sigBytes = Crypto.util.hexToBytes(signatureHex); var publicKeyPoint = ecparams.getCurve().decodePointHex(publicKeyHex); @@ -138,7 +138,7 @@ } //Generates a new flo ID and returns private-key, public-key and floID - const generateNewID = floCrypto.generateNewID = function() { + const generateNewID = floCrypto.generateNewID = function () { var key = new Bitcoin.ECKey(false); key.setCompressed(true); return { @@ -168,7 +168,7 @@ }); //Returns public-key from private-key - floCrypto.getPubKeyHex = function(privateKeyHex) { + floCrypto.getPubKeyHex = function (privateKeyHex) { if (!privateKeyHex) return null; var key = new Bitcoin.ECKey(privateKeyHex); @@ -179,7 +179,7 @@ } //Returns flo-ID from public-key or private-key - floCrypto.getFloID = function(keyHex) { + floCrypto.getFloID = function (keyHex) { if (!keyHex) return null; try { @@ -192,7 +192,7 @@ } } - floCrypto.getAddress = function(privateKeyHex, strict = false) { + floCrypto.getAddress = function (privateKeyHex, strict = false) { if (!privateKeyHex) return; var key = new Bitcoin.ECKey(privateKeyHex); @@ -212,7 +212,7 @@ } //Verify the private-key for the given public-key or flo-ID - floCrypto.verifyPrivKey = function(privateKeyHex, pubKey_floID, isfloID = true) { + floCrypto.verifyPrivKey = function (privateKeyHex, pubKey_floID, isfloID = true) { if (!privateKeyHex || !pubKey_floID) return false; try { @@ -232,7 +232,7 @@ } //Check if the given flo-id is valid or not - floCrypto.validateFloID = function(floID) { + floCrypto.validateFloID = function (floID) { if (!floID) return false; try { @@ -244,7 +244,7 @@ } //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) { let raw = decodeAddress(address); if (!raw) return false; @@ -267,7 +267,7 @@ } //Check the public-key for the address (any blockchain) - floCrypto.verifyPubKey = function(pubKeyHex, address) { + floCrypto.verifyPubKey = function (pubKeyHex, address) { let raw = decodeAddress(address), pub_hash = Crypto.util.bytesToHex(ripemd160(Crypto.SHA256(Crypto.util.hexToBytes(pubKeyHex), { asBytes: true @@ -276,12 +276,18 @@ } //Convert the given address (any blockchain) to equivalent floID - floCrypto.toFloID = function(address) { + floCrypto.toFloID = function (address, options = null) { if (!address) return; let raw = decodeAddress(address); if (!raw) return; + else if (options) { + if (typeof raw.version !== 'undefined' && (!options.std || !options.std.includes(raw.version))) + return; + if (typeof raw.bech_version !== 'undefined' && (!options.bech || !options.bech.includes(raw.bech_version))) + return; + } raw.bytes.unshift(bitjs.pub); let hash = Crypto.SHA256(Crypto.SHA256(raw.bytes, { asBytes: true @@ -292,7 +298,7 @@ } //Checks if the given addresses (any blockchain) are same (w.r.t keys) - floCrypto.isSameAddr = function(addr1, addr2) { + floCrypto.isSameAddr = function (addr1, addr2) { if (!addr1 || !addr2) return; let raw1 = decodeAddress(addr1), @@ -303,7 +309,7 @@ return raw1.hex === raw2.hex; } - const decodeAddress = floCrypto.decodeAddr = function(address) { + const decodeAddress = floCrypto.decodeAddr = function (address) { if (!address) return; else if (address.length == 33 || address.length == 34) { //legacy encoding @@ -338,7 +344,7 @@ } //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 { if (str.length > 0) { var strHex = shamirSecretShare.str2hex(str); @@ -352,7 +358,7 @@ } //Returns the retrived secret by combining the shamirs shares - const retrieveShamirSecret = floCrypto.retrieveShamirSecret = function(sharesArray) { + const retrieveShamirSecret = floCrypto.retrieveShamirSecret = function (sharesArray) { try { if (sharesArray.length > 0) { var comb = shamirSecretShare.combine(sharesArray.slice(0, sharesArray.length)); @@ -366,7 +372,7 @@ } //Verifies the shares and str - floCrypto.verifyShamirsSecret = function(sharesArray, str) { + floCrypto.verifyShamirsSecret = function (sharesArray, str) { if (!str) return null; else if (retrieveShamirSecret(sharesArray) === str) @@ -375,7 +381,7 @@ return false; } - const validateASCII = floCrypto.validateASCII = function(string, bool = true) { + const validateASCII = floCrypto.validateASCII = function (string, bool = true) { if (typeof string !== "string") return null; if (bool) { @@ -393,8 +399,8 @@ if (x < 32 || x > 127) if (x in invalids) invalids[string[i]].push(i) - else - invalids[string[i]] = [i]; + else + invalids[string[i]] = [i]; } if (Object.keys(invalids).length) return invalids; @@ -403,7 +409,7 @@ } } - floCrypto.convertToASCII = function(string, mode = 'soft-remove') { + floCrypto.convertToASCII = function (string, mode = 'soft-remove') { let chars = validateASCII(string, false); if (chars === true) return string; @@ -414,9 +420,9 @@ ascii_alternatives.split('\n').forEach(a => refAlt[a[0]] = a.slice(2)); mode = mode.toLowerCase(); if (mode === "hard-unicode") - convertor = (c) => `\\u${('000'+c.charCodeAt().toString(16)).slice(-4)}`; + convertor = (c) => `\\u${('000' + c.charCodeAt().toString(16)).slice(-4)}`; else if (mode === "soft-unicode") - convertor = (c) => refAlt[c] || `\\u${('000'+c.charCodeAt().toString(16)).slice(-4)}`; + convertor = (c) => refAlt[c] || `\\u${('000' + c.charCodeAt().toString(16)).slice(-4)}`; else if (mode === "hard-remove") convertor = c => ""; else if (mode === "soft-remove") @@ -428,7 +434,7 @@ return result; } - floCrypto.revertUnicode = function(string) { + floCrypto.revertUnicode = function (string) { return string.replace(/\\u[\dA-F]{4}/gi, m => String.fromCharCode(parseInt(m.replace(/\\u/g, ''), 16))); } From 87f0260fe482fbbb2e3a2e891bc5bdc2ad000194 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Tue, 18 Oct 2022 04:43:53 +0530 Subject: [PATCH 29/42] btcOperator v1.0.11 - Added createSignedTx: creates a signed tx (same as sendTx, but doesnt broadcast) - Added transactionID: returns the txid of the tx_hex (or tx-object) --- btcOperator.js | 29 +++++++++++++++++++++++------ index.html | 1 + 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/btcOperator.js b/btcOperator.js index 9fc39d2..ce8b09d 100644 --- a/btcOperator.js +++ b/btcOperator.js @@ -1,4 +1,4 @@ -(function (EXPORTS) { //btcOperator v1.0.10b +(function (EXPORTS) { //btcOperator v1.0.11 /* BTC Crypto and API Operator */ const btcOperator = EXPORTS; @@ -39,7 +39,7 @@ "tx_hex": rawTxHex }, dataType: "json", - error: e => reject(e.responseJSON), + error: e => reject((e.responseJSON && e.responseJSON.status === "fail") ? null : e.responseJSON), success: r => r.status === "success" ? resolve(r.data.txid) : reject(r) }) }); @@ -451,6 +451,17 @@ */ btcOperator.sendTx = function (senders, privkeys, receivers, amounts, fee, change_addr = null) { + return new Promise((resolve, reject) => { + createSignedTx(senders, privkeys, receivers, amounts, fee, change_addr).then(result => { + debugger; + broadcastTx(result.transaction.serialize()) + .then(txid => resolve(txid)) + .catch(error => reject(error)); + }).catch(error => reject(error)) + }) + } + + const createSignedTx = btcOperator.createSignedTx = function (senders, privkeys, receivers, amounts, fee, change_addr = null) { return new Promise((resolve, reject) => { try { ({ @@ -484,10 +495,7 @@ console.debug("Unsigned:", tx.serialize()); new Set(wif_keys).forEach(key => console.debug("Signing key:", key, tx.sign(key, 1 /*sighashtype*/))); //Sign the tx using private key WIF console.debug("Signed:", tx.serialize()); - debugger; - broadcastTx(tx.serialize()) - .then(txid => resolve(txid)) - .catch(error => reject(error)); + resolve(result); }).catch(error => reject(error)); }) } @@ -664,6 +672,15 @@ }) } + btcOperator.transactionID = function (tx) { + tx = deserializeTx(tx); + let clone = coinjs.clone(tx); + clone.witness = null; + let raw_bytes = Crypto.util.hexToBytes(clone.serialize()); + let txid = Crypto.SHA256(Crypto.SHA256(raw_bytes, { asBytes: true }), { asBytes: true }).reverse(); + return Crypto.util.bytesToHex(txid); + } + btcOperator.getTx = txid => new Promise((resolve, reject) => { fetch_api(`tx/BTC/${txid}`) .then(result => resolve(result.data)) diff --git a/index.html b/index.html index 2b60d9d..7ec9496 100644 --- a/index.html +++ b/index.html @@ -13,6 +13,7 @@ + From d21db616da4cb5cfb46c46689c482f97b812cf29 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Mon, 24 Oct 2022 15:38:48 +0530 Subject: [PATCH 30/42] btcOperator v1.0.12 - Changed broadcastTx to coinb API to eliminate $.ajax requirement - Set default value for fee=null (automatic fee) to createSignedTx and createMultiSigTx --- btcOperator.js | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/btcOperator.js b/btcOperator.js index ce8b09d..bb0b7ca 100644 --- a/btcOperator.js +++ b/btcOperator.js @@ -1,4 +1,4 @@ -(function (EXPORTS) { //btcOperator v1.0.11 +(function (EXPORTS) { //btcOperator v1.0.12 /* BTC Crypto and API Operator */ const btcOperator = EXPORTS; @@ -32,16 +32,30 @@ } const broadcastTx = btcOperator.broadcastTx = rawTxHex => new Promise((resolve, reject) => { - $.ajax({ - type: "POST", - url: URL + "send_tx/BTC/", - data: { - "tx_hex": rawTxHex + let url = 'https://coinb.in/api/?uid=1&key=12345678901234567890123456789012&setmodule=bitcoin&request=sendrawtransaction'; + fetch(url, { + method: 'POST', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' }, - dataType: "json", - error: e => reject((e.responseJSON && e.responseJSON.status === "fail") ? null : e.responseJSON), - success: r => r.status === "success" ? resolve(r.data.txid) : reject(r) - }) + body: "rawtx=" + rawTxHex + }).then(response => { + response.text().then(resultText => { + let r = resultText.match(/.*<\/result>/); + if (!r) + reject(resultText); + else { + r = r.pop().replace('', '').replace('', ''); + if (r == '1') { + let txid = resultText.match(/.*<\/txid>/).pop().replace('', '').replace('', ''); + resolve(txid); + } else if (r == '0') { + let error = resultText.match(/.*<\/response>/).pop().replace('', '').replace('', ''); + reject(decodeURIComponent(error.replace(/\+/g, " "))); + } else reject(resultText); + } + }).catch(error => reject(error)) + }).catch(error => reject(error)) }); Object.defineProperties(btcOperator, { @@ -461,7 +475,7 @@ }) } - const createSignedTx = btcOperator.createSignedTx = function (senders, privkeys, receivers, amounts, fee, change_addr = null) { + const createSignedTx = btcOperator.createSignedTx = function (senders, privkeys, receivers, amounts, fee = null, change_addr = null) { return new Promise((resolve, reject) => { try { ({ @@ -529,7 +543,7 @@ }) } - btcOperator.createMultiSigTx = function (sender, redeemScript, receivers, amounts, fee) { + btcOperator.createMultiSigTx = function (sender, redeemScript, receivers, amounts, fee = null) { return new Promise((resolve, reject) => { //validate tx parameters if (validateAddress(sender) !== "multisig") From bffb130bd4acd529ffc86fbcb8c25058f01936b8 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Wed, 26 Oct 2022 04:58:41 +0530 Subject: [PATCH 31/42] floBlockchainAPI v2.3.3d - renamed sender and receiver options to senders and receivers (bug fix) --- floBlockchainAPI.js | 14 +++++++------- floTokenAPI.js | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/floBlockchainAPI.js b/floBlockchainAPI.js index 5bb3cbb..473b192 100644 --- a/floBlockchainAPI.js +++ b/floBlockchainAPI.js @@ -1,4 +1,4 @@ -(function (EXPORTS) { //floBlockchainAPI v2.3.3c +(function (EXPORTS) { //floBlockchainAPI v2.3.3d /* FLO Blockchain Operator to send/receive data from blockchain using API calls*/ 'use strict'; const floBlockchainAPI = EXPORTS; @@ -485,8 +485,8 @@ floBlockchainAPI.readData = function (addr, options = {}) { options.limit = options.limit || 0; options.ignoreOld = options.ignoreOld || 0; - if (typeof options.sender === "string") options.sender = [options.sender]; - if (typeof options.receiver === "string") options.receiver = [options.receiver]; + if (typeof options.senders === "string") options.senders = [options.senders]; + if (typeof options.receivers === "string") options.receivers = [options.receivers]; return new Promise((resolve, reject) => { promisedAPI(`api/addrs/${addr}/txs?from=0&to=1`).then(response => { var newItems = response.totalItems - options.ignoreOld; @@ -521,10 +521,10 @@ } if (!flag) continue; } - if (Array.isArray(options.sender)) { + if (Array.isArray(options.senders)) { let flag = false; for (let vin of response.items[i].vin) - if (options.sender.includes(vin.addr)) { + if (options.senders.includes(vin.addr)) { flag = true; break; } @@ -539,10 +539,10 @@ } if (!flag) continue; } - if (Array.isArray(options.receiver)) { + if (Array.isArray(options.receivers)) { let flag = false; for (let vout of response.items[i].vout) - if (options.receiver.includes(vout.scriptPubKey.addresses[0])) { + if (options.receivers.includes(vout.scriptPubKey.addresses[0])) { flag = true; break; } diff --git a/floTokenAPI.js b/floTokenAPI.js index 7378f43..efbd2ae 100644 --- a/floTokenAPI.js +++ b/floTokenAPI.js @@ -1,11 +1,11 @@ -(function(EXPORTS) { //floTokenAPI v1.0.3b +(function (EXPORTS) { //floTokenAPI v1.0.3c /* Token Operator to send/receive tokens via blockchain using API calls*/ 'use strict'; const tokenAPI = EXPORTS; const DEFAULT = { apiURL: floGlobals.tokenURL || "https://ranchimallflo.duckdns.org/", - currency: "rupee" + currency: floGlobals.currency || "rupee" } Object.defineProperties(tokenAPI, { @@ -27,9 +27,9 @@ } }); - const fetch_api = tokenAPI.fetch = function(apicall) { + const fetch_api = tokenAPI.fetch = function (apicall) { return new Promise((resolve, reject) => { - console.log(DEFAULT.apiURL + apicall); + console.debug(DEFAULT.apiURL + apicall); fetch(DEFAULT.apiURL + apicall).then(response => { if (response.ok) response.json().then(data => resolve(data)); @@ -39,7 +39,7 @@ }) } - const getBalance = tokenAPI.getBalance = function(floID, token = DEFAULT.currency) { + const getBalance = tokenAPI.getBalance = function (floID, token = DEFAULT.currency) { return new Promise((resolve, reject) => { fetch_api(`api/v1.0/getFloAddressBalance?token=${token}&floAddress=${floID}`) .then(result => resolve(result.balance || 0)) @@ -47,7 +47,7 @@ }) } - tokenAPI.getTx = function(txID) { + tokenAPI.getTx = function (txID) { return new Promise((resolve, reject) => { fetch_api(`api/v1.0/getTransactionDetails/${txID}`).then(res => { if (res.result === "error") @@ -62,7 +62,7 @@ }) } - tokenAPI.sendToken = function(privKey, amount, receiverID, message = "", token = DEFAULT.currency, options = {}) { + tokenAPI.sendToken = function (privKey, amount, receiverID, message = "", token = DEFAULT.currency, options = {}) { return new Promise((resolve, reject) => { let senderID = floCrypto.getFloID(privKey); if (typeof amount !== "number" || isNaN(amount) || amount <= 0) @@ -77,7 +77,7 @@ }); } - tokenAPI.getAllTxs = function(floID, token = DEFAULT.currency) { + tokenAPI.getAllTxs = function (floID, token = DEFAULT.currency) { return new Promise((resolve, reject) => { fetch_api(`api/v1.0/getFloAddressTransactions?token=${token}&floAddress=${floID}`) .then(result => resolve(result)) @@ -87,7 +87,7 @@ const util = tokenAPI.util = {}; - util.parseTxData = function(txData) { + util.parseTxData = function (txData) { let parsedData = {}; for (let p in txData.parsedFloData) parsedData[p] = txData.parsedFloData[p]; From 663dfe2d548b0e58767b666d1b176f2fe3db03db Mon Sep 17 00:00:00 2001 From: sairajzero Date: Sun, 6 Nov 2022 04:27:24 +0530 Subject: [PATCH 32/42] floCloudAPI v2.4.3 - Fixed a rare bug where array has empty value - now `null` is supported by objectData update (ie, objects can now have null as value) --- floCloudAPI.js | 86 +++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 46 deletions(-) diff --git a/floCloudAPI.js b/floCloudAPI.js index 98dbfa6..921fa69 100644 --- a/floCloudAPI.js +++ b/floCloudAPI.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floCloudAPI v2.4.2e +(function (EXPORTS) { //floCloudAPI v2.4.3 /* FLO Cloud operations to send/request application data*/ 'use strict'; const floCloudAPI = EXPORTS; @@ -94,7 +94,7 @@ }); var kBucket; - const K_Bucket = floCloudAPI.K_Bucket = function(masterID, nodeList) { + const K_Bucket = floCloudAPI.K_Bucket = function (masterID, nodeList) { const decodeID = floID => { let k = bitjs.Base58.decode(floID); @@ -128,7 +128,7 @@ }); self.isNode = floID => _CO.includes(floID); - self.innerNodes = function(id1, id2) { + self.innerNodes = function (id1, id2) { if (!_CO.includes(id1) || !_CO.includes(id2)) throw Error('Given nodes are not supernode'); let iNodes = [] @@ -139,7 +139,7 @@ } return iNodes } - self.outterNodes = function(id1, id2) { + self.outterNodes = function (id1, id2) { if (!_CO.includes(id1) || !_CO.includes(id2)) throw Error('Given nodes are not supernode'); let oNodes = [] @@ -150,7 +150,7 @@ } return oNodes } - self.prevNode = function(id, N = 1) { + self.prevNode = function (id, N = 1) { let n = N || _CO.length; if (!_CO.includes(id)) throw Error('Given node is not supernode'); @@ -164,7 +164,7 @@ } return (N == 1 ? pNodes[0] : pNodes) } - self.nextNode = function(id, N = 1) { + self.nextNode = function (id, N = 1) { let n = N || _CO.length; if (!_CO.includes(id)) throw Error('Given node is not supernode'); @@ -179,7 +179,7 @@ } return (N == 1 ? nNodes[0] : nNodes) } - self.closestNode = function(id, N = 1) { + self.closestNode = function (id, N = 1) { let decodedId = decodeID(id); let n = N || _CO.length; let cNodes = _KB.closest(decodedId, n) @@ -293,8 +293,8 @@ fetch_ActiveAPI(floID, data).then(response => { if (response.ok) response.json() - .then(result => resolve(result)) - .catch(error => reject(error)) + .then(result => resolve(result)) + .catch(error => reject(error)) else response.text() .then(result => reject(response.status + ": " + result)) //Error Message from Node .catch(error => reject(error)) @@ -370,21 +370,21 @@ const util = floCloudAPI.util = {}; - const encodeMessage = util.encodeMessage = function(message) { + const encodeMessage = util.encodeMessage = function (message) { return btoa(unescape(encodeURIComponent(JSON.stringify(message)))) } - const decodeMessage = util.decodeMessage = function(message) { + const decodeMessage = util.decodeMessage = function (message) { return JSON.parse(decodeURIComponent(escape(atob(message)))) } - const filterKey = util.filterKey = function(type, options = {}) { + const filterKey = util.filterKey = function (type, options = {}) { return type + (options.comment ? ':' + options.comment : '') + '|' + (options.group || options.receiverID || DEFAULT.adminID) + '|' + (options.application || DEFAULT.application); } - const proxyID = util.proxyID = function(address) { + const proxyID = util.proxyID = function (address) { if (!address) return; var bytes; @@ -489,7 +489,7 @@ } //set status as online for user_id - floCloudAPI.setStatus = function(options = {}) { + floCloudAPI.setStatus = function (options = {}) { return new Promise((resolve, reject) => { let callback = options.callback instanceof Function ? options.callback : DEFAULT.callback; var request = { @@ -508,7 +508,7 @@ } //request status of floID(s) in trackList - floCloudAPI.requestStatus = function(trackList, options = {}) { + floCloudAPI.requestStatus = function (trackList, options = {}) { return new Promise((resolve, reject) => { if (!Array.isArray(trackList)) trackList = [trackList]; @@ -525,7 +525,7 @@ } //send any message to supernode cloud storage - const sendApplicationData = floCloudAPI.sendApplicationData = function(message, type, options = {}) { + const sendApplicationData = floCloudAPI.sendApplicationData = function (message, type, options = {}) { return new Promise((resolve, reject) => { var data = { senderID: user.id, @@ -547,7 +547,7 @@ } //request any data from supernode cloud - const requestApplicationData = floCloudAPI.requestApplicationData = function(type, options = {}) { + const requestApplicationData = floCloudAPI.requestApplicationData = function (type, options = {}) { return new Promise((resolve, reject) => { var request = { receiverID: options.receiverID || DEFAULT.adminID, @@ -650,7 +650,7 @@ */ //tag data in supernode cloud (subAdmin access only) - floCloudAPI.tagApplicationData = function(vectorClock, tag, options = {}) { + floCloudAPI.tagApplicationData = function (vectorClock, tag, options = {}) { return new Promise((resolve, reject) => { if (!floGlobals.subAdmins.includes(user.id)) return reject("Only subAdmins can tag data") @@ -671,7 +671,7 @@ } //note data in supernode cloud (receiver only or subAdmin allowed if receiver is adminID) - floCloudAPI.noteApplicationData = function(vectorClock, note, options = {}) { + floCloudAPI.noteApplicationData = function (vectorClock, note, options = {}) { return new Promise((resolve, reject) => { var request = { receiverID: options.receiverID || DEFAULT.adminID, @@ -690,7 +690,7 @@ } //send general data - floCloudAPI.sendGeneralData = function(message, type, options = {}) { + floCloudAPI.sendGeneralData = function (message, type, options = {}) { return new Promise((resolve, reject) => { if (options.encrypt) { let encryptionKey = options.encrypt === true ? @@ -704,7 +704,7 @@ } //request general data - floCloudAPI.requestGeneralData = function(type, options = {}) { + floCloudAPI.requestGeneralData = function (type, options = {}) { return new Promise((resolve, reject) => { var fk = filterKey(type, options) lastVC[fk] = parseInt(lastVC[fk]) || 0; @@ -728,7 +728,7 @@ } //request an object data from supernode cloud - floCloudAPI.requestObjectData = function(objectName, options = {}) { + floCloudAPI.requestObjectData = function (objectName, options = {}) { return new Promise((resolve, reject) => { options.lowerVectorClock = options.lowerVectorClock || lastVC[objectName] + 1; options.senderID = [false, null].includes(options.senderID) ? null : @@ -765,7 +765,7 @@ }) } - floCloudAPI.closeRequest = function(requestID) { + floCloudAPI.closeRequest = function (requestID) { return new Promise((resolve, reject) => { let conn = _liveRequest[requestID] if (!conn) @@ -779,7 +779,7 @@ } //reset or initialize an object and send it to cloud - floCloudAPI.resetObjectData = function(objectName, options = {}) { + floCloudAPI.resetObjectData = function (objectName, options = {}) { return new Promise((resolve, reject) => { let message = { reset: appObjects[objectName] @@ -793,7 +793,7 @@ } //update the diff and send it to cloud - floCloudAPI.updateObjectData = function(objectName, options = {}) { + floCloudAPI.updateObjectData = function (objectName, options = {}) { return new Promise((resolve, reject) => { let message = { diff: diff.find(lastCommit.get(objectName), appObjects[ @@ -812,7 +812,7 @@ findDiff(original, updatedObj) returns an object with the added, deleted and updated differences mergeDiff(original, allDiff) returns a new object from original object merged with all differences (allDiff is returned object of findDiff) */ - var diff = (function() { + var diff = (function () { const isDate = d => d instanceof Date; const isEmpty = o => Object.keys(o).length === 0; const isObject = o => o != null && typeof o === 'object'; @@ -986,23 +986,23 @@ }, {}); }; - const mergeRecursive = (obj1, obj2) => { + const mergeRecursive = (obj1, obj2, deleteMode = false) => { for (var p in obj2) { try { if (obj2[p].constructor == Object) - obj1[p] = mergeRecursive(obj1[p], obj2[p]); + obj1[p] = mergeRecursive(obj1[p], obj2[p], deleteMode); // Property in destination object set; update its value. - else if (Ext.isArray(obj2[p])) { + else if (Array.isArray(obj2[p])) { // obj1[p] = []; if (obj2[p].length < 1) obj1[p] = obj2[p]; else - obj1[p] = mergeRecursive(obj1[p], obj2[p]); + obj1[p] = mergeRecursive(obj1[p], obj2[p], deleteMode); } else - obj1[p] = obj2[p]; + obj1[p] = deleteMode && obj2[p] === null ? undefined : obj2[p]; } catch (e) { // Property in destination object not set; create it and set its value. - obj1[p] = obj2[p]; + obj1[p] = deleteMode && obj2[p] === null ? undefined : obj2[p]; } } return obj1; @@ -1011,23 +1011,17 @@ const cleanse = (obj) => { Object.keys(obj).forEach(key => { var value = obj[key]; - if (typeof value === "object" && value !== null) { - // Recurse... - cleanse(value); - // ...and remove if now "empty" (NOTE: insert your definition of "empty" here) - //if (!Object.keys(value).length) - // delete obj[key]; - } else if (value === null) - delete obj[key]; // null, remove it + if (typeof value === "object" && value !== null) + obj[key] = cleanse(value); + else if (typeof value === 'undefined') + delete obj[key]; // undefined, remove it }); - if (obj.constructor.toString().indexOf("Array") != -1) { - obj = obj.filter(function(el) { - return el != null; - }); - } + if (Array.isArray(obj)) + obj = obj.filter(v => typeof v !== 'undefined'); return obj; } + const findDiff = (lhs, rhs) => ({ added: addedDiff(lhs, rhs), deleted: deletedDiff(lhs, rhs), @@ -1039,7 +1033,7 @@ if (Object.keys(diff.updated).length !== 0) obj = mergeRecursive(obj, diff.updated) if (Object.keys(diff.deleted).length !== 0) { - obj = mergeRecursive(obj, diff.deleted) + obj = mergeRecursive(obj, diff.deleted, true) obj = cleanse(obj) } if (Object.keys(diff.added).length !== 0) From 006ff9f0a95bc268defcb30c91bf4588e59aacd7 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Fri, 18 Nov 2022 17:49:03 +0530 Subject: [PATCH 33/42] btcOperator v1.0.13b: Fee from receiver - Added: fee_from_receiver option to create transaction. - change_address and fee_from_receiver are passed as options for createTx, createSignedTx, sendTx and createMultiSigTx - Fixed: getTx not rejecting properly when txid is invalid --- btcOperator.js | 74 +++++++++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 28 deletions(-) diff --git a/btcOperator.js b/btcOperator.js index bb0b7ca..85ae761 100644 --- a/btcOperator.js +++ b/btcOperator.js @@ -1,4 +1,4 @@ -(function (EXPORTS) { //btcOperator v1.0.12 +(function (EXPORTS) { //btcOperator v1.0.13b /* BTC Crypto and API Operator */ const btcOperator = EXPORTS; @@ -307,8 +307,8 @@ parameters.receivers.forEach(id => !validateAddress(id) ? invalids.push(id) : null); if (invalids.length) throw "Invalid receivers:" + invalids; - if (parameters.change_addr && !validateAddress(parameters.change_addr)) - throw "Invalid change_address:" + parameters.change_addr; + if (parameters.change_address && !validateAddress(parameters.change_address)) + throw "Invalid change_address:" + parameters.change_address; //fee and amounts if ((typeof parameters.fee !== "number" || parameters.fee <= 0) && parameters.fee !== null) //fee = null (auto calc) throw "Invalid fee:" + parameters.fee; @@ -323,18 +323,32 @@ return parameters; } - function createTransaction(senders, redeemScripts, receivers, amounts, fee, change_addr) { + function createTransaction(senders, redeemScripts, receivers, amounts, fee, change_address, fee_from_receiver) { return new Promise((resolve, reject) => { let total_amount = parseFloat(amounts.reduce((t, a) => t + a, 0).toFixed(8)); const tx = coinjs.transaction(); - let output_size = addOutputs(tx, receivers, amounts, change_addr); - addInputs(tx, senders, redeemScripts, total_amount, fee, output_size).then(result => { - if (result.change_amount > 0) + let output_size = addOutputs(tx, receivers, amounts, change_address); + addInputs(tx, senders, redeemScripts, total_amount, fee, output_size, fee_from_receiver).then(result => { + if (result.change_amount > 0) //add change amount if any tx.outs[tx.outs.length - 1].value = parseInt(result.change_amount * SATOSHI_IN_BTC); //values are in satoshi - else - tx.outs.pop(); //remove the change output if no change_amount + if (fee_from_receiver) { //deduce fee from receivers if fee_from_receiver + let fee_remaining = parseInt(result.fee * SATOSHI_IN_BTC); + for (let i = 0; i < tx.outs.length - 1 && fee_remaining > 0; i++) { + if (fee_remaining < tx.outs[i].value) { + tx.outs[i].value -= fee_remaining; + fee_remaining = 0; + } else { + fee_remaining -= tx.outs[i].value; + tx.outs[i].value = 0; + } + } + if (fee_remaining > 0) + return reject("Send amount is less than fee"); + + } + tx.outs = tx.outs.filter(o => o.value !== 0); //remove all output with value 0 result.output_size = output_size; - result.output_amount = total_amount; + result.output_amount = total_amount - (fee_from_receiver ? result.fee : 0); result.total_size = BASE_TX_SIZE + output_size + result.input_size; result.transaction = tx; resolve(result); @@ -342,10 +356,10 @@ }) } - function addInputs(tx, senders, redeemScripts, total_amount, fee, output_size) { + function addInputs(tx, senders, redeemScripts, total_amount, fee, output_size, fee_from_receiver) { return new Promise((resolve, reject) => { if (fee !== null) { - addUTXOs(tx, senders, redeemScripts, total_amount + fee, false).then(result => { + addUTXOs(tx, senders, redeemScripts, fee_from_receiver ? total_amount : total_amount + fee, false).then(result => { result.fee = fee; resolve(result); }).catch(error => reject(error)) @@ -353,7 +367,10 @@ get_fee_rate().then(fee_rate => { let net_fee = BASE_TX_SIZE * fee_rate; net_fee += (output_size * fee_rate); - addUTXOs(tx, senders, redeemScripts, total_amount + net_fee, fee_rate).then(result => { + (fee_from_receiver ? + addUTXOs(tx, senders, redeemScripts, total_amount, false) : + addUTXOs(tx, senders, redeemScripts, total_amount + net_fee, fee_rate) + ).then(result => { result.fee = parseFloat((net_fee + (result.input_size * fee_rate)).toFixed(8)); result.fee_rate = fee_rate; resolve(result); @@ -416,14 +433,14 @@ }) } - function addOutputs(tx, receivers, amounts, change_addr) { + function addOutputs(tx, receivers, amounts, change_address) { let size = 0; for (let i in receivers) { tx.addoutput(receivers[i], amounts[i]); size += _sizePerOutput(receivers[i]); } - tx.addoutput(change_addr, 0); - size += _sizePerOutput(change_addr); + tx.addoutput(change_address, 0); + size += _sizePerOutput(change_address); return size; } @@ -464,9 +481,9 @@ } */ - btcOperator.sendTx = function (senders, privkeys, receivers, amounts, fee, change_addr = null) { + btcOperator.sendTx = function (senders, privkeys, receivers, amounts, fee = null, options = {}) { return new Promise((resolve, reject) => { - createSignedTx(senders, privkeys, receivers, amounts, fee, change_addr).then(result => { + createSignedTx(senders, privkeys, receivers, amounts, fee, options).then(result => { debugger; broadcastTx(result.transaction.serialize()) .then(txid => resolve(txid)) @@ -475,7 +492,7 @@ }) } - const createSignedTx = btcOperator.createSignedTx = function (senders, privkeys, receivers, amounts, fee = null, change_addr = null) { + const createSignedTx = btcOperator.createSignedTx = function (senders, privkeys, receivers, amounts, fee = null, options = {}) { return new Promise((resolve, reject) => { try { ({ @@ -489,7 +506,7 @@ receivers, amounts, fee, - change_addr + change_address: options.change_address })); } catch (e) { return reject(e) @@ -504,7 +521,7 @@ if (redeemScripts.includes(null)) //TODO: segwit return reject("Unable to get redeem-script"); //create transaction - createTransaction(senders, redeemScripts, receivers, amounts, fee, change_addr || senders[0]).then(result => { + createTransaction(senders, redeemScripts, receivers, amounts, fee, options.change_address || senders[0], options.fee_from_receiver).then(result => { let tx = result.transaction; console.debug("Unsigned:", tx.serialize()); new Set(wif_keys).forEach(key => console.debug("Signing key:", key, tx.sign(key, 1 /*sighashtype*/))); //Sign the tx using private key WIF @@ -514,7 +531,7 @@ }) } - btcOperator.createTx = function (senders, receivers, amounts, fee = null, change_addr = null) { + btcOperator.createTx = function (senders, receivers, amounts, fee = null, options = {}) { return new Promise((resolve, reject) => { try { ({ @@ -526,7 +543,7 @@ receivers, amounts, fee, - change_addr + change_address: options.change_address })); } catch (e) { return reject(e) @@ -535,7 +552,7 @@ if (redeemScripts.includes(null)) //TODO: segwit return reject("Unable to get redeem-script"); //create transaction - createTransaction(senders, redeemScripts, receivers, amounts, fee, change_addr || senders[0]).then(result => { + createTransaction(senders, redeemScripts, receivers, amounts, fee, options.change_address || senders[0], options.fee_from_receiver).then(result => { result.tx_hex = result.transaction.serialize(); delete result.transaction; resolve(result); @@ -543,7 +560,7 @@ }) } - btcOperator.createMultiSigTx = function (sender, redeemScript, receivers, amounts, fee = null) { + btcOperator.createMultiSigTx = function (sender, redeemScript, receivers, amounts, fee = null, options = {}) { return new Promise((resolve, reject) => { //validate tx parameters if (validateAddress(sender) !== "multisig") @@ -561,13 +578,14 @@ } = validateTxParameters({ receivers, amounts, - fee + fee, + change_address: options.change_address })); } catch (e) { return reject(e) } //create transaction - createTransaction([sender], [redeemScript], receivers, amounts, fee, sender).then(result => { + createTransaction([sender], [redeemScript], receivers, amounts, fee, options.change_address || sender, options.fee_from_receiver).then(result => { result.tx_hex = result.transaction.serialize(); delete result.transaction; resolve(result); @@ -696,7 +714,7 @@ } btcOperator.getTx = txid => new Promise((resolve, reject) => { - fetch_api(`tx/BTC/${txid}`) + fetch_api(`get_tx/BTC/${txid}`) .then(result => resolve(result.data)) .catch(error => reject(error)) }); From b7254bc3ac5f8d4f4d544da3dc96a92f9fb6fc6c Mon Sep 17 00:00:00 2001 From: sairajzero Date: Sun, 20 Nov 2022 19:46:22 +0530 Subject: [PATCH 34/42] btcOperator v1.0.13c bug fix Fixed: tx outputs with 0 value (such as change amount) not removed --- btcOperator.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/btcOperator.js b/btcOperator.js index 85ae761..0f2786a 100644 --- a/btcOperator.js +++ b/btcOperator.js @@ -1,4 +1,4 @@ -(function (EXPORTS) { //btcOperator v1.0.13b +(function (EXPORTS) { //btcOperator v1.0.13c /* BTC Crypto and API Operator */ const btcOperator = EXPORTS; @@ -346,7 +346,7 @@ return reject("Send amount is less than fee"); } - tx.outs = tx.outs.filter(o => o.value !== 0); //remove all output with value 0 + tx.outs = tx.outs.filter(o => o.value != 0); //remove all output with value 0 result.output_size = output_size; result.output_amount = total_amount - (fee_from_receiver ? result.fee : 0); result.total_size = BASE_TX_SIZE + output_size + result.input_size; From 7a6a02f2b6f85a46a43611874501aa83f4499c32 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Thu, 24 Nov 2022 03:25:35 +0530 Subject: [PATCH 35/42] Update lib.js - support for multisig-bech32 (p2wsh) --- lib.js | 1512 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 910 insertions(+), 602 deletions(-) diff --git a/lib.js b/lib.js index b435194..2234db8 100644 --- a/lib.js +++ b/lib.js @@ -1,4 +1,4 @@ -(function(GLOBAL) { //lib v1.3.1 +(function (GLOBAL) { //lib v1.3.2 'use strict'; /* Utility Libraries required for Standard operations * All credits for these codes belong to their respective creators, moderators and owners. @@ -6,16 +6,16 @@ */ GLOBAL.cryptocoin = (typeof floGlobals === 'undefined' ? null : floGlobals.blockchain) || 'FLO'; - const getRandomBytes = (function() { + const getRandomBytes = (function () { if (typeof require === 'function') { const crypto = require('crypto'); - return function(buf) { + return function (buf) { var bytes = crypto.randomBytes(buf.length); buf.set(bytes); return buf; } } else if (GLOBAL.crypto && GLOBAL.crypto.getRandomValues) { - return function(buf) { + return function (buf) { return GLOBAL.crypto.getRandomValues(buf); } } else @@ -23,14 +23,14 @@ })(); - GLOBAL.securedMathRandom = (function() { + GLOBAL.securedMathRandom = (function () { if (typeof require === 'function') { const crypto = require('crypto'); - return function() { + return function () { return crypto.randomBytes(4).readUInt32LE() / 0xffffffff; } } else if (GLOBAL.crypto && GLOBAL.crypto.getRandomValues) { - return function() { + return function () { return (GLOBAL.crypto.getRandomValues(new Uint32Array(1))[0] / 0xffffffff); } } else @@ -38,7 +38,7 @@ })(); //Crypto.js - (function() { + (function () { // Global Crypto object var Crypto = GLOBAL.Crypto = {}; /*! @@ -47,7 +47,7 @@ * Copyright (c) 2009-2013, Jeff Mott. All rights reserved. * http://code.google.com/p/crypto-js/wiki/License */ - (function() { + (function () { var base64map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; @@ -55,17 +55,17 @@ var util = Crypto.util = { // Bit-wise rotate left - rotl: function(n, b) { + rotl: function (n, b) { return (n << b) | (n >>> (32 - b)); }, // Bit-wise rotate right - rotr: function(n, b) { + rotr: function (n, b) { return (n << (32 - b)) | (n >>> b); }, // Swap big-endian to little-endian and vice versa - endian: function(n) { + endian: function (n) { // If number given, swap endian if (n.constructor == Number) { @@ -81,28 +81,28 @@ }, // Generate an array of any length of random bytes - randomBytes: function(n) { + randomBytes: function (n) { for (var bytes = []; n > 0; n--) bytes.push(Math.floor(securedMathRandom() * 256)); return bytes; }, // Convert a byte array to big-endian 32-bit words - bytesToWords: function(bytes) { + bytesToWords: function (bytes) { for (var words = [], i = 0, b = 0; i < bytes.length; i++, b += 8) words[b >>> 5] |= (bytes[i] & 0xFF) << (24 - b % 32); return words; }, // Convert big-endian 32-bit words to a byte array - wordsToBytes: function(words) { + wordsToBytes: function (words) { for (var bytes = [], b = 0; b < words.length * 32; b += 8) bytes.push((words[b >>> 5] >>> (24 - b % 32)) & 0xFF); return bytes; }, // Convert a byte array to a hex string - bytesToHex: function(bytes) { + bytesToHex: function (bytes) { for (var hex = [], i = 0; i < bytes.length; i++) { hex.push((bytes[i] >>> 4).toString(16)); hex.push((bytes[i] & 0xF).toString(16)); @@ -111,14 +111,14 @@ }, // Convert a hex string to a byte array - hexToBytes: function(hex) { + hexToBytes: function (hex) { for (var bytes = [], c = 0; c < hex.length; c += 2) bytes.push(parseInt(hex.substr(c, 2), 16)); return bytes; }, // Convert a byte array to a base-64 string - bytesToBase64: function(bytes) { + bytesToBase64: function (bytes) { for (var base64 = [], i = 0; i < bytes.length; i += 3) { var triplet = (bytes[i] << 16) | (bytes[i + 1] << 8) | bytes[i + 2]; for (var j = 0; j < 4; j++) { @@ -132,7 +132,7 @@ }, // Convert a base-64 string to a byte array - base64ToBytes: function(base64) { + base64ToBytes: function (base64) { // Remove non-base-64 characters base64 = base64.replace(/[^A-Z0-9+\/]/ig, ""); @@ -154,12 +154,12 @@ var UTF8 = charenc.UTF8 = { // Convert a string to a byte array - stringToBytes: function(str) { + stringToBytes: function (str) { return Binary.stringToBytes(unescape(encodeURIComponent(str))); }, // Convert a byte array to a string - bytesToString: function(bytes) { + bytesToString: function (bytes) { return decodeURIComponent(escape(Binary.bytesToString(bytes))); } @@ -169,14 +169,14 @@ var Binary = charenc.Binary = { // Convert a string to a byte array - stringToBytes: function(str) { + stringToBytes: function (str) { for (var bytes = [], i = 0; i < str.length; i++) bytes.push(str.charCodeAt(i) & 0xFF); return bytes; }, // Convert a byte array to a string - bytesToString: function(bytes) { + bytesToString: function (bytes) { for (var str = [], i = 0; i < bytes.length; i++) str.push(String.fromCharCode(bytes[i])); return str.join(""); @@ -192,7 +192,7 @@ * (c) 2009-2012 by Jeff Mott. All rights reserved. * http://code.google.com/p/crypto-js/wiki/License */ - (function() { + (function () { // Shortcuts var C = Crypto, @@ -202,15 +202,15 @@ Binary = charenc.Binary; // Public API - var SHA1 = C.SHA1 = function(message, options) { + var SHA1 = C.SHA1 = function (message, options) { var digestbytes = util.wordsToBytes(SHA1._sha1(message)); return options && options.asBytes ? digestbytes : options && options.asString ? Binary.bytesToString(digestbytes) : - util.bytesToHex(digestbytes); + util.bytesToHex(digestbytes); }; // The core - SHA1._sha1 = function(message) { + SHA1._sha1 = function (message) { // Convert to byte array if (message.constructor == String) message = UTF8.stringToBytes(message); @@ -247,9 +247,9 @@ var t = ((H0 << 5) | (H0 >>> 27)) + H4 + (w[j] >>> 0) + ( j < 20 ? (H1 & H2 | ~H1 & H3) + 1518500249 : - j < 40 ? (H1 ^ H2 ^ H3) + 1859775393 : - j < 60 ? (H1 & H2 | H1 & H3 | H2 & H3) - 1894007588 : - (H1 ^ H2 ^ H3) - 899497514); + j < 40 ? (H1 ^ H2 ^ H3) + 1859775393 : + j < 60 ? (H1 & H2 | H1 & H3 | H2 & H3) - 1894007588 : + (H1 ^ H2 ^ H3) - 899497514); H4 = H3; H3 = H2; @@ -285,7 +285,7 @@ * (c) 2009-2012 by Jeff Mott. All rights reserved. * http://code.google.com/p/crypto-js/wiki/License */ - (function() { + (function () { // Shortcuts var C = Crypto, @@ -294,7 +294,7 @@ UTF8 = charenc.UTF8, Binary = charenc.Binary; - C.HMAC = function(hasher, message, key, options) { + C.HMAC = function (hasher, message, key, options) { // Convert to byte arrays if (message.constructor == String) message = UTF8.stringToBytes(message); @@ -323,7 +323,7 @@ return options && options.asBytes ? hmacbytes : options && options.asString ? Binary.bytesToString(hmacbytes) : - util.bytesToHex(hmacbytes); + util.bytesToHex(hmacbytes); }; @@ -337,7 +337,7 @@ * (c) 2009-2012 by Jeff Mott. All rights reserved. * http://code.google.com/p/crypto-js/wiki/License */ - (function() { + (function () { var d = Crypto, k = d.util, g = d.charenc, @@ -353,11 +353,11 @@ 506948616, 659060556, 883997877, 958139571, 1322822218, 1537002063, 1747873779, 1955562222, 2024104815, 2227730452, 2361852424, 2428436474, 2756734187, 3204031479, 3329325298 ], - e = d.SHA256 = function(b, c) { + e = d.SHA256 = function (b, c) { var f = k.wordsToBytes(e._sha256(b)); return c && c.asBytes ? f : c && c.asString ? a.bytesToString(f) : k.bytesToHex(f) }; - e._sha256 = function(a) { + e._sha256 = function (a) { a.constructor == String && (a = b.stringToBytes(a)); var e = k.bytesToWords(a), f = a.length * 8, @@ -380,7 +380,7 @@ for (h = 0; h < 64; h++) { h < 16 ? d[h] = e[h + t] : (l = d[h - 15], j = d[h - 2], d[h] = ((l << 25 | l >>> 7) ^ (l << 14 | l >>> 18) ^ l >>> 3) + (d[h - 7] >>> 0) + ((j << 15 | j >>> 17) ^ - (j << 13 | j >>> 19) ^ j >>> 10) + (d[h - 16] >>> 0)); + (j << 13 | j >>> 19) ^ j >>> 10) + (d[h - 16] >>> 0)); j = f & g ^ f & m ^ g & m; var u = (f << 30 | f >>> 2) ^ (f << 19 | f >>> 13) ^ (f << 10 | f >>> 22); l = (s >>> 0) + ((i << 26 | i >>> 6) ^ (i << 21 | i >>> 11) ^ (i << 7 | i >>> 25)) + @@ -409,13 +409,13 @@ e._blocksize = 16; e._digestsize = 32 })(); - (function() { + (function () { var d = Crypto, k = d.util, g = d.charenc, b = g.UTF8, a = g.Binary; - d.HMAC = function(c, e, d, g) { + d.HMAC = function (c, e, d, g) { e.constructor == String && (e = b.stringToBytes(e)); d.constructor == String && (d = b.stringToBytes(d)); d.length > c._blocksize * 4 && (d = c(d, { @@ -434,7 +434,7 @@ })(); //SecureRandom.js - (function() { + (function () { /*! @@ -449,7 +449,7 @@ */ // Constructor function of Global SecureRandom object - var sr = GLOBAL.SecureRandom = function() {}; + var sr = GLOBAL.SecureRandom = function () { }; // Properties sr.state; @@ -465,7 +465,7 @@ // public method // ba: byte array - sr.prototype.nextBytes = function(ba) { + sr.prototype.nextBytes = function (ba) { var i; if (getRandomBytes && GLOBAL.Uint8Array) { try { @@ -486,11 +486,11 @@ // Mix in the current time (w/milliseconds) into the pool // NOTE: this method should be called from body click/keypress event handlers to increase entropy - sr.seedTime = function() { + sr.seedTime = function () { sr.seedInt(new Date().getTime()); } - sr.getByte = function() { + sr.getByte = function () { if (sr.state == null) { sr.seedTime(); sr.state = sr.ArcFour(); // Plug in your RNG constructor here @@ -505,7 +505,7 @@ } // Mix in a 32-bit integer into the pool - sr.seedInt = function(x) { + sr.seedInt = function (x) { sr.seedInt8(x); sr.seedInt8((x >> 8)); sr.seedInt8((x >> 16)); @@ -513,19 +513,19 @@ } // Mix in a 16-bit integer into the pool - sr.seedInt16 = function(x) { + sr.seedInt16 = function (x) { sr.seedInt8(x); sr.seedInt8((x >> 8)); } // Mix in a 8-bit integer into the pool - sr.seedInt8 = function(x) { + sr.seedInt8 = function (x) { sr.pool[sr.pptr++] ^= x & 255; if (sr.pptr >= sr.poolSize) sr.pptr -= sr.poolSize; } // Arcfour is a PRNG - sr.ArcFour = function() { + sr.ArcFour = function () { function Arcfour() { this.i = 0; this.j = 0; @@ -610,7 +610,7 @@ } entropyStr += pluginsStr + mimeTypesStr; // cookies and storage: 1 bit - entropyStr += navigator.cookieEnabled + typeof(sessionStorage) + typeof(localStorage); + entropyStr += navigator.cookieEnabled + typeof (sessionStorage) + typeof (localStorage); // language: ~7 bit entropyStr += navigator.language; // history: ~2 bit @@ -628,7 +628,7 @@ })(); //ripemd160.js - (function() { + (function () { /* CryptoJS v3.1.2 @@ -677,7 +677,7 @@ var hl = [0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E]; var hr = [0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000]; - var bytesToWords = function(bytes) { + var bytesToWords = function (bytes) { var words = []; for (var i = 0, b = 0; i < bytes.length; i++, b += 8) { words[b >>> 5] |= bytes[i] << (24 - b % 32); @@ -685,7 +685,7 @@ return words; }; - var wordsToBytes = function(words) { + var wordsToBytes = function (words) { var bytes = []; for (var b = 0; b < words.length * 32; b += 8) { bytes.push((words[b >>> 5] >>> (24 - b % 32)) & 0xFF); @@ -693,7 +693,7 @@ return bytes; }; - var processBlock = function(H, M, offset) { + var processBlock = function (H, M, offset) { // Swap endian for (var i = 0; i < 16; i++) { @@ -829,7 +829,7 @@ })(); //BigInteger.js - (function() { + (function () { // Upstream 'BigInteger' here: // Original Author: http://www-cs-students.stanford.edu/~tjw/jsbn/ // Follows 'jsbn' on Github: https://github.com/jasondavies/jsbn @@ -854,7 +854,7 @@ if (a != null) if ("number" == typeof a) this.fromNumber(a, b, c); else if (b == null && "string" != typeof a) this.fromString(a, 256); - else this.fromString(a, b); + else this.fromString(a, b); }; // Bits per digit @@ -1000,7 +1000,7 @@ // (protected) copy this to r - BigInteger.prototype.copyTo = function(r) { + BigInteger.prototype.copyTo = function (r) { for (var i = this.t - 1; i >= 0; --i) r[i] = this[i]; r.t = this.t; r.s = this.s; @@ -1008,7 +1008,7 @@ // (protected) set from integer value x, -DV <= x < DV - BigInteger.prototype.fromInt = function(x) { + BigInteger.prototype.fromInt = function (x) { this.t = 1; this.s = (x < 0) ? -1 : 0; if (x > 0) this[0] = x; @@ -1017,7 +1017,7 @@ }; // (protected) set from string and radix - BigInteger.prototype.fromString = function(s, b) { + BigInteger.prototype.fromString = function (s, b) { var k; if (b == 16) k = 4; else if (b == 8) k = 3; @@ -1061,13 +1061,13 @@ // (protected) clamp off excess high words - BigInteger.prototype.clamp = function() { + BigInteger.prototype.clamp = function () { var c = this.s & this.DM; while (this.t > 0 && this[this.t - 1] == c) --this.t; }; // (protected) r = this << n*DB - BigInteger.prototype.dlShiftTo = function(n, r) { + BigInteger.prototype.dlShiftTo = function (n, r) { var i; for (i = this.t - 1; i >= 0; --i) r[i + n] = this[i]; for (i = n - 1; i >= 0; --i) r[i] = 0; @@ -1076,7 +1076,7 @@ }; // (protected) r = this >> n*DB - BigInteger.prototype.drShiftTo = function(n, r) { + BigInteger.prototype.drShiftTo = function (n, r) { for (var i = n; i < this.t; ++i) r[i - n] = this[i]; r.t = Math.max(this.t - n, 0); r.s = this.s; @@ -1084,7 +1084,7 @@ // (protected) r = this << n - BigInteger.prototype.lShiftTo = function(n, r) { + BigInteger.prototype.lShiftTo = function (n, r) { var bs = n % this.DB; var cbs = this.DB - bs; var bm = (1 << cbs) - 1; @@ -1104,7 +1104,7 @@ // (protected) r = this >> n - BigInteger.prototype.rShiftTo = function(n, r) { + BigInteger.prototype.rShiftTo = function (n, r) { r.s = this.s; var ds = Math.floor(n / this.DB); if (ds >= this.t) { @@ -1126,7 +1126,7 @@ // (protected) r = this - a - BigInteger.prototype.subTo = function(a, r) { + BigInteger.prototype.subTo = function (a, r) { var i = 0, c = 0, m = Math.min(a.t, this.t); @@ -1162,7 +1162,7 @@ // (protected) r = this * a, r != this,a (HAC 14.12) // "this" should be the larger one if appropriate. - BigInteger.prototype.multiplyTo = function(a, r) { + BigInteger.prototype.multiplyTo = function (a, r) { var x = this.abs(), y = a.abs(); var i = x.t; @@ -1176,7 +1176,7 @@ // (protected) r = this^2, r != this (HAC 14.16) - BigInteger.prototype.squareTo = function(r) { + BigInteger.prototype.squareTo = function (r) { var x = this.abs(); var i = r.t = 2 * x.t; while (--i >= 0) r[i] = 0; @@ -1196,7 +1196,7 @@ // (protected) divide this by m, quotient and remainder to q, r (HAC 14.20) // r != q, this != m. q or r may be null. - BigInteger.prototype.divRemTo = function(m, q, r) { + BigInteger.prototype.divRemTo = function (m, q, r) { var pm = m.abs(); if (pm.t <= 0) return; var pt = this.abs(); @@ -1265,7 +1265,7 @@ // if y is 1/x mod m, then y(2-xy) is 1/x mod m^2 // should reduce x and y(2-xy) by m^2 at each step to keep size bounded. // JS multiply "overflows" differently from C/C++, so care is needed here. - BigInteger.prototype.invDigit = function() { + BigInteger.prototype.invDigit = function () { if (this.t < 1) return 0; var x = this[0]; if ((x & 1) == 0) return 0; @@ -1282,13 +1282,13 @@ // (protected) true iff this is even - BigInteger.prototype.isEven = function() { + BigInteger.prototype.isEven = function () { return ((this.t > 0) ? (this[0] & 1) : this.s) == 0; }; // (protected) this^e, e < 2^32, doing sqr and mul with "r" (HAC 14.79) - BigInteger.prototype.exp = function(e, z) { + BigInteger.prototype.exp = function (e, z) { if (e > 0xffffffff || e < 1) return BigInteger.ONE; var r = nbi(), r2 = nbi(), @@ -1309,7 +1309,7 @@ // (public) return string representation in given radix - BigInteger.prototype.toString = function(b) { + BigInteger.prototype.toString = function (b) { if (this.s < 0) return "-" + this.negate().toString(b); var k; if (b == 16) k = 4; @@ -1348,19 +1348,19 @@ // (public) -this - BigInteger.prototype.negate = function() { + BigInteger.prototype.negate = function () { var r = nbi(); BigInteger.ZERO.subTo(this, r); return r; }; // (public) |this| - BigInteger.prototype.abs = function() { + BigInteger.prototype.abs = function () { return (this.s < 0) ? this.negate() : this; }; // (public) return + if this > a, - if this < a, 0 if equal - BigInteger.prototype.compareTo = function(a) { + BigInteger.prototype.compareTo = function (a) { var r = this.s - a.s; if (r != 0) return r; var i = this.t; @@ -1372,13 +1372,13 @@ } // (public) return the number of bits in "this" - BigInteger.prototype.bitLength = function() { + BigInteger.prototype.bitLength = function () { if (this.t <= 0) return 0; return this.DB * (this.t - 1) + nbits(this[this.t - 1] ^ (this.s & this.DM)); }; // (public) this mod a - BigInteger.prototype.mod = function(a) { + BigInteger.prototype.mod = function (a) { var r = nbi(); this.abs().divRemTo(a, null, r); if (this.s < 0 && r.compareTo(BigInteger.ZERO) > 0) a.subTo(r, r); @@ -1386,7 +1386,7 @@ } // (public) this^e % m, 0 <= e < 2^32 - BigInteger.prototype.modPowInt = function(e, m) { + BigInteger.prototype.modPowInt = function (e, m) { var z; if (e < 256 || m.isEven()) z = new Classic(m); else z = new Montgomery(m); @@ -1468,12 +1468,12 @@ // (protected) return x s.t. r^x < DV - BigInteger.prototype.chunkSize = function(r) { + BigInteger.prototype.chunkSize = function (r) { return Math.floor(Math.LN2 * this.DB / Math.log(r)); }; // (protected) convert to radix string - BigInteger.prototype.toRadix = function(b) { + BigInteger.prototype.toRadix = function (b) { if (b == null) b = 10; if (this.signum() == 0 || b < 2 || b > 36) return "0"; var cs = this.chunkSize(b); @@ -1491,7 +1491,7 @@ }; // (protected) convert from radix string - BigInteger.prototype.fromRadix = function(s, b) { + BigInteger.prototype.fromRadix = function (s, b) { this.fromInt(0); if (b == null) b = 10; var cs = this.chunkSize(b); @@ -1521,7 +1521,7 @@ }; // (protected) alternate constructor - BigInteger.prototype.fromNumber = function(a, b, c) { + BigInteger.prototype.fromNumber = function (a, b, c) { if ("number" == typeof b) { // new BigInteger(int,int,RNG) if (a < 2) this.fromInt(1); @@ -1548,7 +1548,7 @@ }; // (protected) r = this op a (bitwise) - BigInteger.prototype.bitwiseTo = function(a, op, r) { + BigInteger.prototype.bitwiseTo = function (a, op, r) { var i, f, m = Math.min(a.t, this.t); for (i = 0; i < m; ++i) r[i] = op(this[i], a[i]); if (a.t < this.t) { @@ -1565,14 +1565,14 @@ }; // (protected) this op (1<= 0, 1 < n < DV - BigInteger.prototype.dMultiply = function(n) { + BigInteger.prototype.dMultiply = function (n) { this[this.t] = this.am(0, n - 1, this, 0, 0, this.t); ++this.t; this.clamp(); }; // (protected) this += n << w words, this >= 0 - BigInteger.prototype.dAddOffset = function(n, w) { + BigInteger.prototype.dAddOffset = function (n, w) { if (n == 0) return; while (this.t <= w) this[this.t++] = 0; this[w] += n; @@ -1626,7 +1626,7 @@ // (protected) r = lower n words of "this * a", a.t <= n // "this" should be the larger one if appropriate. - BigInteger.prototype.multiplyLowerTo = function(a, n, r) { + BigInteger.prototype.multiplyLowerTo = function (a, n, r) { var i = Math.min(this.t + a.t, n); r.s = 0; // assumes a,this >= 0 r.t = i; @@ -1640,7 +1640,7 @@ // (protected) r = "this * a" without lower n words, n > 0 // "this" should be the larger one if appropriate. - BigInteger.prototype.multiplyUpperTo = function(a, n, r) { + BigInteger.prototype.multiplyUpperTo = function (a, n, r) { --n; var i = r.t = this.t + a.t - n; r.s = 0; // assumes a,this >= 0 @@ -1652,7 +1652,7 @@ }; // (protected) this % n, n < 2^26 - BigInteger.prototype.modInt = function(n) { + BigInteger.prototype.modInt = function (n) { if (n <= 0) return 0; var d = this.DV % n, r = (this.s < 0) ? n - 1 : 0; @@ -1665,7 +1665,7 @@ // (protected) true if probably prime (HAC 4.24, Miller-Rabin) - BigInteger.prototype.millerRabin = function(t) { + BigInteger.prototype.millerRabin = function (t) { var n1 = this.subtract(BigInteger.ONE); var k = n1.getLowestSetBit(); if (k <= 0) return false; @@ -1692,14 +1692,14 @@ // (public) - BigInteger.prototype.clone = function() { + BigInteger.prototype.clone = function () { var r = nbi(); this.copyTo(r); return r; }; // (public) return value as integer - BigInteger.prototype.intValue = function() { + BigInteger.prototype.intValue = function () { if (this.s < 0) { if (this.t == 1) return this[0] - this.DV; else if (this.t == 0) return -1; @@ -1711,17 +1711,17 @@ // (public) return value as byte - BigInteger.prototype.byteValue = function() { + BigInteger.prototype.byteValue = function () { return (this.t == 0) ? this.s : (this[0] << 24) >> 24; }; // (public) return value as short (assumes DB>=16) - BigInteger.prototype.shortValue = function() { + BigInteger.prototype.shortValue = function () { return (this.t == 0) ? this.s : (this[0] << 16) >> 16; }; // (public) 0 if this == 0, 1 if this > 0 - BigInteger.prototype.signum = function() { + BigInteger.prototype.signum = function () { if (this.s < 0) return -1; else if (this.t <= 0 || (this.t == 1 && this[0] <= 0)) return 0; else return 1; @@ -1729,7 +1729,7 @@ // (public) convert to bigendian byte array - BigInteger.prototype.toByteArray = function() { + BigInteger.prototype.toByteArray = function () { var i = this.t, r = new Array(); r[0] = this.s; @@ -1757,13 +1757,13 @@ return r; }; - BigInteger.prototype.equals = function(a) { + BigInteger.prototype.equals = function (a) { return (this.compareTo(a) == 0); }; - BigInteger.prototype.min = function(a) { + BigInteger.prototype.min = function (a) { return (this.compareTo(a) < 0) ? this : a; }; - BigInteger.prototype.max = function(a) { + BigInteger.prototype.max = function (a) { return (this.compareTo(a) > 0) ? this : a; }; @@ -1771,7 +1771,7 @@ function op_and(x, y) { return x & y; } - BigInteger.prototype.and = function(a) { + BigInteger.prototype.and = function (a) { var r = nbi(); this.bitwiseTo(a, op_and, r); return r; @@ -1781,7 +1781,7 @@ function op_or(x, y) { return x | y; } - BigInteger.prototype.or = function(a) { + BigInteger.prototype.or = function (a) { var r = nbi(); this.bitwiseTo(a, op_or, r); return r; @@ -1791,7 +1791,7 @@ function op_xor(x, y) { return x ^ y; } - BigInteger.prototype.xor = function(a) { + BigInteger.prototype.xor = function (a) { var r = nbi(); this.bitwiseTo(a, op_xor, r); return r; @@ -1801,14 +1801,14 @@ function op_andnot(x, y) { return x & ~y; } - BigInteger.prototype.andNot = function(a) { + BigInteger.prototype.andNot = function (a) { var r = nbi(); this.bitwiseTo(a, op_andnot, r); return r; }; // (public) ~this - BigInteger.prototype.not = function() { + BigInteger.prototype.not = function () { var r = nbi(); for (var i = 0; i < this.t; ++i) r[i] = this.DM & ~this[i]; r.t = this.t; @@ -1817,7 +1817,7 @@ }; // (public) this << n - BigInteger.prototype.shiftLeft = function(n) { + BigInteger.prototype.shiftLeft = function (n) { var r = nbi(); if (n < 0) this.rShiftTo(-n, r); else this.lShiftTo(n, r); @@ -1825,7 +1825,7 @@ }; // (public) this >> n - BigInteger.prototype.shiftRight = function(n) { + BigInteger.prototype.shiftRight = function (n) { var r = nbi(); if (n < 0) this.lShiftTo(-n, r); else this.rShiftTo(n, r); @@ -1833,7 +1833,7 @@ }; // (public) returns index of lowest 1-bit (or -1 if none) - BigInteger.prototype.getLowestSetBit = function() { + BigInteger.prototype.getLowestSetBit = function () { for (var i = 0; i < this.t; ++i) if (this[i] != 0) return i * this.DB + lbit(this[i]); if (this.s < 0) return this.t * this.DB; @@ -1841,7 +1841,7 @@ }; // (public) return number of set bits - BigInteger.prototype.bitCount = function() { + BigInteger.prototype.bitCount = function () { var r = 0, x = this.s & this.DM; for (var i = 0; i < this.t; ++i) r += cbit(this[i] ^ x); @@ -1849,56 +1849,56 @@ }; // (public) true iff nth bit is set - BigInteger.prototype.testBit = function(n) { + BigInteger.prototype.testBit = function (n) { var j = Math.floor(n / this.DB); if (j >= this.t) return (this.s != 0); return ((this[j] & (1 << (n % this.DB))) != 0); }; // (public) this | (1<= 1-.5^t - BigInteger.prototype.isProbablePrime = function(t) { + BigInteger.prototype.isProbablePrime = function (t) { var i, x = this.abs(); if (x.t == 1 && x[0] <= lowprimes[lowprimes.length - 1]) { for (i = 0; i < lowprimes.length; ++i) @@ -2105,7 +2105,7 @@ // JSBN-specific extension // (public) this^2 - BigInteger.prototype.square = function() { + BigInteger.prototype.square = function () { var r = nbi(); this.squareTo(r); return r; @@ -2133,13 +2133,13 @@ * This returns the absolute of the contained value in big endian * form. A value of zero results in an empty array. */ - BigInteger.prototype.toByteArrayUnsigned = function() { + BigInteger.prototype.toByteArrayUnsigned = function () { var ba = this.abs().toByteArray(); if (ba.length) { if (ba[0] == 0) { ba = ba.slice(1); } - return ba.map(function(v) { + return ba.map(function (v) { return (v < 0) ? v + 256 : v; }); } else { @@ -2154,7 +2154,7 @@ * This function will interpret a byte array as a big integer in big * endian notation and ignore leading zeros. */ - BigInteger.fromByteArrayUnsigned = function(ba) { + BigInteger.fromByteArrayUnsigned = function (ba) { if (!ba.length) { return ba.valueOf(0); } else if (ba[0] & 0x80) { @@ -2190,7 +2190,7 @@ * 62300 => 0x00f35c * -62300 => 0x80f35c */ - BigInteger.prototype.toByteArraySigned = function() { + BigInteger.prototype.toByteArraySigned = function () { var val = this.abs().toByteArrayUnsigned(); var neg = this.compareTo(BigInteger.ZERO) < 0; @@ -2214,7 +2214,7 @@ * * For details on the format please see BigInteger.toByteArraySigned. */ - BigInteger.fromByteArraySigned = function(ba) { + BigInteger.fromByteArraySigned = function (ba) { // Check for negative value if (ba[0] & 0x80) { // Remove sign bit @@ -2236,21 +2236,21 @@ var Classic = GLOBAL.Classic = function Classic(m) { this.m = m; } - Classic.prototype.convert = function(x) { + Classic.prototype.convert = function (x) { if (x.s < 0 || x.compareTo(this.m) >= 0) return x.mod(this.m); else return x; }; - Classic.prototype.revert = function(x) { + Classic.prototype.revert = function (x) { return x; }; - Classic.prototype.reduce = function(x) { + Classic.prototype.reduce = function (x) { x.divRemTo(this.m, null, x); }; - Classic.prototype.mulTo = function(x, y, r) { + Classic.prototype.mulTo = function (x, y, r) { x.multiplyTo(y, r); this.reduce(r); }; - Classic.prototype.sqrTo = function(x, r) { + Classic.prototype.sqrTo = function (x, r) { x.squareTo(r); this.reduce(r); }; @@ -2269,7 +2269,7 @@ this.mt2 = 2 * m.t; } // xR mod m - Montgomery.prototype.convert = function(x) { + Montgomery.prototype.convert = function (x) { var r = nbi(); x.abs().dlShiftTo(this.m.t, r); r.divRemTo(this.m, null, r); @@ -2277,14 +2277,14 @@ return r; } // x/R mod m - Montgomery.prototype.revert = function(x) { + Montgomery.prototype.revert = function (x) { var r = nbi(); x.copyTo(r); this.reduce(r); return r; }; // x = x/R mod m (HAC 14.32) - Montgomery.prototype.reduce = function(x) { + Montgomery.prototype.reduce = function (x) { while (x.t <= this.mt2) // pad x so am has enough room later x[x.t++] = 0; for (var i = 0; i < this.m.t; ++i) { @@ -2305,12 +2305,12 @@ if (x.compareTo(this.m) >= 0) x.subTo(this.m, x); }; // r = "xy/R mod m"; x,y != r - Montgomery.prototype.mulTo = function(x, y, r) { + Montgomery.prototype.mulTo = function (x, y, r) { x.multiplyTo(y, r); this.reduce(r); }; // r = "x^2/R mod m"; x != r - Montgomery.prototype.sqrTo = function(x, r) { + Montgomery.prototype.sqrTo = function (x, r) { x.squareTo(r); this.reduce(r); }; @@ -2320,17 +2320,17 @@ // A "null" reducer - var NullExp = GLOBAL.NullExp = function NullExp() {} - NullExp.prototype.convert = function(x) { + var NullExp = GLOBAL.NullExp = function NullExp() { } + NullExp.prototype.convert = function (x) { return x; }; - NullExp.prototype.revert = function(x) { + NullExp.prototype.revert = function (x) { return x; }; - NullExp.prototype.mulTo = function(x, y, r) { + NullExp.prototype.mulTo = function (x, y, r) { x.multiplyTo(y, r); }; - NullExp.prototype.sqrTo = function(x, r) { + NullExp.prototype.sqrTo = function (x, r) { x.squareTo(r); }; @@ -2347,7 +2347,7 @@ this.mu = this.r2.divide(m); this.m = m; } - Barrett.prototype.convert = function(x) { + Barrett.prototype.convert = function (x) { if (x.s < 0 || x.t > 2 * this.m.t) return x.mod(this.m); else if (x.compareTo(this.m) < 0) return x; else { @@ -2357,11 +2357,11 @@ return r; } }; - Barrett.prototype.revert = function(x) { + Barrett.prototype.revert = function (x) { return x; }; // x = x mod m (HAC 14.42) - Barrett.prototype.reduce = function(x) { + Barrett.prototype.reduce = function (x) { x.drShiftTo(this.m.t - 1, this.r2); if (x.t > this.m.t + 1) { x.t = this.m.t + 1; @@ -2374,12 +2374,12 @@ while (x.compareTo(this.m) >= 0) x.subTo(this.m, x); }; // r = x*y mod m; x,y != r - Barrett.prototype.mulTo = function(x, y, r) { + Barrett.prototype.mulTo = function (x, y, r) { x.multiplyTo(y, r); this.reduce(r); }; // r = x^2 mod m; x != r - Barrett.prototype.sqrTo = function(x, r) { + Barrett.prototype.sqrTo = function (x, r) { x.squareTo(r); this.reduce(r); }; @@ -2395,7 +2395,7 @@ })(); //ellipticcurve.js - (function() { + (function () { /*! * Basic Javascript Elliptic Curve implementation * Ported loosely from BouncyCastle's Java EC code @@ -2405,53 +2405,53 @@ * http://www-cs-students.stanford.edu/~tjw/jsbn/LICENSE */ // Constructor function of Global EllipticCurve object - var ec = GLOBAL.EllipticCurve = function() {}; + var ec = GLOBAL.EllipticCurve = function () { }; // ---------------- // ECFieldElementFp constructor // q instanceof BigInteger // x instanceof BigInteger - ec.FieldElementFp = function(q, x) { + ec.FieldElementFp = function (q, x) { this.x = x; // TODO if(x.compareTo(q) >= 0) error this.q = q; }; - ec.FieldElementFp.prototype.equals = function(other) { + ec.FieldElementFp.prototype.equals = function (other) { if (other == this) return true; return (this.q.equals(other.q) && this.x.equals(other.x)); }; - ec.FieldElementFp.prototype.toBigInteger = function() { + ec.FieldElementFp.prototype.toBigInteger = function () { return this.x; }; - ec.FieldElementFp.prototype.negate = function() { + ec.FieldElementFp.prototype.negate = function () { return new ec.FieldElementFp(this.q, this.x.negate().mod(this.q)); }; - ec.FieldElementFp.prototype.add = function(b) { + ec.FieldElementFp.prototype.add = function (b) { return new ec.FieldElementFp(this.q, this.x.add(b.toBigInteger()).mod(this.q)); }; - ec.FieldElementFp.prototype.subtract = function(b) { + ec.FieldElementFp.prototype.subtract = function (b) { return new ec.FieldElementFp(this.q, this.x.subtract(b.toBigInteger()).mod(this.q)); }; - ec.FieldElementFp.prototype.multiply = function(b) { + ec.FieldElementFp.prototype.multiply = function (b) { return new ec.FieldElementFp(this.q, this.x.multiply(b.toBigInteger()).mod(this.q)); }; - ec.FieldElementFp.prototype.square = function() { + ec.FieldElementFp.prototype.square = function () { return new ec.FieldElementFp(this.q, this.x.square().mod(this.q)); }; - ec.FieldElementFp.prototype.divide = function(b) { + ec.FieldElementFp.prototype.divide = function (b) { return new ec.FieldElementFp(this.q, this.x.multiply(b.toBigInteger().modInverse(this.q)).mod( this.q)); }; - ec.FieldElementFp.prototype.getByteLength = function() { + ec.FieldElementFp.prototype.getByteLength = function () { return Math.floor((this.toBigInteger().bitLength() + 7) / 8); }; @@ -2463,7 +2463,7 @@ * Copyright (c) 2000 - 2011 The Legion Of The Bouncy Castle (http://www.bouncycastle.org) * Ported to JavaScript by bitaddress.org */ - ec.FieldElementFp.prototype.sqrt = function() { + ec.FieldElementFp.prototype.sqrt = function () { if (!this.q.testBit(0)) throw new Error("even value of q"); // p mod 4 == 3 @@ -2491,7 +2491,7 @@ P = new BigInteger(this.q.bitLength(), rand); } while (P.compareTo(this.q) >= 0 || !(P.multiply(P).subtract(fourQ).modPow(legendreExponent, - this.q).equals(qMinusOne))); + this.q).equals(qMinusOne))); var result = ec.FieldElementFp.fastLucasSequence(this.q, P, Q, k); @@ -2515,7 +2515,7 @@ * contribution from Simon Greatrix */ - (function(C) { + (function (C) { // Create pad namespace var C_pad = C.pad = {}; @@ -2528,7 +2528,7 @@ } // Remove padding when the final byte gives the number of padding bytes. - var _unpadLength = function(cipher, message, alg, padding) { + var _unpadLength = function (cipher, message, alg, padding) { var pad = message.pop(); if (pad == 0) { throw new Error("Invalid zero-length padding specified for " + alg + @@ -2552,8 +2552,8 @@ // No-operation padding, used for stream ciphers C_pad.NoPadding = { - pad: function(cipher, message) {}, - unpad: function(cipher, message) {} + pad: function (cipher, message) { }, + unpad: function (cipher, message) { } }; // Zero Padding. @@ -2561,7 +2561,7 @@ // If the message is not an exact number of blocks, the final block is // completed with 0x00 bytes. There is no unpadding. C_pad.ZeroPadding = { - pad: function(cipher, message) { + pad: function (cipher, message) { var blockSizeInBytes = cipher._blocksize * 4; var reqd = message.length % blockSizeInBytes; if (reqd != 0) { @@ -2571,7 +2571,7 @@ } }, - unpad: function(cipher, message) { + unpad: function (cipher, message) { while (message[message.length - 1] == 0) { message.pop(); } @@ -2583,7 +2583,7 @@ // Pads the plain text with an 0x80 byte followed by as many 0x00 // bytes are required to complete the block. C_pad.iso7816 = { - pad: function(cipher, message) { + pad: function (cipher, message) { var reqd = _requiredPadding(cipher, message); message.push(0x80); for (; reqd > 1; reqd--) { @@ -2591,7 +2591,7 @@ } }, - unpad: function(cipher, message) { + unpad: function (cipher, message) { var padLength; for (padLength = cipher._blocksize * 4; padLength > 0; padLength--) { var b = message.pop(); @@ -2612,7 +2612,7 @@ // The final block is padded with zeros except for the last byte of the // last block which contains the number of padding bytes. C_pad.ansix923 = { - pad: function(cipher, message) { + pad: function (cipher, message) { var reqd = _requiredPadding(cipher, message); for (var i = 1; i < reqd; i++) { message.push(0x00); @@ -2620,7 +2620,7 @@ message.push(reqd); }, - unpad: function(cipher, message) { + unpad: function (cipher, message) { _unpadLength(cipher, message, "ANSI X.923", 0); } }; @@ -2630,7 +2630,7 @@ // The final block is padded with random bytes except for the last // byte of the last block which contains the number of padding bytes. C_pad.iso10126 = { - pad: function(cipher, message) { + pad: function (cipher, message) { var reqd = _requiredPadding(cipher, message); for (var i = 1; i < reqd; i++) { message.push(Math.floor(securedMathRandom() * 256)); @@ -2638,7 +2638,7 @@ message.push(reqd); }, - unpad: function(cipher, message) { + unpad: function (cipher, message) { _unpadLength(cipher, message, "ISO 10126", undefined); } }; @@ -2649,14 +2649,14 @@ // value of each added byte is the number of bytes that are added, // i.e. N bytes, each of value N are added. C_pad.pkcs7 = { - pad: function(cipher, message) { + pad: function (cipher, message) { var reqd = _requiredPadding(cipher, message); for (var i = 0; i < reqd; i++) { message.push(reqd); } }, - unpad: function(cipher, message) { + unpad: function (cipher, message) { _unpadLength(cipher, message, "PKCS 7", message[message.length - 1]); } }; @@ -2667,19 +2667,19 @@ /** * Mode base "class". */ - var Mode = C_mode.Mode = function(padding) { + var Mode = C_mode.Mode = function (padding) { if (padding) { this._padding = padding; } }; Mode.prototype = { - encrypt: function(cipher, m, iv) { + encrypt: function (cipher, m, iv) { this._padding.pad(cipher, m); this._doEncrypt(cipher, m, iv); }, - decrypt: function(cipher, m, iv) { + decrypt: function (cipher, m, iv) { this._doDecrypt(cipher, m, iv); this._padding.unpad(cipher, m); }, @@ -2696,7 +2696,7 @@ * * ECB does not require an initialization vector. */ - var ECB = C_mode.ECB = function() { + var ECB = C_mode.ECB = function () { // Call parent constructor Mode.apply(this, arguments); }; @@ -2705,14 +2705,14 @@ var ECB_prototype = ECB.prototype = new Mode; // Concrete steps for Mode template - ECB_prototype._doEncrypt = function(cipher, m, iv) { + ECB_prototype._doEncrypt = function (cipher, m, iv) { var blockSizeInBytes = cipher._blocksize * 4; // Encrypt each block for (var offset = 0; offset < m.length; offset += blockSizeInBytes) { cipher._encryptblock(m, offset); } }; - ECB_prototype._doDecrypt = function(cipher, c, iv) { + ECB_prototype._doDecrypt = function (cipher, c, iv) { var blockSizeInBytes = cipher._blocksize * 4; // Decrypt each block for (var offset = 0; offset < c.length; offset += blockSizeInBytes) { @@ -2721,7 +2721,7 @@ }; // ECB never uses an IV - ECB_prototype.fixOptions = function(options) { + ECB_prototype.fixOptions = function (options) { options.iv = []; }; @@ -2732,7 +2732,7 @@ * The first block is XORed with the IV. Subsequent blocks are XOR with the * previous cipher output. */ - var CBC = C_mode.CBC = function() { + var CBC = C_mode.CBC = function () { // Call parent constructor Mode.apply(this, arguments); }; @@ -2741,7 +2741,7 @@ var CBC_prototype = CBC.prototype = new Mode; // Concrete steps for Mode template - CBC_prototype._doEncrypt = function(cipher, m, iv) { + CBC_prototype._doEncrypt = function (cipher, m, iv) { var blockSizeInBytes = cipher._blocksize * 4; // Encrypt each block @@ -2759,7 +2759,7 @@ cipher._encryptblock(m, offset); } }; - CBC_prototype._doDecrypt = function(cipher, c, iv) { + CBC_prototype._doDecrypt = function (cipher, c, iv) { var blockSizeInBytes = cipher._blocksize * 4; // At the start, the previously crypted block is the IV @@ -2789,7 +2789,7 @@ * * This is a stream cipher mode and does not require padding. */ - var CFB = C_mode.CFB = function() { + var CFB = C_mode.CFB = function () { // Call parent constructor Mode.apply(this, arguments); }; @@ -2801,7 +2801,7 @@ CFB_prototype._padding = C_pad.NoPadding; // Concrete steps for Mode template - CFB_prototype._doEncrypt = function(cipher, m, iv) { + CFB_prototype._doEncrypt = function (cipher, m, iv) { var blockSizeInBytes = cipher._blocksize * 4, keystream = iv.slice(0); @@ -2815,7 +2815,7 @@ keystream[j] = m[i]; } }; - CFB_prototype._doDecrypt = function(cipher, c, iv) { + CFB_prototype._doDecrypt = function (cipher, c, iv) { var blockSizeInBytes = cipher._blocksize * 4, keystream = iv.slice(0); @@ -2840,7 +2840,7 @@ * * This is a stream cipher mode and does not require padding. */ - var OFB = C_mode.OFB = function() { + var OFB = C_mode.OFB = function () { // Call parent constructor Mode.apply(this, arguments); }; @@ -2852,7 +2852,7 @@ OFB_prototype._padding = C_pad.NoPadding; // Concrete steps for Mode template - OFB_prototype._doEncrypt = function(cipher, m, iv) { + OFB_prototype._doEncrypt = function (cipher, m, iv) { var blockSizeInBytes = cipher._blocksize * 4, keystream = iv.slice(0); @@ -2880,7 +2880,7 @@ * * This is a stream cipher mode and does not require padding. */ - var CTR = C_mode.CTR = function() { + var CTR = C_mode.CTR = function () { // Call parent constructor Mode.apply(this, arguments); }; @@ -2891,7 +2891,7 @@ // Override padding CTR_prototype._padding = C_pad.NoPadding; - CTR_prototype._doEncrypt = function(cipher, m, iv) { + CTR_prototype._doEncrypt = function (cipher, m, iv) { var blockSizeInBytes = cipher._blocksize * 4; var counter = iv.slice(0); @@ -2930,7 +2930,7 @@ * Copyright (c) 2009-2013, Jeff Mott. All rights reserved. * http://code.google.com/p/crypto-js/wiki/License */ - (function() { + (function () { // Shortcuts var C = Crypto, @@ -2939,7 +2939,7 @@ UTF8 = charenc.UTF8, Binary = charenc.Binary; - C.PBKDF2 = function(password, salt, keylen, options) { + C.PBKDF2 = function (password, salt, keylen, options) { // Convert to byte arrays if (password.constructor == String) password = UTF8.stringToBytes(password); @@ -2975,7 +2975,7 @@ return options && options.asBytes ? derivedKeyBytes : options && options.asString ? Binary.bytesToString(derivedKeyBytes) : - util.bytesToHex(derivedKeyBytes); + util.bytesToHex(derivedKeyBytes); }; @@ -3003,7 +3003,7 @@ * THE SOFTWARE. */ // https://github.com/cheongwy/node-scrypt-js - (function() { + (function () { var MAX_VALUE = 2147483647; var workerUrl = null; @@ -3015,7 +3015,7 @@ * p = parallelization cost * */ - GLOBAL.Crypto_scrypt = function(passwd, salt, N, r, p, dkLen, callback) { + GLOBAL.Crypto_scrypt = function (passwd, salt, N, r, p, dkLen, callback) { if (N == 0 || (N & (N - 1)) != 0) throw Error("N must be > 0 and a power of 2"); if (N > MAX_VALUE / 128 / r) throw Error("Parameter N is too large"); @@ -3032,7 +3032,7 @@ try { var i = 0; var worksDone = 0; - var makeWorker = function() { + var makeWorker = function () { if (!workerUrl) { var code = '(' + scryptCore.toString() + ')()'; var blob; @@ -3051,7 +3051,7 @@ workerUrl = URL.createObjectURL(blob); } var worker = new Worker(workerUrl); - worker.onmessage = function(event) { + worker.onmessage = function (event) { var Bi = event.data[0], Bslice = event.data[1]; worksDone++; @@ -3079,7 +3079,7 @@ workers[1].postMessage([N, r, p, B, i++]); } } catch (e) { - GLOBAL.setTimeout(function() { + GLOBAL.setTimeout(function () { scryptCore(); callback(Crypto.PBKDF2(passwd, B, dkLen, PBKDF2_opts)); }, 0); @@ -3091,7 +3091,7 @@ V = []; if (typeof B === 'undefined') { - onmessage = function(event) { + onmessage = function (event) { var data = event.data; var N = data[0], r = data[1], @@ -3363,7 +3363,7 @@ * Copyright (c) 2009-2013, Jeff Mott. All rights reserved. * http://code.google.com/p/crypto-js/wiki/License */ - (function() { + (function () { // Shortcuts var C = Crypto, @@ -3442,11 +3442,11 @@ // Inner state var state = [ - [], - [], - [], - [] - ], + [], + [], + [], + [] + ], keylength, nrounds, keyschedule; @@ -3457,7 +3457,7 @@ * Public API */ - encrypt: function(message, password, options) { + encrypt: function (message, password, options) { options = options || {}; @@ -3472,8 +3472,8 @@ // Convert to bytes if message is a string m = ( message.constructor == String ? - UTF8.stringToBytes(message) : - message + UTF8.stringToBytes(message) : + message ), // Generate random IV @@ -3482,12 +3482,12 @@ // Generate key k = ( password.constructor == String ? - // Derive key from pass-phrase - C.PBKDF2(password, iv, 32, { - asBytes: true - }) : - // else, assume byte array representing cryptographic key - password + // Derive key from pass-phrase + C.PBKDF2(password, iv, 32, { + asBytes: true + }) : + // else, assume byte array representing cryptographic key + password ); // Encrypt @@ -3500,7 +3500,7 @@ }, - decrypt: function(ciphertext, password, options) { + decrypt: function (ciphertext, password, options) { options = options || {}; @@ -3515,8 +3515,8 @@ // Convert to bytes if ciphertext is a string c = ( ciphertext.constructor == String ? - util.base64ToBytes(ciphertext) : - ciphertext + util.base64ToBytes(ciphertext) : + ciphertext ), // Separate IV and message @@ -3525,12 +3525,12 @@ // Generate key k = ( password.constructor == String ? - // Derive key from pass-phrase - C.PBKDF2(password, iv, 32, { - asBytes: true - }) : - // else, assume byte array representing cryptographic key - password + // Derive key from pass-phrase + C.PBKDF2(password, iv, 32, { + asBytes: true + }) : + // else, assume byte array representing cryptographic key + password ); // Decrypt @@ -3549,7 +3549,7 @@ _blocksize: 4, - _encryptblock: function(m, offset) { + _encryptblock: function (m, offset) { // Set input for (var row = 0; row < AES._blocksize; row++) { @@ -3626,7 +3626,7 @@ }, - _decryptblock: function(c, offset) { + _decryptblock: function (c, offset) { // Set input for (var row = 0; row < AES._blocksize; row++) { @@ -3708,14 +3708,14 @@ * Private methods */ - _init: function(k) { + _init: function (k) { keylength = k.length / 4; nrounds = keylength + 6; AES._keyexpansion(k); }, // Generate a key schedule - _keyexpansion: function(k) { + _keyexpansion: function (k) { keyschedule = []; @@ -3779,7 +3779,7 @@ * Copyright (c) 2000 - 2011 The Legion Of The Bouncy Castle (http://www.bouncycastle.org) * Ported to JavaScript by bitaddress.org */ - ec.FieldElementFp.fastLucasSequence = function(p, P, Q, k) { + ec.FieldElementFp.fastLucasSequence = function (p, P, Q, k) { // TODO Research and apply "common-multiplicand multiplication here" var n = k.bitLength(); @@ -3822,7 +3822,7 @@ // ---------------- // ECPointFp constructor - ec.PointFp = function(curve, x, y, z, compressed) { + ec.PointFp = function (curve, x, y, z, compressed) { this.curve = curve; this.x = x; this.y = y; @@ -3838,7 +3838,7 @@ this.compressed = !!compressed; }; - ec.PointFp.prototype.getX = function() { + ec.PointFp.prototype.getX = function () { if (this.zinv == null) { this.zinv = this.z.modInverse(this.curve.q); } @@ -3847,7 +3847,7 @@ return this.curve.fromBigInteger(r); }; - ec.PointFp.prototype.getY = function() { + ec.PointFp.prototype.getY = function () { if (this.zinv == null) { this.zinv = this.z.modInverse(this.curve.q); } @@ -3856,7 +3856,7 @@ return this.curve.fromBigInteger(r); }; - ec.PointFp.prototype.equals = function(other) { + ec.PointFp.prototype.equals = function (other) { if (other == this) return true; if (this.isInfinity()) return other.isInfinity(); if (other.isInfinity()) return this.isInfinity(); @@ -3871,16 +3871,16 @@ return v.equals(BigInteger.ZERO); }; - ec.PointFp.prototype.isInfinity = function() { + ec.PointFp.prototype.isInfinity = function () { if ((this.x == null) && (this.y == null)) return true; return this.z.equals(BigInteger.ZERO) && !this.y.toBigInteger().equals(BigInteger.ZERO); }; - ec.PointFp.prototype.negate = function() { + ec.PointFp.prototype.negate = function () { return new ec.PointFp(this.curve, this.x, this.y.negate(), this.z); }; - ec.PointFp.prototype.add = function(b) { + ec.PointFp.prototype.add = function (b) { if (this.isInfinity()) return b; if (b.isInfinity()) return this; @@ -3922,7 +3922,7 @@ z3); }; - ec.PointFp.prototype.twice = function() { + ec.PointFp.prototype.twice = function () { if (this.isInfinity()) return this; if (this.y.toBigInteger().signum() == 0) return this.curve.getInfinity(); @@ -3957,7 +3957,7 @@ // Simple NAF (Non-Adjacent Form) multiplication algorithm // TODO: modularize the multiplication algorithm - ec.PointFp.prototype.multiply = function(k) { + ec.PointFp.prototype.multiply = function (k) { if (this.isInfinity()) return this; if (k.signum() == 0) return this.curve.getInfinity(); @@ -3983,7 +3983,7 @@ }; // Compute this*j + x*k (simultaneous multiplication) - ec.PointFp.prototype.multiplyTwo = function(j, x, k) { + ec.PointFp.prototype.multiplyTwo = function (j, x, k) { var i; if (j.bitLength() > k.bitLength()) i = j.bitLength() - 1; @@ -4013,7 +4013,7 @@ // patched by bitaddress.org and Casascius for use with Bitcoin.ECKey // patched by coretechs to support compressed public keys - ec.PointFp.prototype.getEncoded = function(compressed) { + ec.PointFp.prototype.getEncoded = function (compressed) { var x = this.getX().toBigInteger(); var y = this.getY().toBigInteger(); var len = 32; // integerToBytes will zero pad if integer is less than 32 bytes. 32 bytes length is required by the Bitcoin protocol. @@ -4033,7 +4033,7 @@ return enc; }; - ec.PointFp.decodeFrom = function(curve, enc) { + ec.PointFp.decodeFrom = function (curve, enc) { var type = enc[0]; var dataLen = enc.length - 1; @@ -4053,7 +4053,7 @@ return new ec.PointFp(curve, curve.fromBigInteger(x), curve.fromBigInteger(y)); }; - ec.PointFp.prototype.add2D = function(b) { + ec.PointFp.prototype.add2D = function (b) { if (this.isInfinity()) return b; if (b.isInfinity()) return this; @@ -4076,7 +4076,7 @@ return new ec.PointFp(this.curve, x3, y3); }; - ec.PointFp.prototype.twice2D = function() { + ec.PointFp.prototype.twice2D = function () { if (this.isInfinity()) return this; if (this.y.toBigInteger().signum() == 0) { // if y1 == 0, then (x1, y1) == (x1, -y1) @@ -4094,7 +4094,7 @@ return new ec.PointFp(this.curve, x3, y3); }; - ec.PointFp.prototype.multiply2D = function(k) { + ec.PointFp.prototype.multiply2D = function (k) { if (this.isInfinity()) return this; if (k.signum() == 0) return this.curve.getInfinity(); @@ -4119,7 +4119,7 @@ return R; }; - ec.PointFp.prototype.isOnCurve = function() { + ec.PointFp.prototype.isOnCurve = function () { var x = this.getX().toBigInteger(); var y = this.getY().toBigInteger(); var a = this.curve.getA().toBigInteger(); @@ -4130,7 +4130,7 @@ return lhs.equals(rhs); }; - ec.PointFp.prototype.toString = function() { + ec.PointFp.prototype.toString = function () { return '(' + this.getX().toBigInteger().toString() + ',' + this.getY().toBigInteger().toString() + ')'; }; @@ -4140,7 +4140,7 @@ * * See SEC 1, section 3.2.2.1: Elliptic Curve Public Key Validation Primitive */ - ec.PointFp.prototype.validate = function() { + ec.PointFp.prototype.validate = function () { var n = this.curve.getQ(); // Check Q != O @@ -4177,7 +4177,7 @@ // ---------------- // ECCurveFp constructor - ec.CurveFp = function(q, a, b) { + ec.CurveFp = function (q, a, b) { this.q = q; this.a = this.fromBigInteger(a); this.b = this.fromBigInteger(b); @@ -4185,38 +4185,38 @@ this.reducer = new Barrett(this.q); } - ec.CurveFp.prototype.getQ = function() { + ec.CurveFp.prototype.getQ = function () { return this.q; }; - ec.CurveFp.prototype.getA = function() { + ec.CurveFp.prototype.getA = function () { return this.a; }; - ec.CurveFp.prototype.getB = function() { + ec.CurveFp.prototype.getB = function () { return this.b; }; - ec.CurveFp.prototype.equals = function(other) { + ec.CurveFp.prototype.equals = function (other) { if (other == this) return true; return (this.q.equals(other.q) && this.a.equals(other.a) && this.b.equals(other.b)); }; - ec.CurveFp.prototype.getInfinity = function() { + ec.CurveFp.prototype.getInfinity = function () { return this.infinity; }; - ec.CurveFp.prototype.fromBigInteger = function(x) { + ec.CurveFp.prototype.fromBigInteger = function (x) { return new ec.FieldElementFp(this.q, x); }; - ec.CurveFp.prototype.reduce = function(x) { + ec.CurveFp.prototype.reduce = function (x) { this.reducer.reduce(x); }; // for now, work with hex strings because they're easier in JS // compressed support added by bitaddress.org - ec.CurveFp.prototype.decodePointHex = function(s) { + ec.CurveFp.prototype.decodePointHex = function (s) { var firstByte = parseInt(s.substr(0, 2), 16); switch (firstByte) { // first byte case 0: @@ -4243,7 +4243,7 @@ } }; - ec.CurveFp.prototype.encodePointHex = function(p) { + ec.CurveFp.prototype.encodePointHex = function (p) { if (p.isInfinity()) return "00"; var xHex = p.getX().toBigInteger().toString(16); var yHex = p.getY().toBigInteger().toString(16); @@ -4265,7 +4265,7 @@ * Number yTilde * BigInteger X1 */ - ec.CurveFp.prototype.decompressPoint = function(yTilde, X1) { + ec.CurveFp.prototype.decompressPoint = function (yTilde, X1) { var x = this.fromBigInteger(X1); var alpha = x.multiply(x.square().add(this.getA())).add(this.getB()); var beta = alpha.sqrt(); @@ -4281,11 +4281,11 @@ }; - ec.fromHex = function(s) { + ec.fromHex = function (s) { return new BigInteger(s, 16); }; - ec.integerToBytes = function(i, len) { + ec.integerToBytes = function (i, len) { var bytes = i.toByteArrayUnsigned(); if (len < bytes.length) { bytes = bytes.slice(bytes.length - len); @@ -4300,29 +4300,29 @@ // Named EC curves // ---------------- // X9ECParameters constructor - ec.X9Parameters = function(curve, g, n, h) { + ec.X9Parameters = function (curve, g, n, h) { this.curve = curve; this.g = g; this.n = n; this.h = h; } - ec.X9Parameters.prototype.getCurve = function() { + ec.X9Parameters.prototype.getCurve = function () { return this.curve; }; - ec.X9Parameters.prototype.getG = function() { + ec.X9Parameters.prototype.getG = function () { return this.g; }; - ec.X9Parameters.prototype.getN = function() { + ec.X9Parameters.prototype.getN = function () { return this.n; }; - ec.X9Parameters.prototype.getH = function() { + ec.X9Parameters.prototype.getH = function () { return this.h; }; // secp256k1 is the Curve used by Bitcoin ec.secNamedCurves = { // used by Bitcoin - "secp256k1": function() { + "secp256k1": function () { // p = 2^256 - 2^32 - 2^9 - 2^8 - 2^7 - 2^6 - 2^4 - 1 var p = ec.fromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F"); var a = BigInteger.ZERO; @@ -4338,16 +4338,16 @@ }; // secp256k1 called by Bitcoin's ECKEY - ec.getSECCurveByName = function(name) { + ec.getSECCurveByName = function (name) { if (ec.secNamedCurves[name] == undefined) return null; return ec.secNamedCurves[name](); } })(); //bitTrx.js - (function() { + (function () { - var bitjs = GLOBAL.bitjs = function() {}; + var bitjs = GLOBAL.bitjs = function () { }; function ascii_to_hexa(str) { var arr1 = []; @@ -4364,7 +4364,7 @@ bitjs.compressed = false; /* provide a privkey and return an WIF */ - bitjs.privkey2wif = function(h) { + bitjs.privkey2wif = function (h) { var r = Crypto.util.hexToBytes(h); if (bitjs.compressed == true) { @@ -4383,7 +4383,7 @@ } /* convert a wif key back to a private key */ - bitjs.wif2privkey = function(wif) { + bitjs.wif2privkey = function (wif) { var compressed = false; var decode = B58.decode(wif); var key = decode.slice(0, decode.length - 4); @@ -4399,7 +4399,7 @@ } /* convert a wif to a pubkey */ - bitjs.wif2pubkey = function(wif) { + bitjs.wif2pubkey = function (wif) { var compressed = bitjs.compressed; var r = bitjs.wif2privkey(wif); bitjs.compressed = r['compressed']; @@ -4412,7 +4412,7 @@ } /* convert a wif to a address */ - bitjs.wif2address = function(wif) { + bitjs.wif2address = function (wif) { var r = bitjs.wif2pubkey(wif); return { 'address': bitjs.pubkey2address(r['pubkey']), @@ -4421,7 +4421,7 @@ } /* generate a public key from a private key */ - bitjs.newPubkey = function(hash) { + bitjs.newPubkey = function (hash) { var privateKeyBigInt = BigInteger.fromByteArrayUnsigned(Crypto.util.hexToBytes(hash)); var curve = EllipticCurve.getSECCurveByName("secp256k1"); @@ -4447,7 +4447,7 @@ } /* provide a public key and return address */ - bitjs.pubkey2address = function(h, byte) { + bitjs.pubkey2address = function (h, byte) { var r = ripemd160(Crypto.SHA256(Crypto.util.hexToBytes(h), { asBytes: true })); @@ -4461,7 +4461,7 @@ return B58.encode(r.concat(checksum)); } - bitjs.transaction = function() { + bitjs.transaction = function () { var btrx = {}; btrx.version = 2; //flochange look at this version btrx.inputs = []; @@ -4470,7 +4470,7 @@ btrx.floData = ""; //flochange .. look at this - btrx.addinput = function(txid, index, scriptPubKey, sequence) { + btrx.addinput = function (txid, index, scriptPubKey, sequence) { var o = {}; o.outpoint = { 'hash': txid, @@ -4482,7 +4482,7 @@ return this.inputs.push(o); } - btrx.addoutput = function(address, value) { + btrx.addoutput = function (address, value) { var o = {}; var buf = []; var addrDecoded = btrx.addressDecode(address); @@ -4498,14 +4498,14 @@ } - btrx.addflodata = function(txcomments) { // flochange - this whole function needs to be done + btrx.addflodata = function (txcomments) { // flochange - this whole function needs to be done this.floData = txcomments; return this.floData; //flochange .. returning the txcomments -- check if the function return will assign } // Only standard addresses - btrx.addressDecode = function(address) { + btrx.addressDecode = function (address) { var bytes = B58.decode(address); var front = bytes.slice(0, bytes.length - 4); var back = bytes.slice(bytes.length - 4); @@ -4520,7 +4520,7 @@ } /* generate the transaction hash to sign from a transaction input */ - btrx.transactionHash = function(index, sigHashType) { + btrx.transactionHash = function (index, sigHashType) { var clone = bitjs.clone(this); var shType = sigHashType || 1; @@ -4602,7 +4602,7 @@ } /* generate a signature from a transaction hash */ - btrx.transactionSig = function(index, wif, sigHashType, txhash) { + btrx.transactionSig = function (index, wif, sigHashType, txhash) { function serializeSig(r, s) { var rBa = r.toByteArraySigned(); @@ -4658,7 +4658,7 @@ } // https://tools.ietf.org/html/rfc6979#section-3.2 - btrx.deterministicK = function(wif, hash, badrs) { + btrx.deterministicK = function (wif, hash, badrs) { // if r or s were invalid when this function was used in signing, // we do not want to actually compute r, s here for efficiency, so, // we can increment badrs. explained at end of RFC 6979 section 3.2 @@ -4741,7 +4741,7 @@ }; /* sign a "standard" input */ - btrx.signinput = function(index, wif, sigHashType) { + btrx.signinput = function (index, wif, sigHashType) { var key = bitjs.wif2pubkey(wif); var shType = sigHashType || 1; var signature = this.transactionSig(index, wif, shType); @@ -4757,7 +4757,7 @@ } /* sign inputs */ - btrx.sign = function(wif, sigHashType) { + btrx.sign = function (wif, sigHashType) { var shType = sigHashType || 1; for (var i = 0; i < this.inputs.length; i++) { this.signinput(i, wif, shType); @@ -4767,7 +4767,7 @@ /* serialize a transaction */ - btrx.serialize = function() { + btrx.serialize = function () { var buffer = []; buffer = buffer.concat(bitjs.numToBytes(parseInt(this.version), 4)); @@ -4820,7 +4820,7 @@ } - bitjs.numToBytes = function(num, bytes) { + bitjs.numToBytes = function (num, bytes) { if (typeof bytes === "undefined") bytes = 8; if (bytes == 0) { return []; @@ -4831,7 +4831,7 @@ } } - bitjs.numToByteArray = function(num) { + bitjs.numToByteArray = function (num) { if (num <= 256) { return [num]; } else { @@ -4839,7 +4839,7 @@ } } - bitjs.numToVarInt = function(num) { + bitjs.numToVarInt = function (num) { if (num < 253) { return [num]; } else if (num < 65536) { @@ -4851,14 +4851,14 @@ } } - bitjs.bytesToNum = function(bytes) { + bitjs.bytesToNum = function (bytes) { if (bytes.length == 0) return 0; else return bytes[0] + 256 * bitjs.bytesToNum(bytes.slice(1)); } /* clone an object */ - bitjs.clone = function(obj) { - if (obj == null || typeof(obj) != 'object') return obj; + bitjs.clone = function (obj) { + if (obj == null || typeof (obj) != 'object') return obj; var temp = new obj.constructor(); for (var key in obj) { @@ -4882,7 +4882,7 @@ * * Ported to JavaScript by Stefan Thomas. */ - encode: function(input) { + encode: function (input) { var bi = BigInteger.fromByteArrayUnsigned(input); var chars = []; @@ -4911,7 +4911,7 @@ * * Ported to JavaScript by Stefan Thomas. */ - decode: function(input) { + decode: function (input) { var bi = BigInteger.valueOf(0); var leadingZerosNum = 0; for (var i = input.length - 1; i >= 0; i--) { @@ -4939,7 +4939,7 @@ })(); //Bitcoin.js - (function() { + (function () { /* Copyright (c) 2011 Stefan Thomas @@ -4965,7 +4965,7 @@ * * Ported to JavaScript by Stefan Thomas. */ - encode: function(input) { + encode: function (input) { var bi = BigInteger.fromByteArrayUnsigned(input); var chars = []; @@ -4994,7 +4994,7 @@ * * Ported to JavaScript by Stefan Thomas. */ - decode: function(input) { + decode: function (input) { var bi = BigInteger.valueOf(0); var leadingZerosNum = 0; for (var i = input.length - 1; i >= 0; i--) { @@ -5019,7 +5019,7 @@ }; //https://raw.github.com/bitcoinjs/bitcoinjs-lib/09e8c6e184d6501a0c2c59d73ca64db5c0d3eb95/src/address.js - Bitcoin.Address = function(bytes) { + Bitcoin.Address = function (bytes) { if (GLOBAL.cryptocoin == "FLO") this.version = 0x23; // FLO mainnet public address else if (GLOBAL.cryptocoin == "FLO_TEST") @@ -5037,7 +5037,7 @@ * * Returns the address as a base58-encoded string in the standardized format. */ - Bitcoin.Address.prototype.toString = function(version = null) { + Bitcoin.Address.prototype.toString = function (version = null) { // Get a copy of the hash var hash = this.hash.slice(0); @@ -5052,14 +5052,14 @@ return Bitcoin.Base58.encode(bytes); }; - Bitcoin.Address.prototype.getHashBase64 = function() { + Bitcoin.Address.prototype.getHashBase64 = function () { return Crypto.util.bytesToBase64(this.hash); }; /** * Parse a Bitcoin address contained in a string. */ - Bitcoin.Address.decodeString = function(string, version) { + Bitcoin.Address.decodeString = function (string, version) { var bytes = Bitcoin.Base58.decode(string); var hash = bytes.slice(0, 21); var checksum = Crypto.SHA256(Crypto.SHA256(hash, { @@ -5082,7 +5082,7 @@ return hash; }; //https://raw.github.com/bitcoinjs/bitcoinjs-lib/e90780d3d3b8fc0d027d2bcb38b80479902f223e/src/ecdsa.js - Bitcoin.ECDSA = (function() { + Bitcoin.ECDSA = (function () { var ecparams = EllipticCurve.getSECCurveByName("secp256k1"); var rng = new SecureRandom(); @@ -5115,12 +5115,12 @@ }; var ECDSA = { - getBigRandom: function(limit) { + getBigRandom: function (limit) { return new BigInteger(limit.bitLength(), rng) .mod(limit.subtract(BigInteger.ONE)) .add(BigInteger.ONE); }, - sign: function(hash, priv) { + sign: function (hash, priv) { var d = priv; var n = ecparams.getN(); var e = BigInteger.fromByteArrayUnsigned(hash); @@ -5137,7 +5137,7 @@ return ECDSA.serializeSig(r, s); }, - verify: function(hash, sig, pubkey) { + verify: function (hash, sig, pubkey) { var r, s; if (Bitcoin.Util.isArray(sig)) { var obj = ECDSA.parseSig(sig); @@ -5163,7 +5163,7 @@ return ECDSA.verifyRaw(e, r, s, Q); }, - verifyRaw: function(e, r, s, Q) { + verifyRaw: function (e, r, s, Q) { var n = ecparams.getN(); var G = ecparams.getG(); @@ -5196,7 +5196,7 @@ * * Takes two BigIntegers representing r and s and returns a byte array. */ - serializeSig: function(r, s) { + serializeSig: function (r, s) { var rBa = r.toByteArraySigned(); var sBa = s.toByteArraySigned(); @@ -5225,7 +5225,7 @@ * s: BigInteger * } */ - parseSig: function(sig) { + parseSig: function (sig) { var cursor; if (sig[0] != 0x30) throw new Error("Signature not a valid DERSequence"); @@ -5254,7 +5254,7 @@ }; }, - parseSigCompact: function(sig) { + parseSigCompact: function (sig) { if (sig.length !== 65) { throw "Signature has the wrong length"; } @@ -5285,7 +5285,7 @@ * * http://www.secg.org/download/aid-780/sec1-v2.pdf */ - recoverPubKey: function(r, s, hash, i) { + recoverPubKey: function (r, s, hash, i) { // The recovery parameter i has two bits. i = i & 3; @@ -5356,14 +5356,14 @@ * This function simply tries all four cases and returns the value * that resulted in a successful pubkey recovery. */ - calcPubkeyRecoveryParam: function(address, r, s, hash) { + calcPubkeyRecoveryParam: function (address, r, s, hash) { for (var i = 0; i < 4; i++) { try { var pubkey = Bitcoin.ECDSA.recoverPubKey(r, s, hash, i); if (pubkey.getBitcoinAddress().toString() == address) { return i; } - } catch (e) {} + } catch (e) { } } throw "Unable to find valid recovery factor"; } @@ -5371,11 +5371,11 @@ return ECDSA; })(); - Bitcoin.KeyPool = (function() { - var KeyPool = function() { + Bitcoin.KeyPool = (function () { + var KeyPool = function () { this.keyArray = []; - this.push = function(item) { + this.push = function (item) { if (item == null || item.priv == null) return; var doAdd = true; // prevent duplicates from being added to the array @@ -5389,24 +5389,24 @@ if (doAdd) this.keyArray.push(item); }; - this.reset = function() { + this.reset = function () { this.keyArray = []; }; - this.getArray = function() { + this.getArray = function () { // copy array return this.keyArray.slice(0); }; - this.setArray = function(ka) { + this.setArray = function (ka) { this.keyArray = ka; }; - this.length = function() { + this.length = function () { return this.keyArray.length; }; - this.toString = function() { + this.toString = function () { var keyPoolString = "# = " + this.length() + "\n"; var pool = this.getArray(); for (var index in pool) { @@ -5427,17 +5427,17 @@ return new KeyPool(); })(); - Bitcoin.Bip38Key = (function() { - var Bip38 = function(address, encryptedKey) { + Bitcoin.Bip38Key = (function () { + var Bip38 = function (address, encryptedKey) { this.address = address; this.priv = encryptedKey; }; - Bip38.prototype.getBitcoinAddress = function() { + Bip38.prototype.getBitcoinAddress = function () { return this.address; }; - Bip38.prototype.toString = function() { + Bip38.prototype.toString = function () { return this.priv; }; @@ -5445,12 +5445,12 @@ })(); //https://raw.github.com/pointbiz/bitcoinjs-lib/9b2f94a028a7bc9bed94e0722563e9ff1d8e8db8/src/eckey.js - Bitcoin.ECKey = (function() { + Bitcoin.ECKey = (function () { var ECDSA = Bitcoin.ECDSA; var KeyPool = Bitcoin.KeyPool; var ecparams = EllipticCurve.getSECCurveByName("secp256k1"); - var ECKey = function(input) { + var ECKey = function (input) { if (!input) { // Generate new key var n = ecparams.getN(); @@ -5533,7 +5533,7 @@ /** * Set whether the public key should be returned compressed or not. */ - ECKey.prototype.setError = function(err) { + ECKey.prototype.setError = function (err) { this.error = err; this.priv = null; return this; @@ -5542,7 +5542,7 @@ /** * Set whether the public key should be returned compressed or not. */ - ECKey.prototype.setCompressed = function(v) { + ECKey.prototype.setCompressed = function (v) { this.compressed = !!v; if (this.pubPoint) this.pubPoint.compressed = this.compressed; return this; @@ -5551,7 +5551,7 @@ /* * Return public key as a byte array in DER encoding */ - ECKey.prototype.getPub = function() { + ECKey.prototype.getPub = function () { if (this.compressed) { if (this.pubComp) return this.pubComp; return this.pubComp = this.getPubPoint().getEncoded(1); @@ -5564,7 +5564,7 @@ /** * Return public point as ECPoint object. */ - ECKey.prototype.getPubPoint = function() { + ECKey.prototype.getPubPoint = function () { if (!this.pubPoint) { this.pubPoint = ecparams.getG().multiply(this.priv); this.pubPoint.compressed = this.compressed; @@ -5572,7 +5572,7 @@ return this.pubPoint; }; - ECKey.prototype.getPubKeyHex = function() { + ECKey.prototype.getPubKeyHex = function () { if (this.compressed) { if (this.pubKeyHexComp) return this.pubKeyHexComp; return this.pubKeyHexComp = Crypto.util.bytesToHex(this.getPub()).toString().toUpperCase(); @@ -5588,7 +5588,7 @@ * This is calculated as RIPE160(SHA256([encoded pubkey])) and returned as * a byte array. */ - ECKey.prototype.getPubKeyHash = function() { + ECKey.prototype.getPubKeyHash = function () { if (this.compressed) { if (this.pubKeyHashComp) return this.pubKeyHashComp; return this.pubKeyHashComp = Bitcoin.Util.sha256ripe160(this.getPub()); @@ -5598,7 +5598,7 @@ } }; - ECKey.prototype.getBitcoinAddress = function() { + ECKey.prototype.getBitcoinAddress = function () { var hash = this.getPubKeyHash(); var addr = new Bitcoin.Address(hash); return addr.toString(); @@ -5607,7 +5607,7 @@ /* * Takes a public point as a hex string or byte array */ - ECKey.prototype.setPub = function(pub) { + ECKey.prototype.setPub = function (pub) { // byte array if (Bitcoin.Util.isArray(pub)) { pub = Crypto.util.bytesToHex(pub).toString().toUpperCase(); @@ -5619,7 +5619,7 @@ }; // Sipa Private Key Wallet Import Format - ECKey.prototype.getBitcoinWalletImportFormat = function() { + ECKey.prototype.getBitcoinWalletImportFormat = function () { var bytes = this.getBitcoinPrivateKeyByteArray(); if (bytes == null) return ""; bytes.unshift(ECKey.privateKeyPrefix); // prepend 0x80 byte @@ -5635,16 +5635,16 @@ }; // Private Key Hex Format - ECKey.prototype.getBitcoinHexFormat = function() { + ECKey.prototype.getBitcoinHexFormat = function () { return Crypto.util.bytesToHex(this.getBitcoinPrivateKeyByteArray()).toString().toUpperCase(); }; // Private Key Base64 Format - ECKey.prototype.getBitcoinBase64Format = function() { + ECKey.prototype.getBitcoinBase64Format = function () { return Crypto.util.bytesToBase64(this.getBitcoinPrivateKeyByteArray()); }; - ECKey.prototype.getBitcoinPrivateKeyByteArray = function() { + ECKey.prototype.getBitcoinPrivateKeyByteArray = function () { if (this.priv == null) return null; // Get a copy of private key as a byte array var bytes = this.priv.toByteArrayUnsigned(); @@ -5653,7 +5653,7 @@ return bytes; }; - ECKey.prototype.toString = function(format) { + ECKey.prototype.toString = function (format) { format = format || ""; if (format.toString().toLowerCase() == "base64" || format.toString().toLowerCase() == "b64") { return this.getBitcoinBase64Format(); @@ -5666,18 +5666,18 @@ } }; - ECKey.prototype.sign = function(hash) { + ECKey.prototype.sign = function (hash) { return ECDSA.sign(hash, this.priv); }; - ECKey.prototype.verify = function(hash, sig) { + ECKey.prototype.verify = function (hash, sig) { return ECDSA.verify(hash, sig, this.getPub()); }; /** * Parse a wallet import format private key contained in a string. */ - ECKey.decodeWalletImportFormat = function(privStr) { + ECKey.decodeWalletImportFormat = function (privStr) { var bytes = Bitcoin.Base58.decode(privStr); var hash = bytes.slice(0, 33); var checksum = Crypto.SHA256(Crypto.SHA256(hash, { @@ -5704,7 +5704,7 @@ /** * Parse a compressed wallet import format private key contained in a string. */ - ECKey.decodeCompressedWalletImportFormat = function(privStr) { + ECKey.decodeCompressedWalletImportFormat = function (privStr) { var bytes = Bitcoin.Base58.decode(privStr); var hash = bytes.slice(0, 34); var checksum = Crypto.SHA256(Crypto.SHA256(hash, { @@ -5729,13 +5729,13 @@ }; // 64 characters [0-9A-F] - ECKey.isHexFormat = function(key) { + ECKey.isHexFormat = function (key) { key = key.toString(); return /^[A-Fa-f0-9]{64}$/.test(key); }; // 51 characters base58, always starts with a '5' - ECKey.isWalletImportFormat = function(key) { + ECKey.isWalletImportFormat = function (key) { key = key.toString(); return (ECKey.privateKeyPrefix == 0x80) ? (/^5[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{50}$/.test(key)) : @@ -5743,7 +5743,7 @@ }; // 52 characters base58 - ECKey.isCompressedWalletImportFormat = function(key) { + ECKey.isCompressedWalletImportFormat = function (key) { key = key.toString(); return (ECKey.privateKeyPrefix == 0x80) ? (/^[LK][123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{51}$/.test(key)) : @@ -5751,19 +5751,19 @@ }; // 44 characters - ECKey.isBase64Format = function(key) { + ECKey.isBase64Format = function (key) { key = key.toString(); return (/^[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789=+\/]{44}$/.test(key)); }; // 99 characters, 1=1, if using dice convert 6 to 0 - ECKey.isBase6Format = function(key) { + ECKey.isBase6Format = function (key) { key = key.toString(); return (/^[012345]{99}$/.test(key)); }; // 22, 26 or 30 characters, always starts with an 'S' - ECKey.isMiniFormat = function(key) { + ECKey.isMiniFormat = function (key) { key = key.toString(); var validChars22 = /^S[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{21}$/.test(key); var validChars26 = /^S[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{25}$/.test(key); @@ -5783,13 +5783,13 @@ /** * Cross-browser compatibility version of Array.isArray. */ - isArray: Array.isArray || function(o) { + isArray: Array.isArray || function (o) { return Object.prototype.toString.call(o) === '[object Array]'; }, /** * Create an array of a certain length filled with a specific value. */ - makeFilledArray: function(len, val) { + makeFilledArray: function (len, val) { var array = []; var i = 0; while (i < len) { @@ -5804,7 +5804,7 @@ * * Returns a byte array. */ - numToVarInt: function(i) { + numToVarInt: function (i) { if (i < 0xfd) { // unsigned char return [i]; @@ -5822,7 +5822,7 @@ /** * Parse a Bitcoin value byte array, returning a BigInteger. */ - valueToBigInt: function(valueBuffer) { + valueToBigInt: function (valueBuffer) { if (valueBuffer instanceof BigInteger) return valueBuffer; // Prepend zero byte to prevent interpretation as negative integer @@ -5840,7 +5840,7 @@ * 900.99998888 * 34.00 */ - formatValue: function(valueBuffer) { + formatValue: function (valueBuffer) { var value = this.valueToBigInt(valueBuffer).toString(); var integerPart = value.length > 8 ? value.substr(0, value.length - 8) : '0'; var decimalPart = value.length > 8 ? value.substr(value.length - 8) : value; @@ -5856,7 +5856,7 @@ * the parsed value back to the user to make sure we understood his input * correctly. */ - parseValue: function(valueString) { + parseValue: function (valueString) { // TODO: Detect other number formats (e.g. comma as decimal separator) var valueComp = valueString.split('.'); var integralPart = valueComp[0]; @@ -5874,7 +5874,7 @@ * Takes an arbitrary byte array as inputs and returns the hash as a byte * array. */ - sha256ripe160: function(data) { + sha256ripe160: function (data) { return ripemd160(Crypto.SHA256(data, { asBytes: true }), { @@ -5882,7 +5882,7 @@ }); }, // double sha256 - dsha256: function(data) { + dsha256: function (data) { return Crypto.SHA256(Crypto.SHA256(data, { asBytes: true }), { @@ -5890,7 +5890,7 @@ }); }, // duck typing method - hasMethods: function(obj /*, method list as strings */ ) { + hasMethods: function (obj /*, method list as strings */) { var i = 1, methodName; while ((methodName = arguments[i++])) { @@ -5904,15 +5904,15 @@ })(); //ellipticCurveEncryption.js - (function() { - (function(ellipticCurveType) { + (function () { + (function (ellipticCurveType) { //Defining Elliptic Encryption Object - var ellipticEncryption = GLOBAL.ellipticCurveEncryption = function() {}; + var ellipticEncryption = GLOBAL.ellipticCurveEncryption = function () { }; ellipticEncryption.rng = new SecureRandom(); - ellipticEncryption.getCurveParameters = function(curveName) { + ellipticEncryption.getCurveParameters = function (curveName) { //Default is secp256k1 curveName = typeof curveName !== 'undefined' ? curveName : "secp256k1"; @@ -5940,38 +5940,38 @@ ellipticEncryption.selectedCurve = ellipticEncryption.getCurveParameters(ellipticCurveType); - ellipticEncryption.get_curve = function() { + ellipticEncryption.get_curve = function () { return new EllipticCurve.CurveFp(new BigInteger(this.selectedCurve.Q), new BigInteger(this.selectedCurve.A), new BigInteger(this.selectedCurve.B)); } - ellipticEncryption.get_G = function(curve) { + ellipticEncryption.get_G = function (curve) { return new EllipticCurve.PointFp(curve, curve.fromBigInteger(new BigInteger(this.selectedCurve.GX)), curve.fromBigInteger(new BigInteger(this.selectedCurve.GY))); } - ellipticEncryption.pick_rand = function() { + ellipticEncryption.pick_rand = function () { var n = new BigInteger(this.selectedCurve.N); var n1 = n.subtract(BigInteger.ONE); var r = new BigInteger(n.bitLength(), this.rng); return r.mod(n1).add(BigInteger.ONE); } - ellipticEncryption.senderRandom = function() { + ellipticEncryption.senderRandom = function () { var r = this.pick_rand(); return r.toString(); }; - ellipticEncryption.receiverRandom = function() { + ellipticEncryption.receiverRandom = function () { //This is receivers private key. For now we will use random. CHANGE IT LATER var r = this.pick_rand(); return r.toString(); } - ellipticEncryption.senderPublicString = function(senderPrivateKey) { + ellipticEncryption.senderPublicString = function (senderPrivateKey) { var senderKeyECData = {}; @@ -5987,7 +5987,7 @@ //In real life ellipticEncryption.receiverPublicString is the public key of the receiver. //you don't have to run receiverRandom and the bottom function - ellipticEncryption.receiverPublicString = function(receiverPublicKey) { + ellipticEncryption.receiverPublicString = function (receiverPublicKey) { var receiverKeyECData = {}; @@ -6001,7 +6001,7 @@ return receiverKeyECData; } - ellipticEncryption.senderSharedKeyDerivation = function(receiverPublicStringXValue, + ellipticEncryption.senderSharedKeyDerivation = function (receiverPublicStringXValue, receiverPublicStringYValue, senderPrivateKey) { var senderDerivedKey = {}; @@ -6018,7 +6018,7 @@ return senderDerivedKey; } - ellipticEncryption.receiverSharedKeyDerivation = function(senderPublicStringXValue, + ellipticEncryption.receiverSharedKeyDerivation = function (senderPublicStringXValue, senderPublicStringYValue, receiverPrivateKey) { var receiverDerivedKey = {}; @@ -6039,17 +6039,17 @@ })(); //sha512.js - (function() { + (function () { /* - A JavaScript implementation of the SHA family of hashes, as defined in FIPS - PUB 180-2 as well as the corresponding HMAC implementation as defined in - FIPS PUB 198a + A JavaScript implementation of the SHA family of hashes, as defined in FIPS + PUB 180-2 as well as the corresponding HMAC implementation as defined in + FIPS PUB 198a - Copyright Brian Turek 2008-2012 - Distributed under the BSD License - See http://caligatio.github.com/jsSHA/ for more information + Copyright Brian Turek 2008-2012 + Distributed under the BSD License + See http://caligatio.github.com/jsSHA/ for more information - Several functions taken from Paul Johnson + Several functions taken from Paul Johnson */ function n(a) { throw a; @@ -6128,7 +6128,7 @@ }; try { a.hasOwnProperty("outputUpper") && (b.outputUpper = a.outputUpper), a.hasOwnProperty("b64Pad") && (b.b64Pad = a.b64Pad) - } catch (d) {} + } catch (d) { } "boolean" !== typeof b.outputUpper && n("Invalid outputUpper formatting option"); "string" !== typeof b.b64Pad && n("Invalid b64Pad formatting option"); return b @@ -6215,12 +6215,12 @@ var h, f, g, k, m, j, A, C, K, e, L, v, l, M, t, p, y, z, r, N, O, P, Q, R, c, S, w = [], T, D; "SHA-384" === d || "SHA-512" === d ? (L = 80, h = (b + 128 >>> 10 << 5) + 31, M = 32, t = 2, c = s, p = Z, y = aa, z = ba, r = X, N = Y, O = V, P = W, R = U, Q = J, S = [new c(1116352408, 3609767458), new c(1899447441, 602891725), new c(3049323471, 3964484399), new c(3921009573, 2173295548), new c(961987163, 4081628472), new c(1508970993, 3053834265), new c(2453635748, 2937671579), new c(2870763221, 3664609560), new c(3624381080, 2734883394), new c(310598401, 1164996542), new c(607225278, 1323610764), - new c(1426881987, 3590304994), new c(1925078388, 4068182383), new c(2162078206, 991336113), new c(2614888103, 633803317), new c(3248222580, 3479774868), new c(3835390401, 2666613458), new c(4022224774, 944711139), new c(264347078, 2341262773), new c(604807628, 2007800933), new c(770255983, 1495990901), new c(1249150122, 1856431235), new c(1555081692, 3175218132), new c(1996064986, 2198950837), new c(2554220882, 3999719339), new c(2821834349, 766784016), new c(2952996808, 2566594879), new c(3210313671, 3203337956), new c(3336571891, - 1034457026), new c(3584528711, 2466948901), new c(113926993, 3758326383), new c(338241895, 168717936), new c(666307205, 1188179964), new c(773529912, 1546045734), new c(1294757372, 1522805485), new c(1396182291, 2643833823), new c(1695183700, 2343527390), new c(1986661051, 1014477480), new c(2177026350, 1206759142), new c(2456956037, 344077627), new c(2730485921, 1290863460), new c(2820302411, 3158454273), new c(3259730800, 3505952657), new c(3345764771, 106217008), new c(3516065817, 3606008344), new c(3600352804, 1432725776), new c(4094571909, + new c(1426881987, 3590304994), new c(1925078388, 4068182383), new c(2162078206, 991336113), new c(2614888103, 633803317), new c(3248222580, 3479774868), new c(3835390401, 2666613458), new c(4022224774, 944711139), new c(264347078, 2341262773), new c(604807628, 2007800933), new c(770255983, 1495990901), new c(1249150122, 1856431235), new c(1555081692, 3175218132), new c(1996064986, 2198950837), new c(2554220882, 3999719339), new c(2821834349, 766784016), new c(2952996808, 2566594879), new c(3210313671, 3203337956), new c(3336571891, + 1034457026), new c(3584528711, 2466948901), new c(113926993, 3758326383), new c(338241895, 168717936), new c(666307205, 1188179964), new c(773529912, 1546045734), new c(1294757372, 1522805485), new c(1396182291, 2643833823), new c(1695183700, 2343527390), new c(1986661051, 1014477480), new c(2177026350, 1206759142), new c(2456956037, 344077627), new c(2730485921, 1290863460), new c(2820302411, 3158454273), new c(3259730800, 3505952657), new c(3345764771, 106217008), new c(3516065817, 3606008344), new c(3600352804, 1432725776), new c(4094571909, 1467031594), new c(275423344, 851169720), new c(430227734, 3100823752), new c(506948616, 1363258195), new c(659060556, 3750685593), new c(883997877, 3785050280), new c(958139571, 3318307427), new c(1322822218, 3812723403), new c(1537002063, 2003034995), new c(1747873779, 3602036899), new c(1955562222, 1575990012), new c(2024104815, 1125592928), new c(2227730452, 2716904306), new c(2361852424, 442776044), new c(2428436474, 593698344), new c(2756734187, 3733110249), new c(3204031479, 2999351573), new c(3329325298, 3815920427), new c(3391569614, - 3928383900), new c(3515267271, 566280711), new c(3940187606, 3454069534), new c(4118630271, 4000239992), new c(116418474, 1914138554), new c(174292421, 2731055270), new c(289380356, 3203993006), new c(460393269, 320620315), new c(685471733, 587496836), new c(852142971, 1086792851), new c(1017036298, 365543100), new c(1126000580, 2618297676), new c(1288033470, 3409855158), new c(1501505948, 4234509866), new c(1607167915, 987167468), new c(1816402316, 1246189591) + 3928383900), new c(3515267271, 566280711), new c(3940187606, 3454069534), new c(4118630271, 4000239992), new c(116418474, 1914138554), new c(174292421, 2731055270), new c(289380356, 3203993006), new c(460393269, 320620315), new c(685471733, 587496836), new c(852142971, 1086792851), new c(1017036298, 365543100), new c(1126000580, 2618297676), new c(1288033470, 3409855158), new c(1501505948, 4234509866), new c(1607167915, 987167468), new c(1816402316, 1246189591) ], e = "SHA-384" === d ? [new c(3418070365, 3238371032), new c(1654270250, 914150663), - new c(2438529370, 812702999), new c(355462360, 4144912697), new c(1731405415, 4290775857), new c(41048885895, 1750603025), new c(3675008525, 1694076839), new c(1203062813, 3204075428) + new c(2438529370, 812702999), new c(355462360, 4144912697), new c(1731405415, 4290775857), new c(41048885895, 1750603025), new c(3675008525, 1694076839), new c(1203062813, 3204075428) ] : [new c(1779033703, 4089235720), new c(3144134277, 2227873595), new c(1013904242, 4271175723), new c(2773480762, 1595750129), new c(1359893119, 2917565137), new c(2600822924, 725511199), new c(528734635, 4215389547), new c(1541459225, 327033209)]) : n("Unexpected error in SHA-2 implementation"); a[b >>> 5] |= 128 << 24 - b % 32; a[h] = b; @@ -6246,11 +6246,11 @@ e[7] = p(A, e[7]) } "SHA-384" === d ? D = [e[0].a, e[0].b, e[1].a, e[1].b, e[2].a, e[2].b, e[3].a, e[3].b, e[4].a, e[4].b, e[5].a, e[5].b] : "SHA-512" === d ? D = [e[0].a, e[0].b, - e[1].a, e[1].b, e[2].a, e[2].b, e[3].a, e[3].b, e[4].a, e[4].b, e[5].a, e[5].b, e[6].a, e[6].b, e[7].a, e[7].b + e[1].a, e[1].b, e[2].a, e[2].b, e[3].a, e[3].b, e[4].a, e[4].b, e[5].a, e[5].b, e[6].a, e[6].b, e[7].a, e[7].b ] : n("Unexpected error in SHA-2 implementation"); return D } - GLOBAL.jsSHA = function(a, b, d) { + GLOBAL.jsSHA = function (a, b, d) { var h = q, f = q, g = 0, @@ -6260,7 +6260,7 @@ m = "undefined" !== typeof d ? d : 8; 8 === m || 16 === m || n("charSize must be 8 or 16"); "HEX" === b ? (0 !== a.length % 2 && n("srcString of HEX type must be in byte increments"), j = x(a), g = j.binLen, k = j.value) : "ASCII" === b || "TEXT" === b ? (j = u(a, m), g = j.binLen, k = j.value) : "B64" === b ? (j = B(a), g = j.binLen, k = j.value) : n("inputFormat must be HEX, TEXT, ASCII, or B64"); - this.getHash = function(a, b, d) { + this.getHash = function (a, b, d) { var e = q, m = k.slice(), j = ""; @@ -6275,10 +6275,10 @@ n("format must be HEX or B64") } "SHA-384" === - a ? (q === h && (h = $(m, g, a)), j = e(h, G(d))) : "SHA-512" === a ? (q === f && (f = $(m, g, a)), j = e(f, G(d))) : n("Chosen SHA variant is not supported"); + a ? (q === h && (h = $(m, g, a)), j = e(h, G(d))) : "SHA-512" === a ? (q === f && (f = $(m, g, a)), j = e(f, G(d))) : n("Chosen SHA variant is not supported"); return j }; - this.getHMAC = function(a, b, d, e, f) { + this.getHMAC = function (a, b, d, e, f) { var h, l, j, t, p, y = [], z = [], r = q; @@ -6306,13 +6306,13 @@ })(); //coin.js - (function() { + (function () { /* - Coinjs 0.01 beta by OutCast3k{at}gmail.com - A bitcoin framework. - http://github.com/OutCast3k/coinjs or http://coinb.in/coinjs - */ - var coinjs = GLOBAL.coinjs = function() {}; + Coinjs 0.01 beta by OutCast3k{at}gmail.com + A bitcoin framework. + http://github.com/OutCast3k/coinjs or http://coinb.in/coinjs + */ + var coinjs = GLOBAL.coinjs = function () { }; /* public vars */ coinjs.pub = 0x00; @@ -6343,7 +6343,7 @@ /* start of address functions */ /* generate a private and public keypair, with address and WIF address */ - coinjs.newKeys = function(input) { + coinjs.newKeys = function (input) { var privkey = (input) ? Crypto.SHA256(input) : this.newPrivkey(); var pubkey = this.newPubkey(privkey); return { @@ -6356,7 +6356,7 @@ } /* generate a new random private key */ - coinjs.newPrivkey = function() { + coinjs.newPrivkey = function () { var x = GLOBAL.location; x += (GLOBAL.screen.height * GLOBAL.screen.width * GLOBAL.screen.colorDepth); x += coinjs.random(64); @@ -6387,7 +6387,7 @@ } /* generate a public key from a private key */ - coinjs.newPubkey = function(hash) { + coinjs.newPubkey = function (hash) { var privateKeyBigInt = BigInteger.fromByteArrayUnsigned(Crypto.util.hexToBytes(hash)); var curve = EllipticCurve.getSECCurveByName("secp256k1"); @@ -6413,7 +6413,7 @@ } /* provide a public key and return address */ - coinjs.pubkey2address = function(h, byte) { + coinjs.pubkey2address = function (h, byte) { var r = ripemd160(Crypto.SHA256(Crypto.util.hexToBytes(h), { asBytes: true })); @@ -6428,7 +6428,7 @@ } /* provide a scripthash and return address */ - coinjs.scripthash2address = function(h) { + coinjs.scripthash2address = function (h) { var x = Crypto.util.hexToBytes(h); x.unshift(coinjs.pub); var r = x; @@ -6442,7 +6442,7 @@ } /* new multisig address, provide the pubkeys AND required signatures to release the funds */ - coinjs.pubkeys2MultisigAddress = function(pubkeys, required) { + coinjs.pubkeys2MultisigAddress = function (pubkeys, required) { var s = coinjs.script(); s.writeOp(81 + (required * 1) - 1); //OP_1 for (var i = 0; i < pubkeys.length; ++i) { @@ -6478,13 +6478,27 @@ }; } + //Return a Bech32 address for the multisig. Format is same as above + coinjs.pubkeys2MultisigAddressBech32 = function (pubkeys, required) { + var r = coinjs.pubkeys2MultisigAddress(pubkeys, required); + var program = Crypto.SHA256(Crypto.util.hexToBytes(r.redeemScript), { + asBytes: true + }); + var address = coinjs.bech32_encode(coinjs.bech32.hrp, [coinjs.bech32.version].concat(coinjs.bech32_convert(program, 8, 5, true))); + return { + 'address': address, + 'redeemScript': r.redeemScript, + 'size': r.size + }; + } + /* new time locked address, provide the pubkey and time necessary to unlock the funds. when time is greater than 500000000, it should be a unix timestamp (seconds since epoch), otherwise it should be the block height required before this transaction can be released. may throw a string on failure! */ - coinjs.simpleHodlAddress = function(pubkey, checklocktimeverify) { + coinjs.simpleHodlAddress = function (pubkey, checklocktimeverify) { if (checklocktimeverify < 0) { throw "Parameter for OP_CHECKLOCKTIMEVERIFY is negative."; @@ -6524,7 +6538,7 @@ } /* create a new segwit address */ - coinjs.segwitAddress = function(pubkey) { + coinjs.segwitAddress = function (pubkey) { var keyhash = [0x00, 0x14].concat(ripemd160(Crypto.SHA256(Crypto.util.hexToBytes(pubkey), { asBytes: true }), { @@ -6553,7 +6567,7 @@ } /* create a new segwit bech32 encoded address */ - coinjs.bech32Address = function(pubkey) { + coinjs.bech32Address = function (pubkey) { var program = ripemd160(Crypto.SHA256(Crypto.util.hexToBytes(pubkey), { asBytes: true }), { @@ -6567,8 +6581,20 @@ }; } + coinjs.multisigBech32Address = function (raw_redeemscript) { + var program = Crypto.SHA256(Crypto.util.hexToBytes(raw_redeemscript), { + asBytes: true + }); + var address = coinjs.bech32_encode(coinjs.bech32.hrp, [coinjs.bech32.version].concat(coinjs.bech32_convert(program, 8, 5, true))); + return { + 'address': address, + 'type': 'multisigBech32', + 'redeemscript': Crypto.util.bytesToHex(program) + }; + } + /* extract the redeemscript from a bech32 address */ - coinjs.bech32redeemscript = function(address) { + coinjs.bech32redeemscript = function (address) { var r = false; var decode = coinjs.bech32_decode(address); if (decode) { @@ -6579,7 +6605,7 @@ } /* provide a privkey and return an WIF */ - coinjs.privkey2wif = function(h) { + coinjs.privkey2wif = function (h) { var r = Crypto.util.hexToBytes(h); if (coinjs.compressed == true) { @@ -6598,7 +6624,7 @@ } /* convert a wif key back to a private key */ - coinjs.wif2privkey = function(wif) { + coinjs.wif2privkey = function (wif) { var compressed = false; var decode = coinjs.base58decode(wif); var key = decode.slice(0, decode.length - 4); @@ -6614,7 +6640,7 @@ } /* convert a wif to a pubkey */ - coinjs.wif2pubkey = function(wif) { + coinjs.wif2pubkey = function (wif) { var compressed = coinjs.compressed; var r = coinjs.wif2privkey(wif); coinjs.compressed = r['compressed']; @@ -6627,7 +6653,7 @@ } /* convert a wif to a address */ - coinjs.wif2address = function(wif) { + coinjs.wif2address = function (wif) { var r = coinjs.wif2pubkey(wif); return { 'address': coinjs.pubkey2address(r['pubkey']), @@ -6636,7 +6662,7 @@ } /* decode or validate an address and return the hash */ - coinjs.addressDecode = function(addr) { + coinjs.addressDecode = function (addr) { try { var bytes = coinjs.base58decode(addr); var front = bytes.slice(0, bytes.length - 4); @@ -6658,6 +6684,9 @@ } else if (o.version == coinjs.multisig) { // multisig address o.type = 'multisig'; + } else if (o.version == coinjs.multisigBech32) { // multisigBech32 added + o.type = 'multisigBech32'; + } else if (o.version == coinjs.priv) { // wifkey o.type = 'wifkey'; @@ -6698,11 +6727,16 @@ } } catch (e) { let bech32rs = coinjs.bech32redeemscript(addr); - if (bech32rs) { + if (bech32rs && bech32rs.length == 40) { return { 'type': 'bech32', 'redeemscript': bech32rs }; + } else if (bech32rs && bech32rs.length == 64) { + return { + 'type': 'multisigBech32', + 'redeemscript': bech32rs + }; } else { return false; } @@ -6710,13 +6744,13 @@ } /* retreive the balance from a given address */ - coinjs.addressBalance = function(address, callback) { - coinjs.ajax(coinjs.host + '?uid=' + coinjs.uid + '&key=' + coinjs.key + '&setmodule=addresses&request=bal&address=' + address + '&r=' + securedMathRandom(), callback, "GET"); + coinjs.addressBalance = function (address, callback) { + coinjs.ajax(coinjs.host + '?uid=' + coinjs.uid + '&key=' + coinjs.key + '&setmodule=addresses&request=bal&address=' + address + '&r=' + Math.random(), callback, "GET"); } /* decompress an compressed public key */ - coinjs.pubkeydecompress = function(pubkey) { - if ((typeof(pubkey) == 'string') && pubkey.match(/^[a-f0-9]+$/i)) { + coinjs.pubkeydecompress = function (pubkey) { + if ((typeof (pubkey) == 'string') && pubkey.match(/^[a-f0-9]+$/i)) { var curve = EllipticCurve.getSECCurveByName("secp256k1"); try { var pt = curve.curve.decodePointHex(pubkey); @@ -6735,7 +6769,7 @@ return false; } - coinjs.bech32_polymod = function(values) { + coinjs.bech32_polymod = function (values) { var chk = 1; var BECH32_GENERATOR = [0x3b6a57b2, 0x26508e6d, 0x1ea119fa, 0x3d4233dd, 0x2a1462b3]; for (var p = 0; p < values.length; ++p) { @@ -6750,7 +6784,7 @@ return chk; } - coinjs.bech32_hrpExpand = function(hrp) { + coinjs.bech32_hrpExpand = function (hrp) { var ret = []; var p; for (p = 0; p < hrp.length; ++p) { @@ -6763,11 +6797,11 @@ return ret; } - coinjs.bech32_verifyChecksum = function(hrp, data) { + coinjs.bech32_verifyChecksum = function (hrp, data) { return coinjs.bech32_polymod(coinjs.bech32_hrpExpand(hrp).concat(data)) === 1; } - coinjs.bech32_createChecksum = function(hrp, data) { + coinjs.bech32_createChecksum = function (hrp, data) { var values = coinjs.bech32_hrpExpand(hrp).concat(data).concat([0, 0, 0, 0, 0, 0]); var mod = coinjs.bech32_polymod(values) ^ 1; var ret = []; @@ -6777,7 +6811,7 @@ return ret; } - coinjs.bech32_encode = function(hrp, data) { + coinjs.bech32_encode = function (hrp, data) { var combined = data.concat(coinjs.bech32_createChecksum(hrp, data)); var ret = hrp + '1'; for (var p = 0; p < combined.length; ++p) { @@ -6786,7 +6820,7 @@ return ret; } - coinjs.bech32_decode = function(bechString) { + coinjs.bech32_decode = function (bechString) { var p; var has_lower = false; var has_upper = false; @@ -6827,7 +6861,7 @@ }; } - coinjs.bech32_convert = function(data, inBits, outBits, pad) { + coinjs.bech32_convert = function (data, inBits, outBits, pad) { var value = 0; var bits = 0; var maxV = (1 << outBits) - 1; @@ -6855,7 +6889,7 @@ return result; } - coinjs.testdeterministicK = function() { + coinjs.testdeterministicK = function () { // https://github.com/bitpay/bitcore/blob/9a5193d8e94b0bd5b8e7f00038e7c0b935405a03/test/crypto/ecdsa.js // Line 21 and 22 specify digest hash and privkey for the first 2 test vectors. // Line 96-117 tells expected result. @@ -6863,81 +6897,81 @@ var tx = coinjs.transaction(); var test_vectors = [{ - 'message': 'test data', - 'privkey': 'fee0a1f7afebf9d2a5a80c0c98a31c709681cce195cbcd06342b517970c0be1e', - 'k_bad00': 'fcce1de7a9bcd6b2d3defade6afa1913fb9229e3b7ddf4749b55c4848b2a196e', - 'k_bad01': '727fbcb59eb48b1d7d46f95a04991fc512eb9dbf9105628e3aec87428df28fd8', - 'k_bad15': '398f0e2c9f79728f7b3d84d447ac3a86d8b2083c8f234a0ffa9c4043d68bd258' - }, - { - 'message': 'Everything should be made as simple as possible, but not simpler.', - 'privkey': '0000000000000000000000000000000000000000000000000000000000000001', - 'k_bad00': 'ec633bd56a5774a0940cb97e27a9e4e51dc94af737596a0c5cbb3d30332d92a5', - 'k_bad01': 'df55b6d1b5c48184622b0ead41a0e02bfa5ac3ebdb4c34701454e80aabf36f56', - 'k_bad15': 'def007a9a3c2f7c769c75da9d47f2af84075af95cadd1407393dc1e26086ef87' - }, - { - 'message': 'Satoshi Nakamoto', - 'privkey': '0000000000000000000000000000000000000000000000000000000000000002', - 'k_bad00': 'd3edc1b8224e953f6ee05c8bbf7ae228f461030e47caf97cde91430b4607405e', - 'k_bad01': 'f86d8e43c09a6a83953f0ab6d0af59fb7446b4660119902e9967067596b58374', - 'k_bad15': '241d1f57d6cfd2f73b1ada7907b199951f95ef5ad362b13aed84009656e0254a' - }, - { - 'message': 'Diffie Hellman', - 'privkey': '7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f', - 'k_bad00': 'c378a41cb17dce12340788dd3503635f54f894c306d52f6e9bc4b8f18d27afcc', - 'k_bad01': '90756c96fef41152ac9abe08819c4e95f16da2af472880192c69a2b7bac29114', - 'k_bad15': '7b3f53300ab0ccd0f698f4d67db87c44cf3e9e513d9df61137256652b2e94e7c' - }, - { - 'message': 'Japan', - 'privkey': '8080808080808080808080808080808080808080808080808080808080808080', - 'k_bad00': 'f471e61b51d2d8db78f3dae19d973616f57cdc54caaa81c269394b8c34edcf59', - 'k_bad01': '6819d85b9730acc876fdf59e162bf309e9f63dd35550edf20869d23c2f3e6d17', - 'k_bad15': 'd8e8bae3ee330a198d1f5e00ad7c5f9ed7c24c357c0a004322abca5d9cd17847' - }, - { - 'message': 'Bitcoin', - 'privkey': 'fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140', - 'k_bad00': '36c848ffb2cbecc5422c33a994955b807665317c1ce2a0f59c689321aaa631cc', - 'k_bad01': '4ed8de1ec952a4f5b3bd79d1ff96446bcd45cabb00fc6ca127183e14671bcb85', - 'k_bad15': '56b6f47babc1662c011d3b1f93aa51a6e9b5f6512e9f2e16821a238d450a31f8' - }, - { - 'message': 'i2FLPP8WEus5WPjpoHwheXOMSobUJVaZM1JPMQZq', - 'privkey': 'fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140', - 'k_bad00': '6e9b434fcc6bbb081a0463c094356b47d62d7efae7da9c518ed7bac23f4e2ed6', - 'k_bad01': 'ae5323ae338d6117ce8520a43b92eacd2ea1312ae514d53d8e34010154c593bb', - 'k_bad15': '3eaa1b61d1b8ab2f1ca71219c399f2b8b3defa624719f1e96fe3957628c2c4ea' - }, - { - 'message': 'lEE55EJNP7aLrMtjkeJKKux4Yg0E8E1SAJnWTCEh', - 'privkey': '3881e5286abc580bb6139fe8e83d7c8271c6fe5e5c2d640c1f0ed0e1ee37edc9', - 'k_bad00': '5b606665a16da29cc1c5411d744ab554640479dd8abd3c04ff23bd6b302e7034', - 'k_bad01': 'f8b25263152c042807c992eacd2ac2cc5790d1e9957c394f77ea368e3d9923bd', - 'k_bad15': 'ea624578f7e7964ac1d84adb5b5087dd14f0ee78b49072aa19051cc15dab6f33' - }, - { - 'message': '2SaVPvhxkAPrayIVKcsoQO5DKA8Uv5X/esZFlf+y', - 'privkey': '7259dff07922de7f9c4c5720d68c9745e230b32508c497dd24cb95ef18856631', - 'k_bad00': '3ab6c19ab5d3aea6aa0c6da37516b1d6e28e3985019b3adb388714e8f536686b', - 'k_bad01': '19af21b05004b0ce9cdca82458a371a9d2cf0dc35a813108c557b551c08eb52e', - 'k_bad15': '117a32665fca1b7137a91c4739ac5719fec0cf2e146f40f8e7c21b45a07ebc6a' - }, - { - 'message': '00A0OwO2THi7j5Z/jp0FmN6nn7N/DQd6eBnCS+/b', - 'privkey': '0d6ea45d62b334777d6995052965c795a4f8506044b4fd7dc59c15656a28f7aa', - 'k_bad00': '79487de0c8799158294d94c0eb92ee4b567e4dc7ca18addc86e49d31ce1d2db6', - 'k_bad01': '9561d2401164a48a8f600882753b3105ebdd35e2358f4f808c4f549c91490009', - 'k_bad15': 'b0d273634129ff4dbdf0df317d4062a1dbc58818f88878ffdb4ec511c77976c0' - } + 'message': 'test data', + 'privkey': 'fee0a1f7afebf9d2a5a80c0c98a31c709681cce195cbcd06342b517970c0be1e', + 'k_bad00': 'fcce1de7a9bcd6b2d3defade6afa1913fb9229e3b7ddf4749b55c4848b2a196e', + 'k_bad01': '727fbcb59eb48b1d7d46f95a04991fc512eb9dbf9105628e3aec87428df28fd8', + 'k_bad15': '398f0e2c9f79728f7b3d84d447ac3a86d8b2083c8f234a0ffa9c4043d68bd258' + }, + { + 'message': 'Everything should be made as simple as possible, but not simpler.', + 'privkey': '0000000000000000000000000000000000000000000000000000000000000001', + 'k_bad00': 'ec633bd56a5774a0940cb97e27a9e4e51dc94af737596a0c5cbb3d30332d92a5', + 'k_bad01': 'df55b6d1b5c48184622b0ead41a0e02bfa5ac3ebdb4c34701454e80aabf36f56', + 'k_bad15': 'def007a9a3c2f7c769c75da9d47f2af84075af95cadd1407393dc1e26086ef87' + }, + { + 'message': 'Satoshi Nakamoto', + 'privkey': '0000000000000000000000000000000000000000000000000000000000000002', + 'k_bad00': 'd3edc1b8224e953f6ee05c8bbf7ae228f461030e47caf97cde91430b4607405e', + 'k_bad01': 'f86d8e43c09a6a83953f0ab6d0af59fb7446b4660119902e9967067596b58374', + 'k_bad15': '241d1f57d6cfd2f73b1ada7907b199951f95ef5ad362b13aed84009656e0254a' + }, + { + 'message': 'Diffie Hellman', + 'privkey': '7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f', + 'k_bad00': 'c378a41cb17dce12340788dd3503635f54f894c306d52f6e9bc4b8f18d27afcc', + 'k_bad01': '90756c96fef41152ac9abe08819c4e95f16da2af472880192c69a2b7bac29114', + 'k_bad15': '7b3f53300ab0ccd0f698f4d67db87c44cf3e9e513d9df61137256652b2e94e7c' + }, + { + 'message': 'Japan', + 'privkey': '8080808080808080808080808080808080808080808080808080808080808080', + 'k_bad00': 'f471e61b51d2d8db78f3dae19d973616f57cdc54caaa81c269394b8c34edcf59', + 'k_bad01': '6819d85b9730acc876fdf59e162bf309e9f63dd35550edf20869d23c2f3e6d17', + 'k_bad15': 'd8e8bae3ee330a198d1f5e00ad7c5f9ed7c24c357c0a004322abca5d9cd17847' + }, + { + 'message': 'Bitcoin', + 'privkey': 'fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140', + 'k_bad00': '36c848ffb2cbecc5422c33a994955b807665317c1ce2a0f59c689321aaa631cc', + 'k_bad01': '4ed8de1ec952a4f5b3bd79d1ff96446bcd45cabb00fc6ca127183e14671bcb85', + 'k_bad15': '56b6f47babc1662c011d3b1f93aa51a6e9b5f6512e9f2e16821a238d450a31f8' + }, + { + 'message': 'i2FLPP8WEus5WPjpoHwheXOMSobUJVaZM1JPMQZq', + 'privkey': 'fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140', + 'k_bad00': '6e9b434fcc6bbb081a0463c094356b47d62d7efae7da9c518ed7bac23f4e2ed6', + 'k_bad01': 'ae5323ae338d6117ce8520a43b92eacd2ea1312ae514d53d8e34010154c593bb', + 'k_bad15': '3eaa1b61d1b8ab2f1ca71219c399f2b8b3defa624719f1e96fe3957628c2c4ea' + }, + { + 'message': 'lEE55EJNP7aLrMtjkeJKKux4Yg0E8E1SAJnWTCEh', + 'privkey': '3881e5286abc580bb6139fe8e83d7c8271c6fe5e5c2d640c1f0ed0e1ee37edc9', + 'k_bad00': '5b606665a16da29cc1c5411d744ab554640479dd8abd3c04ff23bd6b302e7034', + 'k_bad01': 'f8b25263152c042807c992eacd2ac2cc5790d1e9957c394f77ea368e3d9923bd', + 'k_bad15': 'ea624578f7e7964ac1d84adb5b5087dd14f0ee78b49072aa19051cc15dab6f33' + }, + { + 'message': '2SaVPvhxkAPrayIVKcsoQO5DKA8Uv5X/esZFlf+y', + 'privkey': '7259dff07922de7f9c4c5720d68c9745e230b32508c497dd24cb95ef18856631', + 'k_bad00': '3ab6c19ab5d3aea6aa0c6da37516b1d6e28e3985019b3adb388714e8f536686b', + 'k_bad01': '19af21b05004b0ce9cdca82458a371a9d2cf0dc35a813108c557b551c08eb52e', + 'k_bad15': '117a32665fca1b7137a91c4739ac5719fec0cf2e146f40f8e7c21b45a07ebc6a' + }, + { + 'message': '00A0OwO2THi7j5Z/jp0FmN6nn7N/DQd6eBnCS+/b', + 'privkey': '0d6ea45d62b334777d6995052965c795a4f8506044b4fd7dc59c15656a28f7aa', + 'k_bad00': '79487de0c8799158294d94c0eb92ee4b567e4dc7ca18addc86e49d31ce1d2db6', + 'k_bad01': '9561d2401164a48a8f600882753b3105ebdd35e2358f4f808c4f549c91490009', + 'k_bad15': 'b0d273634129ff4dbdf0df317d4062a1dbc58818f88878ffdb4ec511c77976c0' + } ]; var result_txt = '\n----------------------\nResults\n----------------------\n\n'; for (i = 0; i < test_vectors.length; i++) { - var hash = Crypto.SHA256(test_vectors[i]['message'].split('').map(function(c) { + var hash = Crypto.SHA256(test_vectors[i]['message'].split('').map(function (c) { return c.charCodeAt(0); }), { asBytes: true @@ -6973,17 +7007,17 @@ }; /* start of hd functions, thanks bip32.org */ - coinjs.hd = function(data) { + coinjs.hd = function (data) { var r = {}; /* some hd value parsing */ - r.parse = function() { + r.parse = function () { var bytes = []; // some quick validation - if (typeof(data) == 'string') { + if (typeof (data) == 'string') { var decoded = coinjs.base58decode(data); if (decoded.length == 82) { var checksum = decoded.slice(78, 82); @@ -7044,7 +7078,7 @@ } // extend prv/pub key - r.extend = function() { + r.extend = function () { var hd = coinjs.hd(); return hd.make({ 'depth': (this.depth * 1) + 1, @@ -7057,7 +7091,7 @@ } // derive from path - r.derive_path = function(path) { + r.derive_path = function (path) { if (path == 'm' || path == 'M' || path == 'm\'' || path == 'M\'') return this; @@ -7085,7 +7119,7 @@ } // derive key from index - r.derive = function(i) { + r.derive = function (i) { i = (i) ? i : 0; var blob = (Crypto.util.hexToBytes(this.keys.pubkey)).concat(coinjs.numToBytes(i, 4).reverse()); @@ -7153,7 +7187,7 @@ } // make a master hd xprv/xpub - r.master = function(pass) { + r.master = function (pass) { var seed = (pass) ? Crypto.SHA256(pass) : coinjs.newPrivkey(); var hasher = new jsSHA(seed, 'HEX'); var I = hasher.getHMAC("Bitcoin seed", "TEXT", "SHA-512", "HEX"); @@ -7173,7 +7207,7 @@ } // encode data to a base58 string - r.make = function(data) { // { (int) depth, (array) parent_fingerprint, (int) child_index, (byte array) chain_code, (hex str) privkey, (hex str) pubkey} + r.make = function (data) { // { (int) depth, (array) parent_fingerprint, (int) child_index, (byte array) chain_code, (hex str) privkey, (hex str) pubkey} var k = []; //depth @@ -7228,7 +7262,7 @@ /* start of script functions */ - coinjs.script = function(data) { + coinjs.script = function (data) { var r = {}; if (!data) { @@ -7244,7 +7278,7 @@ } /* parse buffer array */ - r.parse = function() { + r.parse = function () { var self = this; r.chunks = []; @@ -7286,7 +7320,7 @@ }; /* decode the redeemscript of a multisignature transaction */ - r.decodeRedeemScript = function(script) { + r.decodeRedeemScript = function (script) { var r = false; try { var s = coinjs.script(Crypto.util.hexToBytes(script)); @@ -7328,11 +7362,39 @@ return r; } + /* decode the redeemscript of a multisignature transaction for Bech32*/ + r.decodeRedeemScriptBech32 = function (script) { + var r = false; + try { + var s = coinjs.script(Crypto.util.hexToBytes(script)); + if ((s.chunks.length >= 3) && s.chunks[s.chunks.length - 1] == 174) { //OP_CHECKMULTISIG + r = {}; + r.signaturesRequired = s.chunks[0] - 80; + var pubkeys = []; + for (var i = 1; i < s.chunks.length - 2; i++) { + pubkeys.push(Crypto.util.bytesToHex(s.chunks[i])); + } + r.pubkeys = pubkeys; + var multi = coinjs.pubkeys2MultisigAddressBech32(pubkeys, r.signaturesRequired); + r.address = multi['address']; + r.type = 'multisig__'; // using __ for now to differentiat from the other object .type == "multisig" + var rs = Crypto.util.bytesToHex(s.buffer); + r.redeemscript = rs; + + } + + } catch (e) { + // console.log(e); + r = false; + } + return r; + } + /* create output script to spend */ - r.spendToScript = function(address) { + r.spendToScript = function (address) { var addr = coinjs.addressDecode(address); var s = coinjs.script(); - if (addr.type == "bech32") { + if (addr.type == "bech32" || addr.type == "multisigBech32") { s.writeOp(0); s.writeBytes(Crypto.util.hexToBytes(addr.redeemscript)); } else if (addr.version == coinjs.multisig) { // multisig address @@ -7350,7 +7412,7 @@ } /* geneate a (script) pubkey hash of the address - used for when signing */ - r.pubkeyHash = function(address) { + r.pubkeyHash = function (address) { var addr = coinjs.addressDecode(address); var s = coinjs.script(); s.writeOp(118); //OP_DUP @@ -7362,14 +7424,14 @@ } /* write to buffer */ - r.writeOp = function(op) { + r.writeOp = function (op) { this.buffer.push(op); this.chunks.push(op); return true; } /* write bytes to buffer */ - r.writeBytes = function(data) { + r.writeBytes = function (data) { if (data.length < 76) { //OP_PUSHDATA1 this.buffer.push(data.length); } else if (data.length <= 0xff) { @@ -7398,7 +7460,7 @@ /* start of transaction functions */ /* create a new transaction object */ - coinjs.transaction = function() { + coinjs.transaction = function () { var r = {}; r.version = 1; @@ -7410,7 +7472,7 @@ r.block = null; /* add an input to a transaction */ - r.addinput = function(txid, index, script, sequence) { + r.addinput = function (txid, index, script, sequence) { var o = {}; o.outpoint = { 'hash': txid, @@ -7422,7 +7484,7 @@ } /* add an output to a transaction */ - r.addoutput = function(address, value) { + r.addoutput = function (address, value) { var o = {}; o.value = new BigInteger('' + Math.round((value * 1) * 1e8), 10); var s = coinjs.script(); @@ -7432,7 +7494,7 @@ } /* add two outputs for stealth addresses to a transaction */ - r.addstealth = function(stealth, value) { + r.addstealth = function (stealth, value) { var ephemeralKeyBigInt = BigInteger.fromByteArrayUnsigned(Crypto.util.hexToBytes(coinjs.newPrivkey())); var curve = EllipticCurve.getSECCurveByName("secp256k1"); @@ -7474,7 +7536,7 @@ } /* add data to a transaction */ - r.adddata = function(data) { + r.adddata = function (data) { var r = false; if (((data.match(/^[a-f0-9]+$/gi)) && data.length < 160) && (data.length % 2) == 0) { var s = coinjs.script(); @@ -7489,19 +7551,19 @@ } /* list unspent transactions */ - r.listUnspent = function(address, callback) { - coinjs.ajax(coinjs.host + '?uid=' + coinjs.uid + '&key=' + coinjs.key + '&setmodule=addresses&request=unspent&address=' + address + '&r=' + securedMathRandom(), callback, "GET"); + r.listUnspent = function (address, callback) { + coinjs.ajax(coinjs.host + '?uid=' + coinjs.uid + '&key=' + coinjs.key + '&setmodule=addresses&request=unspent&address=' + address + '&r=' + Math.random(), callback, "GET"); } /* list transaction data */ - r.getTransaction = function(txid, callback) { - coinjs.ajax(coinjs.host + '?uid=' + coinjs.uid + '&key=' + coinjs.key + '&setmodule=bitcoin&request=gettransaction&txid=' + txid + '&r=' + securedMathRandom(), callback, "GET"); + r.getTransaction = function (txid, callback) { + coinjs.ajax(coinjs.host + '?uid=' + coinjs.uid + '&key=' + coinjs.key + '&setmodule=bitcoin&request=gettransaction&txid=' + txid + '&r=' + Math.random(), callback, "GET"); } /* add unspent to transaction */ - r.addUnspent = function(address, callback, script, segwit, sequence) { + r.addUnspent = function (address, callback, script, segwit, sequence) { var self = this; - this.listUnspent(address, function(data) { + this.listUnspent(address, function (data) { var s = coinjs.script(); var value = 0; var total = 0; @@ -7525,7 +7587,7 @@ var n = u.getElementsByTagName("tx_output_n")[0].childNodes[0].nodeValue; var scr = script || u.getElementsByTagName("script")[0].childNodes[0].nodeValue; - if (segwit) { + if (segwit) { //also for MULTISIG_BECH32 (p2wsh-multisig)(script = raw_redeemscript; for p2wsh-multisig) /* this is a small hack to include the value with the redeemscript to make the signing procedure smoother. It is not standard and removed during the signing procedure. */ @@ -7554,23 +7616,23 @@ } /* add unspent and sign */ - r.addUnspentAndSign = function(wif, callback) { + r.addUnspentAndSign = function (wif, callback) { var self = this; var address = coinjs.wif2address(wif); - self.addUnspent(address['address'], function(data) { + self.addUnspent(address['address'], function (data) { self.sign(wif); return callback(data); }); } /* broadcast a transaction */ - r.broadcast = function(callback, txhex) { + r.broadcast = function (callback, txhex) { var tx = txhex || this.serialize(); coinjs.ajax(coinjs.host + '?uid=' + coinjs.uid + '&key=' + coinjs.key + '&setmodule=bitcoin&request=sendrawtransaction', callback, "POST", ["rawtx=" + tx]); } /* generate the transaction hash to sign from a transaction input */ - r.transactionHash = function(index, sigHashType) { + r.transactionHash = function (index, sigHashType) { var clone = coinjs.clone(this); var shType = sigHashType || 1; @@ -7588,7 +7650,7 @@ if ((clone.ins) && clone.ins[index]) { /* SIGHASH : For more info on sig hashs see https://en.bitcoin.it/wiki/OP_CHECKSIG - and https://bitcoin.org/en/developer-guide#signature-hash-type */ + and https://bitcoin.org/en/developer-guide#signature-hash-type */ if (shType == 1) { //SIGHASH_ALL 0x01 @@ -7654,7 +7716,7 @@ } /* generate a segwit transaction hash to sign from a transaction input */ - r.transactionHashSegWitV0 = function(index, sigHashType) { + r.transactionHashSegWitV0 = function (index, sigHashType) { /* Notice: coinb.in by default, deals with segwit transactions in a non-standard way. Segwit transactions require that input values are included in the transaction hash. @@ -7664,7 +7726,7 @@ // start redeem script check var extract = this.extractScriptKey(index); - if (extract['type'] != 'segwit') { + if (extract['type'] != 'segwit' && extract['type'] != 'multisig_bech32') { return { 'result': 0, 'fail': 'redeemscript', @@ -7693,6 +7755,8 @@ scriptcode = scriptcode.slice(1); scriptcode.unshift(25, 118, 169); scriptcode.push(136, 172); + } else if (scriptcode[0] > 80) { + scriptcode.unshift(scriptcode.length) } var value = coinjs.numToBytes(extract['value'], 8); @@ -7784,7 +7848,7 @@ } /* extract the scriptSig, used in the transactionHash() function */ - r.extractScriptKey = function(index) { + r.extractScriptKey = function (index) { if (this.ins[index]) { if ((this.ins[index].script.chunks.length == 5) && this.ins[index].script.chunks[4] == 172 && coinjs.isArray(this.ins[index].script.chunks[2])) { //OP_CHECKSIG // regular scriptPubkey (not signed) @@ -7855,11 +7919,26 @@ 'signatures': 0, 'script': Crypto.util.bytesToHex(this.ins[index].script.buffer) }; + } else if (this.ins[index].script.chunks.length == 3 && this.ins[index].script.chunks[0][0] >= 80 && this.ins[index].script.chunks[0][this.ins[index].script.chunks[0].length - 1] == 174 && this.ins[index].script.chunks[1] == 0) { //OP_CHECKMULTISIG_BECH32 + // multisig bech32 script + let last_index = this.ins[index].script.chunks.length - 1; + var value = -1; + if (last_index >= 2 && this.ins[index].script.chunks[last_index].length == 8) { + value = coinjs.bytesToNum(this.ins[index].script.chunks[last_index]); // value found encoded in transaction (THIS IS NON STANDARD) + } + var sigcount = (!this.witness[index]) ? 0 : this.witness[index].length - 2; + return { + 'type': 'multisig_bech32', + 'signed': 'false', + 'signatures': sigcount, + 'script': Crypto.util.bytesToHex(this.ins[index].script.chunks[0]), + 'value': value + }; } else if (this.ins[index].script.chunks.length == 0) { // empty //bech32 witness check - var signed = ((this.witness[index]) && this.witness[index].length == 2) ? 'true' : 'false'; - var sigs = (signed == 'true') ? 1 : 0; + var signed = ((this.witness[index]) && this.witness[index].length >= 2) ? 'true' : 'false'; + var sigs = (signed == 'true') ? (!this.witness[index][0] ? this.witness[index].length - 2 : 1) : 0; return { 'type': 'empty', 'signed': signed, @@ -7881,7 +7960,7 @@ } /* generate a signature from a transaction hash */ - r.transactionSig = function(index, wif, sigHashType, txhash) { + r.transactionSig = function (index, wif, sigHashType, txhash) { function serializeSig(r, s) { var rBa = r.toByteArraySigned(); @@ -7937,7 +8016,7 @@ } // https://tools.ietf.org/html/rfc6979#section-3.2 - r.deterministicK = function(wif, hash, badrs) { + r.deterministicK = function (wif, hash, badrs) { // if r or s were invalid when this function was used in signing, // we do not want to actually compute r, s here for efficiency, so, // we can increment badrs. explained at end of RFC 6979 section 3.2 @@ -8015,7 +8094,7 @@ }; /* sign a "standard" input */ - r.signinput = function(index, wif, sigHashType) { + r.signinput = function (index, wif, sigHashType) { var key = coinjs.wif2pubkey(wif); var shType = sigHashType || 1; var signature = this.transactionSig(index, wif, shType); @@ -8027,7 +8106,7 @@ } /* signs a time locked / hodl input */ - r.signhodl = function(index, wif, sigHashType) { + r.signhodl = function (index, wif, sigHashType) { var shType = sigHashType || 1; var signature = this.transactionSig(index, wif, shType); var redeemScript = this.ins[index].script.buffer @@ -8038,8 +8117,73 @@ return true; } + r.signmultisig_bech32 = function (index, wif, sigHashType) { + + function scriptListPubkey(redeemScript) { + var r = {}; + for (var i = 1; i < redeemScript.chunks.length - 2; i++) { + r[i] = Crypto.util.hexToBytes(coinjs.pubkeydecompress(Crypto.util.bytesToHex(redeemScript.chunks[i]))); + } + return r; + } + + function scriptListSigs(sigList) { + let r = {}; + var c = 0; + if (Array.isArray(sigList)) { + for (let i = 1; i < sigList.length - 1; i++) { + c++; + r[c] = Crypto.util.hexToBytes(sigList[i]); + } + } + return r; + } + + var redeemScript = Crypto.util.bytesToHex(this.ins[index].script.chunks[0]); //redeemScript + + if (!coinjs.isArray(this.witness)) { + this.witness = new Array(this.ins.length); + this.witness.fill([]); + } + + var pubkeyList = scriptListPubkey(coinjs.script(redeemScript)); + var sigsList = scriptListSigs(this.witness[index]); + let decode_rs = coinjs.script().decodeRedeemScriptBech32(redeemScript); + + var shType = sigHashType || 1; + var txhash = this.transactionHashSegWitV0(index, shType); + + if (txhash.result == 1 && decode_rs.pubkeys.includes(coinjs.wif2pubkey(wif)['pubkey'])) { + + var segwitHash = Crypto.util.hexToBytes(txhash.hash); + var signature = Crypto.util.hexToBytes(this.transactionSig(index, wif, shType, segwitHash)); //CHECK THIS + + sigsList[coinjs.countObject(sigsList) + 1] = signature; + + var w = []; + + for (let x in pubkeyList) { + for (let y in sigsList) { + var sighash = this.transactionHashSegWitV0(index, sigsList[y].slice(-1)[0] * 1).hash + sighash = Crypto.util.hexToBytes(sighash); + if (coinjs.verifySignature(sighash, sigsList[y], pubkeyList[x])) { + w.push((Crypto.util.bytesToHex(sigsList[y]))) + } + } + } + + // when enough signatures collected, remove any non standard data we store, i.e. input value + if (w.length >= decode_rs.signaturesRequired) { + this.ins[index].script = coinjs.script(); + } + w.unshift(0); + w.push(redeemScript); + this.witness[index] = w; + } + } + /* sign a multisig input */ - r.signmultisig = function(index, wif, sigHashType) { + r.signmultisig = function (index, wif, sigHashType) { function scriptListPubkey(redeemScript) { var r = {}; @@ -8094,7 +8238,7 @@ } /* sign segwit input */ - r.signsegwit = function(index, wif, sigHashType) { + r.signsegwit = function (index, wif, sigHashType) { var shType = sigHashType || 1; var wif2 = coinjs.wif2pubkey(wif); @@ -8169,7 +8313,7 @@ } /* sign inputs */ - r.sign = function(wif, sigHashType) { + r.sign = function (wif, sigHashType) { var shType = sigHashType || 1; for (var i = 0; i < this.ins.length; i++) { var d = this.extractScriptKey(i); @@ -8187,6 +8331,9 @@ } else if (d['type'] == 'multisig') { this.signmultisig(i, wif, shType); + } else if (d['type'] == 'multisig_bech32' && d['signed'] == "false") { + this.signmultisig_bech32(i, wif, shType); + } else if (d['type'] == 'segwit') { this.signsegwit(i, wif, shType); @@ -8198,7 +8345,7 @@ } /* serialize a transaction */ - r.serialize = function() { + r.serialize = function () { var buffer = []; buffer = buffer.concat(coinjs.numToBytes(parseInt(this.version), 4)); @@ -8240,8 +8387,65 @@ return Crypto.util.bytesToHex(buffer); } + //Utility funtion added to directly compute signatures without transaction index + r.transactionSigNoIndex = function (wif, sigHashType, txhash) { + + function serializeSig(r, s) { + var rBa = r.toByteArraySigned(); + var sBa = s.toByteArraySigned(); + + var sequence = []; + sequence.push(0x02); // INTEGER + sequence.push(rBa.length); + sequence = sequence.concat(rBa); + + sequence.push(0x02); // INTEGER + sequence.push(sBa.length); + sequence = sequence.concat(sBa); + + sequence.unshift(sequence.length); + sequence.unshift(0x30); // SEQUENCE + + return sequence; + } + + var shType = sigHashType || 1; + var hash = Crypto.util.hexToBytes(txhash); + + if (hash) { + var curve = EllipticCurve.getSECCurveByName("secp256k1"); + var key = coinjs.wif2privkey(wif); + var priv = BigInteger.fromByteArrayUnsigned(Crypto.util.hexToBytes(key['privkey'])); + var n = curve.getN(); + var e = BigInteger.fromByteArrayUnsigned(hash); + + var badrs = 0 + do { + var k = this.deterministicK(wif, hash, badrs); + var G = curve.getG(); + var Q = G.multiply(k); + var r = Q.getX().toBigInteger().mod(n); + var s = k.modInverse(n).multiply(e.add(priv.multiply(r))).mod(n); + badrs++ + } while (r.compareTo(BigInteger.ZERO) <= 0 || s.compareTo(BigInteger.ZERO) <= 0); + + // Force lower s values per BIP62 + var halfn = n.shiftRight(1); + if (s.compareTo(halfn) > 0) { + s = n.subtract(s); + }; + + var sig = serializeSig(r, s); + sig.push(parseInt(shType, 10)); + + return Crypto.util.bytesToHex(sig); + } else { + return false; + } + } + /* deserialize a transaction */ - r.deserialize = function(buffer) { + r.deserialize = function (buffer) { if (typeof buffer == "string") { buffer = Crypto.util.hexToBytes(buffer) } @@ -8249,13 +8453,13 @@ var pos = 0; var witness = false; - var readAsInt = function(bytes) { + var readAsInt = function (bytes) { if (bytes == 0) return 0; pos++; return buffer[pos - 1] + readAsInt(bytes - 1) * 256; } - var readVarInt = function() { + var readVarInt = function () { pos++; if (buffer[pos - 1] < 253) { return buffer[pos - 1]; @@ -8263,12 +8467,12 @@ return readAsInt(buffer[pos - 1] - 251); } - var readBytes = function(bytes) { + var readBytes = function (bytes) { pos += bytes; return buffer.slice(pos - bytes, pos); } - var readVarString = function() { + var readVarString = function () { var size = readVarInt(); return readBytes(size); } @@ -8322,7 +8526,7 @@ return obj; } - r.size = function() { + r.size = function () { return ((this.serialize()).length / 2).toFixed(0); } @@ -8331,7 +8535,7 @@ /* start of signature vertification functions */ - coinjs.verifySignature = function(hash, sig, pubkey) { + coinjs.verifySignature = function (hash, sig, pubkey) { function parseSig(sig) { var cursor; @@ -8386,7 +8590,7 @@ return coinjs.verifySignatureRaw(e, r, s, Q); } - coinjs.verifySignatureRaw = function(e, r, s, Q) { + coinjs.verifySignatureRaw = function (e, r, s, Q) { var ecparams = EllipticCurve.getSECCurveByName("secp256k1"); var n = ecparams.getN(); var G = ecparams.getG(); @@ -8412,7 +8616,7 @@ /* start of privates functions */ /* base58 encode function */ - coinjs.base58encode = function(buffer) { + coinjs.base58encode = function (buffer) { var alphabet = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"; var base = BigInteger.valueOf(58); @@ -8435,7 +8639,7 @@ } /* base58 decode function */ - coinjs.base58decode = function(buffer) { + coinjs.base58decode = function (buffer) { var alphabet = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"; var base = BigInteger.valueOf(58); var validRegex = /^[1-9A-HJ-NP-Za-km-z]+$/; @@ -8459,7 +8663,7 @@ } /* raw ajax function to avoid needing bigger frame works like jquery, mootools etc */ - coinjs.ajax = function(u, f, m, a) { + coinjs.ajax = function (u, f, m, a) { var x = false; try { x = new ActiveXObject('Msxml2.XMLHTTP') @@ -8476,7 +8680,7 @@ } x.open(m, u, true); - x.onreadystatechange = function() { + x.onreadystatechange = function () { if ((x.readyState == 4) && f) f(x.responseText); }; @@ -8489,8 +8693,8 @@ } /* clone an object */ - coinjs.clone = function(obj) { - if (obj == null || typeof(obj) != 'object') return obj; + coinjs.clone = function (obj) { + if (obj == null || typeof (obj) != 'object') return obj; var temp = new obj.constructor(); for (var key in obj) { @@ -8501,7 +8705,7 @@ return temp; } - coinjs.numToBytes = function(num, bytes) { + coinjs.numToBytes = function (num, bytes) { if (typeof bytes === "undefined") bytes = 8; if (bytes == 0) { return []; @@ -8515,13 +8719,13 @@ function scriptNumSize(i) { return i > 0x7fffffff ? 5 : i > 0x7fffff ? 4 : - i > 0x7fff ? 3 : - i > 0x7f ? 2 : - i > 0x00 ? 1 : - 0; + i > 0x7fff ? 3 : + i > 0x7f ? 2 : + i > 0x00 ? 1 : + 0; } - coinjs.numToScriptNumBytes = function(_number) { + coinjs.numToScriptNumBytes = function (_number) { var value = Math.abs(_number); var size = scriptNumSize(value); var result = []; @@ -8539,7 +8743,7 @@ return result; } - coinjs.numToVarInt = function(num) { + coinjs.numToVarInt = function (num) { if (num < 253) { return [num]; } else if (num < 65536) { @@ -8551,12 +8755,12 @@ } } - coinjs.bytesToNum = function(bytes) { + coinjs.bytesToNum = function (bytes) { if (bytes.length == 0) return 0; else return bytes[0] + 256 * coinjs.bytesToNum(bytes.slice(1)); } - coinjs.uint = function(f, size) { + coinjs.uint = function (f, size) { if (f.length < size) throw new Error("not enough data"); var n = 0; @@ -8567,11 +8771,11 @@ return n; } - coinjs.isArray = function(o) { + coinjs.isArray = function (o) { return Object.prototype.toString.call(o) === '[object Array]'; } - coinjs.countObject = function(obj) { + coinjs.countObject = function (obj) { var count = 0; var i; for (i in obj) { @@ -8582,12 +8786,116 @@ return count; } - coinjs.random = function(length) { + //Nine utility functions added for generating transaction hashes and verification of signatures + coinjs.changeEndianness = (string) => { + const result = []; + let len = string.length - 2; + while (len >= 0) { + result.push(string.substr(len, 2)); + len -= 2; + } + return result.join(''); + } + + coinjs.getTransactionHash = function (transaction_in_hex, changeOutputEndianess) { + var x1, x2, x3, x4, x5; + x1 = Crypto.util.hexToBytes(transaction_in_hex); + x2 = Crypto.SHA256(x1); + x3 = Crypto.util.hexToBytes(x2); + x4 = Crypto.SHA256(x3); + x5 = coinjs.changeEndianness(x4); + if (changeOutputEndianess == true) { x5 = x5 } else if ((typeof changeOutputEndianess == 'undefined') || (changeOutputEndianess == false)) { x5 = x4 }; + return x5; + } + + coinjs.compressedToUncompressed = function (compressed) { + var t1, t2; + var curve = EllipticCurve.getSECCurveByName("secp256k1"); + t1 = curve.curve.decodePointHex(compressed); + t2 = curve.curve.encodePointHex(t1); + return t2; + } + + coinjs.uncompressedToCompressed = function (uncompressed) { + var t1, t2, t3; + t1 = uncompressed.charAt(uncompressed.length - 1) + t2 = parseInt(t1, 10); + //Check if the last digit is odd + if (t2 % 2 == 1) { t3 = "03"; } else { t3 = "02" }; + return t3 + uncompressed.substr(2, 64); + } + + coinjs.verifySignatureHex = function (hashHex, sigHex, pubHexCompressed) { + var h1, s1, p1, p2; + h1 = Crypto.util.hexToBytes(hashHex); + s1 = Crypto.util.hexToBytes(sigHex); + p1 = coinjs.compressedToUncompressed(pubHexCompressed); + p2 = Crypto.util.hexToBytes(p1); + + return coinjs.verifySignature(h1, s1, p2); + } + + coinjs.generateBitcoinSignature = function (private_key, hash, sighash_type_int = 1) { + var wif, tx1; + if (private_key.length < 60) { wif = private_key } else { wif = coinjs.privkey2wif(private_key) }; + tx1 = coinjs.transaction(); + return tx1.transactionSigNoIndex(wif, sighash_type_int, hash); + } + + coinjs.dSHA256 = function (data) { + var t1, t2, t3; + t1 = Crypto.SHA256(Crypto.util.hexToBytes(data)); + t2 = Crypto.util.hexToBytes(t1); + t3 = Crypto.SHA256(t2); + return t3; + } + + coinjs.fromBitcoinAmountFormat = function (data) { + var x1, x2, x3; + x1 = coinjs.changeEndianness(data); + x2 = parseInt(x1, 16); + x3 = x2 / (10 ** 8); + return x3; + } + + coinjs.toBitcoinAmountFormat = function (countBitcoin) { + var t2, t3, t4, t5; + t2 = countBitcoin * 10 ** 8; + t3 = t2.toString(16); + t4 = coinjs.changeEndianness(t3); + t5 = t4.padEnd(16, "0"); + return t5; + } + + coinjs.scriptcodeCreatorBasic = function (scriptpubkey) { + var t1, t2, t3, t4; + if (scriptpubkey.substr(0, 4) == "0014") { + //Scriptpubkey case + t1 = scriptpubkey.slice(2); + t2 = "1976a9" + t1 + "88ac"; + } else { + //Redeemscript case + t3 = (scriptpubkey.length) / 2; + t4 = t3.toString(16); + t2 = t4 + scriptpubkey; + } + return t2; + } + + coinjs.ripemd160sha256 = function (data) { + var t1, t2; + + t1 = ripemd160(Crypto.SHA256(Crypto.util.hexToBytes(data), { asBytes: true }), { asBytes: true }); + t2 = Crypto.util.bytesToHex(t1) + return t2; + } + + coinjs.random = function (length) { var r = ""; var l = length || 25; var chars = "!$%^&*()_+{}:@~?><|\./;'#][=-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; for (let x = 0; x < l; x++) { - r += chars.charAt(Math.floor(securedMathRandom() * 62)); + r += chars.charAt(Math.floor(Math.random() * 62)); } return r; } @@ -8595,7 +8903,7 @@ })(); //secrets.js - (function() { + (function () { //Shamir Secret Share by Alexander Stetsyuk - released under MIT License var SecretShare = GLOBAL.shamirSecretShare = {}; @@ -8623,7 +8931,7 @@ var config = {}; /** @expose **/ - SecretShare.getConfig = function() { + SecretShare.getConfig = function () { return { 'bits': config.bits, 'unsafePRNG': config.unsafePRNG @@ -8632,7 +8940,7 @@ function init(bits) { if (bits && (typeof bits !== 'number' || bits % 1 !== 0 || bits < defaults.minBits || bits > - defaults.maxBits)) { + defaults.maxBits)) { throw new Error('Number of bits must be an integer between ' + defaults.minBits + ' and ' + defaults.maxBits + ', inclusive.') } @@ -8695,7 +9003,7 @@ // node.js crypto.randomBytes() if (typeof require === 'function') { - return function(bits) { + return function (bits) { var bytes = Math.ceil(bits / 8), str = null; @@ -8709,7 +9017,7 @@ // browsers with window.crypto.getRandomValues() if (GLOBAL['crypto'] && typeof GLOBAL['crypto']['getRandomValues'] === 'function' && typeof GLOBAL['Uint32Array'] === 'function') { crypto = GLOBAL['crypto']; - return function(bits) { + return function (bits) { var elems = Math.ceil(bits / 32), str = null, arr = new GLOBAL['Uint32Array'](elems); @@ -8730,7 +9038,7 @@ var bitsPerNum = 32; var max = Math.pow(2, bitsPerNum) - 1; - return function(bits) { + return function (bits) { var elems = Math.ceil(bits / bitsPerNum); var arr = [], str = null; @@ -8755,7 +9063,7 @@ // Set the PRNG to use. If no RNG function is supplied, pick a default using getRNG() /** @expose **/ - SecretShare.setRNG = function(rng, alert) { + SecretShare.setRNG = function (rng, alert) { if (!isInited()) { this.init(); } @@ -8764,7 +9072,7 @@ // test the RNG (5 times) if (typeof rng !== 'function' || typeof rng(config.bits) !== 'string' || !parseInt(rng(config.bits), - 2) || rng(config.bits).length > config.bits || rng(config.bits).length < config.bits) { + 2) || rng(config.bits).length > config.bits || rng(config.bits).length < config.bits) { throw new Error( "Random number generator is invalid. Supply an RNG of the form function(bits){} that returns a string containing 'bits' number of random 1's and 0's." ) @@ -8782,7 +9090,7 @@ // Generates a random bits-length number string using the PRNG /** @expose **/ - SecretShare.random = function(bits) { + SecretShare.random = function (bits) { if (!isSetRNG()) { this.setRNG(); } @@ -8802,7 +9110,7 @@ // requiring `threshold` number of shares to reconstruct the secret. // Optionally, zero-pads the secret to a length that is a multiple of padLength before sharing. /** @expose **/ - SecretShare.share = function(secret, numShares, threshold, padLength, withoutPrefix) { + SecretShare.share = function (secret, numShares, threshold, padLength, withoutPrefix) { if (!isInited()) { this.init(); } @@ -8873,7 +9181,7 @@ // Note: no error-checking at this stage! If `secrets` is NOT // a NUMBER less than 2^bits-1, the output will be incorrect! /** @expose **/ - SecretShare._getShares = function(secret, numShares, threshold) { + SecretShare._getShares = function (secret, numShares, threshold) { var shares = []; var coeffs = [secret]; @@ -8920,7 +9228,7 @@ var bits = parseInt(share[0], 36); if (bits && (typeof bits !== 'number' || bits % 1 !== 0 || bits < defaults.minBits || bits > - defaults.maxBits)) { + defaults.maxBits)) { throw new Error('Number of bits must be an integer between ' + defaults.minBits + ' and ' + defaults.maxBits + ', inclusive.') } @@ -8995,14 +9303,14 @@ // Combine `shares` Array into the original secret /** @expose **/ - SecretShare.combine = function(shares) { + SecretShare.combine = function (shares) { return combine(0, shares); }; // Generate a new share with id `id` (a number between 1 and 2^bits-1) // `id` can be a Number or a String in the default radix (16) /** @expose **/ - SecretShare.newShare = function(id, shares) { + SecretShare.newShare = function (id, shares) { if (typeof id === 'string') { id = parseInt(id, config.radix); } @@ -9041,7 +9349,7 @@ product = -1; // fix for a zero product term, after which the sum should be sum^0 = sum, not sum^1 break; } - product = (product + config.logs[at ^ x[j]] - config.logs[x[i] ^ x[j]] + config.max /* to make sure it's not negative */ ) % + product = (product + config.logs[at ^ x[j]] - config.logs[x[i] ^ x[j]] + config.max /* to make sure it's not negative */) % config.max; } @@ -9108,7 +9416,7 @@ // Each character of the input string is represented by // `bytesPerChar` bytes in the output string. /** @expose **/ - SecretShare.str2hex = function(str, bytesPerChar) { + SecretShare.str2hex = function (str, bytesPerChar) { if (typeof str !== 'string') { throw new Error('Input must be a character string.'); } @@ -9142,7 +9450,7 @@ // Converts a given HEX number string to a UTF16 character string. /** @expose **/ - SecretShare.hex2str = function(str, bytesPerChar) { + SecretShare.hex2str = function (str, bytesPerChar) { if (typeof str !== 'string') { throw new Error('Input must be a hexadecimal string.'); } @@ -9168,7 +9476,7 @@ })(); //kbucket.js - (function() { + (function () { // Kademlia DHT K-bucket implementation as a binary tree. // by 'Tristan Slominski' under 'MIT License' GLOBAL.BuildKBucket = function KBucket(options = {}) { @@ -9181,7 +9489,7 @@ this.arbiter = options.arbiter || this.arbiter this.metadata = Object.assign({}, options.metadata) - this.createNode = function() { + this.createNode = function () { return { contacts: [], dontSplit: false, @@ -9190,12 +9498,12 @@ } } - this.ensureInt8 = function(name, val) { + this.ensureInt8 = function (name, val) { if (!(val instanceof Uint8Array)) throw new TypeError(name + ' is not a Uint8Array') } - this.arrayEquals = function(array1, array2) { + this.arrayEquals = function (array1, array2) { if (array1 === array2) return true if (array1.length !== array2.length) @@ -9209,11 +9517,11 @@ this.ensureInt8('option.localNodeId as parameter 1', this.localNodeId) this.root = this.createNode() - this.arbiter = function(incumbent, candidate) { + this.arbiter = function (incumbent, candidate) { return incumbent.vectorClock > candidate.vectorClock ? incumbent : candidate } - this.distance = function(firstId, secondId) { + this.distance = function (firstId, secondId) { let distance = 0 let i = 0 const min = Math.min(firstId.length, secondId.length) @@ -9224,7 +9532,7 @@ return distance } - this.add = function(contact) { + this.add = function (contact) { this.ensureInt8('contact.id', (contact || {}).id) let bitIndex = 0 let node = this.root @@ -9245,7 +9553,7 @@ return this.add(contact) } - this.closest = function(id, n = Infinity) { + this.closest = function (id, n = Infinity) { this.ensureInt8('id', id) if ((!Number.isInteger(n) && n !== Infinity) || n <= 0) throw new TypeError('n is not positive number') @@ -9266,7 +9574,7 @@ .map(a => a[1]) } - this.count = function() { + this.count = function () { let count = 0 for (const nodes = [this.root]; nodes.length > 0;) { const node = nodes.pop() @@ -9278,7 +9586,7 @@ return count } - this._determineNode = function(node, id, bitIndex) { + this._determineNode = function (node, id, bitIndex) { const bytesDescribedByBitIndex = bitIndex >> 3 const bitIndexWithinByte = bitIndex % 8 if ((id.length <= bytesDescribedByBitIndex) && (bitIndexWithinByte !== 0)) @@ -9289,7 +9597,7 @@ return node.left } - this.get = function(id) { + this.get = function (id) { this.ensureInt8('id', id) let bitIndex = 0 let node = this.root @@ -9299,14 +9607,14 @@ return index >= 0 ? node.contacts[index] : null } - this._indexOf = function(node, id) { + this._indexOf = function (node, id) { for (let i = 0; i < node.contacts.length; ++i) if (this.arrayEquals(node.contacts[i].id, id)) return i return -1 } - this.remove = function(id) { + this.remove = function (id) { this.ensureInt8('the id as parameter 1', id) let bitIndex = 0 let node = this.root @@ -9318,7 +9626,7 @@ return this } - this._split = function(node, bitIndex) { + this._split = function (node, bitIndex) { node.left = this.createNode() node.right = this.createNode() for (const contact of node.contacts) @@ -9329,7 +9637,7 @@ otherNode.dontSplit = true } - this.toArray = function() { + this.toArray = function () { let result = [] for (const nodes = [this.root]; nodes.length > 0;) { const node = nodes.pop() @@ -9341,7 +9649,7 @@ return result } - this._update = function(node, index, contact) { + this._update = function (node, index, contact) { if (!this.arrayEquals(node.contacts[index].id, contact.id)) throw new Error('wrong index for _update') const incumbent = node.contacts[index] From aebda7ec80d3bce49998f5b621f8bcb8afa7e2da Mon Sep 17 00:00:00 2001 From: sairajzero Date: Thu, 24 Nov 2022 03:25:52 +0530 Subject: [PATCH 36/42] btcOperator v1.0.14: multisig-bech32 (p2wsh) --- btcOperator.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/btcOperator.js b/btcOperator.js index 0f2786a..d1f57fa 100644 --- a/btcOperator.js +++ b/btcOperator.js @@ -1,4 +1,4 @@ -(function (EXPORTS) { //btcOperator v1.0.13c +(function (EXPORTS) { //btcOperator v1.0.14 /* BTC Crypto and API Operator */ const btcOperator = EXPORTS; @@ -102,7 +102,7 @@ if (!addr) return undefined; let type = coinjs.addressDecode(addr).type; - if (["standard", "multisig", "bech32"].includes(type)) + if (["standard", "multisig", "bech32", "multisigBech32"].includes(type)) return type; else return false; @@ -398,6 +398,7 @@ return reject("Insufficient Balance"); let addr = senders[rec_args.n], rs = redeemScripts[rec_args.n]; + let addr_type = coinjs.addressDecode(addr).type; let size_per_input = _sizePerInput(addr, rs); fetch_api(`get_tx_unspent/BTC/${addr}`).then(result => { let utxos = result.data.txs; @@ -408,14 +409,14 @@ var script; if (!rs || !rs.length) //legacy script script = utxos[i].script_hex; - else if (((rs.match(/^00/) && rs.length == 44)) || (rs.length == 40 && rs.match(/^[a-f0-9]+$/gi))) { - //redeemScript for segwit/bech32 + else if (((rs.match(/^00/) && rs.length == 44)) || (rs.length == 40 && rs.match(/^[a-f0-9]+$/gi)) || addr_type === 'multisigBech32') { + //redeemScript for segwit/bech32 and multisig (bech32) let s = coinjs.script(); s.writeBytes(Crypto.util.hexToBytes(rs)); s.writeOp(0); s.writeBytes(coinjs.numToBytes((utxos[i].value * SATOSHI_IN_BTC).toFixed(0), 8)); script = Crypto.util.bytesToHex(s.buffer); - } else //redeemScript for multisig + } else //redeemScript for multisig (segwit) script = rs; tx.addinput(utxos[i].txid, utxos[i].output_no, script, 0xfffffffd /*sequence*/); //0xfffffffd for Replace-by-fee //update track values From a71c851cc2705a1689713e3e2ba22d4db42d5c9a Mon Sep 17 00:00:00 2001 From: sairajzero Date: Sun, 27 Nov 2022 02:47:02 +0530 Subject: [PATCH 37/42] btcOperator v1.0.14a - Added multisig-bech32 to auto-fee calc - Fixed: createMultiSigTx not working with bech32 sender - Fixed: checkSigned for multisig-bech32 --- btcOperator.js | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/btcOperator.js b/btcOperator.js index d1f57fa..9efd6ee 100644 --- a/btcOperator.js +++ b/btcOperator.js @@ -1,4 +1,4 @@ -(function (EXPORTS) { //btcOperator v1.0.14 +(function (EXPORTS) { //btcOperator v1.0.14a /* BTC Crypto and API Operator */ const btcOperator = EXPORTS; @@ -108,12 +108,15 @@ return false; } - btcOperator.multiSigAddress = function (pubKeys, minRequired) { + btcOperator.multiSigAddress = function (pubKeys, minRequired, bech32 = true) { if (!Array.isArray(pubKeys)) throw "pubKeys must be an array of public keys"; else if (pubKeys.length < minRequired) throw "minimum required should be less than the number of pubKeys"; - return coinjs.pubkeys2MultisigAddress(pubKeys, minRequired); + if (bech32) + return coinjs.pubkeys2MultisigAddressBech32(pubKeys, minRequired); + else + return coinjs.pubkeys2MultisigAddress(pubKeys, minRequired); } //convert from one blockchain to another blockchain (target version) @@ -222,11 +225,13 @@ BASE_INPUT_SIZE = 41, LEGACY_INPUT_SIZE = 107, BECH32_INPUT_SIZE = 27, + BECH32_MULTISIG_INPUT_SIZE = 35, SEGWIT_INPUT_SIZE = 59, MULTISIG_INPUT_SIZE_ES = 351, BASE_OUTPUT_SIZE = 9, LEGACY_OUTPUT_SIZE = 25, BECH32_OUTPUT_SIZE = 23, + BECH32_MULTISIG_OUTPUT_SIZE = 34, SEGWIT_OUTPUT_SIZE = 23; function _redeemScript(addr, key) { @@ -249,6 +254,8 @@ return BASE_INPUT_SIZE + LEGACY_INPUT_SIZE; case "bech32": return BASE_INPUT_SIZE + BECH32_INPUT_SIZE; + case "multisigBech32": + return BASE_INPUT_SIZE + BECH32_MULTISIG_INPUT_SIZE; case "multisig": switch (coinjs.script().decodeRedeemScript(rs).type) { case "segwit__": @@ -269,6 +276,8 @@ return BASE_OUTPUT_SIZE + LEGACY_OUTPUT_SIZE; case "bech32": return BASE_OUTPUT_SIZE + BECH32_OUTPUT_SIZE; + case "multisigBech32": + return BASE_OUTPUT_SIZE + BECH32_MULTISIG_OUTPUT_SIZE; case "multisig": return BASE_OUTPUT_SIZE + SEGWIT_OUTPUT_SIZE; default: @@ -564,11 +573,14 @@ btcOperator.createMultiSigTx = function (sender, redeemScript, receivers, amounts, fee = null, options = {}) { return new Promise((resolve, reject) => { //validate tx parameters - if (validateAddress(sender) !== "multisig") + let addr_type = validateAddress(sender); + if (!(["multisig", "multisigBech32"].includes(addr_type))) return reject("Invalid sender (multisig):" + sender); else { let script = coinjs.script(); - let decode = script.decodeRedeemScript(redeemScript); + let decode = (addr_type == "multisig") ? + script.decodeRedeemScript(redeemScript) : + script.decodeRedeemScriptBech32(redeemScript); if (!decode || decode.address !== sender) return reject("Invalid redeem-script"); } @@ -623,10 +635,10 @@ let n = []; for (let i in tx.ins) { var s = tx.extractScriptKey(i); - if (s['type'] !== 'multisig') + if (s['type'] !== 'multisig' && s['type'] !== 'multisig_bech32') n.push(s.signed == 'true' || (tx.witness[i] && tx.witness[i].length == 2)) else { - var rs = coinjs.script().decodeRedeemScript(s.script); + var rs = coinjs.script().decodeRedeemScript(s.script); //will work for bech32 too, as only address is diff let x = { s: s['signatures'], r: rs['signaturesRequired'], @@ -682,10 +694,10 @@ result.outputs = tx.outs.map(out => { var address; switch (out.script.chunks[0]) { - case 0: //bech32 + case 0: //bech32, multisig-bech32 address = encodeBech32(Crypto.util.bytesToHex(out.script.chunks[1]), coinjs.bech32.version, coinjs.bech32.hrp); break; - case 169: //multisig, segwit + case 169: //segwit, multisig-segwit address = encodeLegacy(Crypto.util.bytesToHex(out.script.chunks[1]), coinjs.multisig); break; case 118: //legacy From ea4d1f67d6299d04a0be43c97ae8a85ced206ec3 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Fri, 16 Dec 2022 20:47:21 +0530 Subject: [PATCH 38/42] bug fix: btcOperator v1.0.14b (ignore dust-change) --- btcOperator.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/btcOperator.js b/btcOperator.js index 9efd6ee..c81f2e2 100644 --- a/btcOperator.js +++ b/btcOperator.js @@ -1,4 +1,4 @@ -(function (EXPORTS) { //btcOperator v1.0.14a +(function (EXPORTS) { //btcOperator v1.0.14b /* BTC Crypto and API Operator */ const btcOperator = EXPORTS; @@ -338,7 +338,7 @@ const tx = coinjs.transaction(); let output_size = addOutputs(tx, receivers, amounts, change_address); addInputs(tx, senders, redeemScripts, total_amount, fee, output_size, fee_from_receiver).then(result => { - if (result.change_amount > 0) //add change amount if any + if (result.change_amount > 0 && result.change_amount > result.fee) //add change amount if any (ignore dust change) tx.outs[tx.outs.length - 1].value = parseInt(result.change_amount * SATOSHI_IN_BTC); //values are in satoshi if (fee_from_receiver) { //deduce fee from receivers if fee_from_receiver let fee_remaining = parseInt(result.fee * SATOSHI_IN_BTC); From cc4380d623003b1dfc50dcd3438ac33e528b50cd Mon Sep 17 00:00:00 2001 From: sairajzero Date: Sun, 18 Dec 2022 03:44:04 +0530 Subject: [PATCH 39/42] floDapps v2.3.3 - Added support: update cloud node URL - Added support: trusted IDs (configured by adminID) - Trusted IDs have permission to edit tag data --- floDapps.js | 73 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 54 insertions(+), 19 deletions(-) diff --git a/floDapps.js b/floDapps.js index 38ee0b4..9603c41 100644 --- a/floDapps.js +++ b/floDapps.js @@ -1,4 +1,4 @@ -(function(EXPORTS) { //floDapps v2.3.2d +(function (EXPORTS) { //floDapps v2.3.3 /* General functions for FLO Dapps*/ 'use strict'; const floDapps = EXPORTS; @@ -181,6 +181,7 @@ credentials: {}, //for Dapps subAdmins: {}, + trustedIDs: {}, settings: {}, appObjects: {}, generalData: {}, @@ -244,6 +245,12 @@ compactIDB.removeData("supernodes", sn, DEFAULT.root); for (let sn in content.newNodes) compactIDB.writeData("supernodes", content.newNodes[sn], sn, DEFAULT.root); + for (let sn in content.updateNodes) + compactIDB.readData("supernodes", sn, DEFAULT.root).then(r => { + r = r || {} + r.uri = content.updateNodes[sn]; + compactIDB.writeData("supernodes", r, sn, DEFAULT.root); + }); } compactIDB.writeData("lastTx", result.totalTxs, floCloudAPI.SNStorageID, DEFAULT.root); compactIDB.readAllData("supernodes", DEFAULT.root).then(nodes => { @@ -274,6 +281,12 @@ if (Array.isArray(content.addSubAdmin)) for (var k = 0; k < content.addSubAdmin.length; k++) compactIDB.writeData("subAdmins", true, content.addSubAdmin[k]); + if (Array.isArray(content.removeTrustedID)) + for (var j = 0; j < content.removeTrustedID.length; j++) + compactIDB.removeData("trustedIDs", content.removeTrustedID[j]); + if (Array.isArray(content.addTrustedID)) + for (var k = 0; k < content.addTrustedID.length; k++) + compactIDB.writeData("trustedIDs", true, content.addTrustedID[k]); if (content.settings) for (let l in content.settings) compactIDB.writeData("settings", content.settings[l], l) @@ -454,7 +467,7 @@ }) }); - floDapps.launchStartUp = function() { + floDapps.launchStartUp = function () { return new Promise((resolve, reject) => { initIndexedDB().then(log => { console.log(log) @@ -497,7 +510,7 @@ floDapps.setAppObjectStores = appObs => initIndexedDB.appObs = appObs; - floDapps.storeContact = function(floID, name) { + floDapps.storeContact = function (floID, name) { return new Promise((resolve, reject) => { if (!floCrypto.validateAddr(floID)) return reject("Invalid floID!") @@ -508,7 +521,7 @@ }); } - floDapps.storePubKey = function(floID, pubKey) { + floDapps.storePubKey = function (floID, pubKey) { return new Promise((resolve, reject) => { if (floID in user.pubKeys) return resolve("pubKey already stored") @@ -523,7 +536,7 @@ }); } - floDapps.sendMessage = function(floID, message) { + floDapps.sendMessage = function (floID, message) { return new Promise((resolve, reject) => { let options = { receiverID: floID, @@ -538,7 +551,7 @@ }) } - floDapps.requestInbox = function(callback) { + floDapps.requestInbox = function (callback) { return new Promise((resolve, reject) => { let lastVC = Object.keys(user.messages).sort().pop() let options = { @@ -552,7 +565,7 @@ try { if (d[v].message instanceof Object && "secret" in d[v].message) d[v].message = floCrypto.decryptData(d[v].message, privKey) - } catch (error) {} + } catch (error) { } compactIDB.writeData("messages", d[v], v, user.db_name) user.messages[v] = d[v] } @@ -565,7 +578,7 @@ }) } - floDapps.manageAppConfig = function(adminPrivKey, addList, rmList, settings) { + floDapps.manageAppConfig = function (adminPrivKey, addList, rmList, settings) { return new Promise((resolve, reject) => { if (!Array.isArray(addList) || !addList.length) addList = undefined; if (!Array.isArray(rmList) || !rmList.length) rmList = undefined; @@ -584,12 +597,34 @@ reject('Access Denied for Admin privilege') else floBlockchainAPI.writeData(floID, JSON.stringify(floData), adminPrivKey) - .then(result => resolve(['Updated App Configuration', result])) - .catch(error => reject(error)) + .then(result => resolve(['Updated App Configuration', result])) + .catch(error => reject(error)) }) } - const clearCredentials = floDapps.clearCredentials = function() { + floDapps.manageAppTrustedIDs = function (adminPrivKey, addList, rmList) { + return new Promise((resolve, reject) => { + if (!Array.isArray(addList) || !addList.length) addList = undefined; + if (!Array.isArray(rmList) || !rmList.length) rmList = undefined; + if (!addList && !rmList) + return reject("No change in list") + var floData = { + [DEFAULT.application]: { + addTrustedID: addList, + removeTrustedID: rmList + } + } + var floID = floCrypto.getFloID(adminPrivKey) + if (floID != DEFAULT.adminID) + reject('Access Denied for Admin privilege') + else + floBlockchainAPI.writeData(floID, JSON.stringify(floData), adminPrivKey) + .then(result => resolve(['Updated App Configuration', result])) + .catch(error => reject(error)) + }) + } + + const clearCredentials = floDapps.clearCredentials = function () { return new Promise((resolve, reject) => { compactIDB.clearData('credentials', DEFAULT.application).then(result => { localStorage.removeItem(`${DEFAULT.application}#privKey`); @@ -599,7 +634,7 @@ }) } - floDapps.deleteUserData = function(credentials = false) { + floDapps.deleteUserData = function (credentials = false) { return new Promise((resolve, reject) => { let p = [] p.push(compactIDB.deleteDB(user.db_name)) @@ -611,7 +646,7 @@ }) } - floDapps.deleteAppData = function() { + floDapps.deleteAppData = function () { return new Promise((resolve, reject) => { compactIDB.deleteDB(DEFAULT.application).then(result => { localStorage.removeItem(`${DEFAULT.application}#privKey`) @@ -623,7 +658,7 @@ }) } - floDapps.securePrivKey = function(pwd) { + floDapps.securePrivKey = function (pwd) { return new Promise(async (resolve, reject) => { let indexArr = localStorage.getItem(`${DEFAULT.application}#privKey`) if (!indexArr) @@ -643,8 +678,8 @@ }) } - floDapps.verifyPin = function(pin = null) { - const readSharesFromIDB = function(indexArr) { + floDapps.verifyPin = function (pin = null) { + const readSharesFromIDB = function (indexArr) { return new Promise((resolve, reject) => { var promises = [] for (var i = 0; i < indexArr.length; i++) @@ -687,7 +722,7 @@ }) } - const getNextGeneralData = floDapps.getNextGeneralData = function(type, vectorClock = null, options = {}) { + const getNextGeneralData = floDapps.getNextGeneralData = function (type, vectorClock = null, options = {}) { var fk = floCloudAPI.util.filterKey(type, options) vectorClock = vectorClock || getNextGeneralData[fk] || '0'; var filteredResult = {} @@ -716,10 +751,10 @@ let tmp = floCrypto.decryptData(data.message, key) data.message = JSON.parse(tmp) break; - } catch (error) {} + } catch (error) { } } } - } catch (error) {} + } catch (error) { } } } getNextGeneralData[fk] = Object.keys(filteredResult).sort().pop(); From c2b836c069eca5c04c4275e169dc854fdc394479 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Fri, 23 Dec 2022 22:48:52 +0530 Subject: [PATCH 40/42] Updating floSight URLs --- floBlockchainAPI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/floBlockchainAPI.js b/floBlockchainAPI.js index 473b192..ab778fe 100644 --- a/floBlockchainAPI.js +++ b/floBlockchainAPI.js @@ -1,4 +1,4 @@ -(function (EXPORTS) { //floBlockchainAPI v2.3.3d +(function (EXPORTS) { //floBlockchainAPI v2.3.3e /* FLO Blockchain Operator to send/receive data from blockchain using API calls*/ 'use strict'; const floBlockchainAPI = EXPORTS; @@ -6,7 +6,7 @@ const DEFAULT = { blockchain: floGlobals.blockchain, apiURL: { - FLO: ['https://flosight.duckdns.org/'], + FLO: ['https://flosight.duckdns.org/', 'https://flosight.ranchimall.net/'], FLO_TEST: ['https://testnet-flosight.duckdns.org', 'https://testnet.flocha.in/'] }, sendAmt: 0.001, From c2a94e6246103d11c6a077c6fb95f29bea3241d3 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Tue, 31 Jan 2023 01:21:48 +0530 Subject: [PATCH 41/42] btcOperator v1.1.0: updating API provider updating API link to blockchain.info --- btcOperator.js | 158 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 126 insertions(+), 32 deletions(-) diff --git a/btcOperator.js b/btcOperator.js index c81f2e2..beb2cd6 100644 --- a/btcOperator.js +++ b/btcOperator.js @@ -1,16 +1,16 @@ -(function (EXPORTS) { //btcOperator v1.0.14b +(function (EXPORTS) { //btcOperator v1.1.0 /* BTC Crypto and API Operator */ const btcOperator = EXPORTS; //This library uses API provided by chain.so (https://chain.so/) - const URL = "https://chain.so/api/v2/"; + const URL = "https://blockchain.info/"; const fetch_api = btcOperator.fetch = function (api) { return new Promise((resolve, reject) => { console.debug(URL + api); fetch(URL + api).then(response => { response.json() - .then(result => result.status === "success" ? resolve(result) : reject(result)) + .then(result => result.error ? reject(result) : resolve(result)) .catch(error => reject(error)) }).catch(error => reject(error)) }) @@ -18,12 +18,17 @@ const SATOSHI_IN_BTC = 1e8; + const util = btcOperator.util = {}; + + util.Sat_to_BTC = value => parseFloat((value / SATOSHI_IN_BTC).toFixed(8)); + util.BTC_to_Sat = value => parseInt(value * SATOSHI_IN_BTC); + function get_fee_rate() { return new Promise((resolve, reject) => { fetch('https://api.blockchain.info/mempool/fees').then(response => { if (response.ok) response.json() - .then(result => resolve(parseFloat((result.regular / SATOSHI_IN_BTC).toFixed(8)))) + .then(result => resolve(util.Sat_to_BTC(result.regular))) .catch(error => reject(error)); else reject(response); @@ -216,8 +221,8 @@ //BTC blockchain APIs btcOperator.getBalance = addr => new Promise((resolve, reject) => { - fetch_api(`get_address_balance/BTC/${addr}`) - .then(result => resolve(parseFloat(result.data.confirmed_balance))) + fetch_api(`q/addressbalance/${addr}`) + .then(result => resolve(util.Sat_to_BTC(result))) .catch(error => reject(error)) }); @@ -308,7 +313,7 @@ parameters.privkeys[i] = coinjs.privkey2wif(key); }); if (invalids.length) - throw "Invalid keys:" + invalids; + throw "Invalid private key for address:" + invalids; } //receiver-ids (and change-id) if (!Array.isArray(parameters.receivers)) @@ -339,9 +344,9 @@ let output_size = addOutputs(tx, receivers, amounts, change_address); addInputs(tx, senders, redeemScripts, total_amount, fee, output_size, fee_from_receiver).then(result => { if (result.change_amount > 0 && result.change_amount > result.fee) //add change amount if any (ignore dust change) - tx.outs[tx.outs.length - 1].value = parseInt(result.change_amount * SATOSHI_IN_BTC); //values are in satoshi + tx.outs[tx.outs.length - 1].value = util.BTC_to_Sat(result.change_amount); //values are in satoshi if (fee_from_receiver) { //deduce fee from receivers if fee_from_receiver - let fee_remaining = parseInt(result.fee * SATOSHI_IN_BTC); + let fee_remaining = util.BTC_to_Sat(result.fee); for (let i = 0; i < tx.outs.length - 1 && fee_remaining > 0; i++) { if (fee_remaining < tx.outs[i].value) { tx.outs[i].value -= fee_remaining; @@ -409,29 +414,29 @@ rs = redeemScripts[rec_args.n]; let addr_type = coinjs.addressDecode(addr).type; let size_per_input = _sizePerInput(addr, rs); - fetch_api(`get_tx_unspent/BTC/${addr}`).then(result => { - let utxos = result.data.txs; + fetch_api(`unspent?active=${addr}`).then(result => { + let utxos = result.unspent_outputs; console.debug("add-utxo", addr, rs, required_amount, utxos); for (let i = 0; i < utxos.length && required_amount > 0; i++) { if (!utxos[i].confirmations) //ignore unconfirmed utxo continue; var script; if (!rs || !rs.length) //legacy script - script = utxos[i].script_hex; + script = utxos[i].script; else if (((rs.match(/^00/) && rs.length == 44)) || (rs.length == 40 && rs.match(/^[a-f0-9]+$/gi)) || addr_type === 'multisigBech32') { //redeemScript for segwit/bech32 and multisig (bech32) let s = coinjs.script(); s.writeBytes(Crypto.util.hexToBytes(rs)); s.writeOp(0); - s.writeBytes(coinjs.numToBytes((utxos[i].value * SATOSHI_IN_BTC).toFixed(0), 8)); + s.writeBytes(coinjs.numToBytes(utxos[i].value.toFixed(0), 8)); script = Crypto.util.bytesToHex(s.buffer); } else //redeemScript for multisig (segwit) script = rs; - tx.addinput(utxos[i].txid, utxos[i].output_no, script, 0xfffffffd /*sequence*/); //0xfffffffd for Replace-by-fee + tx.addinput(utxos[i].tx_hash_big_endian, utxos[i].tx_output_n, script, 0xfffffffd /*sequence*/); //0xfffffffd for Replace-by-fee //update track values rec_args.input_size += size_per_input; - rec_args.input_amount += parseFloat(utxos[i].value); - required_amount -= parseFloat(utxos[i].value); + rec_args.input_amount += util.Sat_to_BTC(utxos[i].value); + required_amount -= util.Sat_to_BTC(utxos[i].value); if (fee_rate) //automatic fee calculation (dynamic) required_amount += size_per_input * fee_rate; } @@ -670,8 +675,8 @@ } const getTxOutput = (txid, i) => new Promise((resolve, reject) => { - fetch_api(`get_tx_outputs/BTC/${txid}/${i}`) - .then(result => resolve(result.data.outputs)) + fetch_api(`rawtx/${txid}`) + .then(result => resolve(result.out[i])) .catch(error => reject(error)) }); @@ -685,8 +690,8 @@ promises.push(getTxOutput(tx.ins[i].outpoint.hash, tx.ins[i].outpoint.index)); Promise.all(promises).then(inputs => { result.inputs = inputs.map(inp => Object({ - address: inp.address, - value: parseFloat(inp.value) + address: inp.addr, + value: util.Sat_to_BTC(inp.value) })); let signed = checkSigned(tx, false); result.inputs.forEach((inp, i) => inp.signed = signed[i]); @@ -705,7 +710,7 @@ } return { address, - value: parseFloat(out.value / SATOSHI_IN_BTC) + value: util.Sat_to_BTC(out.value) } }); //Parse Totals @@ -726,22 +731,111 @@ return Crypto.util.bytesToHex(txid); } - btcOperator.getTx = txid => new Promise((resolve, reject) => { - fetch_api(`get_tx/BTC/${txid}`) - .then(result => resolve(result.data)) + const getLatestBlock = btcOperator.getLatestBlock = () => new Promise((resolve, reject) => { + fetch_api(`q/getblockcount`) + .then(result => resolve(result)) .catch(error => reject(error)) + }) + + btcOperator.getTx = txid => new Promise((resolve, reject) => { + fetch_api(`rawtx/${txid}`).then(result => { + getLatestBlock().then(latest_block => { + resolve({ + block: result.block_height, + txid: result.hash, + time: result.time * 1000, + confirmations: latest_block - result.block_height, //calculate confirmations using latest block number as api doesnt relay it + size: result.size, + fee: util.Sat_to_BTC(result.fee), + inputs: result.inputs.map(i => Object({ address: i.prev_out.addr, value: util.Sat_to_BTC(i.prev_out.value) })), + total_input_value: util.Sat_to_BTC(result.inputs.reduce((a, i) => a + i.prev_out.value, 0)), + outputs: result.out.map(o => Object({ address: o.addr, value: util.Sat_to_BTC(o.value) })), + total_output_value: util.Sat_to_BTC(result.out.reduce((a, o) => a += o.value, 0)), + }) + }) + }).catch(error => reject(error)) }); - btcOperator.getAddressData = addr => new Promise((resolve, reject) => { - fetch_api(`address/BTC/${addr}`) - .then(result => resolve(result.data)) - .catch(error => reject(error)) + btcOperator.getAddressData = address => new Promise((resolve, reject) => { + fetch_api(`rawaddr/${address}`).then(data => { + let details = {}; + details.balance = util.Sat_to_BTC(data.final_balance); + details.address = data.address; + details.txs = data.txs.map(tx => { + let d = { + txid: tx.hash, + time: tx.time * 1000, //s to ms + block: tx.block_height, + } + //sender list + d.tx_senders = {}; + tx.inputs.forEach(i => { + if (i.prev_out.addr in d.tx_senders) + d.tx_senders[i.prev_out.addr] += i.prev_out.value; + else d.tx_senders[i.prev_out.addr] = i.prev_out.value; + }); + d.tx_input_value = 0; + for (let s in d.tx_senders) { + let val = d.tx_senders[s]; + d.tx_senders[s] = util.Sat_to_BTC(val); + d.tx_input_value += val; + } + d.tx_input_value = util.Sat_to_BTC(d.tx_input_value); + //receiver list + d.tx_receivers = {}; + tx.out.forEach(o => { + if (o.addr in d.tx_receivers) + d.tx_receivers[o.addr] += o.value; + else d.tx_receivers[o.addr] = o.value; + }); + d.tx_output_value = 0; + for (let r in d.tx_receivers) { + let val = d.tx_receivers[r]; + d.tx_receivers[r] = util.Sat_to_BTC(val); + d.tx_output_value += val; + } + d.tx_output_value = util.Sat_to_BTC(d.tx_output_value); + d.tx_fee = util.Sat_to_BTC(tx.fee); + //tx type + if (tx.result > 0) { //net > 0, balance inc => type=in + d.type = "in"; + d.amount = util.Sat_to_BTC(tx.result); + d.sender = Object.keys(d.tx_senders).filter(s => s !== address); + } else if (Object.keys(d.tx_receivers).some(r => r !== address)) { //net < 0, balance dec & receiver present => type=out + d.type = "out"; + d.amount = util.Sat_to_BTC(tx.result * -1); + d.receiver = Object.keys(d.tx_receivers).filter(r => r !== address); + d.fee = d.tx_fee; + } else { //net < 0 (fee) & no other id in receiver list => type=self + d.type = "self"; + d.amount = d.tx_receivers[address]; + d.address = address + } + return d; + }) + resolve(details); + }).catch(error => reject(error)) }); btcOperator.getBlock = block => new Promise((resolve, reject) => { - fetch_api(`get_block/BTC/${block}`) - .then(result => resolve(result.data)) - .catch(error => reject(error)) + fetch_api(`rawblock/${block}`).then(result => resolve({ + height: result.height, + hash: result.hash, + merkle_root: result.mrkl_root, + prev_block: result.prev_block, + next_block: result.next_block[0], + size: result.size, + time: result.time * 1000, //s to ms + txs: result.tx.map(t => Object({ + fee: t.fee, + size: t.size, + inputs: t.inputs.map(i => Object({ address: i.prev_out.addr, value: util.Sat_to_BTC(i.prev_out.value) })), + total_input_value: util.Sat_to_BTC(t.inputs.reduce((a, i) => a + i.prev_out.value, 0)), + outputs: t.out.map(o => Object({ address: o.addr, value: util.Sat_to_BTC(o.value) })), + total_output_value: util.Sat_to_BTC(t.out.reduce((a, o) => a += o.value, 0)), + })) + + })).catch(error => reject(error)) }); -})('object' === typeof module ? module.exports : window.btcOperator = {}); \ No newline at end of file +})('object' === typeof module ? module.exports : window.btcOperator = {}); From ca0d557d943aab2e4a7decca5ccae436bc4f10d6 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Tue, 31 Jan 2023 02:13:37 +0530 Subject: [PATCH 42/42] btcOperator v1.1.1: getTx.hex - Added getTx.hex(txid): resolves the tx hex of the txid - Update: api responses are checked for response.ok - Fixed: getTx giving incorrect confirmation value for unconfirmed tx --- btcOperator.js | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/btcOperator.js b/btcOperator.js index beb2cd6..6925cec 100644 --- a/btcOperator.js +++ b/btcOperator.js @@ -1,17 +1,23 @@ -(function (EXPORTS) { //btcOperator v1.1.0 +(function (EXPORTS) { //btcOperator v1.1.1 /* BTC Crypto and API Operator */ const btcOperator = EXPORTS; //This library uses API provided by chain.so (https://chain.so/) const URL = "https://blockchain.info/"; - const fetch_api = btcOperator.fetch = function (api) { + const fetch_api = btcOperator.fetch = function (api, json_res = true) { return new Promise((resolve, reject) => { console.debug(URL + api); fetch(URL + api).then(response => { - response.json() - .then(result => result.error ? reject(result) : resolve(result)) - .catch(error => reject(error)) + if (response.ok) { + (json_res ? response.json() : response.text()) + .then(result => resolve(result)) + .catch(error => reject(error)) + } else { + response.json() + .then(result => reject(result)) + .catch(error => reject(error)) + } }).catch(error => reject(error)) }) }; @@ -739,23 +745,27 @@ btcOperator.getTx = txid => new Promise((resolve, reject) => { fetch_api(`rawtx/${txid}`).then(result => { - getLatestBlock().then(latest_block => { - resolve({ - block: result.block_height, - txid: result.hash, - time: result.time * 1000, - confirmations: latest_block - result.block_height, //calculate confirmations using latest block number as api doesnt relay it - size: result.size, - fee: util.Sat_to_BTC(result.fee), - inputs: result.inputs.map(i => Object({ address: i.prev_out.addr, value: util.Sat_to_BTC(i.prev_out.value) })), - total_input_value: util.Sat_to_BTC(result.inputs.reduce((a, i) => a + i.prev_out.value, 0)), - outputs: result.out.map(o => Object({ address: o.addr, value: util.Sat_to_BTC(o.value) })), - total_output_value: util.Sat_to_BTC(result.out.reduce((a, o) => a += o.value, 0)), - }) - }) + getLatestBlock().then(latest_block => resolve({ + block: result.block_height, + txid: result.hash, + time: result.time * 1000, + confirmations: result.block_height === null ? 0 : latest_block - result.block_height, //calculate confirmations using latest block number as api doesnt relay it + size: result.size, + fee: util.Sat_to_BTC(result.fee), + inputs: result.inputs.map(i => Object({ address: i.prev_out.addr, value: util.Sat_to_BTC(i.prev_out.value) })), + total_input_value: util.Sat_to_BTC(result.inputs.reduce((a, i) => a + i.prev_out.value, 0)), + outputs: result.out.map(o => Object({ address: o.addr, value: util.Sat_to_BTC(o.value) })), + total_output_value: util.Sat_to_BTC(result.out.reduce((a, o) => a += o.value, 0)), + })) }).catch(error => reject(error)) }); + btcOperator.getTx.hex = txid => new Promise((resolve, reject) => { + fetch_api(`rawtx/${txid}?format=hex`, false) + .then(result => resolve(result)) + .catch(error => reject(error)) + }) + btcOperator.getAddressData = address => new Promise((resolve, reject) => { fetch_api(`rawaddr/${address}`).then(data => { let details = {};