Skip to content

Commit 3bb479f

Browse files
onbjergonbjerg
committed
chore: deprecate signature uploading
1 parent ae2ebd6 commit 3bb479f

File tree

7 files changed

+30
-362
lines changed

7 files changed

+30
-362
lines changed

‎crates/cast/src/args.rs‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ use foundry_common::{
1919
fmt::{format_tokens, format_uint_exp, serialize_value_as_json},
2020
fs,
2121
selectors::{
22-
ParsedSignatures, SelectorImportData, SelectorKind, decode_calldata, decode_event_topic,
23-
decode_function_selector, decode_selectors, import_selectors, parse_signatures,
24-
pretty_calldata,
22+
SelectorKind, decode_calldata, decode_event_topic, decode_function_selector,
23+
decode_selectors, pretty_calldata,
2524
},
2625
shell, stdin,
2726
};
@@ -594,15 +593,13 @@ pub async fn run_command(args: CastArgs) -> Result<()> {
594593
sh_println!("{sig}")?
595594
}
596595
}
597-
CastSubcommand::UploadSignature { signatures } => {
598-
let signatures = stdin::unwrap_vec(signatures)?;
599-
let ParsedSignatures { signatures, abis } = parse_signatures(signatures);
600-
if !abis.is_empty() {
601-
import_selectors(SelectorImportData::Abi(abis)).await?.describe();
602-
}
603-
if !signatures.is_empty() {
604-
import_selectors(SelectorImportData::Raw(signatures)).await?.describe();
605-
}
596+
CastSubcommand::UploadSignature { .. } => {
597+
sh_eprintln!(
598+
"Selector uploading is deprecated and is currently a no-op, as the upstream API has been removed."
599+
)?;
600+
sh_eprintln!(
601+
"To upload selectors in the future, verify your contracts with Sourcify."
602+
)?;
606603
}
607604

608605
// ENS

‎crates/cast/src/opts.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ pub enum CastSubcommand {
742742
topic: Option<B256>,
743743
},
744744

745-
/// Upload the given signatures to <https://docs.sourcify.dev/docs/api/>.
745+
/// DEPRECATED: Upload the given signatures to <https://docs.sourcify.dev/docs/api/>.
746746
///
747747
/// Example inputs:
748748
/// - "transfer(address,uint256)"

‎crates/cast/tests/cli/main.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1688,7 +1688,7 @@ casttest!(mktx_raw_unsigned_no_from_missing_nonce, |_prj, cmd| {
16881688
"--chain",
16891689
"1",
16901690
"--gas-limit",
1691-
"21000",
1691+
"21000",
16921692
"--gas-price",
16931693
"20000000000",
16941694
"0x742d35Cc6634C0532925a3b8D6Ac6F67C9c2b7FD",
@@ -3386,7 +3386,7 @@ Traces:
33863386
│ ├─ [2553] 0x2Ce6311ddAE708829bc0784C967b7d77D19FD779::balanceOf(0xA12384c5E52fD646E7BC7F6B3b33A605651F566E) [delegatecall]
33873387
│ │ └─ ← [Return] 0x000000000000000000000000000000000000000000000000000000000000f3b9
33883388
│ └─ ← [Return] 0x000000000000000000000000000000000000000000000000000000000000f3b9
3389-
├─ [65442] 0xc2FF493F28e894742b968A7DB5D3F21F0aD80C6c::00000000(00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000a12384c5e52fd646e7bc7f6b3b33a605651f566e000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000000000000000000000000000000833589fcd6edb6e08f4c7c32d4f71b54bda02913000000000000000000000000000000000000000000000000000000000000060f000000000000000000000000000000000000000000000000000000000000060f0000000000000000000000000000000000000000000000000000000000036cd000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000060f000000000000000000000000000000000000000000000000000000000000060f000000000000000000000000327a25ad5cfe5c4d4339c1a4267d4a83e8c93312000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000005a00000000000000000000000000b55b053230e4effb6609de652fca73fd1c2980400000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000221000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000006cdd519280ec730727f07aa36550bde31a1d5f3097818f3425c2f083ed33a91f080fa2afac0071f6e1af9a0e9c09b851bf01e68bc8a1c1f89f686c48205762f92500000000000000000000000000000000000000000000000000000000000000244242424242424242424242424242424242424242424242424242424242424242010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000827b226368616c6c656e6765223a224b51704d51446e7841757a726f68522d483878472d5a536b625249702d76515f5f5f4a714259357a655038222c2263726f73734f726967696e223a66616c73652c226f726967696e223a2268747470732f2f6974686163612e78797a222c2274797065223a22776562617574686e2e676574227d0000000000000000000000000000000000000000000000000000000000001bde17b8de18819c9eb86cefc3920ddb5d3d4254de276e3d6e18dd2b399f732b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)
3389+
├─ [65442] 0xc2FF493F28e894742b968A7DB5D3F21F0aD80C6c::fulfillBasicOrder_efficient_6GL6yc()
33903390
│ ├─ [25070] 0xA12384c5E52fD646E7BC7F6B3b33A605651F566E::unwrapAndValidateSignature(0x290a4c4039f102eceba2147e1fcc46f994a46d1229faf43ffff26a058e7378ff, 0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000006cdd519280ec730727f07aa36550bde31a1d5f3097818f3425c2f083ed33a91f080fa2afac0071f6e1af9a0e9c09b851bf01e68bc8a1c1f89f686c48205762f92500000000000000000000000000000000000000000000000000000000000000244242424242424242424242424242424242424242424242424242424242424242010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000827b226368616c6c656e6765223a224b51704d51446e7841757a726f68522d483878472d5a536b625249702d76515f5f5f4a714259357a655038222c2263726f73734f726967696e223a66616c73652c226f726967696e223a2268747470732f2f6974686163612e78797a222c2274797065223a22776562617574686e2e676574227d0000000000000000000000000000000000000000000000000000000000001bde17b8de18819c9eb86cefc3920ddb5d3d4254de276e3d6e18dd2b399f732b00) [staticcall]
33913391
│ │ ├─ [22067] 0x0B55b053230E4EFFb6609de652fCa73Fd1C29804::unwrapAndValidateSignature(0x290a4c4039f102eceba2147e1fcc46f994a46d1229faf43ffff26a058e7378ff, 0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000006cdd519280ec730727f07aa36550bde31a1d5f3097818f3425c2f083ed33a91f080fa2afac0071f6e1af9a0e9c09b851bf01e68bc8a1c1f89f686c48205762f92500000000000000000000000000000000000000000000000000000000000000244242424242424242424242424242424242424242424242424242424242424242010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000827b226368616c6c656e6765223a224b51704d51446e7841757a726f68522d483878472d5a536b625249702d76515f5f5f4a714259357a655038222c2263726f73734f726967696e223a66616c73652c226f726967696e223a2268747470732f2f6974686163612e78797a222c2274797065223a22776562617574686e2e676574227d0000000000000000000000000000000000000000000000000000000000001bde17b8de18819c9eb86cefc3920ddb5d3d4254de276e3d6e18dd2b399f732b00) [delegatecall]
33923392
│ │ │ ├─ [2369] 0xc2FF493F28e894742b968A7DB5D3F21F0aD80C6c::pauseFlag() [staticcall]
@@ -3420,7 +3420,7 @@ Traces:
34203420
│ │ ├─ [553] 0x2Ce6311ddAE708829bc0784C967b7d77D19FD779::balanceOf(0x327a25aD5Cfe5c4D4339C1A4267D4a83E8c93312) [delegatecall]
34213421
│ │ │ └─ ← [Return] 0x0000000000000000000000000000000000000000000000000000000000009c9a
34223422
│ │ └─ ← [Return] 0x0000000000000000000000000000000000000000000000000000000000009c9a
3423-
│ ├─ [5675] 0xc2FF493F28e894742b968A7DB5D3F21F0aD80C6c::00000001(00000000000000000000000000000000000000000000000000000000000000001bde17b8de18819c9eb86cefc3920ddb5d3d4254de276e3d6e18dd2b399f732b290a4c4039f102eceba2147e1fcc46f994a46d1229faf43ffff26a058e7378ff0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000a12384c5e52fd646e7bc7f6b3b33a605651f566e000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000000000000000000000000000000833589fcd6edb6e08f4c7c32d4f71b54bda02913000000000000000000000000000000000000000000000000000000000000060f000000000000000000000000000000000000000000000000000000000000060f0000000000000000000000000000000000000000000000000000000000036cd000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000060f000000000000000000000000000000000000000000000000000000000000060f000000000000000000000000327a25ad5cfe5c4d4339c1a4267d4a83e8c93312000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000005a00000000000000000000000000b55b053230e4effb6609de652fca73fd1c2980400000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000221000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000006cdd519280ec730727f07aa36550bde31a1d5f3097818f3425c2f083ed33a91f080fa2afac0071f6e1af9a0e9c09b851bf01e68bc8a1c1f89f686c48205762f92500000000000000000000000000000000000000000000000000000000000000244242424242424242424242424242424242424242424242424242424242424242010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000827b226368616c6c656e6765223a224b51704d51446e7841757a726f68522d483878472d5a536b625249702d76515f5f5f4a714259357a655038222c2263726f73734f726967696e223a66616c73652c226f726967696e223a2268747470732f2f6974686163612e78797a222c2274797065223a22776562617574686e2e676574227d0000000000000000000000000000000000000000000000000000000000001bde17b8de18819c9eb86cefc3920ddb5d3d4254de276e3d6e18dd2b399f732b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)
3423+
│ ├─ [5675] 0xc2FF493F28e894742b968A7DB5D3F21F0aD80C6c::multicallN2M_001Taw5z()
34243424
│ │ ├─ [4148] 0xA12384c5E52fD646E7BC7F6B3b33A605651F566E::execute(0x0100000000007821000100000000000000000000000000000000000000000000, 0x0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000201bde17b8de18819c9eb86cefc3920ddb5d3d4254de276e3d6e18dd2b399f732b)
34253425
│ │ │ ├─ [3693] 0x0B55b053230E4EFFb6609de652fCa73Fd1C29804::execute(0x0100000000007821000100000000000000000000000000000000000000000000, 0x0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000201bde17b8de18819c9eb86cefc3920ddb5d3d4254de276e3d6e18dd2b399f732b) [delegatecall]
34263426
│ │ │ │ ├─ [435] 0xA12384c5E52fD646E7BC7F6B3b33A605651F566E::fallback()
@@ -3588,12 +3588,12 @@ forgetest_async!(cast_send_create_with_constructor_args, |prj, cmd| {
35883588
contract ConstructorContract {
35893589
uint256 public value;
35903590
string public name;
3591-
3591+
35923592
constructor(uint256 _value, string memory _name) {
35933593
value = _value;
35943594
name = _name;
35953595
}
3596-
3596+
35973597
function getValue() public view returns (uint256) {
35983598
return value;
35993599
}
@@ -3667,7 +3667,7 @@ casttest!(cast_estimate_create_with_constructor_args, |prj, cmd| {
36673667
contract EstimateContract {
36683668
uint256 public value;
36693669
string public name;
3670-
3670+
36713671
constructor(uint256 _value, string memory _name) {
36723672
value = _value;
36733673
name = _name;
@@ -3769,13 +3769,13 @@ contract ComplexContract {
37693769
address public owner;
37703770
uint256[] public values;
37713771
bool public active;
3772-
3772+
37733773
constructor(address _owner, uint256[] memory _values, bool _active) {
37743774
owner = _owner;
37753775
values = _values;
37763776
active = _active;
37773777
}
3778-
3778+
37793779
function getValuesLength() public view returns (uint256) {
37803780
return values.length;
37813781
}

‎crates/cast/tests/cli/selectors.rs‎

Lines changed: 2 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
use foundry_test_utils::util::OutputExt;
2-
use std::path::Path;
3-
41
casttest!(error_decode_with_sourcify, |prj, cmd| {
52
prj.clear_cache();
63
cmd.args(["decode-error", "0x7a0e198500000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000064"]).assert_success().stdout_eq(str![[r#"
@@ -14,6 +11,7 @@ ValueTooHigh(uint256,uint256)
1411
casttest!(fourbyte, |_prj, cmd| {
1512
cmd.args(["4byte", "0xa9059cbb"]).assert_success().stdout_eq(str![[r#"
1613
transfer(address,uint256)
14+
_____$_$__$___$$$___$$___$__$$(address,uint256)
1715
1816
"#]]);
1917
});
@@ -39,6 +37,7 @@ casttest!(fourbyte_calldata, |_prj, cmd| {
3937
casttest!(fourbyte_calldata_only_selector, |_prj, cmd| {
4038
cmd.args(["4byte-calldata", "0xa9059cbb"]).assert_success().stdout_eq(str![[r#"
4139
transfer(address,uint256)
40+
_____$_$__$___$$$___$$___$__$$(address,uint256)
4241
4342
"#]]);
4443
});
@@ -70,66 +69,6 @@ canCall(address,address,bytes4)
7069
"#]]);
7170
});
7271

73-
casttest!(upload_signatures, |_prj, cmd| {
74-
// test no prefix is accepted as function
75-
let output = cmd
76-
.args(["upload-signature", "transfer(address,uint256)"])
77-
.assert_success()
78-
.get_output()
79-
.stdout_lossy();
80-
assert!(output.contains("Function transfer(address,uint256): 0xa9059cbb"), "{}", output);
81-
82-
// test event prefix
83-
cmd.args(["upload-signature", "event Transfer(address,uint256)"]);
84-
let output = cmd.assert_success().get_output().stdout_lossy();
85-
assert!(output.contains("Event Transfer(address,uint256): 0x69ca02dd4edd7bf0a4abb9ed3b7af3f14778db5d61921c7dc7cd545266326de2"), "{}", output);
86-
87-
// test error prefix
88-
cmd.args(["upload-signature", "error ERC20InsufficientBalance(address,uint256,uint256)"]);
89-
let output = cmd.assert_success().get_output().stdout_lossy();
90-
assert!(
91-
output.contains("Function ERC20InsufficientBalance(address,uint256,uint256): 0xe450d38c"),
92-
"{}",
93-
output
94-
); // Custom error is interpreted as function
95-
96-
// test multiple sigs
97-
cmd.args([
98-
"upload-signature",
99-
"event Transfer(address,uint256)",
100-
"transfer(address,uint256)",
101-
"approve(address,uint256)",
102-
]);
103-
let output = cmd.assert_success().get_output().stdout_lossy();
104-
assert!(output.contains("Event Transfer(address,uint256): 0x69ca02dd4edd7bf0a4abb9ed3b7af3f14778db5d61921c7dc7cd545266326de2"), "{}", output);
105-
assert!(output.contains("Function transfer(address,uint256): 0xa9059cbb"), "{}", output);
106-
assert!(output.contains("Function approve(address,uint256): 0x095ea7b3"), "{}", output);
107-
108-
// test abi
109-
cmd.args([
110-
"upload-signature",
111-
"event Transfer(address,uint256)",
112-
"transfer(address,uint256)",
113-
"error ERC20InsufficientBalance(address,uint256,uint256)",
114-
Path::new(env!("CARGO_MANIFEST_DIR"))
115-
.join("tests/fixtures/ERC20Artifact.json")
116-
.as_os_str()
117-
.to_str()
118-
.unwrap(),
119-
]);
120-
let output = cmd.assert_success().get_output().stdout_lossy();
121-
assert!(output.contains("Event Transfer(address,uint256): 0x69ca02dd4edd7bf0a4abb9ed3b7af3f14778db5d61921c7dc7cd545266326de2"), "{}", output);
122-
assert!(output.contains("Function transfer(address,uint256): 0xa9059cbb"), "{}", output);
123-
assert!(output.contains("Function approve(address,uint256): 0x095ea7b3"), "{}", output);
124-
assert!(output.contains("Function decimals(): 0x313ce567"), "{}", output);
125-
assert!(output.contains("Function allowance(address,address): 0xdd62ed3e"), "{}", output);
126-
assert!(
127-
output.contains("Function ERC20InsufficientBalance(address,uint256,uint256): 0xe450d38c"),
128-
"{}",
129-
output
130-
);
131-
});
132-
13372
// tests cast can decode event with provided signature
13473
casttest!(event_decode_with_sig, |_prj, cmd| {
13574
cmd.args(["decode-event", "--sig", "MyEvent(uint256,address)", "0x000000000000000000000000000000000000000000000000000000000000004e0000000000000000000000000000000000000000000000000000000000d0004f"]).assert_success().stdout_eq(str![[r#"

0 commit comments

Comments
 (0)