Merge branch 'main' of github.com:cardano-scaling/hydra-control-plane…

… into chore/add-prepare-online-node-script
cardano-scaling · Nov 20, 2024 · 0302289 · 0302289
2 parents a204245 + 05df02e
commit 0302289
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -141,7 +141,7 @@ jobs:
       TF_VAR_hydra_scripts_tx_id: 03f8deb122fbbd98af8eb58ef56feda37728ec957d39586b78198a0cf624412a
       TF_VAR_admin_addr: addr_test1vpgcjapuwl7gfnzhzg6svtj0ph3gxu8kyuadudmf0kzsksqrfugfc
       TF_VAR_frontend_image: ghcr.io/cardano-scaling/hydra-doom-frontend:latest
-      TF_VAR_referee_image: ghcr.io/cardano-scaling/hydra-doom-referee:sha-d313547 # latest?
+      TF_VAR_referee_image: ghcr.io/cardano-scaling/hydra-doom-referee:sha-a82bccd # latest?
       TF_VAR_ai_image: ghcr.io/cardano-scaling/hydra-doom-ai:sha-68987ed # latest?
 
     steps:

diff --git a/crates/rpc/src/bin/metric_exporter/main.rs b/crates/rpc/src/bin/metric_exporter/main.rs
@@ -43,7 +43,7 @@ async fn main() -> Result<()> {
         secure: args.secure,
     };
     let socket = Arc::new(HydraSocket::new(
-        connection_info.to_websocket_url().as_str(),
+        &(connection_info.to_websocket_url() + "?history=no"),
         &connection_info.to_authority(),
         &tx,
     ));

diff --git a/crates/rpc/src/model/game/contract/_referee.cbor b/crates/rpc/src/model/game/contract/_referee.cbor
@@ -1 +1 @@
-59071701010033232323232323223225333004323232323253323300a3001300b37540042646464a6646601c6002601e6ea801c4c8c8c8c94ccc054c0600084c8c8c8c94ccc058c02400454ccc064c060dd50028a8010b0a99980b18068008a99980c980c1baa0051500216153330163004001153330193018375400a2a0042c2a66602c60060022a66603260306ea8014540085858c058dd50020a99980a1803980a9baa008132323232323232323232533301e3011301f375400226464646464646464646464646464646464a646464666064604a0142646464646464646464a66607666ebc05d300103d87980001533303b33712664600200244a66608000229000099b8048008cc008008c10c0040180e454ccc0ecc8cc004004068894ccc100004528899299981f1980800498218010998018018008a5030430011533303b300a0021533303b3375e02e0082a66607660180102601600229405280a5014a02940528181f9820001181f000981f001181e000981e0011bac303a001303a00230380013034375466600a030036028264a6466606860560182646464646464646464a66607a6060607c6ea80204c94ccc0f8cdd780d26103d87980001533303e300b0051533303e3375e6e9c070dd38038a99981f18078048a99981f18068018a99981f18070010998060130008a5014a029405280a5014a06eb8c108c0fcdd50040b1820982100118200009820001181f000981f0011bac303c001303c002303a0013036375466600e03403a02c2a66606860440182646464646464646464a66607a6060607c6ea80204c94ccc0f8c02c06854ccc0f8cdd79ba701c374e00e2a66607c601e0122a66607c6601804c002264a66607e605a0022a66607e606460806ea800c4c94ccc100c0dcc104dd50028a99982019baf00501a13301200900114a02c608860826ea800c5854ccc0fcc0b000454ccc0fcc0c8c100dd50020992999820181b98209baa019153330403375e008032266024012002294058c110c104dd50020b0a99981f99b874802000454ccc0fcc03001054ccc0fcc03000c54ccc0fcc03c00c4c0380105280a5014a02c607e6ea80145280a5014a02940dd71821181f9baa008163041304200230400013040002303e001303e0023758607800260780046074002606c6ea8ccc01c06807405854ccc0d0c09cc0d4dd500a099299981aa99981a99baf0114c103d87c800014a22a66606a66ebc045300103d87b800014a2266ebc04530103d87d800013300301d00114a06eb8c0e4c0d8dd500a0b1baf4c0103d87a800022323300100100322533303900114a0264a66606e66e3cdd7181e0010020a51133003003001303c001375e0166ebc024dd780791191980080080191299981a8008a5013253330333375e607000400829444cc00c00c004c0e0004888c8c94ccc0c8c094c0ccdd500089919299981a19baf303900200415333034302230353754002264a66606a6050606c6ea80044c8c8c8c8c8c8c8c8c8c94ccc108c1140084cc0580244c8cc00400402088c94ccc1140084c8c94ccc110c0dc00454ccc11cc118dd50050a8010b0a999822181d8008a99982398231baa00a150021615333044303200115333047304637540142a0042c2a66608860620022a66608e608c6ea8028540085854ccc110cdc3a40100022a66608e608c6ea8028540085858c110dd500489980c00309980c002080709980c982380109800982400118010010b1821800982180118208009820801181f800981f8011bac303d001303d002303b001303737540022c6072606c6ea80045858c0e0c0e4c0e4004c0d0dd5181b981a1baa00116330050030043014303237540026002002444a6660620042980103d87a8000132325333030302300313374a90001981a00125eb804ccc014014004cdc0001a4002606a00660660044464a66605a604000226464a666064606a00426600c0022a0082c6066002605e6ea800c54ccc0b4c09000454ccc0c0c0bcdd50018a8010b0b18169baa0022232533302c301f00113232533303130340021500416375c6064002605c6ea800c54ccc0b0c08c0044c8c94ccc0c4c0d00085401058dd7181900098171baa00316302c375400460526ea8034c0b0c0b4008c0ac004c0ac008c0a4004c0a4008dd618138009813801181280098109baa00b3023302430203754604660406ea800458c8cc004004dd618118049129998110008a60103d87a80001323253330213375e600a60466ea80080584cdd2a40006604a00497ae0133004004001302600230240012302200130203021002375a603e00260366ea8048dd6180e980f180f180f180f180f180f0011bac301c001301c301c001301737540206032602c6ea802058dc3a400c6e1d20041630160013016002375a602800260206ea801cdc3a40002c60226024004602000260186ea8008dc3a40042c601a601c004601800260180046014002600c6ea800452613656375a002ae6955ceaab9e5573eae815d0aba24c101040001
+59072e01010033232323232323223225333004323232323253323300a3001300b37540042646464a6646601c6002601e6ea801c4c8c8c8c94ccc054c0600084c8c8c8c94ccc058c02400454ccc064c060dd50028a8010b0a99980b18068008a99980c980c1baa0051500216153330163004001153330193018375400a2a0042c2a66602c60060022a66603260306ea8014540085858c058dd50020a99980a1803980a9baa008132323232323232323232533301e3011301f375400226464646464646464646464646464646464a64646464666066604c0162646464646464646464a66607860180302a66607866e24cc8c004004894ccc10400452000133700900119801001182200080301d0a99981e191980080080d9129998208008a51132533303f33011009304400213300300300114a060880022a66607860140042a66607866ebc06001054ccc0f0c0340204c02c0045280a5014a029405280a5030403041002303f001303f002303d001303d0023758607600260760046072002606a6ea8ccc0180640700544c94c8ccc0d4c0b00344c8c8c8c8c8c8c8c8c94ccc0f8c0c4c0fcdd5004099299981f980780d8a99981f98058028a99981f99baf374e03a6e9c01c54ccc0fcc04002454ccc0fcc03400c54ccc0fcc0380084cc03009c0045280a5014a029405280a50375c608660806ea802058c108c10c008c104004c104008c0fc004c0fc008dd6181e800981e801181d800981b9baa33300801b01e01715333035302300d1323232323232323232533303e3031303f3754010264a66607e66ebcdd380e9ba70071533303f30100091533303f3300c0270011325333040302e00115333040303330413754006264a666082607060846ea801454ccc104c03407454ccc104cdd780280d8998098048008a5014a02c608a60846ea800c5854ccc100c0b400454ccc100c0ccc104dd50020992999820981c18211baa01a15333041300d01d153330413375e00803426602601200229405280b182298211baa00416153330403370e90040008a9998202999820180800e0a511300c01c15333040300c00415333040300c00315333040300f0031300e00414a029405280a50163040375400a29405280a50375c608660806ea802058c108c10c008c104004c104008c0fc004c0fc008dd6181e800981e801181d800981b9baa33300801b01e0171533303530283036375402a264a66606ca66606c66ebc04930103d87c800014a22a66606c66ebc049300103d87b800014a2266ebc04930103d87d800013300301e00114a06eb8c0e8c0dcdd500a8b1baf4c0103d87a800022323300100100322533303a00114a0264a66607066e3cdd7181e8010020a51133003003001303d001375e0186ebc028dd7a6103d8798000375e01e44646600200200644a66606a00229404c94ccc0cccdd7981c0010020a5113300300300130380012223232533303230253033375400226464a66606866ebcc0e400801054ccc0d0c088c0d4dd5000899299981a9814181b1baa001132323232323232323232533304230450021330160091323300100100822325333045002132325333044303700115333047304637540142a0042c2a66608860760022a66608e608c6ea8028540085854ccc110c0c800454ccc11cc118dd50050a8010b0a99982218188008a99982398231baa00a1500216153330443370e90040008a99982398231baa00a1500216163044375401226603000c266030008201c266032608e00426002609000460040042c6086002608600460820026082004607e002607e0046eb0c0f4004c0f4008c0ec004c0dcdd50008b181c981b1baa001161630383039303900130343754606e60686ea800458cc01400c010c050c0c8dd5000980080091129998188010a60103d87a8000132325333030302300313374a90001981a00125eb804ccc014014004cdc0001a4002606a00660660044464a66605a604000226464a666064606a00426600c0022a0082c6066002605e6ea800c54ccc0b4c09000454ccc0c0c0bcdd50018a8010b0b18169baa0022232533302c301f00113232533303130340021500416375c6064002605c6ea800c54ccc0b0c08c0044c8c94ccc0c4c0d00085401058dd7181900098171baa00316302c375400460526ea8034c0b0c0b4008c0ac004c0ac008c0a4004c0a4008dd618138009813801181280098109baa00b3023302430203754604660406ea800458c8cc004004dd618118049129998110008a60103d87a80001323253330213375e600a60466ea80080584cdd2a40006604a00497ae0133004004001302600230240012302200130203021002375a603e00260366ea8048dd6180e980f180f180f180f180f180f0011bac301c001301c301c001301737540206032602c6ea802058dc3a400c6e1d20041630160013016002375a602800260206ea801cdc3a40002c60226024004602000260186ea8008dc3a40042c601a601c004601800260180046014002600c6ea800452613656375a002ae6955ceaab9e5573eae815d0aba24c101040001
diff --git a/crates/rpc/src/routes/stats.rs b/crates/rpc/src/routes/stats.rs
@@ -1,7 +1,6 @@
 use rocket::{get, serde::json::Json};
 use rocket_errors::anyhow::Result;
 use serde::Serialize;
-use std::collections::HashMap;
 
 #[derive(Debug, Serialize)]
 pub struct GlobalStats {
@@ -25,7 +24,7 @@ pub struct GlobalStats {
 pub async fn global_stats() -> Result<Json<GlobalStats>> {
     // TODO: fetch data from the observer server
     // dummy data for now
-    Ok(Json(GlobalStats{
+    Ok(Json(GlobalStats {
         total_games: 123,
         active_games: 21,
         total_players: 125,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		59071701010033232323232323223225333004323232323253323300a3001300b37540042646464a6646601c6002601e6ea801c4c8c8c8c94ccc054c0600084c8c8c8c94ccc058c02400454ccc064c060dd50028a8010b0a99980b18068008a99980c980c1baa0051500216153330163004001153330193018375400a2a0042c2a66602c60060022a66603260306ea8014540085858c058dd50020a99980a1803980a9baa008132323232323232323232533301e3011301f375400226464646464646464646464646464646464a646464666064604a0142646464646464646464a66607666ebc05d300103d87980001533303b33712664600200244a66608000229000099b8048008cc008008c10c0040180e454ccc0ecc8cc004004068894ccc100004528899299981f1980800498218010998018018008a5030430011533303b300a0021533303b3375e02e0082a66607660180102601600229405280a5014a02940528181f9820001181f000981f001181e000981e0011bac303a001303a00230380013034375466600a030036028264a6466606860560182646464646464646464a66607a6060607c6ea80204c94ccc0f8cdd780d26103d87980001533303e300b0051533303e3375e6e9c070dd38038a99981f18078048a99981f18068018a99981f18070010998060130008a5014a029405280a5014a06eb8c108c0fcdd50040b1820982100118200009820001181f000981f0011bac303c001303c002303a0013036375466600e03403a02c2a66606860440182646464646464646464a66607a6060607c6ea80204c94ccc0f8c02c06854ccc0f8cdd79ba701c374e00e2a66607c601e0122a66607c6601804c002264a66607e605a0022a66607e606460806ea800c4c94ccc100c0dcc104dd50028a99982019baf00501a13301200900114a02c608860826ea800c5854ccc0fcc0b000454ccc0fcc0c8c100dd50020992999820181b98209baa019153330403375e008032266024012002294058c110c104dd50020b0a99981f99b874802000454ccc0fcc03001054ccc0fcc03000c54ccc0fcc03c00c4c0380105280a5014a02c607e6ea80145280a5014a02940dd71821181f9baa008163041304200230400013040002303e001303e0023758607800260780046074002606c6ea8ccc01c06807405854ccc0d0c09cc0d4dd500a099299981aa99981a99baf0114c103d87c800014a22a66606a66ebc045300103d87b800014a2266ebc04530103d87d800013300301d00114a06eb8c0e4c0d8dd500a0b1baf4c0103d87a800022323300100100322533303900114a0264a66606e66e3cdd7181e0010020a51133003003001303c001375e0166ebc024dd780791191980080080191299981a8008a5013253330333375e607000400829444cc00c00c004c0e0004888c8c94ccc0c8c094c0ccdd500089919299981a19baf303900200415333034302230353754002264a66606a6050606c6ea80044c8c8c8c8c8c8c8c8c8c94ccc108c1140084cc0580244c8cc00400402088c94ccc1140084c8c94ccc110c0dc00454ccc11cc118dd50050a8010b0a999822181d8008a99982398231baa00a150021615333044303200115333047304637540142a0042c2a66608860620022a66608e608c6ea8028540085854ccc110cdc3a40100022a66608e608c6ea8028540085858c110dd500489980c00309980c002080709980c982380109800982400118010010b1821800982180118208009820801181f800981f8011bac303d001303d002303b001303737540022c6072606c6ea80045858c0e0c0e4c0e4004c0d0dd5181b981a1baa00116330050030043014303237540026002002444a6660620042980103d87a8000132325333030302300313374a90001981a00125eb804ccc014014004cdc0001a4002606a00660660044464a66605a604000226464a666064606a00426600c0022a0082c6066002605e6ea800c54ccc0b4c09000454ccc0c0c0bcdd50018a8010b0b18169baa0022232533302c301f00113232533303130340021500416375c6064002605c6ea800c54ccc0b0c08c0044c8c94ccc0c4c0d00085401058dd7181900098171baa00316302c375400460526ea8034c0b0c0b4008c0ac004c0ac008c0a4004c0a4008dd618138009813801181280098109baa00b3023302430203754604660406ea800458c8cc004004dd618118049129998110008a60103d87a80001323253330213375e600a60466ea80080584cdd2a40006604a00497ae0133004004001302600230240012302200130203021002375a603e00260366ea8048dd6180e980f180f180f180f180f180f0011bac301c001301c301c001301737540206032602c6ea802058dc3a400c6e1d20041630160013016002375a602800260206ea801cdc3a40002c60226024004602000260186ea8008dc3a40042c601a601c004601800260180046014002600c6ea800452613656375a002ae6955ceaab9e5573eae815d0aba24c101040001
		59072e01010033232323232323223225333004323232323253323300a3001300b37540042646464a6646601c6002601e6ea801c4c8c8c8c94ccc054c0600084c8c8c8c94ccc058c02400454ccc064c060dd50028a8010b0a99980b18068008a99980c980c1baa0051500216153330163004001153330193018375400a2a0042c2a66602c60060022a66603260306ea8014540085858c058dd50020a99980a1803980a9baa008132323232323232323232533301e3011301f375400226464646464646464646464646464646464a64646464666066604c0162646464646464646464a66607860180302a66607866e24cc8c004004894ccc10400452000133700900119801001182200080301d0a99981e191980080080d9129998208008a51132533303f33011009304400213300300300114a060880022a66607860140042a66607866ebc06001054ccc0f0c0340204c02c0045280a5014a029405280a5030403041002303f001303f002303d001303d0023758607600260760046072002606a6ea8ccc0180640700544c94c8ccc0d4c0b00344c8c8c8c8c8c8c8c8c94ccc0f8c0c4c0fcdd5004099299981f980780d8a99981f98058028a99981f99baf374e03a6e9c01c54ccc0fcc04002454ccc0fcc03400c54ccc0fcc0380084cc03009c0045280a5014a029405280a50375c608660806ea802058c108c10c008c104004c104008c0fc004c0fc008dd6181e800981e801181d800981b9baa33300801b01e01715333035302300d1323232323232323232533303e3031303f3754010264a66607e66ebcdd380e9ba70071533303f30100091533303f3300c0270011325333040302e00115333040303330413754006264a666082607060846ea801454ccc104c03407454ccc104cdd780280d8998098048008a5014a02c608a60846ea800c5854ccc100c0b400454ccc100c0ccc104dd50020992999820981c18211baa01a15333041300d01d153330413375e00803426602601200229405280b182298211baa00416153330403370e90040008a9998202999820180800e0a511300c01c15333040300c00415333040300c00315333040300f0031300e00414a029405280a50163040375400a29405280a50375c608660806ea802058c108c10c008c104004c104008c0fc004c0fc008dd6181e800981e801181d800981b9baa33300801b01e0171533303530283036375402a264a66606ca66606c66ebc04930103d87c800014a22a66606c66ebc049300103d87b800014a2266ebc04930103d87d800013300301e00114a06eb8c0e8c0dcdd500a8b1baf4c0103d87a800022323300100100322533303a00114a0264a66607066e3cdd7181e8010020a51133003003001303d001375e0186ebc028dd7a6103d8798000375e01e44646600200200644a66606a00229404c94ccc0cccdd7981c0010020a5113300300300130380012223232533303230253033375400226464a66606866ebcc0e400801054ccc0d0c088c0d4dd5000899299981a9814181b1baa001132323232323232323232533304230450021330160091323300100100822325333045002132325333044303700115333047304637540142a0042c2a66608860760022a66608e608c6ea8028540085854ccc110c0c800454ccc11cc118dd50050a8010b0a99982218188008a99982398231baa00a1500216153330443370e90040008a99982398231baa00a1500216163044375401226603000c266030008201c266032608e00426002609000460040042c6086002608600460820026082004607e002607e0046eb0c0f4004c0f4008c0ec004c0dcdd50008b181c981b1baa001161630383039303900130343754606e60686ea800458cc01400c010c050c0c8dd5000980080091129998188010a60103d87a8000132325333030302300313374a90001981a00125eb804ccc014014004cdc0001a4002606a00660660044464a66605a604000226464a666064606a00426600c0022a0082c6066002605e6ea800c54ccc0b4c09000454ccc0c0c0bcdd50018a8010b0b18169baa0022232533302c301f00113232533303130340021500416375c6064002605c6ea800c54ccc0b0c08c0044c8c94ccc0c4c0d00085401058dd7181900098171baa00316302c375400460526ea8034c0b0c0b4008c0ac004c0ac008c0a4004c0a4008dd618138009813801181280098109baa00b3023302430203754604660406ea800458c8cc004004dd618118049129998110008a60103d87a80001323253330213375e600a60466ea80080584cdd2a40006604a00497ae0133004004001302600230240012302200130203021002375a603e00260366ea8048dd6180e980f180f180f180f180f180f0011bac301c001301c301c001301737540206032602c6ea802058dc3a400c6e1d20041630160013016002375a602800260206ea801cdc3a40002c60226024004602000260186ea8008dc3a40042c601a601c004601800260180046014002600c6ea800452613656375a002ae6955ceaab9e5573eae815d0aba24c101040001