clipperz/password-manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switched Toll computation inner loop using time instead of iteration count before pausing.

Browse Source
This commit is contained in:
Giulio Cesare Solaroli 2018-11-25 17:32:45 +01:00
parent 0fd0970a42
commit 5d0cb4026c
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
frontend/delta/js/Clipperz/PM/Toll.js
View File

@ -1,6 +1,6 @@
/* /*
Copyright 2008-2015 Clipperz Srl Copyright 2008-2018 Clipperz Srl
This file is part of Clipperz, the online password manager. This file is part of Clipperz, the online password manager.
For further information about its features and functionalities please For further information about its features and functionalities please
@ -107,20 +107,26 @@ Clipperz.PM.Toll.prototype = MochiKit.Base.update(null, {
var deferredResult; var deferredResult;
var result; var result;
var payment; var payment;
var i; var startTime;
var currentTime;
var elapsedTime;
currentTime = (new Date()).getMilliseconds();
startTime = currentTime;
result = null; result = null;
payment = aPayment; payment = aPayment;
i = 0; elapsedTime = currentTime - startTime;
while ((result == null) && (i < Clipperz.PM.Toll.numberOfCloseLoopIterations)) { while ((result == null) && (elapsedTime < Clipperz.PM.Toll.maxTimeForCloseLoopIterations)) {
if (Clipperz.ByteArray.prefixMatchingBits(aTargetValue, Clipperz.Crypto.SHA.sha256(payment)) > aCost) { if (Clipperz.ByteArray.prefixMatchingBits(aTargetValue, Clipperz.Crypto.SHA.sha256(payment)) > aCost) {
result = payment; result = payment;
} else { } else {
payment.increment(); payment.increment();
} }
i ++; currentTime = (new Date()).getMilliseconds();
elapsedTime = currentTime - startTime;
} }
if (result == null) { if (result == null) {
@ -137,8 +143,7 @@ Clipperz.PM.Toll.prototype = MochiKit.Base.update(null, {
var toll; var toll;
toll = this; toll = this;
deferredResult = new Clipperz.Async.Deferred("Toll.deferredPay"); deferredResult = new Clipperz.Async.Deferred("Toll.deferredPay", {trace:false});
//deferredResult.addLog("--->>> deferredPay - " + this.cost());
deferredResult.addMethod(Clipperz.Crypto.PRNG.defaultRandomGenerator(), 'getRandomBytes', 32); deferredResult.addMethod(Clipperz.Crypto.PRNG.defaultRandomGenerator(), 'getRandomBytes', 32);
deferredResult.addMethod(toll, 'innerDeferredPay', new Clipperz.ByteArray("0x" + this.targetValue()), this.cost()); deferredResult.addMethod(toll, 'innerDeferredPay', new Clipperz.ByteArray("0x" + this.targetValue()), this.cost());
deferredResult.addCallback(MochiKit.Base.bind(function(aPayment) { deferredResult.addCallback(MochiKit.Base.bind(function(aPayment) {
@ -151,7 +156,6 @@ Clipperz.PM.Toll.prototype = MochiKit.Base.update(null, {
return result; return result;
}, this)); }, this));
//deferredResult.addLog("<<<--- deferredPay - " + this.cost());
deferredResult.callback(); deferredResult.callback();
return deferredResult; return deferredResult;
@ -185,5 +189,5 @@ Clipperz.PM.Toll.validate = function(aTargetValue, aToll, aCost) {
return result; return result;
}; };
Clipperz.PM.Toll.numberOfCloseLoopIterations = 50; Clipperz.PM.Toll.maxTimeForCloseLoopIterations = 500; // milliseconds
Clipperz.PM.Toll.pauseBetweenEachCloseLoop = 0.5; Clipperz.PM.Toll.pauseBetweenEachCloseLoop = 0.1; // seconds