@evvm/testnet-contracts 2.1.2 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (32) hide show
  1. package/README.md +195 -17
  2. package/contracts/evvm/Evvm.sol +13 -10
  3. package/contracts/evvm/lib/EvvmStorage.sol +2 -0
  4. package/contracts/evvm/lib/SignatureUtils.sol +12 -13
  5. package/contracts/nameService/NameService.sol +11 -8
  6. package/contracts/nameService/lib/ErrorsLib.sol +1 -1
  7. package/contracts/nameService/lib/SignatureUtils.sol +38 -39
  8. package/contracts/p2pSwap/P2PSwap.sol +14 -382
  9. package/contracts/p2pSwap/lib/SignatureUtils.sol +15 -16
  10. package/contracts/staking/Estimator.sol +4 -4
  11. package/contracts/staking/Staking.sol +28 -17
  12. package/contracts/staking/lib/ErrorsLib.sol +0 -1
  13. package/contracts/staking/lib/SignatureUtils.sol +6 -34
  14. package/contracts/treasuryTwoChains/TreasuryExternalChainStation.sol +3 -3
  15. package/contracts/treasuryTwoChains/TreasuryHostChainStation.sol +3 -3
  16. package/contracts/treasuryTwoChains/lib/SignatureUtils.sol +7 -7
  17. package/interfaces/IStaking.sol +1 -1
  18. package/library/Erc191TestBuilder.sol +57 -57
  19. package/library/EvvmService.sol +104 -0
  20. package/library/primitives/Math.sol +415 -0
  21. package/library/primitives/SignatureRecover.sol +42 -0
  22. package/library/utils/AdvancedStrings.sol +89 -0
  23. package/library/utils/SignatureUtil.sol +29 -0
  24. package/library/utils/service/AsyncNonceService.sol +34 -0
  25. package/library/utils/service/MakeServicePaymentOnEvvm.sol +49 -0
  26. package/library/utils/service/StakingServiceUtils.sol +37 -0
  27. package/library/utils/service/SyncNonceService.sol +18 -0
  28. package/package.json +16 -4
  29. package/contracts/evvm/EvvmLegacy.sol +0 -1553
  30. package/library/AdvancedStrings.sol +0 -77
  31. package/library/SignatureRecover.sol +0 -140
  32. package/library/StakingServiceHooks.sol +0 -116
package/contracts/nameService/lib/SignatureUtils.sol CHANGED
@@ -1,9 +1,8 @@
1
1
  // SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
2
2
  // Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
3
3
 
4
- import {SignatureRecover} from "@evvm/testnet-contracts/library/SignatureRecover.sol";
5
- import {AdvancedStrings} from "@evvm/testnet-contracts/library/AdvancedStrings.sol";
6
- import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
4
+ import {SignatureUtil} from "@evvm/testnet-contracts/library/utils/SignatureUtil.sol";
5
+ import {AdvancedStrings} from "@evvm/testnet-contracts/library/utils/AdvancedStrings.sol";
7
6
 
8
7
  pragma solidity ^0.8.0;
9
8
 
@@ -22,13 +21,13 @@ library SignatureUtils {
22
21
  bytes memory signature
23
22
  ) internal pure returns (bool) {
24
23
  return
25
- SignatureRecover.signatureVerification(
26
- Strings.toString(evvmID),
24
+ SignatureUtil.verifySignature(
25
+ evvmID,
27
26
  "preRegistrationUsername",
28
27
  string.concat(
29
28
  AdvancedStrings.bytes32ToString(_hashUsername),
30
29
  ",",
31
- Strings.toString(_nameServiceNonce)
30
+ AdvancedStrings.uintToString(_nameServiceNonce)
32
31
  ),
33
32
  signature,
34
33
  signer
@@ -44,15 +43,15 @@ library SignatureUtils {
44
43
  bytes memory signature
45
44
  ) internal pure returns (bool) {
46
45
  return
47
- SignatureRecover.signatureVerification(
48
- Strings.toString(evvmID),
46
+ SignatureUtil.verifySignature(
47
+ evvmID,
49
48
  "registrationUsername",
50
49
  string.concat(
51
50
  _username,
52
51
  ",",
53
- Strings.toString(_clowNumber),
52
+ AdvancedStrings.uintToString(_clowNumber),
54
53
  ",",
55
- Strings.toString(_nameServiceNonce)
54
+ AdvancedStrings.uintToString(_nameServiceNonce)
56
55
  ),
57
56
  signature,
58
57
  signer
@@ -69,17 +68,17 @@ library SignatureUtils {
69
68
  bytes memory signature
70
69
  ) internal pure returns (bool) {
71
70
  return
72
- SignatureRecover.signatureVerification(
73
- Strings.toString(evvmID),
71
+ SignatureUtil.verifySignature(
72
+ evvmID,
74
73
  "makeOffer",
75
74
  string.concat(
76
75
  _username,
77
76
  ",",
78
- Strings.toString(_dateExpire),
77
+ AdvancedStrings.uintToString(_dateExpire),
79
78
  ",",
80
- Strings.toString(_amount),
79
+ AdvancedStrings.uintToString(_amount),
81
80
  ",",
82
- Strings.toString(_nameServiceNonce)
81
+ AdvancedStrings.uintToString(_nameServiceNonce)
83
82
  ),
84
83
  signature,
85
84
  signer
@@ -95,15 +94,15 @@ library SignatureUtils {
95
94
  bytes memory signature
96
95
  ) internal pure returns (bool) {
97
96
  return
98
- SignatureRecover.signatureVerification(
99
- Strings.toString(evvmID),
97
+ SignatureUtil.verifySignature(
98
+ evvmID,
100
99
  "withdrawOffer",
101
100
  string.concat(
102
101
  _username,
103
102
  ",",
104
- Strings.toString(_offerId),
103
+ AdvancedStrings.uintToString(_offerId),
105
104
  ",",
106
- Strings.toString(_nameServiceNonce)
105
+ AdvancedStrings.uintToString(_nameServiceNonce)
107
106
  ),
108
107
  signature,
109
108
  signer
@@ -119,15 +118,15 @@ library SignatureUtils {
119
118
  bytes memory signature
120
119
  ) internal pure returns (bool) {
121
120
  return
122
- SignatureRecover.signatureVerification(
123
- Strings.toString(evvmID),
121
+ SignatureUtil.verifySignature(
122
+ evvmID,
124
123
  "acceptOffer",
125
124
  string.concat(
126
125
  _username,
127
126
  ",",
128
- Strings.toString(_offerId),
127
+ AdvancedStrings.uintToString(_offerId),
129
128
  ",",
130
- Strings.toString(_nameServiceNonce)
129
+ AdvancedStrings.uintToString(_nameServiceNonce)
131
130
  ),
132
131
  signature,
133
132
  signer
@@ -142,13 +141,13 @@ library SignatureUtils {
142
141
  bytes memory signature
143
142
  ) internal pure returns (bool) {
144
143
  return
145
- SignatureRecover.signatureVerification(
146
- Strings.toString(evvmID),
144
+ SignatureUtil.verifySignature(
145
+ evvmID,
147
146
  "renewUsername",
148
147
  string.concat(
149
148
  _username,
150
149
  ",",
151
- Strings.toString(_nameServiceNonce)
150
+ AdvancedStrings.uintToString(_nameServiceNonce)
152
151
  ),
153
152
  signature,
154
153
  signer
@@ -164,15 +163,15 @@ library SignatureUtils {
164
163
  bytes memory signature
165
164
  ) internal pure returns (bool) {
166
165
  return
167
- SignatureRecover.signatureVerification(
168
- Strings.toString(evvmID),
166
+ SignatureUtil.verifySignature(
167
+ evvmID,
169
168
  "addCustomMetadata",
170
169
  string.concat(
171
170
  _identity,
172
171
  ",",
173
172
  _value,
174
173
  ",",
175
- Strings.toString(_nameServiceNonce)
174
+ AdvancedStrings.uintToString(_nameServiceNonce)
176
175
  ),
177
176
  signature,
178
177
  signer
@@ -188,15 +187,15 @@ library SignatureUtils {
188
187
  bytes memory signature
189
188
  ) internal pure returns (bool) {
190
189
  return
191
- SignatureRecover.signatureVerification(
192
- Strings.toString(evvmID),
190
+ SignatureUtil.verifySignature(
191
+ evvmID,
193
192
  "removeCustomMetadata",
194
193
  string.concat(
195
194
  _username,
196
195
  ",",
197
- Strings.toString(_key),
196
+ AdvancedStrings.uintToString(_key),
198
197
  ",",
199
- Strings.toString(_nonce)
198
+ AdvancedStrings.uintToString(_nonce)
200
199
  ),
201
200
  signature,
202
201
  signer
@@ -211,10 +210,10 @@ library SignatureUtils {
211
210
  bytes memory signature
212
211
  ) internal pure returns (bool) {
213
212
  return
214
- SignatureRecover.signatureVerification(
215
- Strings.toString(evvmID),
213
+ SignatureUtil.verifySignature(
214
+ evvmID,
216
215
  "flushCustomMetadata",
217
- string.concat(_identity, ",", Strings.toString(_nonce)),
216
+ string.concat(_identity, ",", AdvancedStrings.uintToString(_nonce)),
218
217
  signature,
219
218
  signer
220
219
  );
@@ -228,10 +227,10 @@ library SignatureUtils {
228
227
  bytes memory signature
229
228
  ) internal pure returns (bool) {
230
229
  return
231
- SignatureRecover.signatureVerification(
232
- Strings.toString(evvmID),
230
+ SignatureUtil.verifySignature(
231
+ evvmID,
233
232
  "flushUsername",
234
- string.concat(_username, ",", Strings.toString(_nonce)),
233
+ string.concat(_username, ",", AdvancedStrings.uintToString(_nonce)),
235
234
  signature,
236
235
  signer
237
236
  );