Comparing version 5.4.0 to 5.4.1
{ | ||
"name": "ethrpc", | ||
"version": "5.4.0", | ||
"version": "5.4.1", | ||
"description": "Ethereum JSON RPC", | ||
@@ -5,0 +5,0 @@ "author": "The Augur Developers <team@augur.net>", |
@@ -12,4 +12,10 @@ "use strict"; | ||
if (getState().debug.broadcast) console.log("[ethrpc] New block:", newBlock.hash); | ||
dispatch(reprocessTransactions()); | ||
internalState.get("blockAndLogStreamer").reconcileNewBlock(newBlock).then(callback).catch(callback); | ||
setTimeout(function () { | ||
var streamer = internalState.get("blockAndLogStreamer"); | ||
if (streamer && streamer.reconcileNewBlock) { | ||
streamer.reconcileNewBlock(newBlock).then(callback).catch(callback); | ||
} | ||
}, getState().configuration.propagationDelayWaitMillis); | ||
}; | ||
@@ -16,0 +22,0 @@ } |
@@ -19,2 +19,3 @@ "use strict"; | ||
websocketClientConfig: {}, | ||
propagationDelayWaitMillis: 6000, | ||
}; | ||
@@ -21,0 +22,0 @@ module.exports.currentBlock = null; |
@@ -15,18 +15,5 @@ "use strict"; | ||
// if transaction is null, then it was dropped from the txpool | ||
// if transaction is null, then it isn't in the txpool | ||
if (onChainTransaction === null) { | ||
dispatch({ type: "INCREMENT_TRANSACTION_PAYLOAD_TRIES", hash: transactionHash }); | ||
// if we have retries left, then resubmit the transaction | ||
if (getState().transactions[transactionHash].payload.tries > constants.TX_RETRY_MAX) { // no retries left, transaction failed :( | ||
callback(new RPCError("TRANSACTION_RETRY_MAX_EXCEEDED", { data: getState().transactions[transactionHash] })); | ||
} else { | ||
dispatch({ type: "DECREMENT_HIGHEST_NONCE" }); | ||
dispatch({ type: "TRANSACTION_RESUBMITTED", hash: transactionHash }); | ||
if (getState().debug.tx) console.log("resubmitting tx:", transactionHash); | ||
var transaction = getState().transactions[transactionHash]; | ||
var meta = transaction.meta || {}; | ||
dispatch(transact.default(transaction.payload, meta.signer, meta.accountType, transaction.onSent, transaction.onSuccess, transaction.onFailed)); | ||
} | ||
callback(null); | ||
// non-null transaction: transaction not dropped | ||
@@ -33,0 +20,0 @@ // check if it has been sealed (mined) yet by checking for a greater-than-zero blockhash |
@@ -61,3 +61,10 @@ "use strict"; | ||
}); | ||
} else if (response.statusCode === 502) { // to handle INFURA's 502 error response | ||
console.warn("[ethrpc] http-transport 502 response", error, response); | ||
error = new Error("Gateway timeout, retryable"); | ||
error.code = response.statusCode; | ||
error.retryable = true; | ||
errorCallback(error); | ||
} else { | ||
console.error("[ethrpc] http-transport unexpected status code", response); | ||
error = new Error("Unexpected status code."); | ||
@@ -64,0 +71,0 @@ error.code = response.statusCode; |
@@ -23,3 +23,3 @@ "use strict"; | ||
}; | ||
this.webSocketClient = new WebSocketClient(this.address, undefined, undefined, undefined, { timeout: this.timeout }, this.websocketClientConfig); | ||
this.webSocketClient = new WebSocketClient(this.address, [], undefined, undefined, { timeout: this.timeout }, this.websocketClientConfig); | ||
var messageHandler = function () {}; | ||
@@ -26,0 +26,0 @@ this.webSocketClient.onopen = function () { |
// generated by genversion | ||
module.exports = '5.4.0' | ||
module.exports = '5.4.1' |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
3112279
140
63780