diff options
| author | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-08-17 20:01:41 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-09-22 02:33:28 +0800 |
| commit | eaa4473dbd4ad404b85f8f0f63b0418a782351b4 (patch) | |
| tree | 27eabb671346c279969caafe28d25a44aef0f9a0 /cmd | |
| parent | 12c0afe4fe9f284dd10a80af7744102dac8bf06b (diff) | |
| download | dexon-eaa4473dbd4ad404b85f8f0f63b0418a782351b4.tar.gz dexon-eaa4473dbd4ad404b85f8f0f63b0418a782351b4.tar.zst dexon-eaa4473dbd4ad404b85f8f0f63b0418a782351b4.zip | |
core, core/types: readd transactions after chain re-org
Added a `Difference` method to `types.Transactions` which sets the
receiver to the difference of a to b (NOTE: not a **and** b).
Transaction pool subscribes to RemovedTransactionEvent adding back to
those potential missing from the chain.
When a chain re-org occurs remove any transactions that were removed
from the canonical chain during the re-org as well as the receipts that
were generated in the process.
Closes #1746
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/js_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index 2fd5a531d..1f5b28e3a 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -92,7 +92,7 @@ func testREPL(t *testing.T, config func(*eth.Config)) (string, *testjethre, *eth db, _ := ethdb.NewMemDatabase() - core.WriteGenesisBlockForTesting(db, common.HexToAddress(testAddress), common.String2Big(testBalance)) + core.WriteGenesisBlockForTesting(db, core.GenesisAccount{common.HexToAddress(testAddress), common.String2Big(testBalance)}) ks := crypto.NewKeyStorePlain(filepath.Join(tmp, "keystore")) am := accounts.NewManager(ks) conf := ð.Config{ |