@@ -57,16 +57,16 @@ enr = { version = "*", features = ["serde", "ed25519", "rust-secp256k1"] }
57
57
58
58
To build an ENR, an ` EnrBuilder ` is provided.
59
59
60
- #### Building an ENR with the default ` secp256k1 ` key type
60
+ #### Building an ENR with the default ` k256 ` key type
61
61
62
62
``` rust
63
- use enr :: {EnrBuilder , secp256k1 };
63
+ use enr :: {EnrBuilder , k256 };
64
64
use std :: net :: Ipv4Addr ;
65
65
use rand :: thread_rng;
66
66
67
- // generate a random secp256k1 key
68
67
let mut rng = thread_rng ();
69
- let key = secp256k1 :: SecretKey :: random (& mut rng );
68
+ // generate a random k256 key
69
+ let key = k256 :: ecdsa :: SigningKey :: random (& mut rng );
70
70
71
71
let ip = Ipv4Addr :: new (192 ,168 ,0 ,1 );
72
72
let enr = EnrBuilder :: new (" v4" ). ip (ip . into ()). tcp (8000 ). build (& key ). unwrap ();
@@ -84,7 +84,7 @@ Note the `ed25519` feature flag must be set. This makes use of the
84
84
use enr :: {EnrBuilder , CombinedKey };
85
85
use std :: net :: Ipv4Addr ;
86
86
87
- // create a new secp256k1 key
87
+ // create a new k256 key
88
88
let key = CombinedKey :: generate_secp256k1 ();
89
89
90
90
// or create a new ed25519 key
@@ -103,44 +103,43 @@ Enr fields can be added and modified using the getters/setters on `Enr`. A custo
103
103
can be added using ` insert ` and retrieved with ` get ` .
104
104
105
105
``` rust
106
- use enr :: {EnrBuilder , secp256k1 :: SecretKey , Enr };
106
+ use enr :: {EnrBuilder , k256 :: ecdsa :: SigningKey , Enr };
107
107
use std :: net :: Ipv4Addr ;
108
108
use rand :: thread_rng;
109
109
110
- // generate a random secp256k1 key
110
+ // generate a random k256 key
111
111
let mut rng = thread_rng ();
112
- let key = SecretKey :: random (& mut rng );
112
+ let key = SigningKey :: random (& mut rng );
113
113
114
114
let ip = Ipv4Addr :: new (192 ,168 ,0 ,1 );
115
115
let mut enr = EnrBuilder :: new (" v4" ). ip (ip . into ()). tcp (8000 ). build (& key ). unwrap ();
116
116
117
117
enr . set_tcp (8001 , & key );
118
118
// set a custom key
119
- enr . insert (" custom_key" , vec! [0 ,0 ,1 ], & key );
119
+ enr . insert (" custom_key" , & vec! [0 ,0 ,1 ], & key );
120
120
121
121
// encode to base64
122
122
let base_64_string = enr . to_base64 ();
123
123
124
124
// decode from base64
125
- let decoded_enr : Enr = base_64_string . parse (). unwrap ();
125
+ let decoded_enr : Enr < SigningKey > = base_64_string . parse (). unwrap ();
126
126
127
127
assert_eq! (decoded_enr . ip (), Some (" 192.168.0.1" . parse (). unwrap ()));
128
128
assert_eq! (decoded_enr . id (), Some (" v4" . into ()));
129
129
assert_eq! (decoded_enr . tcp (), Some (8001 ));
130
- assert_eq! (decoded_enr . get (" custom_key" ), Some (& vec! [0 ,0 ,1 ]));
130
+ assert_eq! (decoded_enr . get (" custom_key" ), Some (vec! [0 ,0 ,1 ]. as_slice () ));
131
131
```
132
132
133
133
#### Encoding/Decoding ENR's of various key types
134
134
135
135
``` rust
136
- use enr :: {EnrBuilder , secp256k1 :: SecretKey , Enr , ed25519_dalek :: Keypair , CombinedKey };
136
+ use enr :: {EnrBuilder , k256 :: ecdsa :: SigningKey , Enr , ed25519_dalek :: Keypair , CombinedKey };
137
137
use std :: net :: Ipv4Addr ;
138
138
use rand :: thread_rng;
139
- use rand :: Rng ;
140
139
141
- // generate a random secp256k1 key
140
+ // generate a random k256 key
142
141
let mut rng = thread_rng ();
143
- let key = SecretKey :: random (& mut rng );
142
+ let key = SigningKey :: random (& mut rng );
144
143
let ip = Ipv4Addr :: new (192 ,168 ,0 ,1 );
145
144
let enr_secp256k1 = EnrBuilder :: new (" v4" ). ip (ip . into ()). tcp (8000 ). build (& key ). unwrap ();
146
145
@@ -156,10 +155,11 @@ let base64_string_ed25519 = enr_ed25519.to_base64();
156
155
157
156
// decode base64 strings of varying key types
158
157
// decode the secp256k1 with default Enr
159
- let decoded_enr_secp256k1 : Enr = base64_string_secp256k1 . parse (). unwrap ();
158
+ let decoded_enr_secp256k1 : Enr < SigningKey > = base64_string_secp256k1 . parse (). unwrap ();
160
159
// decode ed25519 ENRs
161
160
let decoded_enr_ed25519 : Enr <Keypair > = base64_string_ed25519 . parse (). unwrap ();
162
161
163
162
// use the combined key to be able to decode either
164
163
let decoded_enr : Enr <CombinedKey > = base64_string_secp256k1 . parse (). unwrap ();
165
164
let decoded_enr : Enr <CombinedKey > = base64_string_ed25519 . parse (). unwrap ();
165
+ ```
0 commit comments