fix(cast): upload error signature (#6312)

* test(common): Add custom error test * fix(common): import error sigs in SelectorImportData * rustfmt --------- Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
foundry-rs · Nov 14, 2023 · 3ebeded · 3ebeded
1 parent c8954d8
commit 3ebeded
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/crates/cast/tests/cli/main.rs b/crates/cast/tests/cli/main.rs
@@ -184,6 +184,16 @@ casttest!(upload_signatures, |_prj, cmd| {
 
     assert!(output.contains("Event Transfer(address,uint256): 0x69ca02dd4edd7bf0a4abb9ed3b7af3f14778db5d61921c7dc7cd545266326de2"), "{}", output);
 
+    // test error prefix
+    cmd.args(["upload-signature", "error ERC20InsufficientBalance(address,uint256,uint256)"]);
+    let output = cmd.stdout_lossy();
+
+    assert!(
+        output.contains("Function ERC20InsufficientBalance(address,uint256,uint256): 0xe450d38c"),
+        "{}",
+        output
+    ); // Custom error is interpreted as function
+
     // test multiple sigs
     cmd.args([
         "upload-signature",
@@ -202,6 +212,7 @@ casttest!(upload_signatures, |_prj, cmd| {
         "upload-signature",
         "event Transfer(address,uint256)",
         "transfer(address,uint256)",
+        "error ERC20InsufficientBalance(address,uint256,uint256)",
         Path::new(env!("CARGO_MANIFEST_DIR"))
             .join("tests/fixtures/ERC20Artifact.json")
             .into_os_string()
@@ -216,6 +227,11 @@ casttest!(upload_signatures, |_prj, cmd| {
     assert!(output.contains("Function approve(address,uint256): 0x095ea7b3"), "{}", output);
     assert!(output.contains("Function decimals(): 0x313ce567"), "{}", output);
     assert!(output.contains("Function allowance(address,address): 0xdd62ed3e"), "{}", output);
+    assert!(
+        output.contains("Function ERC20InsufficientBalance(address,uint256,uint256): 0xe450d38c"),
+        "{}",
+        output
+    );
 });
 
 // tests that the `cast to-rlp` and `cast from-rlp` commands work correctly

diff --git a/crates/common/src/selectors.rs b/crates/common/src/selectors.rs
@@ -316,7 +316,9 @@ impl SignEthClient {
                 SelectorImportRequest { function: functions_and_errors, event: events }
             }
             SelectorImportData::Raw(raw) => {
-                SelectorImportRequest { function: raw.function, event: raw.event }
+                let function_and_error =
+                    raw.function.iter().chain(raw.error.iter()).cloned().collect::<Vec<_>>();
+                SelectorImportRequest { function: function_and_error, event: raw.event }
             }
         };
 
@@ -636,14 +638,15 @@ mod tests {
         let result = parse_signatures(vec![
             "transfer(address,uint256)".to_string(),
             "event Approval(address,address,uint256)".to_string(),
+            "error ERC20InsufficientBalance(address,uint256,uint256)".to_string(),
         ]);
         assert_eq!(
             result,
             ParsedSignatures {
                 signatures: RawSelectorImportData {
                     function: vec!["transfer(address,uint256)".to_string()],
                     event: vec!["Approval(address,address,uint256)".to_string()],
-                    ..Default::default()
+                    error: vec!["ERC20InsufficientBalance(address,uint256,uint256)".to_string()]
                 },
                 ..Default::default()
             }