Skip to content

Commit a71fc9d

Browse files
firedancer-dev, backtest-ci: clean up
1 parent a1ad9eb commit a71fc9d

File tree

7 files changed

+23
-19
lines changed

7 files changed

+23
-19
lines changed

contrib/offline-replay/offline_replay_network_parameters.sh

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,29 @@ case $network in
1414
export BUCKET_ENDPOINT="gs://mainnet-beta-ledger-us-ny5"
1515
export GENESIS_FILE="https://api.mainnet-beta.solana.com/genesis.tar.bz2"
1616
export HEAP_SIZE=200
17-
export FUNK_PAGES=900
1817
export BACKTEST_FUNK_PAGES=900
1918
export INDEX_MAX=1000000000
20-
export PAGES=250
19+
export PAGES=50
2120
export AGAVE_TAG=v2.3.6
2221
export FD_CLUSTER_VERSION=2.3.6
2322
;;
2423
"testnet")
2524
export BUCKET_ENDPOINT="gs://testnet-ledger-us-sv15"
2625
export GENESIS_FILE="https://api.testnet.solana.com/genesis.tar.bz2"
2726
export HEAP_SIZE=200
28-
export FUNK_PAGES=500
2927
export BACKTEST_FUNK_PAGES=200
3028
export INDEX_MAX=200000000
31-
export PAGES=250
29+
export PAGES=50
3230
export AGAVE_TAG=v2.3.6
3331
export FD_CLUSTER_VERSION=2.3.6
3432
;;
3533
"devnet")
3634
export BUCKET_ENDPOINT="gs://solana-devnet-ledger-us-ny5"
3735
export GENESIS_FILE="https://api.devnet.solana.com/genesis.tar.bz2"
3836
export HEAP_SIZE=100
39-
export FUNK_PAGES=500
4037
export BACKTEST_FUNK_PAGES=500
4138
export INDEX_MAX=200000000
42-
export PAGES=250
39+
export PAGES=50
4340
export AGAVE_TAG=v2.3.6
4441
export FD_CLUSTER_VERSION=2.3.6
4542
;;
@@ -48,6 +45,3 @@ case $network in
4845
return 1
4946
;;
5047
esac
51-
52-
export ALLOC_HUGE_PAGES=300
53-
export ALLOC_GIGANTIC_PAGES=250

src/app/firedancer/config/default.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ user = ""
365365
[funk]
366366
# The size of the funk heap in gigabytes. This value must be large
367367
# enough to store all Solana accounts uncompressed.
368-
heap_size_gib = 140
368+
heap_size_gib = 40
369369

370370
# The max amount of records that the funk instance can store.
371371
# Each Solana account uses at least one record. Additional records
@@ -656,7 +656,7 @@ user = ""
656656
bank_tile_count = 1
657657

658658
# TODO: add docs on exec_tile_cnt / exec tile
659-
exec_tile_count = 4
659+
exec_tile_count = 2
660660

661661
# How many writer tiles to run. Writer tiles are responsible for
662662
# writing account changes made by the exec tiles back to the
@@ -672,7 +672,7 @@ user = ""
672672
# for this to exceed the number of exec tiles, because the number
673673
# of in-flight transactions between exec tiles and writer tiles is
674674
# bounded by the number of exec tiles.
675-
writer_tile_count = 4
675+
writer_tile_count = 1
676676

677677
# How many shred tiles to run. Should be set to 1. This is
678678
# configurable and designed to scale out for future network

src/app/firedancer/config/mainnet.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[snapshots]
2+
cluster = "mainnet"
13
[gossip]
24
entrypoints = [
35
"entrypoint.mainnet-beta.solana.com:8001",
@@ -6,3 +8,8 @@
68
"entrypoint4.mainnet-beta.solana.com:8001",
79
"entrypoint5.mainnet-beta.solana.com:8001",
810
]
11+
[funk]
12+
heap_size_gib = 600
13+
max_account_records = 1_000_000_000
14+
[consensus]
15+
expected_shred_version = 50093
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1+
[snapshots]
2+
cluster = "testnet"
13
[gossip]
24
entrypoints = [
35
"entrypoint.testnet.solana.com:8001",
46
"entrypoint2.testnet.solana.com:8001",
57
"entrypoint3.testnet.solana.com:8001",
68
]
9+
[funk]
10+
heap_size_gib = 40
11+
max_account_records = 200_000_000
12+
[consensus]
13+
expected_shred_version = 9065

src/flamenco/runtime/fd_runtime.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2312,10 +2312,6 @@ fd_runtime_init_bank_from_genesis( fd_exec_slot_ctx_t * slot_ctx,
23122312

23132313
fd_acc_lamports_t capitalization = 0UL;
23142314

2315-
fd_features_t * features = fd_bank_features_modify( slot_ctx->bank );
2316-
FD_FEATURE_SET_ACTIVE(features, accounts_lt_hash, 0);
2317-
FD_FEATURE_SET_ACTIVE(features, remove_accounts_delta_hash, 0);
2318-
23192315
for( ulong i=0UL; i<genesis_block->accounts_len; i++ ) {
23202316
fd_pubkey_account_pair_t const * acc = &genesis_block->accounts[i];
23212317
capitalization = fd_ulong_sat_add( capitalization, acc->account.lamports );

src/flamenco/runtime/tests/run_backtest_tests_all.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ src/flamenco/runtime/tests/run_ledger_backtest.sh -l testnet-336218682-v2.3.0 -y
8080
src/flamenco/runtime/tests/run_ledger_backtest.sh -l testnet-340269866-v2.3.0 -y 5 -m 2000000 -e 340269872 -c 2.3.0
8181
src/flamenco/runtime/tests/run_ledger_backtest.sh -l testnet-340272018-v2.3.0 -y 5 -m 2000000 -e 340272024 -c 2.3.0
8282
src/flamenco/runtime/tests/run_ledger_backtest.sh -l devnet-390056400-v2.3.0 -y 10 -m 2000000 -e 390056406 -c 2.3.0
83-
src/flamenco/runtime/tests/run_ledger_backtest.sh -l localnet-1678201-v2.3.0 -y 1 -m 2000000 -e 1679200 -c 2.3.0 -i shredcap
84-
src/flamenco/runtime/tests/run_ledger_backtest.sh -l testnet-346796573-v2.3.0 -y 30 -m 90000000 -e 346796800 -c 2.3.0 -i shredcap -v true
83+
# src/flamenco/runtime/tests/run_ledger_backtest.sh -l localnet-1678201-v2.3.0 -y 1 -m 2000000 -e 1679200 -c 2.3.0 -i shredcap
84+
# src/flamenco/runtime/tests/run_ledger_backtest.sh -l testnet-346796573-v2.3.0 -y 30 -m 90000000 -e 346796800 -c 2.3.0 -i shredcap -v true
8585
src/flamenco/runtime/tests/run_ledger_backtest.sh -l testnet-346556000 -y 3 -m 2000000 -e 346556337 -c 2.3.0
8686
src/flamenco/runtime/tests/run_ledger_backtest.sh -l testnet-346179946 -y 30 -m 90000000 -e 346179950 -c 2.3.0
8787
src/flamenco/runtime/tests/run_ledger_backtest.sh -l multi-bpf-loader-v2.3.0 -y 1 -m 1000 -e 108 -c 2.3.0

src/flamenco/runtime/tests/run_ledger_backtest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ THREAD_MEM_BOUND="--thread-mem-bound 0"
2323
INGEST_MDOE="rocksdb"
2424
CLUSTER_VERSION=""
2525
DUMP_DIR=${DUMP_DIR:="./dump"}
26-
ONE_OFFS="2B2SBNbUcr438LtGXNcJNBP2GBSxjx81F945SdSkUSfC,LTHasHQX6661DaDD4S6A2TFi6QBuiwXKv66fB1obfHq,LTdLt9Ycbyoipz5fLysCi1NnDnASsZfmJLJXts5ZxZz,LTsNAP8h1voEVVToMNBNqoiNQex4aqfUrbFhRH3mSQ2"
26+
ONE_OFFS=""
2727
HUGE_TLBFS_MOUNT_PATH=${HUGE_TLBFS_MOUNT_PATH:="/mnt/.fd"}
2828
HUGE_TLBFS_ALLOW_HUGEPAGE_INCREASE=${HUGE_TLBFS_ALLOW_HUGEPAGE_INCREASE:="true"}
2929
HAS_INCREMENTAL="false"

0 commit comments

Comments
 (0)