Skip to content

Commit 5a13a86

Browse files
committed
fix net gen
1 parent 1e3307a commit 5a13a86

File tree

5 files changed

+403
-341
lines changed

5 files changed

+403
-341
lines changed

.gitignore

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -76,28 +76,7 @@ bin
7676
keystore/
7777
playground.py
7878
.env
79-
xrpld/
80-
xahau/
8179
rippled
8280
xrpld
83-
rippled.batch.v0
84-
xrpl-*
85-
86-
# networks
87-
2025*
88-
feature-p256-cluster
89-
feature-batch-cluster
90-
feature-batch-db-cluster
91-
notifications-cluster
92-
firewall-v1-cluster
93-
options-cluster
94-
dangell-relay-cluster
95-
axiology
96-
develop-cluster
97-
bootcamp-cluster
98-
rippled.fork
99-
rippled.p256
100-
rippled.unknown
101-
rippled.unknown.1
102-
dangell-smart-contracts-cluster
103-
xahaud
81+
xahaud
82+
workspace/

tests/integration/test_network.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,23 +85,23 @@ def _test_enable_amendment(cls):
8585

8686

8787
class TestINetGenXrpld(BaseTestConfig):
88-
def test_create_network(cls):
88+
def _test_create_network(cls):
8989
create_network(
9090
"trace",
9191
None,
9292
"xrpl", # protocol
9393
3, # num validators
9494
1, # num peers
9595
21465, # network id
96-
"https://github.com/Transia-RnD/rippled/tree/dilithium-full", # build server
97-
"cc5d2ae913404a864e6ff0d6fe110f4dc8457d6f", # build version
96+
"https://github.com/Transia-RnD/rippled/tree/alphanet-develop", # build server
97+
"f5d78179c9d1fbaf8bff8b77a052e263df90faa1", # build version
9898
True,
9999
3,
100100
"NuDB",
101101
)
102102
print(ee)
103103

104-
def _test_create_ansible(cls):
104+
def test_create_ansible(cls):
105105
# https://github.com/Transia-RnD/rippled/tree/develop
106106
# 9874d47d7fbfe81e4cd78afd5b60ec33124ee2e9
107107
create_ansible(
@@ -111,8 +111,8 @@ def _test_create_ansible(cls):
111111
6, # num validators
112112
2, # num peers
113113
21465, # network id
114-
"https://github.com/XRPLF/rippled/tree/dangell/smart-contracts", # build server
115-
"620415e0bec21389cbd58cebb683e36456f6d71e", # build version
114+
"https://github.com/Transia-RnD/rippled/tree/alphanet-develop", # build server
115+
"f5d78179c9d1fbaf8bff8b77a052e263df90faa1", # build version
116116
True,
117117
3,
118118
"NuDB",
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
FROM nginx:latest
22

3+
# Install curl for healthcheck
4+
RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
5+
36
COPY vl.json /usr/share/nginx/html/vl.json
47

58
EXPOSE 80

xrpld_netgen/main.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,18 @@
3636
get_feature_lines_from_path,
3737
)
3838

39-
basedir = os.path.abspath(os.path.dirname(__file__))
39+
# Package directory for static resources (deploykit, genesis files, default features, etc.)
40+
package_dir = os.path.abspath(os.path.dirname(__file__))
41+
# Use workspace directory for deployments
42+
workspace_dir = os.path.join(os.path.dirname(__file__), "..", "workspace")
43+
basedir = os.path.abspath(workspace_dir)
44+
# Create workspace directory if it doesn't exist
45+
os.makedirs(basedir, exist_ok=True)
4046

4147

4248
def generate_validator_config(protocol: str, network: str) -> str:
4349
try:
44-
config = read_json(f"{basedir}/deploykit/config.json")
50+
config = read_json(f"{package_dir}/deploykit/config.json")
4551
return config[protocol][network]
4652
except Exception as e:
4753
print(e)
@@ -138,7 +144,7 @@ def create_xrpl_standalone_folder(
138144
file.write(dockerfile)
139145

140146
shutil.copyfile(
141-
f"{basedir}/deploykit/{protocol}.entrypoint",
147+
f"{package_dir}/deploykit/{protocol}.entrypoint",
142148
f"{basedir}/{protocol}-{name}/entrypoint",
143149
)
144150
print(f"✅ {bcolors.CYAN}Building docker container...")
@@ -331,7 +337,7 @@ def create_xahau_standalone_folder(
331337
file.write(dockerfile)
332338

333339
shutil.copyfile(
334-
f"{basedir}/deploykit/{protocol}.entrypoint",
340+
f"{package_dir}/deploykit/{protocol}.entrypoint",
335341
f"{basedir}/{protocol}-{name}/entrypoint",
336342
)
337343
print(f"✅ {bcolors.CYAN}Building docker container...")

0 commit comments

Comments
 (0)