Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[processor][DO NOT MERGE] Randomnet special cut. #255

Closed
wants to merge 1 commit into from
Closed

[processor][DO NOT MERGE] Randomnet special cut. #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions rust/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ aptos-moving-average = { path = "moving-average" }

anyhow = "1.0.62"
async-trait = "0.1.53"
aptos-protos = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "af0dcea7144225a709e4f595e58f8026b99e901c" }
# Special cut for randomnet.
aptos-protos = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "6cec53ad4123e8f18a49dff35a5c7b9c2cce7728" }
backtrace = "0.3.58"
base64 = "0.13.0"
bb8 = "0.8.1"
Expand All @@ -44,9 +45,9 @@ diesel_migrations = { version = "2.1.0", features = ["postgres"] }
diesel_async_migrations = { git = "https://github.com/niroco/diesel_async_migrations", rev = "11f331b73c5cfcc894380074f748d8fda710ac12" }
enum_dispatch = "0.3.12"
field_count = "0.1.1"
futures = "0.3.24" # Previously futures v0.3.23 caused some consensus network_tests to fail. We now pin the dependency to v0.3.24.
futures-core = "0.3.25"
futures-util = "0.3.21"
futures = "0.3.29" # Previously futures v0.3.23 caused some consensus network_tests to fail. We now pin the dependency to v0.3.24.
futures-core = "0.3.29"
futures-util = "0.3.29"
gcloud-sdk = { version = "0.20.4", features = [
"google-cloud-bigquery-storage-v1",
] }
Expand Down
15 changes: 15 additions & 0 deletions rust/processor/src/models/default_models/transactions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,21 @@ impl Transaction {
vec![],
vec![],
),
TxnData::Validator(_validator_txn) => (
Self::from_transaction_info(
transaction_info,
None,
None,
version,
transaction_type,
0,
block_height,
epoch,
),
None,
vec![],
vec![],
),
}
}

Expand Down
27 changes: 23 additions & 4 deletions rust/processor/src/models/user_transactions_models/signatures.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ use crate::{
use anyhow::{Context, Result};
use aptos_protos::transaction::v1::{
account_signature::Signature as AccountSignatureEnum,
any_signature::Type as AnySignatureTypeEnumPb, signature::Signature as SignatureEnum,
any_signature::{Signature as AnySignaturePb, Type as AnySignatureTypeEnumPb},
signature::Signature as SignatureEnum,
AccountSignature as ProtoAccountSignature, Ed25519Signature as Ed25519SignaturePB,
FeePayerSignature as ProtoFeePayerSignature, MultiAgentSignature as ProtoMultiAgentSignature,
MultiEd25519Signature as MultiEd25519SignaturePb, MultiKeySignature as MultiKeySignaturePb,
Expand Down Expand Up @@ -353,6 +354,12 @@ impl Signature {
"".to_string()
},
};
let signature_bytes = match signature.signature.as_ref().unwrap() {
AnySignaturePb::Ed25519(sig) => sig.signature.as_slice(),
AnySignaturePb::Secp256k1Ecdsa(sig) => sig.signature.as_slice(),
AnySignaturePb::Webauthn(sig) => sig.signature.as_slice(),
AnySignaturePb::Zkid(sig) => sig.signature.as_slice(),
};
Self {
transaction_version,
transaction_block_height,
Expand All @@ -365,7 +372,7 @@ impl Signature {
),
threshold: 1,
public_key_indices: serde_json::Value::Array(vec![]),
signature: format!("0x{}", hex::encode(signature.signature.as_slice())),
signature: format!("0x{}", hex::encode(signature_bytes)),
multi_agent_index,
multi_sig_index: 0,
}
Expand Down Expand Up @@ -394,7 +401,19 @@ impl Signature {
.unwrap()
.public_key
.clone();
let signature_bytes = signature.signature.as_ref().unwrap().signature.clone();
let signature_bytes = match signature
.signature
.as_ref()
.unwrap()
.signature
.as_ref()
.unwrap()
{
AnySignaturePb::Ed25519(sig) => sig.signature.as_slice(),
AnySignaturePb::Secp256k1Ecdsa(sig) => sig.signature.as_slice(),
AnySignaturePb::Webauthn(sig) => sig.signature.as_slice(),
AnySignaturePb::Zkid(sig) => sig.signature.as_slice(),
};
let type_ = match AnySignatureTypeEnumPb::try_from(
signature.signature.as_ref().unwrap().r#type,
) {
Expand All @@ -421,7 +440,7 @@ impl Signature {
type_,
public_key: format!("0x{}", hex::encode(public_key.as_slice())),
threshold: s.signatures_required as i64,
signature: format!("0x{}", hex::encode(signature_bytes.as_slice())),
signature: format!("0x{}", hex::encode(signature_bytes)),
public_key_indices: serde_json::Value::Array(
public_key_indices
.iter()
Expand Down
Loading