From 96286afca6afad05c7f879021e438a9cdc578b8b Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Thu, 14 Mar 2013 19:33:48 -0700 Subject: [PATCH 1/3] JS: Add ImmediateOrCancel and FillOrKill to Transaction flags. --- src/js/transaction.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/js/transaction.js b/src/js/transaction.js index ee82d0bb79..c838d212a6 100644 --- a/src/js/transaction.js +++ b/src/js/transaction.js @@ -110,6 +110,8 @@ Transaction.fees = { Transaction.flags = { 'OfferCreate' : { 'Passive' : 0x00010000, + 'ImmediateOrCancel' : 0x00020000, + 'FillOrKill' : 0x00040000, }, 'Payment' : { From 1bca0154da4d3f3ec364cb0fc3b36efb0493e9c0 Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Thu, 14 Mar 2013 20:38:50 -0700 Subject: [PATCH 2/3] JS: Export Transaction. --- src/js/index.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/js/index.js b/src/js/index.js index 05ec1f842d..7f56be2002 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -1,10 +1,11 @@ -exports.Remote = require('./remote').Remote; -exports.Amount = require('./amount').Amount; -exports.Currency = require('./currency').Currency; -exports.UInt160 = require('./amount').UInt160; -exports.Seed = require('./amount').Seed; +exports.Remote = require('./remote').Remote; +exports.Amount = require('./amount').Amount; +exports.Currency = require('./currency').Currency; +exports.UInt160 = require('./amount').UInt160; +exports.Seed = require('./amount').Seed; +exports.Transaction = require('./amount').Transaction; -exports.utils = require('./utils'); +exports.utils = require('./utils'); // Important: We do not guarantee any specific version of SJCL or for any // specific features to be included. The version and configuration may change at @@ -13,6 +14,8 @@ exports.utils = require('./utils'); // However, for programs that are tied to a specific version of ripple.js like // the official client, it makes sense to expose the SJCL instance so we don't // have to include it twice. -exports.sjcl = require('../../build/sjcl'); +exports.sjcl = require('../../build/sjcl'); -exports.config = require('./config'); +exports.config = require('./config'); + +// vim:sw=2:sts=2:ts=8:et From 1ceb383eb3abae5c086440f2b3913268276f27df Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Thu, 14 Mar 2013 20:56:22 -0700 Subject: [PATCH 3/3] JS: Fix access to Transaction. --- src/js/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/index.js b/src/js/index.js index 7f56be2002..175c277500 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -3,7 +3,7 @@ exports.Amount = require('./amount').Amount; exports.Currency = require('./currency').Currency; exports.UInt160 = require('./amount').UInt160; exports.Seed = require('./amount').Seed; -exports.Transaction = require('./amount').Transaction; +exports.Transaction = require('./transaction').Transaction; exports.utils = require('./utils');