From b29806f0498172a140b5f8a1f4650088b2f676d6 Mon Sep 17 00:00:00 2001 From: blavenie <benoit.lavenier@e-is.pro> Date: Fri, 26 Aug 2016 13:25:38 +0200 Subject: [PATCH] TX : fix #94 allow to mix inputs/outputs with different base --- www/js/services/wallet-services.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/www/js/services/wallet-services.js b/www/js/services/wallet-services.js index d376a98d0..a26a55fb8 100644 --- a/www/js/services/wallet-services.js +++ b/www/js/services/wallet-services.js @@ -792,23 +792,24 @@ angular.module('cesium.wallet.services', ['ngResource', 'ngApi', 'cesium.bma.ser // AMOUNT:BASE:CONDITIONS var rest = amount; var outputBase = inputs.maxBase; + var outputAmount; while(rest > 0) { - var outputAmount = truncBase(rest, outputBase); + outputAmount = truncBase(rest, outputBase); rest -= outputAmount; if (outputAmount > 0) { outputAmount = outputBase === 0 ? outputAmount : outputAmount / Math.pow(10, outputBase); - tx += outputAmount + ':' + outputBase + ':SIG(' + destPub + ')\n' + tx += outputAmount + ':' + outputBase + ':SIG(' + destPub + ')\n'; } outputBase--; } rest = inputs.amount - amount; outputBase = inputs.maxBase; while(rest > 0) { - var outputAmount = truncBase(rest, outputBase); + outputAmount = truncBase(rest, outputBase); rest -= outputAmount; if (outputAmount > 0) { outputAmount = outputBase === 0 ? outputAmount : outputAmount / Math.pow(10, outputBase); - tx += outputAmount +':'+outputBase+':SIG('+data.pubkey+')\n' + tx += outputAmount +':'+outputBase+':SIG('+data.pubkey+')\n'; } outputBase--; } -- GitLab