ARCHIVE/xahau.js
1
0
Fork 0
mirror of https://github.com/Xahau/xahau.js.git synced 2025-11-30 09:05:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/ripple/ripple-lib into develop

Browse Source
This commit is contained in:
wltsmrz
2013-11-07 14:05:40 -08:00
parent 0f80f6d4ae e65f975e29
commit 0e5431468c
3 changed files with 93 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/js/ripple/serializedobject.js
View File

@@ -216,13 +216,16 @@ SerializedObject.prototype.serialize = function (typedef, obj) {
}
};
SerializedObject.prototype.signing_hash = function (prefix) {
SerializedObject.prototype.hash = function (prefix) {
var sign_buffer = new SerializedObject();
stypes.Int32.serialize(sign_buffer, prefix);
sign_buffer.append(this.buffer);
return sign_buffer.hash_sha512_half();
};
// DEPRECATED
SerializedObject.prototype.signing_hash = SerializedObject.prototype.hash;
SerializedObject.prototype.hash_sha512_half = function () {
var bits = sjcl.codec.bytes.toBits(this.buffer);
var hash = sjcl.bitArray.bitSlice(sjcl.hash.sha512.hash(bits), 0, 256);

37
src/js/ripple/transaction.js
View File

@@ -71,8 +71,6 @@ function Transaction(remote) {
// Transaction data.
this.tx_json = { Flags: 0 };
this.hash = void(0);
// ledger_current_index was this when transaction was submited.
this.submit_index = void(0);
@@ -122,8 +120,12 @@ Transaction.flags = {
Transaction.formats = require('./binformat').tx;
Transaction.HASH_SIGN = 0x53545800;
Transaction.HASH_SIGN_TESTNET = 0x73747800;
// transaction plus signature to give transaction ID
Transaction.HASH_TXID = 0x54584E00; // 'TXN'
// inner transaction to sign
Transaction.HASH_SIGN = 0x53545800; // 'STX'
// inner transaction to sign (TESTNET)
Transaction.HASH_SIGN_TESTNET = 0x73747800; // 'stx'
Transaction.prototype.consts = {
telLOCAL_ERROR : -399,
@@ -134,6 +136,10 @@ Transaction.prototype.consts = {
tecCLAIMED : 100,
};
Transaction.from_json = function (j) {
return (new Transaction()).parse_json(j);
};
Transaction.prototype.isTelLocal = function (ter) {
return ter >= this.consts.telLOCAL_ERROR && ter < this.consts.temMALFORMED;
};
@@ -206,8 +212,21 @@ Transaction.prototype.serialize = function () {
};
Transaction.prototype.signing_hash = function () {
var prefix = Transaction[config.testnet ? 'HASH_SIGN_TESTNET' : 'HASH_SIGN'];
return SerializedObject.from_json(this.tx_json).signing_hash(prefix);
return this.hash(config.testnet ? 'HASH_SIGN_TESTNET' : 'HASH_SIGN');
};
Transaction.prototype.hash = function (prefix, as_uint256) {
if ("string" === typeof prefix) {
if ("undefined" === typeof Transaction[prefix]) {
throw new Error("Unknown hashing prefix requested.");
}
prefix = Transaction[prefix];
} else if (!prefix) {
prefix = Transaction['HASH_TXID'];
}
var hash = SerializedObject.from_json(this.tx_json).hash(prefix);
return as_uint256 ? hash : hash.to_hex();
};
Transaction.prototype.sign = function () {
@@ -650,6 +669,12 @@ Transaction.prototype.abort = function(callback) {
}
};
Transaction.prototype.parse_json = function (v) {
this.tx_json = v;
return this;
};
exports.Transaction = Transaction;
// vim:sw=2:sts=2:ts=8:et