Merge branch 'rusowsky/fmt-solar' of github.com:foundry-rs/foundry into rusowsky/fmt-solar

Author: 0xrusowsky

Cargo.lock

@@ -1790,22 +1790,19 @@ casttest!(tx_to_request_json, |_prj, cmd| {
 "#]]);
 });
 
-casttest!(
-    #[ignore = "reth is currently slightly broken"]
-    tx_using_sender_and_nonce,
-    |_prj, cmd| {
-        let rpc = "https://reth-ethereum.ithaca.xyz/rpc";
-        // <https://etherscan.io/tx/0x5bcd22734cca2385dc25b2d38a3d33a640c5961bd46d390dff184c894204b594>
-        let args = vec![
-            "tx",
-            "--from",
-            "0x4648451b5F87FF8F0F7D622bD40574bb97E25980",
-            "--nonce",
-            "113642",
-            "--rpc-url",
-            rpc,
-        ];
-        cmd.args(args).assert_success().stdout_eq(str![[r#"
+casttest!(tx_using_sender_and_nonce, |_prj, cmd| {
+    let rpc = next_http_archive_rpc_url();
+    // <https://etherscan.io/tx/0x5bcd22734cca2385dc25b2d38a3d33a640c5961bd46d390dff184c894204b594>
+    let args = vec![
+        "tx",
+        "--from",
+        "0x4648451b5F87FF8F0F7D622bD40574bb97E25980",
+        "--nonce",
+        "113642",
+        "--rpc-url",
+        rpc.as_str(),
+    ];
+    cmd.args(args).assert_success().stdout_eq(str![[r#"
 
 blockHash            0x29518c1cea251b1bda5949a9b039722604ec1fb99bf9d8124cfe001c95a50bdc
 blockNumber          22287055
@@ -1829,8 +1826,7 @@ value                0
 yParity              1
 ...
 "#]]);
-    }
-);
+});
 
 // ensure receipt or code is required
 casttest!(send_requires_to, |_prj, cmd| {

crates/cast/tests/cli/main.rs

@@ -16,8 +16,9 @@ contract HelloWorld {
      */
     Person public theDude;
 
-    // Will this long comment be wrapped
-    // leaving an orphan word?
+    /// Will this long comment be wrapped
+    /// leaving an
+    /// orphan word?
     Person public anotherDude;
 
     /// Constructs the dude

crates/fmt/testdata/DocComments/wrap-comments.fmt.sol

@@ -80,3 +80,15 @@ function returnLongBinaryOp() returns (bytes32) {
         uint256(Feature.unwrap(feature)) << 128 | uint256(block.chainid) << 64 | uint256(Nonce.unwrap(nonce))
     );
 }
+
+function new_y(uint256 x, uint256 dx, uint256 x_basis, uint256 y, uint256 y_basis)
+    external
+    pure
+    returns (uint256)
+{
+    return _get_y(
+        x * _VELODROME_TOKEN_BASIS / x_basis,
+        dx * _VELODROME_TOKEN_BASIS / x_basis,
+        y * _VELODROME_TOKEN_BASIS / y_basis
+    );
+}

crates/fmt/testdata/ReprosCalls/110.fmt.sol

@@ -74,3 +74,11 @@ function returnLongBinaryOp() returns (bytes32) {
     return
         bytes32(uint256(Feature.unwrap(feature)) << 128 | uint256(block.chainid) << 64 | uint256(Nonce.unwrap(nonce)));
 }
+
+function new_y(uint256 x, uint256 dx, uint256 x_basis, uint256 y, uint256 y_basis) external pure returns (uint256) {
+    return _get_y(
+        x * _VELODROME_TOKEN_BASIS / x_basis,
+        dx * _VELODROME_TOKEN_BASIS / x_basis,
+        y * _VELODROME_TOKEN_BASIS / y_basis
+    );
+}

crates/fmt/testdata/ReprosCalls/120.fmt.sol

@@ -111,3 +111,17 @@ function returnLongBinaryOp() returns (bytes32) {
             | uint256(Nonce.unwrap(nonce))
     );
 }
+
+function new_y(
+    uint256 x,
+    uint256 dx,
+    uint256 x_basis,
+    uint256 y,
+    uint256 y_basis
+) external pure returns (uint256) {
+    return _get_y(
+        x * _VELODROME_TOKEN_BASIS / x_basis,
+        dx * _VELODROME_TOKEN_BASIS / x_basis,
+        y * _VELODROME_TOKEN_BASIS / y_basis
+    );
+}

crates/fmt/testdata/ReprosCalls/80.fmt.sol

@@ -415,10 +415,7 @@ test_repro!(10552);
 test_repro!(10586);
 
 // https://github.com/foundry-rs/foundry/issues/10957
-test_repro!(
-    #[ignore = "reth is currently slightly broken"]
-    10957
-);
+test_repro!(10957);
 
 // https://github.com/foundry-rs/foundry/issues/11353
 test_repro!(11353);