diff --git a/.gitignore b/.gitignore index 3f27cdc00f07..68ebda9de741 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ */**/*tx_database* */**/*dapps* build/_vendor/pkg +data #* .#* diff --git a/Makefile b/Makefile index 614aebd65a65..8899a463dc6c 100644 --- a/Makefile +++ b/Makefile @@ -37,4 +37,4 @@ devtools: env GOBIN= go install github.com/golang/protobuf/protoc-gen-go@latest env GOBIN= go install ./cmd/abigen @type "solc" 2> /dev/null || echo 'Please install solc' - @type "protoc" 2> /dev/null || echo 'Please install protoc'a \ No newline at end of file + @type "protoc" 2> /dev/null || echo 'Please install protoc' \ No newline at end of file diff --git a/consensus/beacon/consensus.go b/consensus/beacon/consensus.go index 28977ef51acf..e856f4e6cead 100644 --- a/consensus/beacon/consensus.go +++ b/consensus/beacon/consensus.go @@ -358,7 +358,7 @@ func (beacon *Beacon) Finalize(chain consensus.ChainHeaderReader, header *types. amount := new(big.Int).SetUint64(w.Amount) amount = amount.Mul(amount, big.NewInt(params.GWei)) state.AddBalance(w.Address, amount) - } + } // No block reward which is issued by consensus layer instead. } diff --git a/core/state/statedb.go b/core/state/statedb.go index 5e6b7ff8db21..d28cd29b309a 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -138,13 +138,6 @@ type StateDB struct { // Testing hooks onCommit func(states *triestate.Set) // Hook invoked when commit is performed - - extJournal Revertable -} - -type Revertable interface { - Snapshot() int - RevertToSnapshot(int) } // New creates a new state from a given trie. @@ -801,11 +794,6 @@ func (s *StateDB) Snapshot() int { id := s.nextRevisionId s.nextRevisionId++ s.validRevisions = append(s.validRevisions, revision{id, s.journal.length()}) - if s.extJournal != nil { - if s.extJournal.Snapshot() != id { - panic("REEEE") - } - } return id } @@ -823,10 +811,6 @@ func (s *StateDB) RevertToSnapshot(revid int) { // Replay the journal to undo changes and remove invalidated snapshots s.journal.revert(s, snapshot) s.validRevisions = s.validRevisions[:idx] - - if s.extJournal != nil { - s.extJournal.RevertToSnapshot(revid) - } } // GetRefund returns the current value of the refund counter. diff --git a/data/node1/geth/LOCK b/data/node1/geth/LOCK deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/data/node1/geth/blobpool/limbo/bkt_00004096.bag b/data/node1/geth/blobpool/limbo/bkt_00004096.bag deleted file mode 100644 index 6df4fb80e9a0..000000000000 Binary files a/data/node1/geth/blobpool/limbo/bkt_00004096.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/limbo/bkt_00135168.bag b/data/node1/geth/blobpool/limbo/bkt_00135168.bag deleted file mode 100644 index 93233657feee..000000000000 Binary files a/data/node1/geth/blobpool/limbo/bkt_00135168.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/limbo/bkt_00266240.bag b/data/node1/geth/blobpool/limbo/bkt_00266240.bag deleted file mode 100644 index 7ad82b4c4ce9..000000000000 Binary files a/data/node1/geth/blobpool/limbo/bkt_00266240.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/limbo/bkt_00397312.bag b/data/node1/geth/blobpool/limbo/bkt_00397312.bag deleted file mode 100644 index 41a34f0b1da4..000000000000 Binary files a/data/node1/geth/blobpool/limbo/bkt_00397312.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/limbo/bkt_00528384.bag b/data/node1/geth/blobpool/limbo/bkt_00528384.bag deleted file mode 100644 index f3939c3fd49d..000000000000 Binary files a/data/node1/geth/blobpool/limbo/bkt_00528384.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/limbo/bkt_00659456.bag b/data/node1/geth/blobpool/limbo/bkt_00659456.bag deleted file mode 100644 index c470b7f741db..000000000000 Binary files a/data/node1/geth/blobpool/limbo/bkt_00659456.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/limbo/bkt_00790528.bag b/data/node1/geth/blobpool/limbo/bkt_00790528.bag deleted file mode 100644 index 9f574f8cfb0c..000000000000 Binary files a/data/node1/geth/blobpool/limbo/bkt_00790528.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/limbo/bkt_00921600.bag b/data/node1/geth/blobpool/limbo/bkt_00921600.bag deleted file mode 100644 index 90eb3abacd9a..000000000000 Binary files a/data/node1/geth/blobpool/limbo/bkt_00921600.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/limbo/bkt_01052672.bag b/data/node1/geth/blobpool/limbo/bkt_01052672.bag deleted file mode 100644 index 3bc4fcb61c17..000000000000 Binary files a/data/node1/geth/blobpool/limbo/bkt_01052672.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/limbo/bkt_01183744.bag b/data/node1/geth/blobpool/limbo/bkt_01183744.bag deleted file mode 100644 index bfcd716da9da..000000000000 Binary files a/data/node1/geth/blobpool/limbo/bkt_01183744.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/limbo/bkt_01314816.bag b/data/node1/geth/blobpool/limbo/bkt_01314816.bag deleted file mode 100644 index 907e524e30e8..000000000000 Binary files a/data/node1/geth/blobpool/limbo/bkt_01314816.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/limbo/bkt_01445888.bag b/data/node1/geth/blobpool/limbo/bkt_01445888.bag deleted file mode 100644 index 69c3176304c8..000000000000 Binary files a/data/node1/geth/blobpool/limbo/bkt_01445888.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/limbo/bkt_01576960.bag b/data/node1/geth/blobpool/limbo/bkt_01576960.bag deleted file mode 100644 index 841fded61381..000000000000 Binary files a/data/node1/geth/blobpool/limbo/bkt_01576960.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/limbo/bkt_01708032.bag b/data/node1/geth/blobpool/limbo/bkt_01708032.bag deleted file mode 100644 index 0263c598d087..000000000000 Binary files a/data/node1/geth/blobpool/limbo/bkt_01708032.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/limbo/bkt_01839104.bag b/data/node1/geth/blobpool/limbo/bkt_01839104.bag deleted file mode 100644 index c7f8fa4198db..000000000000 Binary files a/data/node1/geth/blobpool/limbo/bkt_01839104.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/queue/bkt_00004096.bag b/data/node1/geth/blobpool/queue/bkt_00004096.bag deleted file mode 100644 index 6df4fb80e9a0..000000000000 Binary files a/data/node1/geth/blobpool/queue/bkt_00004096.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/queue/bkt_00135168.bag b/data/node1/geth/blobpool/queue/bkt_00135168.bag deleted file mode 100644 index 93233657feee..000000000000 Binary files a/data/node1/geth/blobpool/queue/bkt_00135168.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/queue/bkt_00266240.bag b/data/node1/geth/blobpool/queue/bkt_00266240.bag deleted file mode 100644 index 7ad82b4c4ce9..000000000000 Binary files a/data/node1/geth/blobpool/queue/bkt_00266240.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/queue/bkt_00397312.bag b/data/node1/geth/blobpool/queue/bkt_00397312.bag deleted file mode 100644 index 41a34f0b1da4..000000000000 Binary files a/data/node1/geth/blobpool/queue/bkt_00397312.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/queue/bkt_00528384.bag b/data/node1/geth/blobpool/queue/bkt_00528384.bag deleted file mode 100644 index f3939c3fd49d..000000000000 Binary files a/data/node1/geth/blobpool/queue/bkt_00528384.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/queue/bkt_00659456.bag b/data/node1/geth/blobpool/queue/bkt_00659456.bag deleted file mode 100644 index c470b7f741db..000000000000 Binary files a/data/node1/geth/blobpool/queue/bkt_00659456.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/queue/bkt_00790528.bag b/data/node1/geth/blobpool/queue/bkt_00790528.bag deleted file mode 100644 index 9f574f8cfb0c..000000000000 Binary files a/data/node1/geth/blobpool/queue/bkt_00790528.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/queue/bkt_00921600.bag b/data/node1/geth/blobpool/queue/bkt_00921600.bag deleted file mode 100644 index 90eb3abacd9a..000000000000 Binary files a/data/node1/geth/blobpool/queue/bkt_00921600.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/queue/bkt_01052672.bag b/data/node1/geth/blobpool/queue/bkt_01052672.bag deleted file mode 100644 index 3bc4fcb61c17..000000000000 Binary files a/data/node1/geth/blobpool/queue/bkt_01052672.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/queue/bkt_01183744.bag b/data/node1/geth/blobpool/queue/bkt_01183744.bag deleted file mode 100644 index bfcd716da9da..000000000000 Binary files a/data/node1/geth/blobpool/queue/bkt_01183744.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/queue/bkt_01314816.bag b/data/node1/geth/blobpool/queue/bkt_01314816.bag deleted file mode 100644 index 907e524e30e8..000000000000 Binary files a/data/node1/geth/blobpool/queue/bkt_01314816.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/queue/bkt_01445888.bag b/data/node1/geth/blobpool/queue/bkt_01445888.bag deleted file mode 100644 index 69c3176304c8..000000000000 Binary files a/data/node1/geth/blobpool/queue/bkt_01445888.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/queue/bkt_01576960.bag b/data/node1/geth/blobpool/queue/bkt_01576960.bag deleted file mode 100644 index 841fded61381..000000000000 Binary files a/data/node1/geth/blobpool/queue/bkt_01576960.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/queue/bkt_01708032.bag b/data/node1/geth/blobpool/queue/bkt_01708032.bag deleted file mode 100644 index 0263c598d087..000000000000 Binary files a/data/node1/geth/blobpool/queue/bkt_01708032.bag and /dev/null differ diff --git a/data/node1/geth/blobpool/queue/bkt_01839104.bag b/data/node1/geth/blobpool/queue/bkt_01839104.bag deleted file mode 100644 index c7f8fa4198db..000000000000 Binary files a/data/node1/geth/blobpool/queue/bkt_01839104.bag and /dev/null differ diff --git a/data/node1/geth/chaindata/000004.sst b/data/node1/geth/chaindata/000004.sst deleted file mode 100644 index 4905b00f2fe2..000000000000 Binary files a/data/node1/geth/chaindata/000004.sst and /dev/null differ diff --git a/data/node1/geth/chaindata/000005.log b/data/node1/geth/chaindata/000005.log deleted file mode 100644 index 4e273759f90d..000000000000 Binary files a/data/node1/geth/chaindata/000005.log and /dev/null differ diff --git a/data/node1/geth/chaindata/000008.log b/data/node1/geth/chaindata/000008.log deleted file mode 100644 index f977f985ba89..000000000000 Binary files a/data/node1/geth/chaindata/000008.log and /dev/null differ diff --git a/data/node1/geth/chaindata/CURRENT b/data/node1/geth/chaindata/CURRENT deleted file mode 100644 index f7753e22ae74..000000000000 --- a/data/node1/geth/chaindata/CURRENT +++ /dev/null @@ -1 +0,0 @@ -MANIFEST-000006 diff --git a/data/node1/geth/chaindata/LOCK b/data/node1/geth/chaindata/LOCK deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/data/node1/geth/chaindata/MANIFEST-000001 b/data/node1/geth/chaindata/MANIFEST-000001 deleted file mode 100644 index 7c30d3195493..000000000000 Binary files a/data/node1/geth/chaindata/MANIFEST-000001 and /dev/null differ diff --git a/data/node1/geth/chaindata/MANIFEST-000006 b/data/node1/geth/chaindata/MANIFEST-000006 deleted file mode 100644 index 1969e58b8a9d..000000000000 Binary files a/data/node1/geth/chaindata/MANIFEST-000006 and /dev/null differ diff --git a/data/node1/geth/chaindata/OPTIONS-000007 b/data/node1/geth/chaindata/OPTIONS-000007 deleted file mode 100644 index fb353e7ba7cc..000000000000 --- a/data/node1/geth/chaindata/OPTIONS-000007 +++ /dev/null @@ -1,107 +0,0 @@ -[Version] - pebble_version=0.1 - -[Options] - bytes_per_sync=524288 - cache_size=536870912 - cleaner=delete - compaction_debt_concurrency=1073741824 - comparer=leveldb.BytewiseComparator - disable_wal=false - flush_delay_delete_range=0s - flush_delay_range_key=0s - flush_split_bytes=4194304 - format_major_version=1 - l0_compaction_concurrency=10 - l0_compaction_file_threshold=500 - l0_compaction_threshold=4 - l0_stop_writes_threshold=12 - lbase_max_bytes=67108864 - max_concurrent_compactions=10 - max_manifest_file_size=134217728 - max_open_files=5120 - mem_table_size=134217728 - mem_table_stop_writes_threshold=2 - min_deletion_rate=0 - merger=pebble.concatenate - read_compaction_rate=16000 - read_sampling_multiplier=-1 - strict_wal_tail=true - table_cache_shards=10 - table_property_collectors=[] - validate_on_ingest=false - wal_dir= - wal_bytes_per_sync=0 - max_writer_concurrency=0 - force_writer_parallelism=false - secondary_cache_size_bytes=0 - -[Level "0"] - block_restart_interval=16 - block_size=4096 - block_size_threshold=90 - compression=Snappy - filter_policy=rocksdb.BuiltinBloomFilter - filter_type=table - index_block_size=4096 - target_file_size=2097152 - -[Level "1"] - block_restart_interval=16 - block_size=4096 - block_size_threshold=90 - compression=Snappy - filter_policy=rocksdb.BuiltinBloomFilter - filter_type=table - index_block_size=4096 - target_file_size=2097152 - -[Level "2"] - block_restart_interval=16 - block_size=4096 - block_size_threshold=90 - compression=Snappy - filter_policy=rocksdb.BuiltinBloomFilter - filter_type=table - index_block_size=4096 - target_file_size=2097152 - -[Level "3"] - block_restart_interval=16 - block_size=4096 - block_size_threshold=90 - compression=Snappy - filter_policy=rocksdb.BuiltinBloomFilter - filter_type=table - index_block_size=4096 - target_file_size=2097152 - -[Level "4"] - block_restart_interval=16 - block_size=4096 - block_size_threshold=90 - compression=Snappy - filter_policy=rocksdb.BuiltinBloomFilter - filter_type=table - index_block_size=4096 - target_file_size=2097152 - -[Level "5"] - block_restart_interval=16 - block_size=4096 - block_size_threshold=90 - compression=Snappy - filter_policy=rocksdb.BuiltinBloomFilter - filter_type=table - index_block_size=4096 - target_file_size=2097152 - -[Level "6"] - block_restart_interval=16 - block_size=4096 - block_size_threshold=90 - compression=Snappy - filter_policy=rocksdb.BuiltinBloomFilter - filter_type=table - index_block_size=4096 - target_file_size=2097152 diff --git a/data/node1/geth/chaindata/ancient/chain/FLOCK b/data/node1/geth/chaindata/ancient/chain/FLOCK deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/data/node1/geth/chaindata/ancient/chain/bodies.0000.cdat b/data/node1/geth/chaindata/ancient/chain/bodies.0000.cdat deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/data/node1/geth/chaindata/ancient/chain/bodies.cidx b/data/node1/geth/chaindata/ancient/chain/bodies.cidx deleted file mode 100644 index ab2c6846789c..000000000000 Binary files a/data/node1/geth/chaindata/ancient/chain/bodies.cidx and /dev/null differ diff --git a/data/node1/geth/chaindata/ancient/chain/bodies.meta b/data/node1/geth/chaindata/ancient/chain/bodies.meta deleted file mode 100644 index 59ee61656b88..000000000000 --- a/data/node1/geth/chaindata/ancient/chain/bodies.meta +++ /dev/null @@ -1 +0,0 @@ -�� \ No newline at end of file diff --git a/data/node1/geth/chaindata/ancient/chain/diffs.0000.rdat b/data/node1/geth/chaindata/ancient/chain/diffs.0000.rdat deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/data/node1/geth/chaindata/ancient/chain/diffs.meta b/data/node1/geth/chaindata/ancient/chain/diffs.meta deleted file mode 100644 index 59ee61656b88..000000000000 --- a/data/node1/geth/chaindata/ancient/chain/diffs.meta +++ /dev/null @@ -1 +0,0 @@ -�� \ No newline at end of file diff --git a/data/node1/geth/chaindata/ancient/chain/diffs.ridx b/data/node1/geth/chaindata/ancient/chain/diffs.ridx deleted file mode 100644 index ab2c6846789c..000000000000 Binary files a/data/node1/geth/chaindata/ancient/chain/diffs.ridx and /dev/null differ diff --git a/data/node1/geth/chaindata/ancient/chain/hashes.0000.rdat b/data/node1/geth/chaindata/ancient/chain/hashes.0000.rdat deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/data/node1/geth/chaindata/ancient/chain/hashes.meta b/data/node1/geth/chaindata/ancient/chain/hashes.meta deleted file mode 100644 index 59ee61656b88..000000000000 --- a/data/node1/geth/chaindata/ancient/chain/hashes.meta +++ /dev/null @@ -1 +0,0 @@ -�� \ No newline at end of file diff --git a/data/node1/geth/chaindata/ancient/chain/hashes.ridx b/data/node1/geth/chaindata/ancient/chain/hashes.ridx deleted file mode 100644 index ab2c6846789c..000000000000 Binary files a/data/node1/geth/chaindata/ancient/chain/hashes.ridx and /dev/null differ diff --git a/data/node1/geth/chaindata/ancient/chain/headers.0000.cdat b/data/node1/geth/chaindata/ancient/chain/headers.0000.cdat deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/data/node1/geth/chaindata/ancient/chain/headers.cidx b/data/node1/geth/chaindata/ancient/chain/headers.cidx deleted file mode 100644 index ab2c6846789c..000000000000 Binary files a/data/node1/geth/chaindata/ancient/chain/headers.cidx and /dev/null differ diff --git a/data/node1/geth/chaindata/ancient/chain/headers.meta b/data/node1/geth/chaindata/ancient/chain/headers.meta deleted file mode 100644 index 59ee61656b88..000000000000 --- a/data/node1/geth/chaindata/ancient/chain/headers.meta +++ /dev/null @@ -1 +0,0 @@ -�� \ No newline at end of file diff --git a/data/node1/geth/chaindata/ancient/chain/receipts.0000.cdat b/data/node1/geth/chaindata/ancient/chain/receipts.0000.cdat deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/data/node1/geth/chaindata/ancient/chain/receipts.cidx b/data/node1/geth/chaindata/ancient/chain/receipts.cidx deleted file mode 100644 index ab2c6846789c..000000000000 Binary files a/data/node1/geth/chaindata/ancient/chain/receipts.cidx and /dev/null differ diff --git a/data/node1/geth/chaindata/ancient/chain/receipts.meta b/data/node1/geth/chaindata/ancient/chain/receipts.meta deleted file mode 100644 index 59ee61656b88..000000000000 --- a/data/node1/geth/chaindata/ancient/chain/receipts.meta +++ /dev/null @@ -1 +0,0 @@ -�� \ No newline at end of file diff --git a/data/node1/geth/lightchaindata/000002.log b/data/node1/geth/lightchaindata/000002.log deleted file mode 100644 index 50ef6d401a98..000000000000 Binary files a/data/node1/geth/lightchaindata/000002.log and /dev/null differ diff --git a/data/node1/geth/lightchaindata/CURRENT b/data/node1/geth/lightchaindata/CURRENT deleted file mode 100644 index 7ed683d17118..000000000000 --- a/data/node1/geth/lightchaindata/CURRENT +++ /dev/null @@ -1 +0,0 @@ -MANIFEST-000001 diff --git a/data/node1/geth/lightchaindata/LOCK b/data/node1/geth/lightchaindata/LOCK deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/data/node1/geth/lightchaindata/MANIFEST-000001 b/data/node1/geth/lightchaindata/MANIFEST-000001 deleted file mode 100644 index 7c30d3195493..000000000000 Binary files a/data/node1/geth/lightchaindata/MANIFEST-000001 and /dev/null differ diff --git a/data/node1/geth/lightchaindata/OPTIONS-000003 b/data/node1/geth/lightchaindata/OPTIONS-000003 deleted file mode 100644 index 77a3cd1b866f..000000000000 --- a/data/node1/geth/lightchaindata/OPTIONS-000003 +++ /dev/null @@ -1,107 +0,0 @@ -[Version] - pebble_version=0.1 - -[Options] - bytes_per_sync=524288 - cache_size=16777216 - cleaner=delete - compaction_debt_concurrency=1073741824 - comparer=leveldb.BytewiseComparator - disable_wal=false - flush_delay_delete_range=0s - flush_delay_range_key=0s - flush_split_bytes=4194304 - format_major_version=1 - l0_compaction_concurrency=10 - l0_compaction_file_threshold=500 - l0_compaction_threshold=4 - l0_stop_writes_threshold=12 - lbase_max_bytes=67108864 - max_concurrent_compactions=10 - max_manifest_file_size=134217728 - max_open_files=16 - mem_table_size=4194304 - mem_table_stop_writes_threshold=2 - min_deletion_rate=0 - merger=pebble.concatenate - read_compaction_rate=16000 - read_sampling_multiplier=-1 - strict_wal_tail=true - table_cache_shards=10 - table_property_collectors=[] - validate_on_ingest=false - wal_dir= - wal_bytes_per_sync=0 - max_writer_concurrency=0 - force_writer_parallelism=false - secondary_cache_size_bytes=0 - -[Level "0"] - block_restart_interval=16 - block_size=4096 - block_size_threshold=90 - compression=Snappy - filter_policy=rocksdb.BuiltinBloomFilter - filter_type=table - index_block_size=4096 - target_file_size=2097152 - -[Level "1"] - block_restart_interval=16 - block_size=4096 - block_size_threshold=90 - compression=Snappy - filter_policy=rocksdb.BuiltinBloomFilter - filter_type=table - index_block_size=4096 - target_file_size=2097152 - -[Level "2"] - block_restart_interval=16 - block_size=4096 - block_size_threshold=90 - compression=Snappy - filter_policy=rocksdb.BuiltinBloomFilter - filter_type=table - index_block_size=4096 - target_file_size=2097152 - -[Level "3"] - block_restart_interval=16 - block_size=4096 - block_size_threshold=90 - compression=Snappy - filter_policy=rocksdb.BuiltinBloomFilter - filter_type=table - index_block_size=4096 - target_file_size=2097152 - -[Level "4"] - block_restart_interval=16 - block_size=4096 - block_size_threshold=90 - compression=Snappy - filter_policy=rocksdb.BuiltinBloomFilter - filter_type=table - index_block_size=4096 - target_file_size=2097152 - -[Level "5"] - block_restart_interval=16 - block_size=4096 - block_size_threshold=90 - compression=Snappy - filter_policy=rocksdb.BuiltinBloomFilter - filter_type=table - index_block_size=4096 - target_file_size=2097152 - -[Level "6"] - block_restart_interval=16 - block_size=4096 - block_size_threshold=90 - compression=Snappy - filter_policy=rocksdb.BuiltinBloomFilter - filter_type=table - index_block_size=4096 - target_file_size=2097152 diff --git a/data/node1/geth/lightchaindata/ancient/chain/FLOCK b/data/node1/geth/lightchaindata/ancient/chain/FLOCK deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/data/node1/geth/lightchaindata/ancient/chain/bodies.0000.cdat b/data/node1/geth/lightchaindata/ancient/chain/bodies.0000.cdat deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/data/node1/geth/lightchaindata/ancient/chain/bodies.cidx b/data/node1/geth/lightchaindata/ancient/chain/bodies.cidx deleted file mode 100644 index ab2c6846789c..000000000000 Binary files a/data/node1/geth/lightchaindata/ancient/chain/bodies.cidx and /dev/null differ diff --git a/data/node1/geth/lightchaindata/ancient/chain/bodies.meta b/data/node1/geth/lightchaindata/ancient/chain/bodies.meta deleted file mode 100644 index 59ee61656b88..000000000000 --- a/data/node1/geth/lightchaindata/ancient/chain/bodies.meta +++ /dev/null @@ -1 +0,0 @@ -�� \ No newline at end of file diff --git a/data/node1/geth/lightchaindata/ancient/chain/diffs.0000.rdat b/data/node1/geth/lightchaindata/ancient/chain/diffs.0000.rdat deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/data/node1/geth/lightchaindata/ancient/chain/diffs.meta b/data/node1/geth/lightchaindata/ancient/chain/diffs.meta deleted file mode 100644 index 59ee61656b88..000000000000 --- a/data/node1/geth/lightchaindata/ancient/chain/diffs.meta +++ /dev/null @@ -1 +0,0 @@ -�� \ No newline at end of file diff --git a/data/node1/geth/lightchaindata/ancient/chain/diffs.ridx b/data/node1/geth/lightchaindata/ancient/chain/diffs.ridx deleted file mode 100644 index ab2c6846789c..000000000000 Binary files a/data/node1/geth/lightchaindata/ancient/chain/diffs.ridx and /dev/null differ diff --git a/data/node1/geth/lightchaindata/ancient/chain/hashes.0000.rdat b/data/node1/geth/lightchaindata/ancient/chain/hashes.0000.rdat deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/data/node1/geth/lightchaindata/ancient/chain/hashes.meta b/data/node1/geth/lightchaindata/ancient/chain/hashes.meta deleted file mode 100644 index 59ee61656b88..000000000000 --- a/data/node1/geth/lightchaindata/ancient/chain/hashes.meta +++ /dev/null @@ -1 +0,0 @@ -�� \ No newline at end of file diff --git a/data/node1/geth/lightchaindata/ancient/chain/hashes.ridx b/data/node1/geth/lightchaindata/ancient/chain/hashes.ridx deleted file mode 100644 index ab2c6846789c..000000000000 Binary files a/data/node1/geth/lightchaindata/ancient/chain/hashes.ridx and /dev/null differ diff --git a/data/node1/geth/lightchaindata/ancient/chain/headers.0000.cdat b/data/node1/geth/lightchaindata/ancient/chain/headers.0000.cdat deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/data/node1/geth/lightchaindata/ancient/chain/headers.cidx b/data/node1/geth/lightchaindata/ancient/chain/headers.cidx deleted file mode 100644 index ab2c6846789c..000000000000 Binary files a/data/node1/geth/lightchaindata/ancient/chain/headers.cidx and /dev/null differ diff --git a/data/node1/geth/lightchaindata/ancient/chain/headers.meta b/data/node1/geth/lightchaindata/ancient/chain/headers.meta deleted file mode 100644 index 59ee61656b88..000000000000 --- a/data/node1/geth/lightchaindata/ancient/chain/headers.meta +++ /dev/null @@ -1 +0,0 @@ -�� \ No newline at end of file diff --git a/data/node1/geth/lightchaindata/ancient/chain/receipts.0000.cdat b/data/node1/geth/lightchaindata/ancient/chain/receipts.0000.cdat deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/data/node1/geth/lightchaindata/ancient/chain/receipts.cidx b/data/node1/geth/lightchaindata/ancient/chain/receipts.cidx deleted file mode 100644 index ab2c6846789c..000000000000 Binary files a/data/node1/geth/lightchaindata/ancient/chain/receipts.cidx and /dev/null differ diff --git a/data/node1/geth/lightchaindata/ancient/chain/receipts.meta b/data/node1/geth/lightchaindata/ancient/chain/receipts.meta deleted file mode 100644 index 59ee61656b88..000000000000 --- a/data/node1/geth/lightchaindata/ancient/chain/receipts.meta +++ /dev/null @@ -1 +0,0 @@ -�� \ No newline at end of file diff --git a/data/node1/geth/nodekey b/data/node1/geth/nodekey deleted file mode 100644 index 1978c79647d4..000000000000 --- a/data/node1/geth/nodekey +++ /dev/null @@ -1 +0,0 @@ -2a05e809857372f5ce3199c9cfddeef915ef8d926c96888d5a415e351f0d9f11 \ No newline at end of file diff --git a/data/node1/geth/nodes/000001.log b/data/node1/geth/nodes/000001.log deleted file mode 100644 index 43b1a7284293..000000000000 Binary files a/data/node1/geth/nodes/000001.log and /dev/null differ diff --git a/data/node1/geth/nodes/CURRENT b/data/node1/geth/nodes/CURRENT deleted file mode 100644 index feda7d6b2481..000000000000 --- a/data/node1/geth/nodes/CURRENT +++ /dev/null @@ -1 +0,0 @@ -MANIFEST-000000 diff --git a/data/node1/geth/nodes/LOCK b/data/node1/geth/nodes/LOCK deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/data/node1/geth/nodes/LOG b/data/node1/geth/nodes/LOG deleted file mode 100644 index 98717c7386da..000000000000 --- a/data/node1/geth/nodes/LOG +++ /dev/null @@ -1,6 +0,0 @@ -=============== Oct 18, 2023 (EDT) =============== -17:11:06.440247 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed -17:11:06.451709 db@open opening -17:11:06.452261 version@stat F·[] S·0B[] Sc·[] -17:11:06.456991 db@janitor F·2 G·0 -17:11:06.457036 db@open done T·5.304083ms diff --git a/data/node1/geth/nodes/MANIFEST-000000 b/data/node1/geth/nodes/MANIFEST-000000 deleted file mode 100644 index 9d54f6733b13..000000000000 Binary files a/data/node1/geth/nodes/MANIFEST-000000 and /dev/null differ diff --git a/data/node1/geth/transactions.rlp b/data/node1/geth/transactions.rlp deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/p2p/server.go b/p2p/server.go index 5129807ce761..8f42765a8c26 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -486,7 +486,6 @@ func (srv *Server) Start() (err error) { if err := srv.setupLocalNode(); err != nil { return err } - srv.setupPortMapping() if srv.ListenAddr != "" {