Merge pull request #2 from avishkarabhishek786/master
flosend signature issue fixed
This commit is contained in:
Abhishek Sinha
GitHub
commit
0a518f8b0f
@ -3302,9 +3302,26 @@
|
||||
buffer = buffer.concat(scriptBytes);
|
||||
}
|
||||
|
||||
buffer = buffer.concat(bitjs.numToBytes(parseInt(this.locktime), 4));
|
||||
buffer = buffer.concat(bitjs.numToBytes(parseInt(this.locktime),4));
|
||||
flohex = ascii_to_hexa(this.floData);
|
||||
return Crypto.util.bytesToHex(buffer) + flohex; // flochange -- Addition of floData in serialization
|
||||
floDataCount = this.floData.length;
|
||||
|
||||
//flochange -- creating unique data character count logic for floData. This string is prefixed before actual floData string in Raw Transaction
|
||||
if (floDataCount <= 16) {
|
||||
floDataCountString = floDataCount.toString(16);
|
||||
floDataCountString = "0"+ floDataCountString;
|
||||
} else if (floDataCount < 253) {
|
||||
floDataCountString = floDataCount.toString(16);
|
||||
} else if (floDataCount <= 1023) {
|
||||
floDataCountAdjusted = (floDataCount - 253) + parseInt("0xfd00fd");
|
||||
floDataCountStringAdjusted = floDataCountAdjusted.toString(16);
|
||||
floDataCountString = floDataCountStringAdjusted.substr(0,2)+ floDataCountStringAdjusted.substr(4,2)+ floDataCountStringAdjusted.substr(2,2);
|
||||
} else {
|
||||
floDataCountString = "Character Limit Exceeded";
|
||||
}
|
||||
|
||||
|
||||
return Crypto.util.bytesToHex(buffer)+floDataCountString+flohex; // flochange -- Addition of floDataCountString and floData in serialization
|
||||
}
|
||||
|
||||
|
||||
@ -3432,7 +3449,6 @@
|
||||
})();
|
||||
|
||||
|
||||
|
||||
//script.js
|
||||
// Actual Code Begins Here
|
||||
function createRawTransaction() {
|
||||
@ -3457,39 +3473,13 @@
|
||||
</script>
|
||||
|
||||
<script>
|
||||
// var request = new XMLHttpRequest();
|
||||
const mainnet = `https://livenet.flocha.in`;
|
||||
const testnet = `https://testnet.flocha.in`;
|
||||
|
||||
// request.open('GET', 'https://livenet.flocha.in/api/txs/?address=FMg9M7GPuUAGKvhWmgWjoqYtMqmckD4tRF', true);
|
||||
// request.onload = function () {
|
||||
|
||||
// // Begin accessing JSON data here
|
||||
// var data = JSON.parse(this.response);
|
||||
|
||||
// if (request.status >= 200 && request.status < 400) {
|
||||
// data.txs.forEach(tx => {
|
||||
// console.log(tx.floData);
|
||||
// });
|
||||
// } else {
|
||||
// console.log('error');
|
||||
// }
|
||||
// }
|
||||
|
||||
// request.send();
|
||||
let server = mainnet;
|
||||
</script>
|
||||
|
||||
<script>
|
||||
|
||||
// [0 … 99]
|
||||
// 0:
|
||||
// address: "FMg9M7GPuUAGKvhWmgWjoqYtMqmckD4tRF"
|
||||
// amount: 12.5
|
||||
// confirmations: 58
|
||||
// height: 3043098
|
||||
// satoshis: 1250000000
|
||||
// scriptPubKey: "76a914adcfd792793fb204ec4e8cf2d0215fea6963b97388ac"
|
||||
// txid: "340ee0f8e298ae79baa9f32e367105a04be9d173cb9ec20253619ebeeee64d9f"
|
||||
// vout: 1
|
||||
|
||||
var utxo_btn = document.getElementById("utxo_btn");
|
||||
|
||||
utxo_btn.onclick = function (addr) {
|
||||
@ -3504,7 +3494,7 @@
|
||||
}
|
||||
|
||||
var request = new XMLHttpRequest();
|
||||
request.open('GET', `https://livenet.flocha.in/api/addr/${addr}/utxo`, true);
|
||||
request.open('GET', `${server}/api/addr/${addr}/utxo`, true);
|
||||
request.onload = function () {
|
||||
|
||||
// Begin accessing JSON data here
|
||||
@ -3535,18 +3525,19 @@
|
||||
<script>
|
||||
function broadcastTx() {
|
||||
var http = new XMLHttpRequest();
|
||||
//var url = 'https://testnet.flocha.in/api/tx/send';
|
||||
var url = 'https://livenet.flocha.in/api/tx/send';
|
||||
var signedTxHash = document.getElementById("rawTrx");
|
||||
var url = `${server}/api/tx/send`;
|
||||
var signedTxHash = document.getElementById("rawTrx").value;
|
||||
if (signedTxHash.length < 1) {
|
||||
alert("Empty Signature");
|
||||
return false;
|
||||
}
|
||||
var params = `rawtx=${signedTxHash}`;
|
||||
|
||||
var params = `{"rawtx":"${signedTxHash}"}`;
|
||||
|
||||
http.open('POST', url, true);
|
||||
|
||||
//Send the proper header information along with the request
|
||||
http.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
|
||||
http.setRequestHeader('Content-type', 'application/json');
|
||||
|
||||
http.onreadystatechange = function () { //Call a function when the state changes.
|
||||
if (http.readyState == 4 && http.status == 200) {
|
||||
|
||||
@ -12,6 +12,156 @@
|
||||
|
||||
<div id="output"></div>
|
||||
|
||||
<!-- SHA1 -->
|
||||
<script type="text/javascript">
|
||||
//Adding SHA1 to fix basic PKBDF2
|
||||
/*
|
||||
* Crypto-JS v2.5.4
|
||||
* http://code.google.com/p/crypto-js/
|
||||
* (c) 2009-2012 by Jeff Mott. All rights reserved.
|
||||
* http://code.google.com/p/crypto-js/wiki/License
|
||||
*/
|
||||
(function () {
|
||||
|
||||
// Shortcuts
|
||||
var C = Crypto,
|
||||
util = C.util,
|
||||
charenc = C.charenc,
|
||||
UTF8 = charenc.UTF8,
|
||||
Binary = charenc.Binary;
|
||||
|
||||
// Public API
|
||||
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);
|
||||
};
|
||||
|
||||
// The core
|
||||
SHA1._sha1 = function (message) {
|
||||
|
||||
// Convert to byte array
|
||||
if (message.constructor == String) message = UTF8.stringToBytes(message);
|
||||
/* else, assume byte array already */
|
||||
|
||||
var m = util.bytesToWords(message),
|
||||
l = message.length * 8,
|
||||
w = [],
|
||||
H0 = 1732584193,
|
||||
H1 = -271733879,
|
||||
H2 = -1732584194,
|
||||
H3 = 271733878,
|
||||
H4 = -1009589776;
|
||||
|
||||
// Padding
|
||||
m[l >> 5] |= 0x80 << (24 - l % 32);
|
||||
m[((l + 64 >>> 9) << 4) + 15] = l;
|
||||
|
||||
for (var i = 0; i < m.length; i += 16) {
|
||||
|
||||
var a = H0,
|
||||
b = H1,
|
||||
c = H2,
|
||||
d = H3,
|
||||
e = H4;
|
||||
|
||||
for (var j = 0; j < 80; j++) {
|
||||
|
||||
if (j < 16) w[j] = m[i + j];
|
||||
else {
|
||||
var n = w[j - 3] ^ w[j - 8] ^ w[j - 14] ^ w[j - 16];
|
||||
w[j] = (n << 1) | (n >>> 31);
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
H4 = H3;
|
||||
H3 = H2;
|
||||
H2 = (H1 << 30) | (H1 >>> 2);
|
||||
H1 = H0;
|
||||
H0 = t;
|
||||
|
||||
}
|
||||
|
||||
H0 += a;
|
||||
H1 += b;
|
||||
H2 += c;
|
||||
H3 += d;
|
||||
H4 += e;
|
||||
|
||||
}
|
||||
|
||||
return [H0, H1, H2, H3, H4];
|
||||
|
||||
};
|
||||
|
||||
// Package private blocksize
|
||||
SHA1._blocksize = 16;
|
||||
|
||||
SHA1._digestsize = 20;
|
||||
|
||||
})();
|
||||
</script>
|
||||
|
||||
<!-- HMAC -->
|
||||
<script type="text/javascript">
|
||||
//Added to make PKBDF2 work
|
||||
/*
|
||||
* Crypto-JS v2.5.4
|
||||
* http://code.google.com/p/crypto-js/
|
||||
* (c) 2009-2012 by Jeff Mott. All rights reserved.
|
||||
* http://code.google.com/p/crypto-js/wiki/License
|
||||
*/
|
||||
(function () {
|
||||
|
||||
// Shortcuts
|
||||
var C = Crypto,
|
||||
util = C.util,
|
||||
charenc = C.charenc,
|
||||
UTF8 = charenc.UTF8,
|
||||
Binary = charenc.Binary;
|
||||
|
||||
C.HMAC = function (hasher, message, key, options) {
|
||||
|
||||
// Convert to byte arrays
|
||||
if (message.constructor == String) message = UTF8.stringToBytes(message);
|
||||
if (key.constructor == String) key = UTF8.stringToBytes(key);
|
||||
/* else, assume byte arrays already */
|
||||
|
||||
// Allow arbitrary length keys
|
||||
if (key.length > hasher._blocksize * 4)
|
||||
key = hasher(key, {
|
||||
asBytes: true
|
||||
});
|
||||
|
||||
// XOR keys with pad constants
|
||||
var okey = key.slice(0),
|
||||
ikey = key.slice(0);
|
||||
for (var i = 0; i < hasher._blocksize * 4; i++) {
|
||||
okey[i] ^= 0x5C;
|
||||
ikey[i] ^= 0x36;
|
||||
}
|
||||
|
||||
var hmacbytes = hasher(okey.concat(hasher(ikey.concat(message), {
|
||||
asBytes: true
|
||||
})), {
|
||||
asBytes: true
|
||||
});
|
||||
|
||||
return options && options.asBytes ? hmacbytes :
|
||||
options && options.asString ? Binary.bytesToString(hmacbytes) :
|
||||
util.bytesToHex(hmacbytes);
|
||||
|
||||
};
|
||||
|
||||
})();
|
||||
</script>
|
||||
|
||||
<script type="text/javascript">
|
||||
/*!
|
||||
* Crypto-JS v2.5.4 Crypto.js
|
||||
@ -5772,7 +5922,8 @@
|
||||
this.version = Bitcoin.Address.networkVersion;
|
||||
};
|
||||
|
||||
Bitcoin.Address.networkVersion = 0x23; // (FLO mainnet 0x23, 35D), (Bitcoin Mainnet, 0x00, 0D)
|
||||
//Bitcoin.Address.networkVersion = 0x23; // (FLO mainnet 0x23, 35D), (Bitcoin Mainnet, 0x00, 0D)
|
||||
Bitcoin.Address.networkVersion = 0x73; // (FLO mainnet 0x23, 35D), (Bitcoin Mainnet, 0x00, 0D)
|
||||
|
||||
/**
|
||||
* Serialize this object as a standard Bitcoin address.
|
||||
@ -6264,8 +6415,9 @@
|
||||
}
|
||||
};
|
||||
|
||||
ECKey.privateKeyPrefix = 0xA3; //(Bitcoin mainnet 0x80 testnet 0xEF) (FLO mainnet 0xA3 163 D)
|
||||
|
||||
//FLO Mainnet (0xA3) --- FLO Testnet (0xEF)
|
||||
ECKey.privateKeyPrefix = 0xEF; //(Bitcoin mainnet 0x80 testnet 0xEF) (FLO mainnet 0xA3 163 D)
|
||||
|
||||
/**
|
||||
* Whether public keys should be returned compressed by default.
|
||||
*/
|
||||
@ -7319,7 +7471,7 @@
|
||||
var generatedPoint = ec.decodePointHex(localbitcoinplusplus.publicKey.getHexFromByteArray(
|
||||
passpoint));
|
||||
var generatedBytes = generatedPoint.multiply(BigInteger.fromByteArrayUnsigned(factorB)).getEncoded(
|
||||
compressed);
|
||||
compressed);
|
||||
var generatedAddress = (new Bitcoin.Address(Bitcoin.Util.sha256ripe160(generatedBytes))).toString();
|
||||
|
||||
// 4) Take the first four bytes of SHA256(SHA256(generatedaddress)) and call it addresshash.
|
||||
@ -7420,9 +7572,7 @@
|
||||
<!-- Keys Object Operations (Generate, Sign and Verify) -->
|
||||
<script>
|
||||
var wallets = localbitcoinplusplus.wallets = function (wallets) {
|
||||
//3354E12F0D2737A16B30B46D66CEDB9C7C0CD35F22CFCCE9828318DDBB73C0F6 // private key
|
||||
this.master_node = "038E48297353843614190D9C36D1F6565D68CB24C01A66DC7432BD91D979F7AC68"; // pub key
|
||||
this.rm_flo_addr = "FSTDEb1ygMSwKB65uMYrrzjhdcCpXkt1uH";
|
||||
//
|
||||
};
|
||||
wallets.prototype = {
|
||||
ecparams: EllipticCurve.getSECCurveByName("secp256k1"),
|
||||
@ -7431,18 +7581,28 @@
|
||||
|
||||
var privateKey = Bitcoin.ECDSA.getBigRandom(EllipticCurve.getSECCurveByName("secp256k1")
|
||||
.getN());
|
||||
console.log(privateKey);
|
||||
//console.log(privateKey);
|
||||
|
||||
var key = new Bitcoin.ECKey(privateKey);
|
||||
key.setCompressed(true);
|
||||
var privateKeyHex = key.getBitcoinHexFormat();
|
||||
var privateKeyWIF= key.getBitcoinWalletImportFormat();
|
||||
|
||||
var publicKeyHex = localbitcoinplusplus.publicKey.getHexFromByteArray(key.getPubPoint().getEncoded(
|
||||
1))
|
||||
.toString().toUpperCase();
|
||||
|
||||
var pubKeyHash = key.getPubKeyHash();
|
||||
var pubKeyHex = key.getPubKeyHex();
|
||||
|
||||
var address = key.getBitcoinAddress(publicKeyHex);
|
||||
|
||||
console.log("privateKeyHex: ", privateKeyHex);
|
||||
console.log("privateKeyWIF: ", privateKeyWIF);
|
||||
console.log("publicKeyHex: ", publicKeyHex);
|
||||
console.log("pubKeyHash: ", pubKeyHash);
|
||||
console.log("pubKeyHex: ", pubKeyHex);
|
||||
console.log("address: ", address);
|
||||
},
|
||||
sign: function (msg, privateKeyHex) {
|
||||
|
||||
@ -7542,6 +7702,9 @@
|
||||
/*Initiate trade level with 0*/
|
||||
var Trade = localbitcoinplusplus.trade = function processTrade() {
|
||||
//this.op_code = null;
|
||||
//3354E12F0D2737A16B30B46D66CEDB9C7C0CD35F22CFCCE9828318DDBB73C0F6 // private key
|
||||
const MASTER_NODE = "038E48297353843614190D9C36D1F6565D68CB24C01A66DC7432BD91D979F7AC68"; // pub key
|
||||
const RM_FLO_ADDR = "FSTDEb1ygMSwKB65uMYrrzjhdcCpXkt1uH";
|
||||
this.errors = [];
|
||||
this.level = 0; // default
|
||||
this.order_type = null;
|
||||
@ -7550,12 +7713,19 @@
|
||||
this.valid_product = ["BTC", "INR"];
|
||||
this.currency = null;
|
||||
this.valid_currencies = ["BTC", "INR"],
|
||||
this.buy_price = null;
|
||||
this.buy_price = null;
|
||||
this.buyer_public_key = null;
|
||||
this.buyer_key_signature = null;
|
||||
this.order_validator_public_key = null;
|
||||
this.rpc_job = null;
|
||||
this.floAddress = null;
|
||||
|
||||
this.fetch_configs= function(callback) {
|
||||
this.floAddress = RM_FLO_ADDR;
|
||||
this.parse_flo_comments(function (floData) {
|
||||
callback(floData);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Trade.prototype = {
|
||||
@ -7657,7 +7827,6 @@
|
||||
|
||||
if (request.status >= 200 && request.status < 400) {
|
||||
data.txs.forEach(tx => {
|
||||
console.log(tx.floData);
|
||||
callback(tx.floData);
|
||||
});
|
||||
} else {
|
||||
@ -7666,6 +7835,7 @@
|
||||
}
|
||||
request.send();
|
||||
}
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -7950,13 +8120,12 @@
|
||||
var RM_TRADE = new localbitcoinplusplus.trade;
|
||||
var RM_RPC = new localbitcoinplusplus.rpc;
|
||||
|
||||
// Test: fetch flo comment
|
||||
RM_TRADE.floAddress = RM_WALLET.rm_flo_addr;
|
||||
var fetch_configs = RM_TRADE.parse_flo_comments(function (floData) {
|
||||
console.log(floData);
|
||||
});
|
||||
//Test: fetch flo comment
|
||||
// var rm_configs = RM_TRADE.fetch_configs(function(data) {
|
||||
// console.log(data);
|
||||
// });
|
||||
|
||||
// Test: Trade functionality
|
||||
// // Test: Trade functionality
|
||||
var trade_btn = document.createElement("button");
|
||||
trade_btn.innerText = "Trade";
|
||||
trade_btn.onclick = function () {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user