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
/*use crate::client::ChunkCachingClient;
use crate::controller::{DataKey, StoreType};
use crate::error::pointer_error::PointerError;
use crate::error::{CreateError, UpdateError};
use crate::model::pnr::{PnrRecord, PnrZone};
use crate::service::pointer_service::{Pointer, PointerService};
use actix_web::web::Data;
use ant_protocol::storage::{Chunk, ChunkAddress};
use autonomi::client::payment::PaymentOption;
use autonomi::Wallet;
use bytes::Bytes;
use crate::service::{validate_immutable_address, validate_immutable_addresses};
#[derive(Debug, Clone)]
pub struct PnrService {
chunk_caching_client: ChunkCachingClient,
pointer_service: Data<PointerService>
}
impl PnrService {
pub fn new(chunk_caching_client: ChunkCachingClient, pointer_service: Data<PointerService>) -> Self {
Self { chunk_caching_client, pointer_service }
}
pub async fn create_mutable_pnr(&self, mut pnr_zone: PnrZone, evm_wallet: Wallet, store_type: StoreType) -> Result<PnrZone, PointerError> {
/*
1. Create chunk containing PNR zone (container for records)
2. Create mutable personal pointer to above chunk
3. Create immutable (TTL=MAX) resolver pointer to personal pointer
4. Trim whitespace from PNR zone name
*/
pnr_zone.name = pnr_zone.name.trim().to_string();
match self.chunk_caching_client.chunk_put(
&Chunk::new(Bytes::from(serde_json::to_vec(&pnr_zone).unwrap())),
PaymentOption::from(&evm_wallet),
store_type.clone()
).await {
Ok(chunk) => {
let personal_pointer_request = Pointer::new(
Some(pnr_zone.name.clone()), chunk.to_hex(), None, None, None,
);
match self.pointer_service.create_pointer(
personal_pointer_request,
evm_wallet.clone(),
store_type.clone(),
DataKey::Personal).await
{
Ok(personal_pointer_result) => {
let resolver_pointer_request = Pointer::new(
Some(pnr_zone.name.clone()), personal_pointer_result.address.clone().unwrap(), None, Some(u64::MAX), None,
);
match self.pointer_service.create_pointer(
resolver_pointer_request,
evm_wallet,
store_type,
DataKey::Resolver).await
{
Ok(resolver_pointer_result) => {
Ok(PnrZone::new(
pnr_zone.name.clone(),
pnr_zone.records.clone(),
resolver_pointer_result.address.clone(),
personal_pointer_result.address.clone(),
))
},
Err(e) => Err(e),
}
},
Err(e) => Err(e),
}
},
Err(e) => Err(PointerError::CreateError(CreateError::InvalidData(e.to_string())))
}
}
pub async fn create_immutable_pnr(&self, mut pnr_zone: PnrZone, evm_wallet: Wallet, store_type: StoreType) -> Result<PnrZone, PointerError> {
/*
1. Create chunk containing PNR zone (container for records)
2. Create immutable (TTL=MAX) resolver pointer to chunk directly
3. Trim whitespace from PNR zone name
4. Validate all record addresses are immutable XOR addresses (64-character hex strings)
*/
pnr_zone.name = pnr_zone.name.trim().to_string();
validate_immutable_addresses(&pnr_zone.records)?;
match self.chunk_caching_client.chunk_put(
&Chunk::new(Bytes::from(serde_json::to_vec(&pnr_zone).unwrap())),
PaymentOption::from(&evm_wallet),
store_type.clone()
).await {
Ok(chunk) => {
let resolver_pointer_request = Pointer::new(
Some(pnr_zone.name.clone()), chunk.to_hex(), None, Some(u64::MAX), None,
);
match self.pointer_service.create_pointer(
resolver_pointer_request,
evm_wallet,
store_type,
DataKey::Resolver).await
{
Ok(resolver_pointer_result) => {
Ok(PnrZone::new(
pnr_zone.name.clone(),
pnr_zone.records.clone(),
resolver_pointer_result.address.clone(),
None,
))
},
Err(e) => Err(e),
}
},
Err(e) => Err(PointerError::CreateError(CreateError::InvalidData(e.to_string())))
}
}
pub async fn update_pnr(&self, name: String, mut pnr_zone: PnrZone, evm_wallet: Wallet, store_type: StoreType) -> Result<PnrZone, PointerError> {
let name = name.trim().to_string();
pnr_zone.name = pnr_zone.name.trim().to_string();
let (resolver_address, personal_pointer_address, is_immutable) = self.resolve_pnr_address(&name).await?;
if is_immutable {
return Err(PointerError::UpdateError(UpdateError::InvalidData("Cannot update an immutable PNR zone".to_string())));
}
match self.chunk_caching_client.chunk_put(
&Chunk::new(Bytes::from(serde_json::to_vec(&pnr_zone).unwrap())),
PaymentOption::from(&evm_wallet),
store_type.clone()
).await {
Ok(chunk) => {
let personal_pointer_request = Pointer::new(
Some(name.clone()), chunk.to_hex(), None, None, None,
);
match self.pointer_service.update_pointer(
personal_pointer_address.clone(),
personal_pointer_request,
store_type,
DataKey::Personal).await
{
Ok(_) => {
Ok(PnrZone::new(
name,
pnr_zone.records,
Some(resolver_address),
Some(personal_pointer_address),
))
},
Err(e) => Err(e),
}
},
Err(e) => Err(PointerError::UpdateError(UpdateError::InvalidData(e.to_string())))
}
}
pub async fn get_pnr(&self, name: String) -> Result<PnrZone, PointerError> {
let name = name.trim().to_string();
let (resolver_address, content_address, is_immutable) = self.resolve_pnr_address(&name).await?;
let pnr_zone_address = if is_immutable {
content_address.clone()
} else {
let personal_pointer = self.pointer_service.get_pointer(content_address.clone(), DataKey::Personal).await?;
personal_pointer.content
};
match self.chunk_caching_client.chunk_get_internal(&ant_protocol::storage::ChunkAddress::from_hex(&pnr_zone_address)?).await {
Ok(chunk) => {
let mut pnr_zone: PnrZone = serde_json::from_slice(chunk.value.as_ref())
.map_err(|e| PointerError::UpdateError(UpdateError::InvalidData(e.to_string())))?;
if is_immutable {
pnr_zone.records.retain(|key, record| {
if let Err(e) = validate_immutable_address(&record.address) {
log::warn!("Removing invalid immutable address for record '{}' in immutable PNR zone '{}': {}", key, name, e);
false
} else {
true
}
});
}
Ok(PnrZone::new(
name,
pnr_zone.records,
Some(resolver_address),
if is_immutable { None } else { Some(content_address) },
))
},
Err(e) => Err(PointerError::UpdateError(UpdateError::InvalidData(e.to_string())))
}
}
pub async fn append_pnr(&self, name: String, mut pnr_zone: PnrZone, evm_wallet: Wallet, store_type: StoreType) -> Result<PnrZone, PointerError> {
let name = name.trim().to_string();
pnr_zone.name = pnr_zone.name.trim().to_string();
let mut existing_pnr_zone = self.get_pnr(name.clone()).await?;
// If the existing zone is immutable (no personal pointer), we shouldn't be able to append to it
// but get_pnr will fail or return personal_address as None.
// The issue only mentions validation when creating an immutable PNR.
// However, if an immutable PNR zone chunk is retrieved and used here, we should still be careful.
for (key, record) in pnr_zone.records {
existing_pnr_zone.records.insert(key.trim().to_string(), record);
}
self.update_pnr(name, existing_pnr_zone, evm_wallet, store_type).await
}
pub async fn update_pnr_record(&self, name: String, record_key: String, record: PnrRecord, evm_wallet: Wallet, store_type: StoreType) -> Result<PnrZone, PointerError> {
let name = name.trim().to_string();
let record_key = record_key.trim().to_string();
let mut existing_pnr_zone = self.get_pnr(name.clone()).await?;
existing_pnr_zone.records.insert(record_key, record);
self.update_pnr(name, existing_pnr_zone, evm_wallet, store_type).await
}
async fn resolve_pnr_address(&self, name: &String) -> Result<(String, String, bool), PointerError> {
let resolver_address = self.pointer_service.get_resolver_address(name)?;
let resolver_pointer = self.pointer_service.get_pointer(resolver_address.clone(), DataKey::Resolver).await?;
let content_address = resolver_pointer.content;
let is_immutable = ChunkAddress::from_hex(&content_address).is_ok();
Ok((resolver_address, content_address, is_immutable))
}
}
#[cfg(test)]
mod tests {
use crate::model::pnr::{PnrRecord, PnrRecordType};
use std::collections::HashMap;
#[tokio::test]
async fn test_append_pnr_logic() {
// This is a logic-only test for the record merging, as full mocking of PnrService's dependencies
// (ChunkCachingClient and PointerService) for an integration test here is complex.
let mut existing_records = HashMap::new();
existing_records.insert("old".to_string(), PnrRecord::new("addr1".to_string(), PnrRecordType::A, 60));
existing_records.insert("keep".to_string(), PnrRecord::new("addr2".to_string(), PnrRecordType::A, 60));
let mut new_records = HashMap::new();
new_records.insert("old".to_string(), PnrRecord::new("addr3".to_string(), PnrRecordType::X, 120));
new_records.insert("new".to_string(), PnrRecord::new("addr4".to_string(), PnrRecordType::A, 60));
// Simulate merging logic from append_pnr
let mut merged_records = existing_records;
for (key, record) in new_records {
merged_records.insert(key, record);
}
assert_eq!(merged_records.len(), 3);
assert_eq!(merged_records.get("old").unwrap().address, "addr3");
assert_eq!(merged_records.get("old").unwrap().ttl, 120);
assert!(matches!(merged_records.get("old").unwrap().record_type, PnrRecordType::X));
assert_eq!(merged_records.get("keep").unwrap().address, "addr2");
assert_eq!(merged_records.get("new").unwrap().address, "addr4");
}
#[test]
fn test_validate_immutable_addresses_get_pnr() {
use super::*;
let mut records = HashMap::new();
// Valid 64-char hex address
let valid_addr = "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef".to_string();
records.insert("valid".to_string(), PnrRecord::new(valid_addr.clone(), PnrRecordType::A, 60));
// Invalid address (too short)
records.insert("invalid".to_string(), PnrRecord::new("short".to_string(), PnrRecordType::A, 60));
// Simulate the retain logic in get_pnr
records.retain(|_, record| {
validate_immutable_address(&record.address).is_ok()
});
assert_eq!(records.len(), 1);
assert!(records.contains_key("valid"));
assert!(!records.contains_key("invalid"));
}
#[tokio::test]
async fn test_update_pnr_record_logic() {
let mut existing_records = HashMap::new();
existing_records.insert("keep".to_string(), PnrRecord::new("addr1".to_string(), PnrRecordType::A, 60));
existing_records.insert("update".to_string(), PnrRecord::new("addr2".to_string(), PnrRecordType::A, 60));
let new_record = PnrRecord::new("addr3".to_string(), PnrRecordType::X, 120);
// Simulate merging logic from update_pnr_record
let mut merged_records = existing_records;
merged_records.insert("update".to_string(), new_record);
assert_eq!(merged_records.len(), 2);
assert_eq!(merged_records.get("update").unwrap().address, "addr3");
assert_eq!(merged_records.get("update").unwrap().ttl, 120);
assert!(matches!(merged_records.get("update").unwrap().record_type, PnrRecordType::X));
assert_eq!(merged_records.get("keep").unwrap().address, "addr1");
}
#[test]
fn test_validate_immutable_addresses() {
use super::*;
use crate::model::pnr::{PnrRecord, PnrRecordType};
use std::collections::HashMap;
let mut valid_records = HashMap::new();
valid_records.insert("valid".to_string(), PnrRecord::new("a".repeat(64), PnrRecordType::A, 60));
assert!(validate_immutable_addresses(&valid_records).is_ok());
let mut too_short = HashMap::new();
too_short.insert("invalid".to_string(), PnrRecord::new("a".repeat(63), PnrRecordType::A, 60));
assert!(validate_immutable_addresses(&too_short).is_err());
let mut non_hex = HashMap::new();
non_hex.insert("invalid".to_string(), PnrRecord::new("g".repeat(64), PnrRecordType::A, 60));
assert!(validate_immutable_addresses(&non_hex).is_err());
}
}
*/