aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Browne <stephenalexbrowne@gmail.com>2018-07-18 03:12:12 +0800
committerGitHub <noreply@github.com>2018-07-18 03:12:12 +0800
commit502287868073eecdea08b3160bd41ef78f5d8583 (patch)
tree88639620b71f08a1b0955bb249465400c5001226
parentb18d2b02745176400aa8cb5e97eb5f2685ca7be2 (diff)
parent2bfacbb8bab837656368e54ac4bb544f2d4b423b (diff)
downloaddexon-sol-tools-502287868073eecdea08b3160bd41ef78f5d8583.tar
dexon-sol-tools-502287868073eecdea08b3160bd41ef78f5d8583.tar.gz
dexon-sol-tools-502287868073eecdea08b3160bd41ef78f5d8583.tar.bz2
dexon-sol-tools-502287868073eecdea08b3160bd41ef78f5d8583.tar.lz
dexon-sol-tools-502287868073eecdea08b3160bd41ef78f5d8583.tar.xz
dexon-sol-tools-502287868073eecdea08b3160bd41ef78f5d8583.tar.zst
dexon-sol-tools-502287868073eecdea08b3160bd41ef78f5d8583.zip
Merge pull request #886 from 0xProject/fix/time-offset-accidental-revert
Mine a dummy block in blockchain_lifecycle to re-apply any time offset
-rw-r--r--packages/dev-utils/src/blockchain_lifecycle.ts39
1 files changed, 25 insertions, 14 deletions
diff --git a/packages/dev-utils/src/blockchain_lifecycle.ts b/packages/dev-utils/src/blockchain_lifecycle.ts
index 9bd65ee5d..a0424f01f 100644
--- a/packages/dev-utils/src/blockchain_lifecycle.ts
+++ b/packages/dev-utils/src/blockchain_lifecycle.ts
@@ -34,6 +34,12 @@ export class BlockchainLifecycle {
blockNumber = await this._web3Wrapper.getBlockNumberAsync();
}
this._snapshotIdsStack.push(blockNumber);
+ // HACK(albrow) It's possible that we applied a time offset but
+ // the transaction we mined to put that time offset into the
+ // blockchain was reverted. As a workaround, we mine a new dummy
+ // block so that the latest block timestamp accounts for any
+ // possible time offsets.
+ await this._mineDummyBlockAsync();
break;
default:
throw new Error(`Unknown node type: ${nodeType}`);
@@ -59,22 +65,9 @@ export class BlockchainLifecycle {
}
private async _mineMinimumBlocksAsync(): Promise<void> {
logUtils.warn('WARNING: minimum block number for tests not met. Mining additional blocks...');
- if (this._addresses.length === 0) {
- this._addresses = await this._web3Wrapper.getAvailableAddressesAsync();
- if (this._addresses.length === 0) {
- throw new Error('No accounts found');
- }
- }
while ((await this._web3Wrapper.getBlockNumberAsync()) < MINIMUM_BLOCKS) {
logUtils.warn('Mining block...');
- await this._web3Wrapper.awaitTransactionMinedAsync(
- await this._web3Wrapper.sendTransactionAsync({
- from: this._addresses[0],
- to: this._addresses[0],
- value: '0',
- }),
- 0,
- );
+ await this._mineDummyBlockAsync();
}
logUtils.warn('Done mining the minimum number of blocks.');
}
@@ -84,4 +77,22 @@ export class BlockchainLifecycle {
}
return this._nodeType;
}
+ // Sends a transaction that has no real effect on the state and waits for it
+ // to be mined.
+ private async _mineDummyBlockAsync(): Promise<void> {
+ if (this._addresses.length === 0) {
+ this._addresses = await this._web3Wrapper.getAvailableAddressesAsync();
+ if (this._addresses.length === 0) {
+ throw new Error('No accounts found');
+ }
+ }
+ await this._web3Wrapper.awaitTransactionMinedAsync(
+ await this._web3Wrapper.sendTransactionAsync({
+ from: this._addresses[0],
+ to: this._addresses[0],
+ value: '0',
+ }),
+ 0,
+ );
+ }
}