Monero v0.18.3.4 (#605 )

* Monero v0.18.3.4 * Correct `check_weight_and_fee` call * Restore empty test files so CI isn't borked
dockertest 0.5, correct errors from prior update commit
2025-12-15 07:29:25 +00:00 · 2024-09-06 01:43:31 -04:00 · 2024-09-05 23:31:45 -04:00
25 changed files with 176 additions and 161 deletions
--- a/.github/actions/monero-wallet-rpc/action.yml
+++ b/.github/actions/monero-wallet-rpc/action.yml
@@ -5,7 +5,7 @@ inputs:
  version:
    description: "Version to download and run"
    required: false
-    default: v0.18.3.1
+    default: v0.18.3.4

 runs:
  using: "composite"
--- a/.github/actions/monero/action.yml
+++ b/.github/actions/monero/action.yml
@@ -5,7 +5,7 @@ inputs:
  version:
    description: "Version to download and run"
    required: false
-    default: v0.18.3.1
+    default: v0.18.3.4

 runs:
  using: "composite"
--- a/.github/actions/test-dependencies/action.yml
+++ b/.github/actions/test-dependencies/action.yml
@@ -5,7 +5,7 @@ inputs:
  monero-version:
    description: "Monero version to download and run as a regtest node"
    required: false
-    default: v0.18.3.1
+    default: v0.18.3.4

  bitcoin-version:
    description: "Bitcoin version to download and run as a regtest node"
--- a/.github/workflows/monero-tests.yaml
+++ b/.github/workflows/monero-tests.yaml
@@ -50,7 +50,7 @@ jobs:
    # Test against all supported protocol versions
    strategy:
      matrix:
-        version: [v0.17.3.2, v0.18.2.0]
+        version: [v0.17.3.2, v0.18.3.4]

    steps:
      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
@@ -69,7 +69,7 @@ jobs:

      - name: Run Integration Tests
        # Don't run if the the tests workflow also will
-        if: ${{ matrix.version != 'v0.18.2.0' }}
+        if: ${{ matrix.version != 'v0.18.3.4' }}
        run: |
          GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-serai --all-features --test '*'
          GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-simple-request-rpc --test '*'
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -459,8 +459,7 @@ dependencies = [
 [[package]]
 name = "alloy-sol-type-parser"
 version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4691da83dce9c9b4c775dd701c87759f173bd3021cbf2e60cde00c5fe6d7241"
+source = "git+https://github.com/alloy-rs/core?rev=446b9d2fbce12b88456152170709a3eaac929af0#446b9d2fbce12b88456152170709a3eaac929af0"
 dependencies = [
 "serde",
 "winnow 0.6.18",
@@ -1213,18 +1212,21 @@ dependencies = [

 [[package]]
 name = "bollard"
-version = "0.15.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f03db470b3c0213c47e978da93200259a1eb4dae2e5512cba9955e2b540a6fc6"
+checksum = "d41711ad46fda47cd701f6908e59d1bd6b9a2b7464c0d0aeab95c6d37096ff8a"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
 "bollard-stubs",
 "bytes",
 "futures-core",
 "futures-util",
 "hex",
- "http 0.2.12",
- "hyper 0.14.30",
+ "http 1.1.0",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-named-pipe",
+ "hyper-util",
 "hyperlocal",
 "log",
 "pin-project-lite",
@@ -1236,15 +1238,16 @@ dependencies = [
 "thiserror",
 "tokio",
 "tokio-util",
+ "tower-service",
 "url",
 "winapi",
 ]

 [[package]]
 name = "bollard-stubs"
-version = "1.43.0-rc.2"
+version = "1.45.0-rc.26.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b58071e8fd9ec1e930efd28e3a90c1251015872a2ce49f81f36421b86466932e"
+checksum = "6d7c5415e3a6bc6d3e99eff6268e488fd4ee25e7b28c10f08fa6760bd9de16e4"
 dependencies = [
 "serde",
 "serde_repr",
@@ -2227,20 +2230,22 @@ dependencies = [

 [[package]]
 name = "dockertest"
-version = "0.4.0"
-source = "git+https://github.com/orcalabs/dockertest-rs?rev=4dd6ae24738aa6dc5c89444cc822ea4745517493#4dd6ae24738aa6dc5c89444cc822ea4745517493"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8648c989dfd460932144f0ce5c55ff35cf0de758f89ea20e3b3d0d3f5e1cce6"
 dependencies = [
 "anyhow",
 "async-trait",
- "base64 0.21.7",
+ "base64 0.22.1",
 "bollard",
+ "bytes",
 "dyn-clone",
 "futures",
- "lazy_static",
 "rand",
 "secrecy",
 "serde",
 "serde_json",
+ "strum 0.26.3",
 "thiserror",
 "tokio",
 "tracing",
@@ -3402,7 +3407,7 @@ dependencies = [
 "httpdate",
 "itoa",
 "pin-project-lite",
- "socket2 0.4.10",
+ "socket2 0.5.7",
 "tokio",
 "tower-service",
 "tracing",
@@ -3421,6 +3426,7 @@ dependencies = [
 "http 1.1.0",
 "http-body 1.0.1",
 "httparse",
+ "httpdate",
 "itoa",
 "pin-project-lite",
 "smallvec",
@@ -3428,6 +3434,21 @@ dependencies = [
 "want",
 ]

+[[package]]
+name = "hyper-named-pipe"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278"
+dependencies = [
+ "hex",
+ "hyper 1.4.1",
+ "hyper-util",
+ "pin-project-lite",
+ "tokio",
+ "tower-service",
+ "winapi",
+]
+
 [[package]]
 name = "hyper-rustls"
 version = "0.27.3"
@@ -3468,15 +3489,17 @@ dependencies = [

 [[package]]
 name = "hyperlocal"
-version = "0.8.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c"
+checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7"
 dependencies = [
- "futures-util",
 "hex",
- "hyper 0.14.30",
- "pin-project",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-util",
+ "pin-project-lite",
 "tokio",
+ "tower-service",
 ]

 [[package]]
@@ -3932,7 +3955,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
 "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]

 [[package]]
@@ -11063,7 +11086,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -138,9 +138,6 @@ panic = "unwind"
 # https://github.com/rust-lang-nursery/lazy-static.rs/issues/201
 lazy_static = { git = "https://github.com/rust-lang-nursery/lazy-static.rs", rev = "5735630d46572f1e5377c8f2ba0f79d18f53b10c" }

-# Needed due to dockertest's usage of `Rc`s when we need `Arc`s
-dockertest = { git = "https://github.com/orcalabs/dockertest-rs", rev = "4dd6ae24738aa6dc5c89444cc822ea4745517493" }
-
 parking_lot_core = { path = "patches/parking_lot_core" }
 parking_lot = { path = "patches/parking_lot" }
 # wasmtime pulls in an old version for this
@@ -161,6 +158,9 @@ matches = { path = "patches/matches" }
 option-ext = { path = "patches/option-ext" }
 directories-next = { path = "patches/directories-next" }

+# https://github.com/alloy-rs/core/issues/717
+alloy-sol-type-parser = { git = "https://github.com/alloy-rs/core", rev = "446b9d2fbce12b88456152170709a3eaac929af0" }
+
 [workspace.lints.clippy]
 unwrap_or_default = "allow"
 borrow_as_ptr = "deny"
--- a/deny.toml
+++ b/deny.toml
@@ -10,6 +10,7 @@ ignore = [
  "RUSTSEC-2020-0168", # mach is unmaintained
  "RUSTSEC-2021-0139", # https://github.com/serai-dex/serai/228
  "RUSTSEC-2022-0061", # https://github.com/serai-dex/serai/227
+  "RUSTSEC-2024-0370", # proc-macro-error is unmaintained
 ]

 [licenses]
@@ -101,5 +102,5 @@ allow-git = [
  "https://github.com/rust-lang-nursery/lazy-static.rs",
  "https://github.com/serai-dex/substrate-bip39",
  "https://github.com/serai-dex/substrate",
-  "https://github.com/orcalabs/dockertest-rs",
+  "https://github.com/alloy-rs/core",
 ]
--- a/networks/ethereum/src/tests/mod.rs
+++ b/networks/ethereum/src/tests/mod.rs
@@ -6,7 +6,7 @@ use k256::{Scalar, ProjectivePoint};
 use frost::{curve::Secp256k1, Participant, ThresholdKeys, tests::key_gen as frost_key_gen};

 use alloy_core::{
-  primitives::{Address, U256, Bytes, TxKind},
+  primitives::{Address, U256, Bytes, Signature, TxKind},
  hex::FromHex,
 };
 use alloy_consensus::{SignableTransaction, TxLegacy};
@@ -69,7 +69,7 @@ pub async fn send(
  );

  let mut bytes = vec![];
-  tx.encode_with_signature_fields(&sig.into(), &mut bytes);
+  tx.encode_with_signature_fields(&Signature::from(sig), &mut bytes);
  let pending_tx = provider.send_raw_transaction(&bytes).await.ok()?;
  pending_tx.get_receipt().await.ok()
 }
--- a/networks/ethereum/src/tests/router.rs
+++ b/networks/ethereum/src/tests/router.rs
@@ -91,7 +91,6 @@ async fn latest_block_hash(client: &RootProvider<SimpleRequest>) -> [u8; 32] {
    .unwrap()
    .header
    .hash
-    .unwrap()
    .0
 }

--- a/networks/monero/wallet/tests/wallet2_compatibility.rs
+++ b/networks/monero/wallet/tests/wallet2_compatibility.rs
@@ -6,7 +6,7 @@ use serde_json::json;
 use monero_simple_request_rpc::SimpleRequestRpc;
 use monero_wallet::{
  transaction::Transaction,
-  rpc::Rpc,
+  rpc::{FeePriority, Rpc},
  address::{Network, SubaddressIndex, MoneroAddress},
  extra::{MAX_ARBITRARY_DATA_SIZE, Extra, PaymentId},
  Scanner,
@@ -102,11 +102,7 @@ async fn from_wallet_rpc_to_self(spec: AddressSpec) {
    .unwrap();
  let tx_hash = hex::decode(tx.tx_hash).unwrap().try_into().unwrap();

-  // TODO: Needs https://github.com/monero-project/monero/pull/9260
-  // let fee_rate = daemon_rpc
-  //   .get_fee_rate(FeePriority::Unimportant)
-  //   .await
-  //   .unwrap();
+  let fee_rate = daemon_rpc.get_fee_rate(FeePriority::Unimportant).await.unwrap();

  // unlock it
  let block = runner::mine_until_unlocked(&daemon_rpc, &wallet_rpc_addr, tx_hash).await;
@@ -122,8 +118,7 @@ async fn from_wallet_rpc_to_self(spec: AddressSpec) {
    scanner.scan(&daemon_rpc, &block).await.unwrap().not_additionally_locked().swap_remove(0);
  assert_eq!(output.transaction(), tx_hash);

-  // TODO: Needs https://github.com/monero-project/monero/pull/9260
-  // runner::check_weight_and_fee(&tx, fee_rate);
+  runner::check_weight_and_fee(&daemon_rpc.get_transaction(tx_hash).await.unwrap(), fee_rate);

  match spec {
    AddressSpec::Subaddress(index) => {
--- a/orchestration/dev/networks/monero/hashes-v0.18.3.1.txt
+++ b/orchestration/dev/networks/monero/hashes-v0.18.3.1.txt
@@ -1,49 +0,0 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-# This GPG-signed message exists to confirm the SHA256 sums of Monero binaries.
-#
-# Please verify the signature against the key for binaryFate in the
-# source code repository (/utils/gpg_keys).
-#
-#
-## CLI
-fc6a93eabc3fd524ff1ceedbf502b8d43c61a7805728b7ed5f9e7204e26b91f5  monero-android-armv7-v0.18.3.1.tar.bz2
-6d9c7d31942dde86ce39757fd55027448ceb260b60b3c8d32ed018211eb4f1e4  monero-android-armv8-v0.18.3.1.tar.bz2
-3e2d9964a9e52c146b4d26b5eb53e691b3ba88e2468dc4fbfee4c318a367a90e  monero-freebsd-x64-v0.18.3.1.tar.bz2
-2ea2c8898cbab88f49423f4f6c15f2a94046cb4bbe827493dd061edc0fd5f1ca  monero-linux-armv7-v0.18.3.1.tar.bz2
-445032e88dc07e51ac5fff7034752be530d1c4117d8d605100017bcd87c7b21f  monero-linux-armv8-v0.18.3.1.tar.bz2
-23af572fdfe3459b9ab97e2e9aa7e3c11021c955d6064b801a27d7e8c21ae09d  monero-linux-x64-v0.18.3.1.tar.bz2
-c8553558dece79a4c23e1114fdf638b15e46899d7cf0af41457f18bbbee83986  monero-linux-x86-v0.18.3.1.tar.bz2
-915288b023cb5811e626e10052adc6ac5323dd283c5a25b91059b0fb86a21fb6  monero-mac-armv8-v0.18.3.1.tar.bz2
-7f8bd9364ef16482b418aa802a65be0e4cc660c794bb5d77b2d17bc84427883a  monero-mac-x64-v0.18.3.1.tar.bz2
-35dcc4bee4caad3442659d37837e0119e4649a77f2e3b5e80dd6d9b8fc4fb6ad  monero-win-x64-v0.18.3.1.zip
-5bcbeddce32b50ebe18289d0560ebf779441526ec84d73b6a83094f092365271  monero-win-x86-v0.18.3.1.zip
-4d217e2aa61a6f105054dddbab52c0301f52766e88783de2480316c5a8661e0c  monero-source-v0.18.3.1.tar.bz2
-#
-## GUI
-792271147ad71a2eaa02fc37d61d72cd92f2f9857dcc09ea032f48481f87e279  monero-gui-install-win-x64-v0.18.3.1.exe
-06f6e600db51205116d52522964cf9b96337d7b5cb1e101730ccb0039b30e15b  monero-gui-linux-x64-v0.18.3.1.tar.bz2
-b0c8d07f8d8ade49d08419b196ddb9f691717ef05cae066e220db707e4dfedc4  monero-gui-mac-armv8-v0.18.3.1.dmg
-8ae53f0908f9bc03452f23d5092bf1eb1d2ad9f1224580486b486cf0a2020401  monero-gui-mac-x64-v0.18.3.1.dmg
-f263ce5863fd87ea959f79420e28ef0002649fa02bd57ae34efda926bdcf1a70  monero-gui-win-x64-v0.18.3.1.zip
-045a84e343423a62ed617f200465b290267ff0a071375fdfc49ea02dcdb1a785  monero-gui-source-v0.18.3.1.tar.bz2
-#
-#
-# ~binaryFate
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAEBCAAdFiEEgaxZH+nEtlxYBq/D8K9NRioL35IFAmUljRIACgkQ8K9NRioL
-35IJjBAAqzoh4saUkTPWPAXOdLMLEcpJ5TvzQpImBNKzegjVMV4VYm+0llZw5uMP
-/9OvkW7Ho5nLfslsF+C/qkfTc+EXm4h7J7iOyIpj8sr52RttfXjecEla5Ah75qZk
-X9puVFd18nEDMktrNp4tkx/WQvzxpPAnsIRwsrX912rOc0jPwqCZ1DFn5JsB4KsK
-dSjyWdRjKuxbMv+97GEpxiG6wAkN5lnEzj9LFZcaOLHAtBhxfZhwDBWTWFdPp2cM
-TL3dNkMgpONGBEpX/7PJTFbmfba8gRZy7jXFVI0KqLLJC+6vpfGGr+NSX1zdIqrR
-Z0Dvl3AA43E/Cjl5ma4L381wEul+7qFB2HN+fB1S6nNHzn/zWVepjD4bvgPvQiVI
-d7PK5jhrX9c0XkR4kQrtPoONJW6blhoGiM2CWCfrifXzGA51WvZ1Vc5s8yuUG2p7
-e5+7c6AWFqOIP/8RexPx4ViYmFqE59P9/JCs+JRNgo7A2/JHGCyjdZalmt3/79Bf
-aBmfv5mcPe/zPbngU9W6DfKbysYozv2/IQ5nUknU8Qgnaq3PADN2Xx5GlAsC69e0
-tZid955OAmtVzMjNO0KPiGEea2t/a8f3lSir2Irdz/LwIv8RID5/VeyafnUoOvGl
-kv15IYnJAQ7vjlskoE/Tzaym/LSaILOHzU5CskI/HjG+7P50mo4=
-=6gw4
-----END PGP SIGNATURE-----
--- a/orchestration/dev/networks/monero/hashes-v0.18.3.4.txt
+++ b/orchestration/dev/networks/monero/hashes-v0.18.3.4.txt
@@ -0,0 +1,50 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+# This GPG-signed message exists to confirm the SHA256 sums of Monero binaries.
+#
+# Please verify the signature against the key for binaryFate in the
+# source code repository (/utils/gpg_keys).
+#
+#
+## CLI
+15e4d7dfc2f9261a0a452b0f8fd157c33cdbc8a896e23d883ddd13e2480a3800  monero-android-armv7-v0.18.3.4.tar.bz2
+d9c9249d1408822ce36b346c6b9fb6b896cda16714d62117fb1c588a5201763c  monero-android-armv8-v0.18.3.4.tar.bz2
+360a551388922c8991a9ba4abaa88676b0fc7ec1fa4d0f4b5c0500847e0b946c  monero-freebsd-x64-v0.18.3.4.tar.bz2
+354603c56446fb0551cdd6933bce5a13590b7881e05979b7ec25d89e7e59a0e2  monero-linux-armv7-v0.18.3.4.tar.bz2
+33ca2f0055529d225b61314c56370e35606b40edad61c91c859f873ed67a1ea7  monero-linux-armv8-v0.18.3.4.tar.bz2
+88739a1521b9fda3154540268e416c7af016ed7857041c76ab8ed7d7674c71ca  monero-linux-riscv64-v0.18.3.4.tar.bz2
+51ba03928d189c1c11b5379cab17dd9ae8d2230056dc05c872d0f8dba4a87f1d  monero-linux-x64-v0.18.3.4.tar.bz2
+d7ca0878abff2919a0104d7ed29d9c35df9ca0ea1b6fb4ebf6c8f7607ffb9e41  monero-linux-x86-v0.18.3.4.tar.bz2
+44520cb3a05c2518ca9aeae1b2e3080fe2bba1e3596d014ceff1090dfcba8ab4  monero-mac-armv8-v0.18.3.4.tar.bz2
+32c449f562216d3d83154e708471236d07db7477d6b67f1936a0a85a5005f2b8  monero-mac-x64-v0.18.3.4.tar.bz2
+54a66db6c892b2a0999754841f4ca68511741b88ea3ab20c7cd504a027f465f5  monero-win-x64-v0.18.3.4.zip
+1a9824742aa1587023c3bddea788c115940cfd49371c78a8dd62c40113132d01  monero-win-x86-v0.18.3.4.zip
+7d4845ec0a3b52404d41785da348ec33509f0a5981e8a27c5fa55b18d696e139  monero-source-v0.18.3.4.tar.bz2
+#
+## GUI
+63349d5a7637cd0c5d1693a1a2e910a92cbb123903d57667077a36454845d7bf  monero-gui-install-win-x64-v0.18.3.4.exe
+2866f3a2be30e4c4113e6274cad1d6698f81c37ceebc6e8f084c57230a0f70a6  monero-gui-linux-x64-v0.18.3.4.tar.bz2
+eedbf827513607a3ef579077dacd573e65892b199102effef97dff9d73138ca6  monero-gui-mac-armv8-v0.18.3.4.dmg
+54eb151d7511a9f26130864e2c02f258344803b2b68311c8be29850d7faef359  monero-gui-mac-x64-v0.18.3.4.dmg
+b5d42dddd722e728e480337f89038c8ea606c6507bf0c88ddf2af25050c9b751  monero-gui-win-x64-v0.18.3.4.zip
+2f1d643bb2cc08e5eb334a6bfd649b0aa95ceb6178ff2f90448d5ef8d2a752a6  monero-gui-source-v0.18.3.4.tar.bz2
+#
+#
+# ~binaryFate
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEgaxZH+nEtlxYBq/D8K9NRioL35IFAmbF8bAACgkQ8K9NRioL
+35KQAQ/7BP9j0Tx+zlFs3zbVIFXzfoPbGo2/uerM4xUWX/NUoI7XDTGWV2lpcR1x
+o6eqstbuHciY0Aj2MsICsdqD+1PYW0EBZlfNLMrk161c3nQMJcjCE65uIhbLkOSs
+6SUakmpxkueQOE/Ug5Afaa/JBATVTxLTmqSCI7Ai9NplF+6KNauXQXNrlwO/gHcd
+whYDmsqp2JyOtMpMlpOckzLgg7Oroj7B0LBf78Z13p1naUyPooBaIEXSdKm5g2HI
+vPd+z1bOVIluqPBnYWUwL7EmXy08/broejHGliQ+2iY9IsmDDx6rnSe/oprNEDic
+l+/w3KvPcTkBh8hJLVDyYieYdVYHqOktIPlR1dKV512CnuP1ljr/CXjJmkAkXHlg
+bObMUCIM9UYqp1I+KDaArjYNbzkHK02Lu6sak49GXgEuq66m9t4isF2GdcHrbERs
+cLGsnhkTO2LtnGcziOC2l9XSzL41swxe0GrkK0rdeiyDCGAlb7hllevFy7zlT90l
+Jw670TyFVBs8fUFHk/tOtT0ivSDJJg8m9waBzi/46ksOvuid6p3P3a0agqu3uclj
+rscSpk0JS3E/3+A/N0IaiTmUO5zSjbsCrSnxQjcfrRRtERL+6JVHFVlW+nJzYWWH
+u0O7bNZSqEruR4aTEtsddLgs57I10thDR5SUONuAqbEq8EYN8OE=
+=aLFR
+-----END PGP SIGNATURE-----
--- a/orchestration/src/networks/monero.rs
+++ b/orchestration/src/networks/monero.rs
@@ -10,7 +10,7 @@ fn monero_internal(
  monero_binary: &str,
  ports: &str,
 ) {
-  const MONERO_VERSION: &str = "0.18.3.1";
+  const MONERO_VERSION: &str = "0.18.3.4";

  let arch = match std::env::consts::ARCH {
    // We probably would run this without issues yet it's not worth needing to provide support for
--- a/orchestration/testnet/networks/monero/hashes-v0.18.3.1.txt
+++ b/orchestration/testnet/networks/monero/hashes-v0.18.3.1.txt
@@ -1,49 +0,0 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-# This GPG-signed message exists to confirm the SHA256 sums of Monero binaries.
-#
-# Please verify the signature against the key for binaryFate in the
-# source code repository (/utils/gpg_keys).
-#
-#
-## CLI
-fc6a93eabc3fd524ff1ceedbf502b8d43c61a7805728b7ed5f9e7204e26b91f5  monero-android-armv7-v0.18.3.1.tar.bz2
-6d9c7d31942dde86ce39757fd55027448ceb260b60b3c8d32ed018211eb4f1e4  monero-android-armv8-v0.18.3.1.tar.bz2
-3e2d9964a9e52c146b4d26b5eb53e691b3ba88e2468dc4fbfee4c318a367a90e  monero-freebsd-x64-v0.18.3.1.tar.bz2
-2ea2c8898cbab88f49423f4f6c15f2a94046cb4bbe827493dd061edc0fd5f1ca  monero-linux-armv7-v0.18.3.1.tar.bz2
-445032e88dc07e51ac5fff7034752be530d1c4117d8d605100017bcd87c7b21f  monero-linux-armv8-v0.18.3.1.tar.bz2
-23af572fdfe3459b9ab97e2e9aa7e3c11021c955d6064b801a27d7e8c21ae09d  monero-linux-x64-v0.18.3.1.tar.bz2
-c8553558dece79a4c23e1114fdf638b15e46899d7cf0af41457f18bbbee83986  monero-linux-x86-v0.18.3.1.tar.bz2
-915288b023cb5811e626e10052adc6ac5323dd283c5a25b91059b0fb86a21fb6  monero-mac-armv8-v0.18.3.1.tar.bz2
-7f8bd9364ef16482b418aa802a65be0e4cc660c794bb5d77b2d17bc84427883a  monero-mac-x64-v0.18.3.1.tar.bz2
-35dcc4bee4caad3442659d37837e0119e4649a77f2e3b5e80dd6d9b8fc4fb6ad  monero-win-x64-v0.18.3.1.zip
-5bcbeddce32b50ebe18289d0560ebf779441526ec84d73b6a83094f092365271  monero-win-x86-v0.18.3.1.zip
-4d217e2aa61a6f105054dddbab52c0301f52766e88783de2480316c5a8661e0c  monero-source-v0.18.3.1.tar.bz2
-#
-## GUI
-792271147ad71a2eaa02fc37d61d72cd92f2f9857dcc09ea032f48481f87e279  monero-gui-install-win-x64-v0.18.3.1.exe
-06f6e600db51205116d52522964cf9b96337d7b5cb1e101730ccb0039b30e15b  monero-gui-linux-x64-v0.18.3.1.tar.bz2
-b0c8d07f8d8ade49d08419b196ddb9f691717ef05cae066e220db707e4dfedc4  monero-gui-mac-armv8-v0.18.3.1.dmg
-8ae53f0908f9bc03452f23d5092bf1eb1d2ad9f1224580486b486cf0a2020401  monero-gui-mac-x64-v0.18.3.1.dmg
-f263ce5863fd87ea959f79420e28ef0002649fa02bd57ae34efda926bdcf1a70  monero-gui-win-x64-v0.18.3.1.zip
-045a84e343423a62ed617f200465b290267ff0a071375fdfc49ea02dcdb1a785  monero-gui-source-v0.18.3.1.tar.bz2
-#
-#
-# ~binaryFate
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAEBCAAdFiEEgaxZH+nEtlxYBq/D8K9NRioL35IFAmUljRIACgkQ8K9NRioL
-35IJjBAAqzoh4saUkTPWPAXOdLMLEcpJ5TvzQpImBNKzegjVMV4VYm+0llZw5uMP
-/9OvkW7Ho5nLfslsF+C/qkfTc+EXm4h7J7iOyIpj8sr52RttfXjecEla5Ah75qZk
-X9puVFd18nEDMktrNp4tkx/WQvzxpPAnsIRwsrX912rOc0jPwqCZ1DFn5JsB4KsK
-dSjyWdRjKuxbMv+97GEpxiG6wAkN5lnEzj9LFZcaOLHAtBhxfZhwDBWTWFdPp2cM
-TL3dNkMgpONGBEpX/7PJTFbmfba8gRZy7jXFVI0KqLLJC+6vpfGGr+NSX1zdIqrR
-Z0Dvl3AA43E/Cjl5ma4L381wEul+7qFB2HN+fB1S6nNHzn/zWVepjD4bvgPvQiVI
-d7PK5jhrX9c0XkR4kQrtPoONJW6blhoGiM2CWCfrifXzGA51WvZ1Vc5s8yuUG2p7
-e5+7c6AWFqOIP/8RexPx4ViYmFqE59P9/JCs+JRNgo7A2/JHGCyjdZalmt3/79Bf
-aBmfv5mcPe/zPbngU9W6DfKbysYozv2/IQ5nUknU8Qgnaq3PADN2Xx5GlAsC69e0
-tZid955OAmtVzMjNO0KPiGEea2t/a8f3lSir2Irdz/LwIv8RID5/VeyafnUoOvGl
-kv15IYnJAQ7vjlskoE/Tzaym/LSaILOHzU5CskI/HjG+7P50mo4=
-=6gw4
-----END PGP SIGNATURE-----
--- a/orchestration/testnet/networks/monero/hashes-v0.18.3.4.txt
+++ b/orchestration/testnet/networks/monero/hashes-v0.18.3.4.txt
@@ -0,0 +1,50 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+# This GPG-signed message exists to confirm the SHA256 sums of Monero binaries.
+#
+# Please verify the signature against the key for binaryFate in the
+# source code repository (/utils/gpg_keys).
+#
+#
+## CLI
+15e4d7dfc2f9261a0a452b0f8fd157c33cdbc8a896e23d883ddd13e2480a3800  monero-android-armv7-v0.18.3.4.tar.bz2
+d9c9249d1408822ce36b346c6b9fb6b896cda16714d62117fb1c588a5201763c  monero-android-armv8-v0.18.3.4.tar.bz2
+360a551388922c8991a9ba4abaa88676b0fc7ec1fa4d0f4b5c0500847e0b946c  monero-freebsd-x64-v0.18.3.4.tar.bz2
+354603c56446fb0551cdd6933bce5a13590b7881e05979b7ec25d89e7e59a0e2  monero-linux-armv7-v0.18.3.4.tar.bz2
+33ca2f0055529d225b61314c56370e35606b40edad61c91c859f873ed67a1ea7  monero-linux-armv8-v0.18.3.4.tar.bz2
+88739a1521b9fda3154540268e416c7af016ed7857041c76ab8ed7d7674c71ca  monero-linux-riscv64-v0.18.3.4.tar.bz2
+51ba03928d189c1c11b5379cab17dd9ae8d2230056dc05c872d0f8dba4a87f1d  monero-linux-x64-v0.18.3.4.tar.bz2
+d7ca0878abff2919a0104d7ed29d9c35df9ca0ea1b6fb4ebf6c8f7607ffb9e41  monero-linux-x86-v0.18.3.4.tar.bz2
+44520cb3a05c2518ca9aeae1b2e3080fe2bba1e3596d014ceff1090dfcba8ab4  monero-mac-armv8-v0.18.3.4.tar.bz2
+32c449f562216d3d83154e708471236d07db7477d6b67f1936a0a85a5005f2b8  monero-mac-x64-v0.18.3.4.tar.bz2
+54a66db6c892b2a0999754841f4ca68511741b88ea3ab20c7cd504a027f465f5  monero-win-x64-v0.18.3.4.zip
+1a9824742aa1587023c3bddea788c115940cfd49371c78a8dd62c40113132d01  monero-win-x86-v0.18.3.4.zip
+7d4845ec0a3b52404d41785da348ec33509f0a5981e8a27c5fa55b18d696e139  monero-source-v0.18.3.4.tar.bz2
+#
+## GUI
+63349d5a7637cd0c5d1693a1a2e910a92cbb123903d57667077a36454845d7bf  monero-gui-install-win-x64-v0.18.3.4.exe
+2866f3a2be30e4c4113e6274cad1d6698f81c37ceebc6e8f084c57230a0f70a6  monero-gui-linux-x64-v0.18.3.4.tar.bz2
+eedbf827513607a3ef579077dacd573e65892b199102effef97dff9d73138ca6  monero-gui-mac-armv8-v0.18.3.4.dmg
+54eb151d7511a9f26130864e2c02f258344803b2b68311c8be29850d7faef359  monero-gui-mac-x64-v0.18.3.4.dmg
+b5d42dddd722e728e480337f89038c8ea606c6507bf0c88ddf2af25050c9b751  monero-gui-win-x64-v0.18.3.4.zip
+2f1d643bb2cc08e5eb334a6bfd649b0aa95ceb6178ff2f90448d5ef8d2a752a6  monero-gui-source-v0.18.3.4.tar.bz2
+#
+#
+# ~binaryFate
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEgaxZH+nEtlxYBq/D8K9NRioL35IFAmbF8bAACgkQ8K9NRioL
+35KQAQ/7BP9j0Tx+zlFs3zbVIFXzfoPbGo2/uerM4xUWX/NUoI7XDTGWV2lpcR1x
+o6eqstbuHciY0Aj2MsICsdqD+1PYW0EBZlfNLMrk161c3nQMJcjCE65uIhbLkOSs
+6SUakmpxkueQOE/Ug5Afaa/JBATVTxLTmqSCI7Ai9NplF+6KNauXQXNrlwO/gHcd
+whYDmsqp2JyOtMpMlpOckzLgg7Oroj7B0LBf78Z13p1naUyPooBaIEXSdKm5g2HI
+vPd+z1bOVIluqPBnYWUwL7EmXy08/broejHGliQ+2iY9IsmDDx6rnSe/oprNEDic
+l+/w3KvPcTkBh8hJLVDyYieYdVYHqOktIPlR1dKV512CnuP1ljr/CXjJmkAkXHlg
+bObMUCIM9UYqp1I+KDaArjYNbzkHK02Lu6sak49GXgEuq66m9t4isF2GdcHrbERs
+cLGsnhkTO2LtnGcziOC2l9XSzL41swxe0GrkK0rdeiyDCGAlb7hllevFy7zlT90l
+Jw670TyFVBs8fUFHk/tOtT0ivSDJJg8m9waBzi/46ksOvuid6p3P3a0agqu3uclj
+rscSpk0JS3E/3+A/N0IaiTmUO5zSjbsCrSnxQjcfrRRtERL+6JVHFVlW+nJzYWWH
+u0O7bNZSqEruR4aTEtsddLgs57I10thDR5SUONuAqbEq8EYN8OE=
+=aLFR
+-----END PGP SIGNATURE-----
--- a/processor/Cargo.toml
+++ b/processor/Cargo.toml
@@ -77,7 +77,7 @@ sp-application-crypto = { git = "https://github.com/serai-dex/substrate", defaul

 ethereum-serai = { path = "../networks/ethereum", default-features = false, features = ["tests"] }

-dockertest = "0.4"
+dockertest = "0.5"
 serai-docker-tests = { path = "../tests/docker" }

 [features]
--- a/processor/src/networks/ethereum.rs
+++ b/processor/src/networks/ethereum.rs
@@ -437,8 +437,7 @@ impl<D: Db> Network for Ethereum<D> {
      .map_err(|_| NetworkError::ConnectionError)?
      .ok_or(NetworkError::ConnectionError)?
      .header
-      .number
-      .unwrap();
+      .number;
    // Error if there hasn't been a full epoch yet
    if actual_number < 32 {
      Err(NetworkError::ConnectionError)?
@@ -467,7 +466,6 @@ impl<D: Db> Network for Ethereum<D> {
        .ok_or(NetworkError::ConnectionError)?
        .header
        .hash
-        .unwrap()
        .into()
    };

@@ -480,7 +478,7 @@ impl<D: Db> Network for Ethereum<D> {
      .ok_or(NetworkError::ConnectionError)?
      .header;

-    let end_hash = end_header.hash.unwrap().into();
+    let end_hash = end_header.hash.into();
    let time = end_header.timestamp;

    Ok(Epoch { prior_end_hash, start: start.try_into().unwrap(), end_hash, time })
@@ -813,7 +811,6 @@ impl<D: Db> Network for Ethereum<D> {
      .unwrap()
      .header
      .number
-      .unwrap()
      .try_into()
      .unwrap()
  }
@@ -921,13 +918,13 @@ impl<D: Db> Network for Ethereum<D> {
      .into(),
    };

-    use ethereum_serai::alloy::consensus::SignableTransaction;
+    use ethereum_serai::alloy::{primitives::Signature, consensus::SignableTransaction};
    let sig = k256::ecdsa::SigningKey::from(k256::elliptic_curve::NonZeroScalar::new(key).unwrap())
      .sign_prehash_recoverable(tx.signature_hash().as_ref())
      .unwrap();

    let mut bytes = vec![];
-    tx.encode_with_signature_fields(&sig.into(), &mut bytes);
+    tx.encode_with_signature_fields(&Signature::from(sig), &mut bytes);
    let pending_tx = self.provider.send_raw_transaction(&bytes).await.ok().unwrap();

    // Mine an epoch containing this TX
--- a/substrate/client/Cargo.toml
+++ b/substrate/client/Cargo.toml
@@ -53,7 +53,7 @@ schnorrkel = { path = "../../crypto/schnorrkel", package = "frost-schnorrkel" }

 tokio = "1"

-dockertest = "0.4"
+dockertest = "0.5"
 serai-docker-tests = { path = "../../tests/docker" }

 [features]
--- a/tests/coordinator/Cargo.toml
+++ b/tests/coordinator/Cargo.toml
@@ -39,6 +39,6 @@ borsh = { version = "1", features = ["de_strict_order"] }

 tokio = { version = "1", features = ["time"] }

-dockertest = "0.4"
+dockertest = "0.5"
 serai-docker-tests = { path = "../docker" }
 serai-message-queue-tests = { path = "../message-queue" }
--- a/tests/full-stack/Cargo.toml
+++ b/tests/full-stack/Cargo.toml
@@ -40,7 +40,7 @@ serai-client = { path = "../../substrate/client", features = ["serai"] }

 tokio = { version = "1", features = ["time"] }

-dockertest = "0.4"
+dockertest = "0.5"
 serai-docker-tests = { path = "../docker" }
 serai-message-queue-tests = { path = "../message-queue" }
 serai-processor-tests = { path = "../processor" }
--- a/tests/message-queue/Cargo.toml
+++ b/tests/message-queue/Cargo.toml
@@ -28,5 +28,5 @@ serai-primitives = { path = "../../substrate/primitives" }
 serai-message-queue = { path = "../../message-queue" }

 tokio = { version = "1", features = ["time"] }
-dockertest = "0.4"
+dockertest = "0.5"
 serai-docker-tests = { path = "../docker" }
--- a/tests/processor/Cargo.toml
+++ b/tests/processor/Cargo.toml
@@ -48,6 +48,6 @@ tokio = { version = "1", features = ["time"] }

 processor = { package = "serai-processor", path = "../../processor", features = ["bitcoin", "ethereum", "monero"] }

-dockertest = "0.4"
+dockertest = "0.5"
 serai-docker-tests = { path = "../docker" }
 serai-message-queue-tests = { path = "../message-queue" }
--- a/tests/processor/src/lib.rs
+++ b/tests/processor/src/lib.rs
@@ -378,8 +378,7 @@ impl Coordinator {
          .unwrap()
          .unwrap()
          .header
-          .number
-          .unwrap();
+          .number;
        // We mine 96 blocks to mine one epoch, then cause its finalization
        provider.raw_request::<_, ()>("anvil_mine".into(), [96]).await.unwrap();
        let end_of_epoch = start + 31;
@@ -389,8 +388,7 @@ impl Coordinator {
          .unwrap()
          .unwrap()
          .header
-          .hash
-          .unwrap();
+          .hash;

        let state = provider
          .raw_request::<_, String>("anvil_dumpState".into(), ())
--- a/tests/processor/src/networks.rs
+++ b/tests/processor/src/networks.rs
@@ -305,7 +305,7 @@ impl Wallet {
        use std::sync::Arc;
        use ethereum_serai::{
          alloy::{
-            primitives::{U256, TxKind},
+            primitives::{U256, Signature, TxKind},
            sol_types::SolCall,
            simple_request_transport::SimpleRequest,
            consensus::{TxLegacy, SignableTransaction},
@@ -355,7 +355,7 @@ impl Wallet {
              .unwrap();

            let mut bytes = vec![];
-            tx.encode_with_signature_fields(&sig, &mut bytes);
+            tx.encode_with_signature_fields(&Signature::from(sig), &mut bytes);
            let _ = provider.send_raw_transaction(&bytes).await.unwrap();

            provider.raw_request::<_, ()>("anvil_mine".into(), [96]).await.unwrap();
@@ -395,7 +395,7 @@ impl Wallet {
            .unwrap();

        let mut bytes = vec![];
-        tx.encode_with_signature_fields(&sig.into(), &mut bytes);
+        tx.encode_with_signature_fields(&Signature::from(sig), &mut bytes);

        // We drop the bottom 10 decimals
        (
--- a/tests/reproducible-runtime/Cargo.toml
+++ b/tests/reproducible-runtime/Cargo.toml
@@ -20,7 +20,7 @@ workspace = true
 rand_core = "0.6"
 hex = "0.4"

-dockertest = "0.4"
+dockertest = "0.5"
 serai-docker-tests = { path = "../docker" }

 tokio = { version = "1", features = ["time"] }
Author	SHA1	Message	Date
Luke Parker	88440807e1	Monero v0.18.3.4 (#605 ) * Monero v0.18.3.4 * Correct `check_weight_and_fee` call * Restore empty test files so CI isn't borked	2024-09-06 01:43:31 -04:00
Luke Parker	c1a9256cc5	dockertest 0.5, correct errors from prior update commit	2024-09-05 23:31:45 -04:00