Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[BG-9549] handle different types of inputs to xrp" #45

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "[BG-9549] handle different types of inputs to xrp" #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,4 +466,4 @@ const run = co(function *(testArgs) {
});

// For admin script and unit testing of functions
module.exports = { run, validateKey, saveKeys, db , requireDB };
module.exports = { run, validateKey, saveKeys, db };
37 changes: 7 additions & 30 deletions app/sign.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ const handleSignUtxo = function(recoveryRequest, key, skipConfirm) {
throw new Error(`Unsupported coin: ${recoveryRequest.coin}`);
}

const txHex = getTransactionHexFromRequest(recoveryRequest);
const transaction = utxoLib.Transaction.fromHex(txHex, network);
const transaction = utxoLib.Transaction.fromHex(recoveryRequest.transactionHex, network);

const outputs = transaction.outs.map(out => ({
address: utxoLib.address.fromOutputScript(out.script, network),
Expand Down Expand Up @@ -161,8 +160,7 @@ const handleSignUtxo = function(recoveryRequest, key, skipConfirm) {
const handleSignEthereum = function(recoveryRequest, key, skipConfirm) {
const EthTx = require('ethereumjs-tx');

const txHex = getTransactionHexFromRequest(recoveryRequest);
const transaction = new EthTx(txHex);
const transaction = new EthTx(recoveryRequest.tx);
const decimals = coinDecimals[recoveryRequest.coin];

const customMessage = recoveryRequest.custom ? recoveryRequest.custom.message : 'None';
Expand Down Expand Up @@ -194,10 +192,8 @@ const handleSignXrp = function(recoveryRequest, key, skipConfirm) {
const rippleKeypairs = require('ripple-keypairs');
const rippleParse = require('ripple-binary-codec');

const txHex = getTransactionHexFromRequest(recoveryRequest);

const decimals = coinDecimals[recoveryRequest.coin];
const transaction = rippleParse.decode(txHex);
const transaction = rippleParse.decode(recoveryRequest.tx);
const customMessage = recoveryRequest.custom ? recoveryRequest.custom.message : 'None';

const outputs = [{
Expand All @@ -216,9 +212,9 @@ const handleSignXrp = function(recoveryRequest, key, skipConfirm) {

const backupAddress = rippleKeypairs.deriveAddress(backupKeyNode.keyPair.getPublicKeyBuffer().toString('hex'));
const privateKeyHex = backupKeyNode.keyPair.getPrivateKeyBuffer().toString('hex');
const cosignedTx = utils.signXrpWithPrivateKey(txHex, privateKeyHex, { signAs: backupAddress });
const cosignedTx = utils.signXrpWithPrivateKey(recoveryRequest.txHex, privateKeyHex, { signAs: backupAddress });

return rippleApi.combine([ txHex, cosignedTx.signedTransaction ]).signedTransaction;
return rippleApi.combine([ recoveryRequest.txHex, cosignedTx.signedTransaction ]).signedTransaction;
};

const handleSignXlm = function(recoveryRequest, key, skipConfirm) {
Expand All @@ -232,8 +228,7 @@ const handleSignXlm = function(recoveryRequest, key, skipConfirm) {

const decimals = coinDecimals[recoveryRequest.coin];

const txHex = getTransactionHexFromRequest(recoveryRequest);
const transaction = new stellar.Transaction(txHex);
const transaction = new stellar.Transaction(recoveryRequest.tx);
const customMessage = recoveryRequest.custom ? recoveryRequest.custom.message : 'None';

if (transaction.operations.length !== 1) {
Expand Down Expand Up @@ -276,8 +271,7 @@ const handleSignXlm = function(recoveryRequest, key, skipConfirm) {
const handleSignErc20 = function(recoveryRequest, key, skipConfirm) {
const EthTx = require('ethereumjs-tx');

const txHex = getTransactionHexFromRequest(recoveryRequest);
const transaction = new EthTx(txHex);
const transaction = new EthTx(recoveryRequest.tx);

const customMessage = recoveryRequest.custom ? recoveryRequest.custom.message : 'None';
const txData = transaction.data;
Expand Down Expand Up @@ -333,23 +327,6 @@ const parseKey = function(rawkey, coin, path) {
return rawkey;
}

/**
Not all recoveryRequest files are formatted the same. Sometimes they have 'tx', 'txHex', or 'transactionHex'
This function gets and gets and returns the transaction hex in all of these cases
*/
const getTransactionHexFromRequest = function(recoveryRequest) {
if (recoveryRequest.txHex){
return recoveryRequest.txHex
}
if (recoveryRequest.transactionHex){
return recoveryRequest.transactionHex
}
if (recoveryRequest.tx){
return recoveryRequest.tx
}
throw new Error("The recovery request did not provide a transaction hex");
}

const handleSign = function(args) {
const file = args.file;

Expand Down
1 change: 0 additions & 1 deletion test/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ describe('Offline Admin Tool', function() {
path: '0'
};
const keyList = [key];
admin.requireDB();
yield admin.saveKeys(keyList, 'xpub');
const foundKey = yield MasterKey.findOne({ pub: xpub });
foundKey.should.have.property('signature');
Expand Down
12 changes: 0 additions & 12 deletions test/sign.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.