From 807572199c8a26ba3b74a0c97d7291393fef48a7 Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Wed, 5 Nov 2025 19:11:33 -0500 Subject: [PATCH] Update misc versions --- .github/actions/bitcoin/action.yml | 2 +- .github/actions/build-dependencies/action.yml | 6 +-- .github/actions/monero-wallet-rpc/action.yml | 2 +- .github/actions/monero/action.yml | 2 +- .github/actions/test-dependencies/action.yml | 4 +- .github/workflows/daily-deny.yml | 2 +- .github/workflows/lint.yml | 16 +++--- networks/ethereum/build-contracts/src/lib.rs | 6 +-- .../ethereum/schnorr/contracts/Schnorr.sol | 2 +- .../schnorr/contracts/tests/Schnorr.sol | 2 +- .../dev/networks/monero/hashes-v0.18.4.2.txt | 50 ------------------- .../dev/networks/monero/hashes-v0.18.4.3.txt | 50 +++++++++++++++++++ orchestration/runtime/Dockerfile | 6 +-- orchestration/src/networks/bitcoin.rs | 2 +- orchestration/src/networks/monero.rs | 2 +- orchestration/src/processor.rs | 4 +- .../ethereum/deployer/contracts/Deployer.sol | 2 +- processor/ethereum/erc20/contracts/IERC20.sol | 2 +- .../ethereum/router/contracts/IRouter.sol | 2 +- .../ethereum/router/contracts/Router.sol | 4 +- .../router/contracts/tests/CreateAddress.sol | 2 +- .../ethereum/router/contracts/tests/ERC20.sol | 2 +- .../router/contracts/tests/Reentrancy.sol | 2 +- rust-toolchain.toml | 2 +- spec/Getting Started.md | 4 +- 25 files changed, 90 insertions(+), 90 deletions(-) delete mode 100644 orchestration/dev/networks/monero/hashes-v0.18.4.2.txt create mode 100644 orchestration/dev/networks/monero/hashes-v0.18.4.3.txt diff --git a/.github/actions/bitcoin/action.yml b/.github/actions/bitcoin/action.yml index b2b36ecf..331a994b 100644 --- a/.github/actions/bitcoin/action.yml +++ b/.github/actions/bitcoin/action.yml @@ -5,7 +5,7 @@ inputs: version: description: "Version to download and run" required: false - default: "29.1" + default: "30.0" runs: using: "composite" diff --git a/.github/actions/build-dependencies/action.yml b/.github/actions/build-dependencies/action.yml index 4bec4fa2..ae16a9e1 100644 --- a/.github/actions/build-dependencies/action.yml +++ b/.github/actions/build-dependencies/action.yml @@ -52,9 +52,9 @@ runs: - name: Install solc shell: bash run: | - cargo +1.90 install svm-rs --version =0.5.19 - svm install 0.8.26 - svm use 0.8.26 + cargo +1.91 install svm-rs --version =0.5.19 + svm install 0.8.29 + svm use 0.8.29 - name: Remove preinstalled Docker shell: bash diff --git a/.github/actions/monero-wallet-rpc/action.yml b/.github/actions/monero-wallet-rpc/action.yml index 11ca899b..c51526c7 100644 --- 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.4 + default: v0.18.4.3 runs: using: "composite" diff --git a/.github/actions/monero/action.yml b/.github/actions/monero/action.yml index a4302e5a..356eafa5 100644 --- 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.4 + default: v0.18.4.3 runs: using: "composite" diff --git a/.github/actions/test-dependencies/action.yml b/.github/actions/test-dependencies/action.yml index 7e63b877..0c8b80cf 100644 --- a/.github/actions/test-dependencies/action.yml +++ b/.github/actions/test-dependencies/action.yml @@ -5,12 +5,12 @@ inputs: monero-version: description: "Monero version to download and run as a regtest node" required: false - default: v0.18.3.4 + default: v0.18.4.3 bitcoin-version: description: "Bitcoin version to download and run as a regtest node" required: false - default: "29.1" + default: "30.0" runs: using: "composite" diff --git a/.github/workflows/daily-deny.yml b/.github/workflows/daily-deny.yml index 5cd7427e..7836827e 100644 --- a/.github/workflows/daily-deny.yml +++ b/.github/workflows/daily-deny.yml @@ -18,7 +18,7 @@ jobs: key: rust-advisory-db - name: Install cargo deny - run: cargo +1.90 install cargo-deny --version =0.18.4 + run: cargo +1.91 install cargo-deny --version =0.18.5 - name: Run cargo deny run: cargo deny -L error --all-features check --hide-inclusion-graph diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ebeab699..09ab776a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -52,7 +52,7 @@ jobs: key: rust-advisory-db - name: Install cargo deny - run: cargo +1.90 install cargo-deny --version =0.18.4 + run: cargo +1.91 install cargo-deny --version =0.18.5 - name: Run cargo deny run: cargo deny -L error --all-features check --hide-inclusion-graph @@ -88,8 +88,8 @@ jobs: - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac - name: Verify all dependencies are in use run: | - cargo +1.90 install cargo-machete --version =0.9.1 - cargo +1.90 machete + cargo +1.91 install cargo-machete --version =0.9.1 + cargo +1.91 machete msrv: runs-on: ubuntu-latest @@ -98,7 +98,7 @@ jobs: - name: Verify claimed `rust-version` shell: bash run: | - cargo +1.90 install cargo-msrv --version =0.18.4 + cargo +1.91 install cargo-msrv --version =0.18.4 function check_msrv { # We `cd` into the directory passed as the first argument, but will return to the @@ -190,12 +190,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac + + - name: Build Dependencies + uses: ./.github/actions/build-dependencies + - name: Slither run: | - python3 -m pip install solc-select - solc-select install 0.8.26 - solc-select use 0.8.26 - python3 -m pip install slither-analyzer slither --include-paths ./networks/ethereum/schnorr/contracts/Schnorr.sol diff --git a/networks/ethereum/build-contracts/src/lib.rs b/networks/ethereum/build-contracts/src/lib.rs index fa431134..e5707402 100644 --- a/networks/ethereum/build-contracts/src/lib.rs +++ b/networks/ethereum/build-contracts/src/lib.rs @@ -6,7 +6,7 @@ use std::{path::PathBuf, fs, process::Command}; /// Build contracts from the specified path, outputting the artifacts to the specified path. /// -/// Requires solc 0.8.26. +/// Requires solc 0.8.29. pub fn build( include_paths: &[&str], contracts_path: &str, @@ -35,8 +35,8 @@ pub fn build( if let Some(version) = line.strip_prefix("Version: ") { let version = version.split('+').next().ok_or_else(|| "no value present on line".to_string())?; - if version != "0.8.26" { - Err(format!("version was {version}, 0.8.26 required"))? + if version != "0.8.29" { + Err(format!("version was {version}, 0.8.29 required"))? } } } diff --git a/networks/ethereum/schnorr/contracts/Schnorr.sol b/networks/ethereum/schnorr/contracts/Schnorr.sol index 69e8d95c..2c257644 100644 --- a/networks/ethereum/schnorr/contracts/Schnorr.sol +++ b/networks/ethereum/schnorr/contracts/Schnorr.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity ^0.8.26; +pragma solidity ^0.8.29; /// @title A library for verifying Schnorr signatures /// @author Luke Parker diff --git a/networks/ethereum/schnorr/contracts/tests/Schnorr.sol b/networks/ethereum/schnorr/contracts/tests/Schnorr.sol index 1a19371a..c09a75c1 100644 --- a/networks/ethereum/schnorr/contracts/tests/Schnorr.sol +++ b/networks/ethereum/schnorr/contracts/tests/Schnorr.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity ^0.8.26; +pragma solidity ^0.8.29; import "../Schnorr.sol"; diff --git a/orchestration/dev/networks/monero/hashes-v0.18.4.2.txt b/orchestration/dev/networks/monero/hashes-v0.18.4.2.txt deleted file mode 100644 index 3188ceca..00000000 --- a/orchestration/dev/networks/monero/hashes-v0.18.4.2.txt +++ /dev/null @@ -1,50 +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 -6122f0bcaca12d5badd92002338847d16032f6d52d86155c203bcb67d4fe1518 monero-android-armv7-v0.18.4.2.tar.bz2 -3b248c3201f028205915403b4b2f173df0dd8bf47eeb268fd67a4661251469d3 monero-android-armv8-v0.18.4.2.tar.bz2 -b4e2b7de80107a1b4613b878d8e2114244b3fb16397821d69baa72d9b0f8c8d5 monero-freebsd-x64-v0.18.4.2.tar.bz2 -ecb2577499a3b0901d731e11d462d3fadcd70095f3ab0def0c27ee64dc56b061 monero-linux-armv7-v0.18.4.2.tar.bz2 -a39530054dac348b219f1048a24ca629da26990f72cf9c1f6b6853e3d8c39a79 monero-linux-armv8-v0.18.4.2.tar.bz2 -18492ace80bf8ef2f44aa9a99b4f20adf00fd59c675a6a496211a720088d5d1a monero-linux-riscv64-v0.18.4.2.tar.bz2 -41d023f2357244ea43ee0a74796f5705ce75ce7373a5865d4959fefa13ecab06 monero-linux-x64-v0.18.4.2.tar.bz2 -03e77a4836861a47430664fa703dd149a355b3b214bc400b04ed38eb064a3ef0 monero-linux-x86-v0.18.4.2.tar.bz2 -9b98da6911b4769abef229c20e21f29d919b11db156965d6f139d2e1ad6625c2 monero-mac-armv8-v0.18.4.2.tar.bz2 -b1b1b580320118d3b6eaa5575fdbd73cf4db90fcc025b7abf875c5e5b4e335c1 monero-mac-x64-v0.18.4.2.tar.bz2 -14dd5aa11308f106183dd7834aa200e74ce6f3497103973696b556e893a4fef2 monero-win-x64-v0.18.4.2.zip -934d9dbeb06ff5610d2c96ebe34fa480e74f78eaeb3fa3e47d89b7961c9bc5e0 monero-win-x86-v0.18.4.2.zip -e9ec2062b3547db58f00102e6905621116ab7f56a331e0bc9b9e892607b87d24 monero-source-v0.18.4.2.tar.bz2 -# -## GUI -9d6e87add7e3ac006ee34c13c4f629252595395f54421db768f72dc233e94ea8 monero-gui-install-win-x64-v0.18.4.2.exe -e4fcdea3f0ff27c3616a8a75545f42a4e4866ea374fa2eeaa9c87027573358ea monero-gui-linux-x64-v0.18.4.2.tar.bz2 -3dfee5c5d8e000c72eb3755bf0eb03ca7c5928b69c3a241e147ad22d144e00a7 monero-gui-mac-armv8-v0.18.4.2.dmg -16abadcbd608d4f7ba20d17a297f2aa2c9066d33f6f22bf3fcdca679ab603990 monero-gui-mac-x64-v0.18.4.2.dmg -4daff8850280173d46464ba9a9de7f712228ad1ef76a1c4954531e4fd2b86d86 monero-gui-win-x64-v0.18.4.2.zip -691085e61ece6c56738431f3cfd395536ca0675214e5991e0dbfab85025e82d7 monero-gui-source-v0.18.4.2.tar.bz2 -# -# -# ~binaryFate ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEgaxZH+nEtlxYBq/D8K9NRioL35IFAmitx+kACgkQ8K9NRioL -35J6cQ/7ByvGstg/a5lIYbB+Lz5bNiPozCILD9/offvC7GgOvna9rkHuofuLS+pX -qhYEMrjFjmp03XMY+i68M83qkBEZ+yU5iNDbwRuHUNMMWaaGlhnhm3nyUVtDpjjr -4xwVsee+dzi0JZhVQG7HJFURiP2Ub5Ua6bSaATDoT/aUYdhmrOnQiH2+VxogiCv3 -JStDqXq6LpFjzw7UkAfxxu1PW+AQFNBzi3L0qWfzb5WWL7xuK63wXGmEkYBlvult -qt3LUhDUzMrfZ5GiiOYDEw44Y2atD4ibOYtBnllCX9CKNb0o2KKU6Qkj+CYqqtnE -uGNOt1oT09VPOtE7OUkBLVkALjef7ZXRibE7tN4wSnsrG39DP795/52L6CGJbl4n -UDnHzLCUbuvhnoAu5U+rUP5nUEDYS9ANNyj610ogNCo7YjfzLH641WSQ/UnuXKkA -RmK8xIiKoOnUeOanX99zqeXqV7gQdQMlfwLUr3pQzCI2YjdvxdRoedSEi5nX5KvO -Snf3BcCYMBemGYqVMdo95tc0Gmsw12/O8WwrBbTea+PeAXJuLaBxrLNn+RNZLfF/ -UJYq2VcEwxG6vXb3cJ5lDKmRDDRI8Fxu6Amdab+6ponhM8Zy3eAynVIO952pLA7N -dtl72RsimM+sgHXP4ERYL4c6WARSHE5sAiog43dr56l3PPmM8pE= -=SoHG ------END PGP SIGNATURE----- diff --git a/orchestration/dev/networks/monero/hashes-v0.18.4.3.txt b/orchestration/dev/networks/monero/hashes-v0.18.4.3.txt new file mode 100644 index 00000000..00d837e6 --- /dev/null +++ b/orchestration/dev/networks/monero/hashes-v0.18.4.3.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 +4e1481835824b9233f204553d4a19645274824f3f6185d8a4b50198470752f54 monero-android-armv7-v0.18.4.3.tar.bz2 +1aebd24aaaec3d1e87a64163f2e30ab2cd45f3902a7a859413f6870944775c21 monero-android-armv8-v0.18.4.3.tar.bz2 +ff7b9c5cf2cb3d602c3dff1902ac0bc3394768cefc260b6003a9ad4bcfb7c6a4 monero-freebsd-x64-v0.18.4.3.tar.bz2 +3ac83049bc565fb5238501f0fa629cdd473bbe94d5fb815088af8e6ff1d761cd monero-linux-armv7-v0.18.4.3.tar.bz2 +b1cc5f135de3ba8512d56deb4b536b38c41addde922b2a53bf443aeaf2a5a800 monero-linux-armv8-v0.18.4.3.tar.bz2 +95baaa6e8957b92caeaed7fb19b5c2659373df8dd5f4de2601ed3dae7b17ce2f monero-linux-riscv64-v0.18.4.3.tar.bz2 +3a7b36ae4da831a4e9913e0a891728f4c43cd320f9b136cdb6686b1d0a33fafa monero-linux-x64-v0.18.4.3.tar.bz2 +e0b51ca71934c33cb83cfa8535ffffebf431a2fc9efe3acf2baad96fb6ce21ec monero-linux-x86-v0.18.4.3.tar.bz2 +bab9a6d3c2ca519386cff5ff0b5601642a495ed1a209736acaf354468cba1145 monero-mac-armv8-v0.18.4.3.tar.bz2 +a8d8273b14f31569f5b7aa3063fbd322e3caec3d63f9f51e287dfc539c7f7d61 monero-mac-x64-v0.18.4.3.tar.bz2 +bd9f615657c35d2d7dd9a5168ad54f1547dbf9a335dee7f12fab115f6f394e36 monero-win-x64-v0.18.4.3.zip +e642ed7bbfa34c30b185387fa553aa9c3ea608db1f3fc0e9332afa9b522c9c1a monero-win-x86-v0.18.4.3.zip +6ba5e082c8fa25216aba7aea8198f3e23d4b138df15c512457081e1eb3d03ff6 monero-source-v0.18.4.3.tar.bz2 +# +## GUI +7b9255c696a462a00a810d9c8f94e60400a9e7d6438e8d6a8b693e9c13dca9ab monero-gui-install-win-x64-v0.18.4.3.exe +0bd84de0a7c18b2a3ea8e8eff2194ae000cf1060045badfd4ab48674bc1b9325 monero-gui-linux-x64-v0.18.4.3.tar.bz2 +68ea30db32efb4a0671ec723297b6629d932fa188edf76edb38a37adaa3528e6 monero-gui-mac-armv8-v0.18.4.3.dmg +27243b01f030fdae68c59cae1daf21f530bbadeaf10579d2908db9a834191cee monero-gui-mac-x64-v0.18.4.3.dmg +dc9531cb4319b37b2c2dea4126e44a0fe6e7b6f34d278ccf5dd9ba693e3031e0 monero-gui-win-x64-v0.18.4.3.zip +0d44687644db9b1824f324416e98f4a46b3bb0a5ed09af54b2835b6facaa0cdd monero-gui-source-v0.18.4.3.tar.bz2 +# +# +# ~binaryFate +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEgaxZH+nEtlxYBq/D8K9NRioL35IFAmjntxwACgkQ8K9NRioL +35J57g//dUOY1KAoLNaV7XLJyGbNk1lT6c2+A8h1wkK6iNQhXsmnc6rcigsHXrG0 +LQyVUuZJ6ELhNb6BnH5V0zbcB72t8XjkSEqlYhStUfMnaUvj1VdXtL/OnSs3fEvt +Zwz6QBTxIKDDYEYyXrvCK96cYaYlIOgK3IVn/zoHdrHRUqTXqRJkFoTHum5l783y +vr9BwMFFWYePUrilphjIiLyJDl+eB5al8PaJkqK2whxBUHoA2jF1edJOSq2mZajI ++L2fBYClePS8oqwoKGquqCh2RVcmdtXtQTVzRIoNx14qFzP8ymqa+6z1Ygkri7bV +qMCJk7KQ8ND7uU9NShpaCIqrZpr5GZ4Al6SRkcpK/7mipQcy2QpKJR3iOpcfiTX1 +YmYGVmLB3zmHu2kiS0kogZv6Ob7+tVFzOQ8NZX4FVnpB0N0phqMfNFOfHzdQZrsZ +qg29HNc9sHlUmsOVmE5w+7Oq+s79yvQB3034XXi/9wQu+f8fKRhqZboe0fe77FLf +QXoAYrZZ7LnGz0Z75Q9O4RB7uxM0Ug5imvyEFus4iuBVyBWjgcfyLnbkKJtbXmfn +BZBbTProhPJfVa/VffBxW9HZB27W7O14oGWVpUkGWnVMZfVY/78XTUHwxaScQsPO +SGawjobQsB3pTMNr/kra1XTjkti70si8Fcs5ueYWGB3yfc6r3hU= +=5HRY +-----END PGP SIGNATURE----- diff --git a/orchestration/runtime/Dockerfile b/orchestration/runtime/Dockerfile index 8716d1af..d4b82c08 100644 --- a/orchestration/runtime/Dockerfile +++ b/orchestration/runtime/Dockerfile @@ -1,10 +1,10 @@ -# rust:1.89.0-slim-bookworm as of August 1st, 2025 (GMT) -FROM --platform=linux/amd64 rust@sha256:703cfb0f80db8eb8a3452bf5151162472039c1b37fe4fb2957b495a6f0104ae7 AS deterministic +# rust:1.91.0-slim-bookworm as of November 5th, 2025 (GMT) +FROM --platform=linux/amd64 rust@sha256:91f3c97d542bff86d69b027d60f52bbafd7b60cc02321a56dbc1a9e6bfef1c55 AS deterministic # Move to a Debian package snapshot RUN rm -rf /etc/apt/sources.list.d/debian.sources && \ rm -rf /var/lib/apt/lists/* && \ - echo "deb [arch=amd64] http://snapshot.debian.org/archive/debian/20250801T000000Z bookworm main" > /etc/apt/sources.list && \ + echo "deb [arch=amd64] http://snapshot.debian.org/archive/debian/20251105T000000Z bookworm main" > /etc/apt/sources.list && \ apt update # Install dependencies diff --git a/orchestration/src/networks/bitcoin.rs b/orchestration/src/networks/bitcoin.rs index c26b27d5..38a2072d 100644 --- a/orchestration/src/networks/bitcoin.rs +++ b/orchestration/src/networks/bitcoin.rs @@ -7,7 +7,7 @@ pub fn bitcoin(orchestration_path: &Path, network: Network) { const DOWNLOAD_BITCOIN: &str = r#" FROM alpine:latest AS bitcoin -ENV BITCOIN_VERSION=29.1 +ENV BITCOIN_VERSION=30.0 RUN apk --no-cache add wget git gnupg diff --git a/orchestration/src/networks/monero.rs b/orchestration/src/networks/monero.rs index d30cdc69..14eaa632 100644 --- 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.4.2"; + const MONERO_VERSION: &str = "0.18.4.3"; let arch = match std::env::consts::ARCH { // We probably would run this without issues yet it's not worth needing to provide support for diff --git a/orchestration/src/processor.rs b/orchestration/src/processor.rs index 4e80b84b..58bdf185 100644 --- a/orchestration/src/processor.rs +++ b/orchestration/src/processor.rs @@ -22,8 +22,8 @@ pub fn processor( if coin == "ethereum" { r#" RUN cargo install svm-rs -RUN svm install 0.8.26 -RUN svm use 0.8.26 +RUN svm install 0.8.29 +RUN svm use 0.8.29 "# } else { "" diff --git a/processor/ethereum/deployer/contracts/Deployer.sol b/processor/ethereum/deployer/contracts/Deployer.sol index 862a27fd..5ff7aef8 100644 --- a/processor/ethereum/deployer/contracts/Deployer.sol +++ b/processor/ethereum/deployer/contracts/Deployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity ^0.8.26; +pragma solidity ^0.8.29; /* The expected deployment process of Serai's Router is as follows: diff --git a/processor/ethereum/erc20/contracts/IERC20.sol b/processor/ethereum/erc20/contracts/IERC20.sol index 6298592a..f5ee1af0 100644 --- a/processor/ethereum/erc20/contracts/IERC20.sol +++ b/processor/ethereum/erc20/contracts/IERC20.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: CC0 -pragma solidity ^0.8.26; +pragma solidity ^0.8.29; interface IERC20 { event Transfer(address indexed from, address indexed to, uint256 value); diff --git a/processor/ethereum/router/contracts/IRouter.sol b/processor/ethereum/router/contracts/IRouter.sol index 1cf61f8e..3474449b 100644 --- a/processor/ethereum/router/contracts/IRouter.sol +++ b/processor/ethereum/router/contracts/IRouter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.26; +pragma solidity ^0.8.29; /// @title Serai Router (without functions overriden by selector collisions) /// @author Luke Parker diff --git a/processor/ethereum/router/contracts/Router.sol b/processor/ethereum/router/contracts/Router.sol index bfb36cfd..e69f862b 100644 --- a/processor/ethereum/router/contracts/Router.sol +++ b/processor/ethereum/router/contracts/Router.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity ^0.8.26; +pragma solidity ^0.8.29; import "IERC20.sol"; @@ -223,7 +223,7 @@ contract Router is IRouterWithoutCollisions { /* Advance the message past the function selector, enabling decoding the arguments. Ideally, we'd also advance past the signature (to simplify decoding arguments and save some memory). This - would transfrom message from: + would transform message from: message (pointer) v diff --git a/processor/ethereum/router/contracts/tests/CreateAddress.sol b/processor/ethereum/router/contracts/tests/CreateAddress.sol index 6aa57629..a9e57ccd 100644 --- a/processor/ethereum/router/contracts/tests/CreateAddress.sol +++ b/processor/ethereum/router/contracts/tests/CreateAddress.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity ^0.8.26; +pragma solidity ^0.8.29; import "Router.sol"; diff --git a/processor/ethereum/router/contracts/tests/ERC20.sol b/processor/ethereum/router/contracts/tests/ERC20.sol index f10ac0cd..1fef1140 100644 --- a/processor/ethereum/router/contracts/tests/ERC20.sol +++ b/processor/ethereum/router/contracts/tests/ERC20.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity ^0.8.26; +pragma solidity ^0.8.29; contract TestERC20 { event Transfer(address indexed from, address indexed to, uint256 value); diff --git a/processor/ethereum/router/contracts/tests/Reentrancy.sol b/processor/ethereum/router/contracts/tests/Reentrancy.sol index 979fd74d..064c0a40 100644 --- a/processor/ethereum/router/contracts/tests/Reentrancy.sol +++ b/processor/ethereum/router/contracts/tests/Reentrancy.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity ^0.8.26; +pragma solidity ^0.8.29; import "Router.sol"; diff --git a/rust-toolchain.toml b/rust-toolchain.toml index b95925f8..5065c497 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.90" +channel = "1.91" targets = ["wasm32v1-none"] profile = "minimal" components = ["rustfmt", "clippy"] diff --git a/spec/Getting Started.md b/spec/Getting Started.md index a2716582..985c223c 100644 --- a/spec/Getting Started.md +++ b/spec/Getting Started.md @@ -36,8 +36,8 @@ rustup target add wasm32v1-none --toolchain nightly ``` cargo install svm-rs -svm install 0.8.26 -svm use 0.8.26 +svm install 0.8.29 +svm use 0.8.29 ``` ### Install foundry (for tests)