Merge branch 'main' into session-key

maxgttph · maxgttph · commit 111adc5c88d8 · 2025-05-12T17:24:02.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,3 +22,4 @@ edition = "2021"
 
 [patch.crates-io]
 sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" }
+# boundless-market = { git = "https://github.com/Hyle-org/boundless.git" }
diff --git a/config.toml b/config.toml
@@ -1,6 +1,6 @@
 id = "hyle-scaffold-app"
 rest_server_port = 4000
-da_address = "127.0.0.1:4141"
+da_read_from = "127.0.0.1:4141"
 rest_server_max_body_size = 10_485_760
 data_directory = "data"
 
diff --git a/front/.env.production b/front/.env.production
@@ -1,4 +1,6 @@
-VITE_SERVER_BASE_URL=https://wallet.devnet.hyle.eu/api
-VITE_NODE_BASE_URL=https://rest-api.devnet.hyle.eu
-VITE_INDEXER_BASE_URL=https://indexer.devnet.hyle.eu
+VITE_SERVER_BASE_URL=https://wallet.testnet.hyle.eu
+VITE_WS_URL=wss://wallet.testnet.hyle.eu/ws
+VITE_NODE_BASE_URL=https://node.testnet.hyle.eu
+VITE_INDEXER_BASE_URL=https://indexer.testnet.hyle.eu
 VITE_TX_EXPLORER_URL=https://hyleou.hyle.eu/
+VITE_FAUCET_URL=https://faucet.testnet.hyle.eu

Original file line number	Diff line number	Diff line change
`@@ -22,3 +22,4 @@ edition = "2021"`
`22`	`22`
`23`	`23`	`[patch.crates-io]`
`24`	`24`	`sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" }`
	`25`	`+# boundless-market = { git = "https://github.com/Hyle-org/boundless.git" }`