Skip to content

Commit 603822d

Browse files
mmcgee-jumpmmcgee-jump
committed
config: add standard configs for --testnet type cli args
1 parent c952b77 commit 603822d

File tree

18 files changed

+271
-52
lines changed

18 files changed

+271
-52
lines changed

‎src/app/fdctl/main.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "topology.h"
22
#include "config.h"
3+
#include "../shared/fd_config_file.h"
34
#include "../shared/boot/fd_boot.h"
45
#include "../shared/commands/configure/configure.h"
56

@@ -116,7 +117,18 @@ action_t * ACTIONS[] = {
116117
int
117118
main( int argc,
118119
char ** argv ) {
119-
return fd_main( argc, argv, 0, (char const *)fdctl_default_config, fdctl_default_config_sz, fd_topo_initialize );
120+
fd_config_file_t _default = (fd_config_file_t){
121+
.name = "default",
122+
.data = fdctl_default_config,
123+
.data_sz = fdctl_default_config_sz,
124+
};
125+
126+
fd_config_file_t * configs[] = {
127+
&_default,
128+
NULL
129+
};
130+
131+
return fd_main( argc, argv, 0, configs, fd_topo_initialize );
120132
}
121133

122134
/* Kind of a hack for now, we sometimes want to view bench generation

‎src/app/fddev/main.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,16 @@
33
int
44
main( int argc,
55
char ** argv ) {
6-
return fd_dev_main( argc, argv, 0, (char const *)fdctl_default_config, fdctl_default_config_sz, fd_topo_initialize );
6+
fd_config_file_t _default = (fd_config_file_t){
7+
.name = "default",
8+
.data = fdctl_default_config,
9+
.data_sz = fdctl_default_config_sz,
10+
};
11+
12+
fd_config_file_t * configs[] = {
13+
&_default,
14+
NULL
15+
};
16+
17+
return fd_dev_main( argc, argv, 0, configs, fd_topo_initialize );
718
}

‎src/app/fddev/tests/test_fddev.c

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ fddev_test_run( int argc,
174174
fd_log_thread_set( "supervisor" );
175175

176176
static config_t config[1];
177-
fd_config_load( 0, 0, 1, (char const *)fdctl_default_config, fdctl_default_config_sz, NULL, 0UL, NULL, config );
177+
fd_config_load( 0, 0, 1, (char const *)fdctl_default_config, fdctl_default_config_sz, NULL, NULL, 0UL, NULL, 0UL, NULL, config );
178178
fd_topo_initialize( config );
179179
config->log.log_fd = fd_log_private_logfile_fd();
180180
config->log.lock_fd = init_log_memfd();
@@ -195,7 +195,18 @@ fddev_test_run( int argc,
195195
else if( FD_UNLIKELY( WEXITSTATUS( wstatus ) ) ) return WEXITSTATUS( wstatus );
196196
}
197197
} else {
198-
return fd_dev_main( argc, argv, 0, (char const *)fdctl_default_config, fdctl_default_config_sz, fd_topo_initialize );
198+
fd_config_file_t _default = (fd_config_file_t){
199+
.name = "default",
200+
.data = fdctl_default_config,
201+
.data_sz = fdctl_default_config_sz,
202+
};
203+
204+
fd_config_file_t * configs[] = {
205+
&_default,
206+
NULL
207+
};
208+
209+
return fd_dev_main( argc, argv, 0, configs, fd_topo_initialize );
199210
}
200211

201212
return 0;

‎src/app/firedancer-dev/main.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,5 +214,18 @@ action_t * ACTIONS[] = {
214214
int
215215
main( int argc,
216216
char ** argv ) {
217-
return fd_dev_main( argc, argv, 1, (char const *)firedancer_default_config, firedancer_default_config_sz, fd_topo_initialize );
217+
fd_config_file_t _default = fd_config_file_default();
218+
fd_config_file_t testnet = fd_config_file_testnet();
219+
fd_config_file_t devnet = fd_config_file_devnet();
220+
fd_config_file_t mainnet = fd_config_file_mainnet();
221+
222+
fd_config_file_t * configs[] = {
223+
&_default,
224+
&testnet,
225+
&devnet,
226+
&mainnet,
227+
NULL
228+
};
229+
230+
return fd_dev_main( argc, argv, 1, configs, fd_topo_initialize );
218231
}

‎src/app/firedancer/Local.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ ifdef FD_HAS_INT128
2323
ifdef FD_HAS_SECP256K1
2424
ifdef FD_HAS_ZSTD
2525

26-
$(OBJDIR)/obj/app/firedancer/config.o: src/app/fdctl/config/default.toml
2726
$(OBJDIR)/obj/app/firedancer/config.o: src/app/firedancer/config/default.toml
27+
$(OBJDIR)/obj/app/firedancer/config.o: src/app/firedancer/config/testnet.toml
28+
$(OBJDIR)/obj/app/firedancer/config.o: src/app/firedancer/config/devnet.toml
29+
$(OBJDIR)/obj/app/firedancer/config.o: src/app/firedancer/config/mainnet.toml
2830
$(OBJDIR)/obj/app/firedancer/version.d: src/app/firedancer/version.h
2931

3032
.PHONY: firedancer

‎src/app/firedancer/config.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
#include "../../util/fd_util.h"
1+
#include "../../util/fd_util_base.h"
22

33
FD_IMPORT_BINARY( firedancer_default_config, "src/app/firedancer/config/default.toml" );
4+
FD_IMPORT_BINARY( firedancer_testnet_config, "src/app/firedancer/config/testnet.toml" );
5+
FD_IMPORT_BINARY( firedancer_devnet_config, "src/app/firedancer/config/devnet.toml" );
6+
FD_IMPORT_BINARY( firedancer_mainnet_config, "src/app/firedancer/config/mainnet.toml" );

‎src/app/firedancer/config.h

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,54 @@
11
#ifndef HEADER_fd_src_app_firedancer_config_h
22
#define HEADER_fd_src_app_firedancer_config_h
33

4-
#include "../../util/fd_util.h"
4+
#include "../shared/fd_config_file.h"
55

66
extern uchar const firedancer_default_config[];
77
extern ulong const firedancer_default_config_sz;
88

9+
extern uchar const firedancer_testnet_config[];
10+
extern ulong const firedancer_testnet_config_sz;
11+
12+
extern uchar const firedancer_devnet_config[];
13+
extern ulong const firedancer_devnet_config_sz;
14+
15+
extern uchar const firedancer_mainnet_config[];
16+
extern ulong const firedancer_mainnet_config_sz;
17+
18+
fd_config_file_t
19+
fd_config_file_default( void ) {
20+
return (fd_config_file_t) {
21+
.name = "default",
22+
.data = firedancer_default_config,
23+
.data_sz = firedancer_default_config_sz,
24+
};
25+
}
26+
27+
fd_config_file_t
28+
fd_config_file_testnet( void ) {
29+
return (fd_config_file_t) {
30+
.name = "testnet",
31+
.data = firedancer_testnet_config,
32+
.data_sz = firedancer_testnet_config_sz,
33+
};
34+
}
35+
36+
fd_config_file_t
37+
fd_config_file_devnet( void ) {
38+
return (fd_config_file_t) {
39+
.name = "devnet",
40+
.data = firedancer_devnet_config,
41+
.data_sz = firedancer_devnet_config_sz,
42+
};
43+
}
44+
45+
fd_config_file_t
46+
fd_config_file_mainnet( void ) {
47+
return (fd_config_file_t) {
48+
.name = "mainnet",
49+
.data = firedancer_mainnet_config,
50+
.data_sz = firedancer_mainnet_config_sz,
51+
};
52+
}
53+
954
#endif /* HEADER_fd_src_app_firedancer_config_h */

‎src/app/firedancer/config/devnet.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[gossip]
2+
entrypoints = [
3+
"entrypoint.devnet.solana.com:8001",
4+
"entrypoint2.devnet.solana.com:8001",
5+
"entrypoint3.devnet.solana.com:8001",
6+
]

‎src/app/firedancer/config/mainnet.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[gossip]
2+
entrypoints = [
3+
"entrypoint.mainnet-beta.solana.com:8001",
4+
"entrypoint2.mainnet-beta.solana.com:8001",
5+
"entrypoint3.mainnet-beta.solana.com:8001",
6+
"entrypoint4.mainnet-beta.solana.com:8001",
7+
"entrypoint5.mainnet-beta.solana.com:8001",
8+
]

‎src/app/firedancer/config/testnet.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[gossip]
2+
entrypoints = [
3+
"entrypoint.testnet.solana.com:8001",
4+
"entrypoint2.testnet.solana.com:8001",
5+
"entrypoint3.testnet.solana.com:8001",
6+
]

0 commit comments

Comments
 (0)