rename files

Author: alinush

api/types/src/transaction.rs

@@ -28,7 +28,7 @@ use aptos_types::{
         webauthn::{PartialAuthenticatorAssertionResponse, MAX_WEBAUTHN_SIGNATURE_BYTES},
         Script, SignedTransaction, TransactionOutput, TransactionWithProof,
     },
-    zkid,
+    oidb,
 };
 use once_cell::sync::Lazy;
 use poem_openapi::{Object, Union};
@@ -1207,15 +1207,15 @@ impl VerifyInput for OidbSignature {
     fn verify(&self) -> anyhow::Result<()> {
         let public_key_len = self.public_key.inner().len();
         let signature_len = self.signature.inner().len();
-        if public_key_len > zkid::OidbPublicKey::MAX_LEN {
+        if public_key_len > oidb::OidbPublicKey::MAX_LEN {
             bail!(
                 "OIDB public key length is greater than the maximum number of {} bytes: found {} bytes",
-                zkid::OidbPublicKey::MAX_LEN, public_key_len
+                oidb::OidbPublicKey::MAX_LEN, public_key_len
             )
-        } else if signature_len > zkid::OidbSignature::MAX_LEN {
+        } else if signature_len > oidb::OidbSignature::MAX_LEN {
             bail!(
                 "OIDB signature length is greater than the maximum number of {} bytes: found {} bytes",
-                zkid::OidbSignature::MAX_LEN, signature_len
+                oidb::OidbSignature::MAX_LEN, signature_len
             )
         } else {
             Ok(())

aptos-move/aptos-vm/src/aptos_vm.rs

@@ -15,7 +15,7 @@ use crate::{
     sharded_block_executor::{executor_client::ExecutorClient, ShardedBlockExecutor},
     system_module_names::*,
     transaction_metadata::TransactionMetadata,
-    transaction_validation, verifier, zkid_validation, VMExecutor, VMValidator,
+    transaction_validation, verifier, oidb_validation, VMExecutor, VMValidator,
 };
 use anyhow::anyhow;
 use aptos_block_executor::txn_commit_hook::NoOpTransactionCommitHook;
@@ -1293,9 +1293,9 @@ impl AptosVM {
             ));
         }
 
-        let authenticators = aptos_types::zkid::get_oidb_authenticators(transaction)
+        let authenticators = aptos_types::oidb::get_oidb_authenticators(transaction)
             .map_err(|_| VMStatus::error(StatusCode::INVALID_SIGNATURE, None))?;
-        zkid_validation::validate_oidb_authenticators(&authenticators, self.features(), resolver)?;
+        oidb_validation::validate_oidb_authenticators(&authenticators, self.features(), resolver)?;
 
         // The prologue MUST be run AFTER any validation. Otherwise you may run prologue and hit
         // SEQUENCE_NUMBER_TOO_NEW if there is more than one transaction from the same sender and

aptos-move/aptos-vm/src/lib.rs

@@ -118,7 +118,7 @@ pub mod transaction_metadata;
 mod transaction_validation;
 pub mod validator_txns;
 pub mod verifier;
-mod zkid_validation;
+mod oidb_validation;
 
 pub use crate::aptos_vm::{AptosSimulationVM, AptosVM};
 use crate::sharded_block_executor::{executor_client::ExecutorClient, ShardedBlockExecutor};

aptos-move/aptos-vm/src/zkid_validation.rs aptos-move/aptos-vm/src/oidb_validation.rs

@@ -10,7 +10,7 @@ use aptos_types::{
     on_chain_config::{CurrentTimeMicroseconds, Features, OnChainConfig},
     transaction::authenticator::EphemeralPublicKey,
     vm_status::{StatusCode, VMStatus},
-    zkid::{
+    oidb::{
         get_public_inputs_hash, Configuration, Groth16VerificationKey, OidbPublicKey,
         OidbSignature, ZkpOrOpenIdSig,
     },

aptos-move/vm-genesis/src/lib.rs

@@ -28,8 +28,8 @@ use aptos_types::{
     },
     transaction::{authenticator::AuthenticationKey, ChangeSet, Transaction, WriteSetPayload},
     write_set::TransactionWrite,
-    zkid,
-    zkid::{Groth16VerificationKey, DEVNET_VERIFICATION_KEY},
+    oidb,
+    oidb::{Groth16VerificationKey, DEVNET_VERIFICATION_KEY},
 };
 use aptos_vm::{
     data_cache::AsMoveResolver,
@@ -536,7 +536,7 @@ fn initialize_on_chain_governance(session: &mut SessionExt, genesis_config: &Gen
 }
 
 fn initialize_oidb(session: &mut SessionExt, chain_id: ChainId) {
-    let config = zkid::Configuration::new_for_devnet();
+    let config = oidb::Configuration::new_for_devnet();
     exec_function(
         session,
         OIDB_MODULE_NAME,

ecosystem/indexer-grpc/indexer-grpc-fullnode/src/convert.rs

@@ -15,7 +15,7 @@ use aptos_logger::warn;
 use aptos_protos::{
     transaction::{
         v1 as transaction,
-        v1::{any_signature, Ed25519, Secp256k1Ecdsa, WebAuthn, ZkId},
+        v1::{any_signature, Ed25519, Secp256k1Ecdsa, WebAuthn, Oidb},
     },
     util::timestamp,
 };
@@ -603,9 +603,9 @@ fn convert_signature(signature: &Signature) -> transaction::AnySignature {
             })),
         },
         Signature::Oidb(s) => transaction::AnySignature {
-            r#type: transaction::any_signature::Type::OIDB as i32,
+            r#type: transaction::any_signature::Type::Oidb as i32,
             signature: s.0.clone(),
-            signature_variant: Some(any_signature::SignatureVariant::Zkid(ZkId {
+            signature_variant: Some(any_signature::SignatureVariant::Oidb(Oidb {
                 signature: s.0.clone(),
             })),
         },
@@ -627,7 +627,7 @@ fn convert_public_key(public_key: &PublicKey) -> transaction::AnyPublicKey {
             public_key: p.0.clone(),
         },
         PublicKey::Oidb(p) => transaction::AnyPublicKey {
-            r#type: transaction::any_public_key::Type::Zkid as i32,
+            r#type: transaction::any_public_key::Type::Oidb as i32,
             public_key: p.0.clone(),
         },
     }

protos/proto/aptos/transaction/v1/transaction.proto

@@ -451,7 +451,7 @@ message AnyPublicKey {
     TYPE_ED25519 = 1;
     TYPE_SECP256K1_ECDSA = 2;
     TYPE_SECP256R1_ECDSA = 3;
-    TYPE_ZKID = 4;
+    TYPE_OIDB = 4;
   }
 
   Type type = 1;
@@ -464,7 +464,7 @@ message AnySignature {
     TYPE_ED25519 = 1;
     TYPE_SECP256K1_ECDSA = 2;
     TYPE_WEBAUTHN = 3;
-    TYPE_ZKID = 4;
+    TYPE_OIDB = 4;
   }
 
   Type type = 1;
@@ -478,7 +478,7 @@ message AnySignature {
     Ed25519 ed25519 = 3;
     Secp256k1Ecdsa secp256k1_ecdsa = 4;
     WebAuthn webauthn = 5;
-    ZkId zkid = 6;
+    Oidb oidb = 6;
   }
 }
 
@@ -494,7 +494,7 @@ message WebAuthn {
   bytes signature = 1;
 }
 
-message ZkId {
+message Oidb {
   bytes signature = 1;
 }
 

protos/python/aptos_protos/aptos/transaction/v1/transaction_pb2.py

@@ -1016,12 +1016,12 @@ class AnyPublicKey(_message.Message):
         TYPE_ED25519: _ClassVar[AnyPublicKey.Type]
         TYPE_SECP256K1_ECDSA: _ClassVar[AnyPublicKey.Type]
         TYPE_SECP256R1_ECDSA: _ClassVar[AnyPublicKey.Type]
-        TYPE_ZKID: _ClassVar[AnyPublicKey.Type]
+        TYPE_OIDB: _ClassVar[AnyPublicKey.Type]
     TYPE_UNSPECIFIED: AnyPublicKey.Type
     TYPE_ED25519: AnyPublicKey.Type
     TYPE_SECP256K1_ECDSA: AnyPublicKey.Type
     TYPE_SECP256R1_ECDSA: AnyPublicKey.Type
-    TYPE_ZKID: AnyPublicKey.Type
+    TYPE_OIDB: AnyPublicKey.Type
     TYPE_FIELD_NUMBER: _ClassVar[int]
     PUBLIC_KEY_FIELD_NUMBER: _ClassVar[int]
     type: AnyPublicKey.Type
@@ -1033,40 +1033,40 @@ class AnyPublicKey(_message.Message):
     ) -> None: ...
 
 class AnySignature(_message.Message):
-    __slots__ = ["type", "signature", "ed25519", "secp256k1_ecdsa", "webauthn", "zkid"]
+    __slots__ = ["type", "signature", "ed25519", "secp256k1_ecdsa", "webauthn", "oidb"]
 
     class Type(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
         __slots__ = []
         TYPE_UNSPECIFIED: _ClassVar[AnySignature.Type]
         TYPE_ED25519: _ClassVar[AnySignature.Type]
         TYPE_SECP256K1_ECDSA: _ClassVar[AnySignature.Type]
         TYPE_WEBAUTHN: _ClassVar[AnySignature.Type]
-        TYPE_ZKID: _ClassVar[AnySignature.Type]
+        TYPE_OIDB: _ClassVar[AnySignature.Type]
     TYPE_UNSPECIFIED: AnySignature.Type
     TYPE_ED25519: AnySignature.Type
     TYPE_SECP256K1_ECDSA: AnySignature.Type
     TYPE_WEBAUTHN: AnySignature.Type
-    TYPE_ZKID: AnySignature.Type
+    TYPE_OIDB: AnySignature.Type
     TYPE_FIELD_NUMBER: _ClassVar[int]
     SIGNATURE_FIELD_NUMBER: _ClassVar[int]
     ED25519_FIELD_NUMBER: _ClassVar[int]
     SECP256K1_ECDSA_FIELD_NUMBER: _ClassVar[int]
     WEBAUTHN_FIELD_NUMBER: _ClassVar[int]
-    ZKID_FIELD_NUMBER: _ClassVar[int]
+    OIDB_FIELD_NUMBER: _ClassVar[int]
     type: AnySignature.Type
     signature: bytes
     ed25519: Ed25519
     secp256k1_ecdsa: Secp256k1Ecdsa
     webauthn: WebAuthn
-    zkid: ZkId
+    oidb: Oidb
     def __init__(
         self,
         type: _Optional[_Union[AnySignature.Type, str]] = ...,
         signature: _Optional[bytes] = ...,
         ed25519: _Optional[_Union[Ed25519, _Mapping]] = ...,
         secp256k1_ecdsa: _Optional[_Union[Secp256k1Ecdsa, _Mapping]] = ...,
         webauthn: _Optional[_Union[WebAuthn, _Mapping]] = ...,
-        zkid: _Optional[_Union[ZkId, _Mapping]] = ...,
+        oidb: _Optional[_Union[Oidb, _Mapping]] = ...,
     ) -> None: ...
 
 class Ed25519(_message.Message):
@@ -1087,7 +1087,7 @@ class WebAuthn(_message.Message):
     signature: bytes
     def __init__(self, signature: _Optional[bytes] = ...) -> None: ...
 
-class ZkId(_message.Message):
+class Oidb(_message.Message):
     __slots__ = ["signature"]
     SIGNATURE_FIELD_NUMBER: _ClassVar[int]
     signature: bytes