RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rpc: fix submitwork.

Browse Source
This commit is contained in:
Christopher Jeffrey 2017-07-25 02:14:24 -07:00
parent 1e9855a4fa
commit 590c4350e9
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/http/rpc.js
View File

@ -1029,11 +1029,11 @@ RPC.prototype._submitWork = async function _submitWork(data) {
if (data.length !== 128) if (data.length !== 128)
throw new RPCError(errs.INVALID_PARAMETER, 'Invalid work size.'); throw new RPCError(errs.INVALID_PARAMETER, 'Invalid work size.');
header = Headers.fromHead(data);
data = data.slice(0, 80); data = data.slice(0, 80);
data = swap32(data); data = swap32(data);
header = Headers.fromHead(data);
if (header.prevBlock !== attempt.prevBlock if (header.prevBlock !== attempt.prevBlock
|| header.bits !== attempt.bits) { || header.bits !== attempt.bits) {
return false; return false;
@ -1047,8 +1047,7 @@ RPC.prototype._submitWork = async function _submitWork(data) {
if (!nonces) if (!nonces)
return false; return false;
n1 = nonces.nonce1; [n1, n2] = nonces;
n2 = nonces.nonce2;
nonce = header.nonce; nonce = header.nonce;
ts = header.ts; ts = header.ts;
@ -2332,7 +2331,7 @@ RPC.prototype.updateWork = async function updateWork() {
root = attempt.getRoot(n1, n2); root = attempt.getRoot(n1, n2);
root = root.toString('hex'); root = root.toString('hex');
this.merkleMap.set(root, new Nonces(n1, n2)); this.merkleMap.set(root, [n1, n2]);
return attempt; return attempt;
} }
@ -2352,7 +2351,7 @@ RPC.prototype.updateWork = async function updateWork() {
this.attempt = attempt; this.attempt = attempt;
this.lastActivity = util.now(); this.lastActivity = util.now();
this.merkleMap.set(root, new Nonces(n1, n2)); this.merkleMap.set(root, [n1, n2]);
return attempt; return attempt;
}; };
@ -2737,11 +2736,6 @@ function toDeployment(id, version, status) {
}; };
} }
function Nonces(n1, n2) {
this.nonce1 = n1;
this.nonce2 = n2;
}
function parseAddress(raw, network) { function parseAddress(raw, network) {
try { try {
return Address.fromString(raw, network); return Address.fromString(raw, network);