Skip to content

Commit ec47db2

Browse files
alinushalinush
committed
oops, should have appended to the enums
1 parent 7d26c0e commit ec47db2

File tree

8 files changed

+59
-59
lines changed

8 files changed

+59
-59
lines changed

‎api/doc/spec.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17692,14 +17692,14 @@
1769217692
{
1769317693
"$ref": "#/components/schemas/PublicKey_Secp256r1Ecdsa"
1769417694
},
17695-
{
17696-
"$ref": "#/components/schemas/PublicKey_SlhDsa_Sha2_128s"
17697-
},
1769817695
{
1769917696
"$ref": "#/components/schemas/PublicKey_Keyless"
1770017697
},
1770117698
{
1770217699
"$ref": "#/components/schemas/PublicKey_FederatedKeyless"
17700+
},
17701+
{
17702+
"$ref": "#/components/schemas/PublicKey_SlhDsa_Sha2_128s"
1770317703
}
1770417704
],
1770517705
"discriminator": {
@@ -17708,9 +17708,9 @@
1770817708
"ed25519": "#/components/schemas/PublicKey_Ed25519",
1770917709
"secp256k1_ecdsa": "#/components/schemas/PublicKey_Secp256k1Ecdsa",
1771017710
"secp256r1_ecdsa": "#/components/schemas/PublicKey_Secp256r1Ecdsa",
17711-
"slh_dsa__sha2_128s": "#/components/schemas/PublicKey_SlhDsa_Sha2_128s",
1771217711
"keyless": "#/components/schemas/PublicKey_Keyless",
17713-
"federated_keyless": "#/components/schemas/PublicKey_FederatedKeyless"
17712+
"federated_keyless": "#/components/schemas/PublicKey_FederatedKeyless",
17713+
"slh_dsa__sha2_128s": "#/components/schemas/PublicKey_SlhDsa_Sha2_128s"
1771417714
}
1771517715
}
1771617716
},
@@ -18005,24 +18005,24 @@
1800518005
{
1800618006
"$ref": "#/components/schemas/Signature_Secp256k1Ecdsa"
1800718007
},
18008-
{
18009-
"$ref": "#/components/schemas/Signature_SlhDsa_Sha2_128s"
18010-
},
1801118008
{
1801218009
"$ref": "#/components/schemas/Signature_WebAuthn"
1801318010
},
1801418011
{
1801518012
"$ref": "#/components/schemas/Signature_Keyless"
18013+
},
18014+
{
18015+
"$ref": "#/components/schemas/Signature_SlhDsa_Sha2_128s"
1801618016
}
1801718017
],
1801818018
"discriminator": {
1801918019
"propertyName": "type",
1802018020
"mapping": {
1802118021
"ed25519": "#/components/schemas/Signature_Ed25519",
1802218022
"secp256k1_ecdsa": "#/components/schemas/Signature_Secp256k1Ecdsa",
18023-
"slh_dsa__sha2_128s": "#/components/schemas/Signature_SlhDsa_Sha2_128s",
1802418023
"web_authn": "#/components/schemas/Signature_WebAuthn",
18025-
"keyless": "#/components/schemas/Signature_Keyless"
18024+
"keyless": "#/components/schemas/Signature_Keyless",
18025+
"slh_dsa__sha2_128s": "#/components/schemas/Signature_SlhDsa_Sha2_128s"
1802618026
}
1802718027
}
1802818028
},

‎api/doc/spec.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13277,18 +13277,18 @@ components:
1327713277
- $ref: '#/components/schemas/PublicKey_Ed25519'
1327813278
- $ref: '#/components/schemas/PublicKey_Secp256k1Ecdsa'
1327913279
- $ref: '#/components/schemas/PublicKey_Secp256r1Ecdsa'
13280-
- $ref: '#/components/schemas/PublicKey_SlhDsa_Sha2_128s'
1328113280
- $ref: '#/components/schemas/PublicKey_Keyless'
1328213281
- $ref: '#/components/schemas/PublicKey_FederatedKeyless'
13282+
- $ref: '#/components/schemas/PublicKey_SlhDsa_Sha2_128s'
1328313283
discriminator:
1328413284
propertyName: type
1328513285
mapping:
1328613286
ed25519: '#/components/schemas/PublicKey_Ed25519'
1328713287
secp256k1_ecdsa: '#/components/schemas/PublicKey_Secp256k1Ecdsa'
1328813288
secp256r1_ecdsa: '#/components/schemas/PublicKey_Secp256r1Ecdsa'
13289-
slh_dsa__sha2_128s: '#/components/schemas/PublicKey_SlhDsa_Sha2_128s'
1329013289
keyless: '#/components/schemas/PublicKey_Keyless'
1329113290
federated_keyless: '#/components/schemas/PublicKey_FederatedKeyless'
13291+
slh_dsa__sha2_128s: '#/components/schemas/PublicKey_SlhDsa_Sha2_128s'
1329213292
PublicKey_Ed25519:
1329313293
allOf:
1329413294
- type: object
@@ -13466,17 +13466,17 @@ components:
1346613466
oneOf:
1346713467
- $ref: '#/components/schemas/Signature_Ed25519'
1346813468
- $ref: '#/components/schemas/Signature_Secp256k1Ecdsa'
13469-
- $ref: '#/components/schemas/Signature_SlhDsa_Sha2_128s'
1347013469
- $ref: '#/components/schemas/Signature_WebAuthn'
1347113470
- $ref: '#/components/schemas/Signature_Keyless'
13471+
- $ref: '#/components/schemas/Signature_SlhDsa_Sha2_128s'
1347213472
discriminator:
1347313473
propertyName: type
1347413474
mapping:
1347513475
ed25519: '#/components/schemas/Signature_Ed25519'
1347613476
secp256k1_ecdsa: '#/components/schemas/Signature_Secp256k1Ecdsa'
13477-
slh_dsa__sha2_128s: '#/components/schemas/Signature_SlhDsa_Sha2_128s'
1347813477
web_authn: '#/components/schemas/Signature_WebAuthn'
1347913478
keyless: '#/components/schemas/Signature_Keyless'
13479+
slh_dsa__sha2_128s: '#/components/schemas/Signature_SlhDsa_Sha2_128s'
1348013480
Signature_Ed25519:
1348113481
allOf:
1348213482
- type: object

‎api/types/src/transaction.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1545,9 +1545,9 @@ impl VerifyInput for KeylessSignature {
15451545
pub enum Signature {
15461546
Ed25519(Ed25519),
15471547
Secp256k1Ecdsa(Secp256k1Ecdsa),
1548-
SlhDsa_Sha2_128s(SlhDsa_Sha2_128s),
15491548
WebAuthn(WebAuthn),
15501549
Keyless(Keyless),
1550+
SlhDsa_Sha2_128s(SlhDsa_Sha2_128s),
15511551
}
15521552

15531553
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Object)]
@@ -1675,9 +1675,9 @@ pub enum PublicKey {
16751675
Ed25519(Ed25519),
16761676
Secp256k1Ecdsa(Secp256k1Ecdsa),
16771677
Secp256r1Ecdsa(Secp256r1Ecdsa),
1678-
SlhDsa_Sha2_128s(SlhDsa_Sha2_128s),
16791678
Keyless(Keyless),
16801679
FederatedKeyless(FederatedKeyless),
1680+
SlhDsa_Sha2_128s(SlhDsa_Sha2_128s),
16811681
}
16821682

16831683
impl TryFrom<&PublicKey> for AnyPublicKey {

‎aptos-move/aptos-release-builder/src/components/feature_flags.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ pub enum FeatureFlag {
9696
CommissionChangeDelegationPool,
9797
Bn254Structures,
9898
WebAuthnSignature,
99-
SlhDsaSha2_128sSignature,
10099
ReconfigureWithDkg,
101100
KeylessAccounts,
102101
KeylessButZklessAccounts,
@@ -158,6 +157,7 @@ pub enum FeatureFlag {
158157
EnableFrameworkForOption,
159158
SessionContinuation,
160159
EnableFunctionReflection,
160+
SlhDsaSha2_128sSignature,
161161
}
162162

163163
fn generate_features_blob(writer: &CodeWriter, data: &[u64]) {

‎testsuite/generate-format/tests/staged/api.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,20 +104,20 @@ AnyPublicKey:
104104
- public_key:
105105
TYPENAME: Secp256r1EcdsaPublicKey
106106
3:
107-
SlhDsa_Sha2_128s:
108-
STRUCT:
109-
- public_key:
110-
TYPENAME: SlhDsa_Sha2_128s_PublicKey
111-
4:
112107
Keyless:
113108
STRUCT:
114109
- public_key:
115110
TYPENAME: KeylessPublicKey
116-
5:
111+
4:
117112
FederatedKeyless:
118113
STRUCT:
119114
- public_key:
120115
TYPENAME: FederatedKeylessPublicKey
116+
5:
117+
SlhDsa_Sha2_128s:
118+
STRUCT:
119+
- public_key:
120+
TYPENAME: SlhDsa_Sha2_128s_PublicKey
121121
AnySignature:
122122
ENUM:
123123
0:
@@ -131,20 +131,20 @@ AnySignature:
131131
- signature:
132132
TYPENAME: Secp256k1EcdsaSignature
133133
2:
134-
SlhDsa_Sha2_128s:
135-
STRUCT:
136-
- signature:
137-
TYPENAME: SlhDsa_Sha2_128s_Signature
138-
3:
139134
WebAuthn:
140135
STRUCT:
141136
- signature:
142137
TYPENAME: PartialAuthenticatorAssertionResponse
143-
4:
138+
3:
144139
Keyless:
145140
STRUCT:
146141
- signature:
147142
TYPENAME: KeylessSignature
143+
4:
144+
SlhDsa_Sha2_128s:
145+
STRUCT:
146+
- signature:
147+
TYPENAME: SlhDsa_Sha2_128s_Signature
148148
AssertionSignature:
149149
ENUM:
150150
0:

‎testsuite/generate-format/tests/staged/aptos.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,20 +92,20 @@ AnyPublicKey:
9292
- public_key:
9393
TYPENAME: Secp256r1EcdsaPublicKey
9494
3:
95-
SlhDsa_Sha2_128s:
96-
STRUCT:
97-
- public_key:
98-
TYPENAME: SlhDsa_Sha2_128s_PublicKey
99-
4:
10095
Keyless:
10196
STRUCT:
10297
- public_key:
10398
TYPENAME: KeylessPublicKey
104-
5:
99+
4:
105100
FederatedKeyless:
106101
STRUCT:
107102
- public_key:
108103
TYPENAME: FederatedKeylessPublicKey
104+
5:
105+
SlhDsa_Sha2_128s:
106+
STRUCT:
107+
- public_key:
108+
TYPENAME: SlhDsa_Sha2_128s_PublicKey
109109
AnySignature:
110110
ENUM:
111111
0:
@@ -119,20 +119,20 @@ AnySignature:
119119
- signature:
120120
TYPENAME: Secp256k1EcdsaSignature
121121
2:
122-
SlhDsa_Sha2_128s:
123-
STRUCT:
124-
- signature:
125-
TYPENAME: SlhDsa_Sha2_128s_Signature
126-
3:
127122
WebAuthn:
128123
STRUCT:
129124
- signature:
130125
TYPENAME: PartialAuthenticatorAssertionResponse
131-
4:
126+
3:
132127
Keyless:
133128
STRUCT:
134129
- signature:
135130
TYPENAME: KeylessSignature
131+
4:
132+
SlhDsa_Sha2_128s:
133+
STRUCT:
134+
- signature:
135+
TYPENAME: SlhDsa_Sha2_128s_Signature
136136
AssertionSignature:
137137
ENUM:
138138
0:

‎testsuite/generate-format/tests/staged/consensus.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,20 @@ AnyPublicKey:
9898
- public_key:
9999
TYPENAME: Secp256r1EcdsaPublicKey
100100
3:
101-
SlhDsa_Sha2_128s:
102-
STRUCT:
103-
- public_key:
104-
TYPENAME: SlhDsa_Sha2_128s_PublicKey
105-
4:
106101
Keyless:
107102
STRUCT:
108103
- public_key:
109104
TYPENAME: KeylessPublicKey
110-
5:
105+
4:
111106
FederatedKeyless:
112107
STRUCT:
113108
- public_key:
114109
TYPENAME: FederatedKeylessPublicKey
110+
5:
111+
SlhDsa_Sha2_128s:
112+
STRUCT:
113+
- public_key:
114+
TYPENAME: SlhDsa_Sha2_128s_PublicKey
115115
AnySignature:
116116
ENUM:
117117
0:
@@ -125,20 +125,20 @@ AnySignature:
125125
- signature:
126126
TYPENAME: Secp256k1EcdsaSignature
127127
2:
128-
SlhDsa_Sha2_128s:
129-
STRUCT:
130-
- signature:
131-
TYPENAME: SlhDsa_Sha2_128s_Signature
132-
3:
133128
WebAuthn:
134129
STRUCT:
135130
- signature:
136131
TYPENAME: PartialAuthenticatorAssertionResponse
137-
4:
132+
3:
138133
Keyless:
139134
STRUCT:
140135
- signature:
141136
TYPENAME: KeylessSignature
137+
4:
138+
SlhDsa_Sha2_128s:
139+
STRUCT:
140+
- signature:
141+
TYPENAME: SlhDsa_Sha2_128s_Signature
142142
AssertionSignature:
143143
ENUM:
144144
0:

‎types/src/transaction/authenticator.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,15 +1241,15 @@ pub enum AnySignature {
12411241
Secp256k1Ecdsa {
12421242
signature: secp256k1_ecdsa::Signature,
12431243
},
1244-
SlhDsa_Sha2_128s {
1245-
signature: slh_dsa_sha2_128s::Signature,
1246-
},
12471244
WebAuthn {
12481245
signature: PartialAuthenticatorAssertionResponse,
12491246
},
12501247
Keyless {
12511248
signature: KeylessSignature,
12521249
},
1250+
SlhDsa_Sha2_128s {
1251+
signature: slh_dsa_sha2_128s::Signature,
1252+
},
12531253
}
12541254

12551255
impl AnySignature {
@@ -1366,15 +1366,15 @@ pub enum AnyPublicKey {
13661366
Secp256r1Ecdsa {
13671367
public_key: secp256r1_ecdsa::PublicKey,
13681368
},
1369-
SlhDsa_Sha2_128s {
1370-
public_key: slh_dsa_sha2_128s::PublicKey,
1371-
},
13721369
Keyless {
13731370
public_key: KeylessPublicKey,
13741371
},
13751372
FederatedKeyless {
13761373
public_key: FederatedKeylessPublicKey,
13771374
},
1375+
SlhDsa_Sha2_128s {
1376+
public_key: slh_dsa_sha2_128s::PublicKey,
1377+
},
13781378
}
13791379

13801380
impl AnyPublicKey {

0 commit comments

Comments
 (0)