|
@@ -1,4 +1,4 @@
|
1
|
|
-use near_client::{near_units, prelude::*};
|
|
1
|
+use near_client::{near_primitives_light::views::AccessKeyView, near_units, prelude::*};
|
2
|
2
|
use serde::{Deserialize, Serialize};
|
3
|
3
|
use std::str::FromStr;
|
4
|
4
|
use url::Url;
|
|
@@ -40,13 +40,11 @@ async fn create_account(
|
40
|
40
|
.await
|
41
|
41
|
.unwrap();
|
42
|
42
|
|
43
|
|
- let nonce = Result::from(
|
44
|
|
- client
|
45
|
|
- .view_access_key(&id, &pk, Finality::None)
|
46
|
|
- .await
|
47
|
|
- .unwrap(),
|
48
|
|
- )
|
49
|
|
- .unwrap();
|
|
43
|
+ let nonce = client
|
|
44
|
+ .view_access_key(&id, &pk, Finality::None)
|
|
45
|
+ .await
|
|
46
|
+ .unwrap()
|
|
47
|
+ .nonce;
|
50
|
48
|
|
51
|
49
|
Signer::from_secret(sk, id, nonce)
|
52
|
50
|
}
|
|
@@ -61,17 +59,16 @@ async fn drop_created_account(
|
61
|
59
|
let sk = Ed25519SecretKey::try_from_bytes(sk_bytes).unwrap();
|
62
|
60
|
let pk = Ed25519PublicKey::from(&sk);
|
63
|
61
|
|
64
|
|
- if let Ok(access_key) = client.view_access_key(&id, &pk, Finality::Final).await {
|
65
|
|
- if let Ok(nonce) = access_key.into() {
|
66
|
|
- let signer = Signer::from_secret(sk, id.clone(), nonce);
|
67
|
|
- signer.update_nonce(nonce);
|
68
|
|
-
|
69
|
|
- client
|
70
|
|
- .delete_account(&signer, &id, beneficiary_acc_id)
|
71
|
|
- .commit(Finality::Final)
|
72
|
|
- .await
|
73
|
|
- .unwrap();
|
74
|
|
- };
|
|
62
|
+ if let Ok(AccessKeyView { nonce, .. }) = client.view_access_key(&id, &pk, Finality::Final).await
|
|
63
|
+ {
|
|
64
|
+ let signer = Signer::from_secret(sk, id.clone(), nonce);
|
|
65
|
+ signer.update_nonce(nonce);
|
|
66
|
+
|
|
67
|
+ client
|
|
68
|
+ .delete_account(&signer, &id, beneficiary_acc_id)
|
|
69
|
+ .commit(Finality::Final)
|
|
70
|
+ .await
|
|
71
|
+ .unwrap();
|
75
|
72
|
}
|
76
|
73
|
}
|
77
|
74
|
|
|
@@ -85,17 +82,15 @@ async fn validator_key() -> ValidatorKey {
|
85
|
82
|
}
|
86
|
83
|
|
87
|
84
|
async fn validator_account(client: &NearClient, validator_key: ValidatorKey) -> Signer {
|
88
|
|
- let key_nonce = Result::from(
|
89
|
|
- client
|
90
|
|
- .view_access_key(
|
91
|
|
- &validator_key.account_id,
|
92
|
|
- &validator_key.public_key,
|
93
|
|
- Finality::Final,
|
94
|
|
- )
|
95
|
|
- .await
|
96
|
|
- .unwrap(),
|
97
|
|
- )
|
98
|
|
- .unwrap();
|
|
85
|
+ let key_nonce = client
|
|
86
|
+ .view_access_key(
|
|
87
|
+ &validator_key.account_id,
|
|
88
|
+ &validator_key.public_key,
|
|
89
|
+ Finality::Final,
|
|
90
|
+ )
|
|
91
|
+ .await
|
|
92
|
+ .unwrap()
|
|
93
|
+ .nonce;
|
99
|
94
|
|
100
|
95
|
Signer::from_secret_str(
|
101
|
96
|
&validator_key.secret_key,
|