-
Notifications
You must be signed in to change notification settings - Fork 276
/
Copy pathstorage.rs
333 lines (293 loc) · 11.5 KB
/
storage.rs
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
use alloc::collections::BTreeMap;
use alloy_primitives::{ruint::ParseError, Bytes, B256, U256};
use core::{fmt, str::FromStr};
use serde::{Deserialize, Deserializer, Serialize};
/// A storage key type that can be serialized to and from a hex string up to 32 bytes. Used for
/// `eth_getStorageAt` and `eth_getProof` RPCs.
///
/// This is a wrapper type meant to mirror geth's serialization and deserialization behavior for
/// storage keys.
///
/// In `eth_getStorageAt`, this is used for deserialization of the `index` field. Internally, the
/// index is a [B256], but in `eth_getStorageAt` requests, its serialization can be _up to_ 32
/// bytes. To support this, the storage key is deserialized first as a U256, and converted to a
/// B256 for use internally.
///
/// `eth_getProof` also takes storage keys up to 32 bytes as input, so the `keys` field is
/// similarly deserialized. However, geth populates the storage proof `key` fields in the response
/// by mirroring the `key` field used in the input.
///
/// See how `storageKey`s (the input) are populated in the `StorageResult` (the output):
/// <https://github.com/ethereum/go-ethereum/blob/00a73fbcce3250b87fc4160f3deddc44390848f4/internal/ethapi/api.go#L658-L690>
///
/// The contained [B256] and From implementation for String are used to preserve the input and
/// implement this behavior from geth.
#[derive(Clone, Copy, Debug, PartialEq, Eq, Deserialize, Serialize)]
#[serde(untagged)]
pub enum JsonStorageKey {
/// A full 32-byte key (tried first during deserialization)
Hash(B256),
/// A number (fallback if B256 deserialization fails)
Number(U256),
}
impl JsonStorageKey {
/// Returns the key as a [`B256`] value.
pub fn as_b256(&self) -> B256 {
match self {
Self::Hash(hash) => *hash,
Self::Number(num) => B256::from(*num),
}
}
}
impl Default for JsonStorageKey {
fn default() -> Self {
Self::Hash(Default::default())
}
}
impl From<B256> for JsonStorageKey {
fn from(value: B256) -> Self {
Self::Hash(value)
}
}
impl From<[u8; 32]> for JsonStorageKey {
fn from(value: [u8; 32]) -> Self {
B256::from(value).into()
}
}
impl From<U256> for JsonStorageKey {
fn from(value: U256) -> Self {
Self::Number(value)
}
}
impl FromStr for JsonStorageKey {
type Err = ParseError;
fn from_str(s: &str) -> Result<Self, Self::Err> {
if let Ok(hash) = B256::from_str(s) {
return Ok(Self::Hash(hash));
}
s.parse().map(Self::Number)
}
}
impl fmt::Display for JsonStorageKey {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
Self::Hash(hash) => hash.fmt(f),
Self::Number(num) => alloc::format!("{num:#x}").fmt(f),
}
}
}
/// Converts a Bytes value into a B256, accepting inputs that are less than 32 bytes long. These
/// inputs will be left padded with zeros.
pub fn from_bytes_to_b256<'de, D>(bytes: Bytes) -> Result<B256, D::Error>
where
D: Deserializer<'de>,
{
if bytes.0.len() > 32 {
return Err(serde::de::Error::custom("input too long to be a B256"));
}
// left pad with zeros to 32 bytes
let mut padded = [0u8; 32];
padded[32 - bytes.0.len()..].copy_from_slice(&bytes.0);
// then convert to B256 without a panic
Ok(B256::from_slice(&padded))
}
/// Deserializes the input into a storage map, using [from_bytes_to_b256] which allows cropped
/// values:
///
/// ```json
/// {
/// "0x0000000000000000000000000000000000000000000000000000000000000001": "0x22"
/// }
/// ```
pub fn deserialize_storage_map<'de, D>(
deserializer: D,
) -> Result<Option<BTreeMap<B256, B256>>, D::Error>
where
D: Deserializer<'de>,
{
let map = Option::<BTreeMap<Bytes, Bytes>>::deserialize(deserializer)?;
match map {
Some(map) => {
let mut res_map = BTreeMap::new();
for (k, v) in map {
let k_deserialized = from_bytes_to_b256::<'de, D>(k)?;
let v_deserialized = from_bytes_to_b256::<'de, D>(v)?;
res_map.insert(k_deserialized, v_deserialized);
}
Ok(Some(res_map))
}
None => Ok(None),
}
}
#[cfg(test)]
mod tests {
use super::*;
use alloc::string::{String, ToString};
use serde_json::json;
#[test]
fn default_number_storage_key() {
let key = JsonStorageKey::Number(Default::default());
assert_eq!(key.to_string(), String::from("0x0"));
}
#[test]
fn default_hash_storage_key() {
let key = JsonStorageKey::default();
assert_eq!(
key.to_string(),
String::from("0x0000000000000000000000000000000000000000000000000000000000000000")
);
}
#[test]
fn test_storage_key() {
let cases = [
"0x0000000000000000000000000000000000000000000000000000000000000001", // Hash
"0000000000000000000000000000000000000000000000000000000000000001", // Hash
];
let key: JsonStorageKey = serde_json::from_str(&json!(cases[0]).to_string()).unwrap();
let key2: JsonStorageKey = serde_json::from_str(&json!(cases[1]).to_string()).unwrap();
assert_eq!(key.as_b256(), key2.as_b256());
}
#[test]
fn test_storage_key_serde_roundtrips() {
let test_cases = [
"0x0000000000000000000000000000000000000000000000000000000000000001", // Hash
"0x0000000000000000000000000000000000000000000000000000000000000abc", // Hash
"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", // Number
"0xabc", // Number
"0xabcd", // Number
];
for input in test_cases {
let key: JsonStorageKey = serde_json::from_str(&json!(input).to_string()).unwrap();
let output = key.to_string();
assert_eq!(
input, output,
"Storage key roundtrip failed to preserve the exact hex representation for {}",
input
);
}
}
#[test]
fn test_as_b256() {
let cases = [
"0x0abc", // Number
"0x0000000000000000000000000000000000000000000000000000000000000abc", // Hash
];
let num_key: JsonStorageKey = serde_json::from_str(&json!(cases[0]).to_string()).unwrap();
let hash_key: JsonStorageKey = serde_json::from_str(&json!(cases[1]).to_string()).unwrap();
assert_eq!(num_key, JsonStorageKey::Number(U256::from_str(cases[0]).unwrap()));
assert_eq!(hash_key, JsonStorageKey::Hash(B256::from_str(cases[1]).unwrap()));
assert_eq!(num_key.as_b256(), hash_key.as_b256());
}
#[test]
fn test_json_storage_key_from_b256() {
let b256_value = B256::from([1u8; 32]);
let key = JsonStorageKey::from(b256_value);
assert_eq!(key, JsonStorageKey::Hash(b256_value));
assert_eq!(
key.to_string(),
"0x0101010101010101010101010101010101010101010101010101010101010101"
);
}
#[test]
fn test_json_storage_key_from_u256() {
let u256_value = U256::from(42);
let key = JsonStorageKey::from(u256_value);
assert_eq!(key, JsonStorageKey::Number(u256_value));
assert_eq!(key.to_string(), "0x2a");
}
#[test]
fn test_json_storage_key_from_u8_array() {
let bytes = [0u8; 32];
let key = JsonStorageKey::from(bytes);
assert_eq!(key, JsonStorageKey::Hash(B256::from(bytes)));
}
#[test]
fn test_from_str_parsing() {
let hex_str = "0x0101010101010101010101010101010101010101010101010101010101010101";
let key = JsonStorageKey::from_str(hex_str).unwrap();
assert_eq!(key, JsonStorageKey::Hash(B256::from_str(hex_str).unwrap()));
let num_str = "42";
let key = JsonStorageKey::from_str(num_str).unwrap();
assert_eq!(key, JsonStorageKey::Number(U256::from(42)));
}
#[test]
fn test_deserialize_storage_map_with_valid_data() {
let json_data = json!({
"0x0000000000000000000000000000000000000000000000000000000000000001": "0x22",
"0x0000000000000000000000000000000000000000000000000000000000000002": "0x33"
});
// Specify the deserialization type explicitly
let deserialized: Option<BTreeMap<B256, B256>> = deserialize_storage_map(
&serde_json::from_value::<serde_json::Value>(json_data).unwrap(),
)
.unwrap();
assert_eq!(
deserialized.unwrap(),
BTreeMap::from([
(B256::from(U256::from(1u128)), B256::from(U256::from(0x22u128))),
(B256::from(U256::from(2u128)), B256::from(U256::from(0x33u128)))
])
);
}
#[test]
fn test_deserialize_storage_map_with_empty_data() {
let json_data = json!({});
let deserialized: Option<BTreeMap<B256, B256>> = deserialize_storage_map(
&serde_json::from_value::<serde_json::Value>(json_data).unwrap(),
)
.unwrap();
assert!(deserialized.unwrap().is_empty());
}
#[test]
fn test_deserialize_storage_map_with_none() {
let json_data = json!(null);
let deserialized: Option<BTreeMap<B256, B256>> = deserialize_storage_map(
&serde_json::from_value::<serde_json::Value>(json_data).unwrap(),
)
.unwrap();
assert!(deserialized.is_none());
}
#[test]
fn test_from_bytes_to_b256_with_valid_input() {
// Test case with input less than 32 bytes, should be left-padded with zeros
let bytes = Bytes::from(vec![0x1, 0x2, 0x3, 0x4]);
let result = from_bytes_to_b256::<serde_json::Value>(bytes).unwrap();
let expected = B256::from_slice(&[
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
2, 3, 4,
]);
assert_eq!(result, expected);
}
#[test]
fn test_from_bytes_to_b256_with_exact_32_bytes() {
// Test case with input exactly 32 bytes long
let bytes = Bytes::from(vec![
0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 0x10, 0x11,
0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
0x20,
]);
let result = from_bytes_to_b256::<serde_json::Value>(bytes).unwrap();
let expected = B256::from_slice(&[
0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 0x10, 0x11,
0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
0x20,
]);
assert_eq!(result, expected);
}
#[test]
fn test_from_bytes_to_b256_with_input_too_long() {
// Test case with input longer than 32 bytes, should return an error
let bytes = Bytes::from(vec![0x1; 33]); // 33 bytes long
let result = from_bytes_to_b256::<serde_json::Value>(bytes);
assert!(result.is_err());
assert_eq!(result.unwrap_err().to_string(), "input too long to be a B256");
}
#[test]
fn test_from_bytes_to_b256_with_empty_input() {
// Test case with empty input, should be all zeros
let bytes = Bytes::from(vec![]);
let result = from_bytes_to_b256::<serde_json::Value>(bytes).unwrap();
let expected = B256::from_slice(&[0; 32]); // All zeros
assert_eq!(result, expected);
}
}