[api] Allow JSON no account signature in simulation (#15558)

* [api] Allow JSON no account signature in simulation * fixup: Remaining lint issues with signature
aptos-labs · Jan 9, 2025 · 1eea32b · 1eea32b
1 parent 3169527
commit 1eea32b
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 17 deletions.
diff --git a/api/doc/spec.json b/api/doc/spec.json
@@ -16427,6 +16427,9 @@
           },
           {
             "$ref": "#/components/schemas/TransactionSignature_AccountSignature"
+          },
+          {
+            "$ref": "#/components/schemas/TransactionSignature_NoAccountSignature"
           }
         ],
         "discriminator": {
@@ -16436,7 +16439,8 @@
             "multi_ed25519_signature": "#/components/schemas/TransactionSignature_MultiEd25519Signature",
             "multi_agent_signature": "#/components/schemas/TransactionSignature_MultiAgentSignature",
             "fee_payer_signature": "#/components/schemas/TransactionSignature_FeePayerSignature",
-            "single_sender": "#/components/schemas/TransactionSignature_AccountSignature"
+            "single_sender": "#/components/schemas/TransactionSignature_AccountSignature",
+            "no_account_signature": "#/components/schemas/TransactionSignature_NoAccountSignature"
           }
         }
       },
@@ -16550,6 +16554,28 @@
           }
         ]
       },
+      "TransactionSignature_NoAccountSignature": {
+        "allOf": [
+          {
+            "type": "object",
+            "required": [
+              "type"
+            ],
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "no_account_signature"
+                ],
+                "example": "no_account_signature"
+              }
+            }
+          },
+          {
+            "$ref": "#/components/schemas/NoAccountSignature"
+          }
+        ]
+      },
       "Transaction_BlockEpilogueTransaction": {
         "allOf": [
           {

diff --git a/api/doc/spec.yaml b/api/doc/spec.yaml
@@ -12224,6 +12224,7 @@ components:
       - $ref: '#/components/schemas/TransactionSignature_MultiAgentSignature'
       - $ref: '#/components/schemas/TransactionSignature_FeePayerSignature'
       - $ref: '#/components/schemas/TransactionSignature_AccountSignature'
+      - $ref: '#/components/schemas/TransactionSignature_NoAccountSignature'
       discriminator:
         propertyName: type
         mapping:
@@ -12232,6 +12233,7 @@ components:
           multi_agent_signature: '#/components/schemas/TransactionSignature_MultiAgentSignature'
           fee_payer_signature: '#/components/schemas/TransactionSignature_FeePayerSignature'
           single_sender: '#/components/schemas/TransactionSignature_AccountSignature'
+          no_account_signature: '#/components/schemas/TransactionSignature_NoAccountSignature'
     TransactionSignature_AccountSignature:
       allOf:
       - type: object
@@ -12292,6 +12294,18 @@ components:
             - multi_ed25519_signature
             example: multi_ed25519_signature
       - $ref: '#/components/schemas/MultiEd25519Signature'
+    TransactionSignature_NoAccountSignature:
+      allOf:
+      - type: object
+        required:
+        - type
+        properties:
+          type:
+            type: string
+            enum:
+            - no_account_signature
+            example: no_account_signature
+      - $ref: '#/components/schemas/NoAccountSignature'
     Transaction_BlockEpilogueTransaction:
       allOf:
       - type: object

diff --git a/api/types/src/transaction.rs b/api/types/src/transaction.rs
@@ -1191,6 +1191,7 @@ pub enum TransactionSignature {
     MultiAgentSignature(MultiAgentSignature),
     FeePayerSignature(FeePayerSignature),
     SingleSender(AccountSignature),
+    NoAccountSignature(NoAccountSignature),
 }
 
 impl VerifyInput for TransactionSignature {
@@ -1201,6 +1202,7 @@ impl VerifyInput for TransactionSignature {
             TransactionSignature::MultiAgentSignature(inner) => inner.verify(),
             TransactionSignature::FeePayerSignature(inner) => inner.verify(),
             TransactionSignature::SingleSender(inner) => inner.verify(),
+            TransactionSignature::NoAccountSignature(inner) => inner.verify(),
         }
     }
 }
@@ -1217,6 +1219,7 @@ impl TryFrom<TransactionSignature> for TransactionAuthenticator {
             TransactionSignature::SingleSender(sig) => {
                 TransactionAuthenticator::single_sender(sig.try_into()?)
             },
+            TransactionSignature::NoAccountSignature(sig) => sig.try_into()?,
         })
     }
 }

diff --git a/crates/indexer/src/models/signatures.rs b/crates/indexer/src/models/signatures.rs
@@ -92,6 +92,7 @@ impl Signature {
                     None,
                 ))
             },
+            APITransactionSignature::NoAccountSignature(_) => Ok(vec![]),
         }
     }
 
@@ -106,6 +107,7 @@ impl Signature {
             },
             APITransactionSignature::FeePayerSignature(_) => String::from("fee_payer_signature"),
             APITransactionSignature::SingleSender(_sig) => String::from("single_sender"),
+            APITransactionSignature::NoAccountSignature(_) => String::from("no_account_signature"),
         }
     }
 

diff --git a/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/convert.rs b/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/convert.rs
@@ -698,16 +698,19 @@ pub fn convert_transaction_signature(
         TransactionSignature::MultiAgentSignature(_) => transaction::signature::Type::MultiAgent,
         TransactionSignature::FeePayerSignature(_) => transaction::signature::Type::FeePayer,
         TransactionSignature::SingleSender(_) => transaction::signature::Type::SingleSender,
+        TransactionSignature::NoAccountSignature(_) => {
+            unreachable!("No account signature can't be committed onchain")
+        },
     };
 
     let signature = match signature {
-        TransactionSignature::Ed25519Signature(s) => {
-            transaction::signature::Signature::Ed25519(convert_ed25519_signature(s))
-        },
-        TransactionSignature::MultiEd25519Signature(s) => {
-            transaction::signature::Signature::MultiEd25519(convert_multi_ed25519_signature(s))
-        },
-        TransactionSignature::MultiAgentSignature(s) => {
+        TransactionSignature::Ed25519Signature(s) => Some(
+            transaction::signature::Signature::Ed25519(convert_ed25519_signature(s)),
+        ),
+        TransactionSignature::MultiEd25519Signature(s) => Some(
+            transaction::signature::Signature::MultiEd25519(convert_multi_ed25519_signature(s)),
+        ),
+        TransactionSignature::MultiAgentSignature(s) => Some(
             transaction::signature::Signature::MultiAgent(transaction::MultiAgentSignature {
                 sender: Some(convert_account_signature(&s.sender)),
                 secondary_signer_addresses: s
@@ -720,9 +723,9 @@ pub fn convert_transaction_signature(
                     .iter()
                     .map(convert_account_signature)
                     .collect(),
-            })
-        },
-        TransactionSignature::FeePayerSignature(s) => {
+            }),
+        ),
+        TransactionSignature::FeePayerSignature(s) => Some(
             transaction::signature::Signature::FeePayer(transaction::FeePayerSignature {
                 sender: Some(convert_account_signature(&s.sender)),
                 secondary_signer_addresses: s
@@ -737,18 +740,19 @@ pub fn convert_transaction_signature(
                     .collect(),
                 fee_payer_address: s.fee_payer_address.to_string(),
                 fee_payer_signer: Some(convert_account_signature(&s.fee_payer_signer)),
-            })
-        },
-        TransactionSignature::SingleSender(s) => {
+            }),
+        ),
+        TransactionSignature::SingleSender(s) => Some(
             transaction::signature::Signature::SingleSender(transaction::SingleSender {
                 sender: Some(convert_account_signature(s)),
-            })
-        },
+            }),
+        ),
+        TransactionSignature::NoAccountSignature(_) => None,
     };
 
     Some(transaction::Signature {
         r#type: r#type as i32,
-        signature: Some(signature),
+        signature,
     })
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,6 +92,7 @@ impl Signature { @@
                         None,
                     ))
                 },
+                APITransactionSignature::NoAccountSignature(_) => Ok(vec![]),
             }
         }
@@ Expand All / @@ -106,6 +107,7 @@ impl Signature { @@
                 },
                 APITransactionSignature::FeePayerSignature(_) => String::from("fee_payer_signature"),
                 APITransactionSignature::SingleSender(_sig) => String::from("single_sender"),
+                APITransactionSignature::NoAccountSignature(_) => String::from("no_account_signature"),
             }
         }
@@ Expand Down @@