Skip to content

Commit fe18e86

Browse files
committed
Revert "build(deps): bump substreams from 0.5.20 to 0.6.0 (#5683)"
This reverts commit a633ae2.
1 parent 0e2ee0a commit fe18e86

File tree

23 files changed

+2017
-826
lines changed

23 files changed

+2017
-826
lines changed

Cargo.lock

Lines changed: 320 additions & 374 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ license = "MIT OR Apache-2.0"
4040

4141
[workspace.dependencies]
4242
anyhow = "1.0"
43-
async-graphql = { version = "7.0.15", features = ["chrono"] }
44-
async-graphql-axum = "7.0.15"
45-
axum = "0.8.1"
43+
async-graphql = { version = "=7.0.11", features = ["chrono"] }
44+
async-graphql-axum = "7.0.11"
45+
axum = "0.7.5"
4646
chrono = "0.4.38"
4747
bs58 = "0.5.1"
4848
clap = { version = "4.5.4", features = ["derive", "env"] }
@@ -60,8 +60,8 @@ graphman = { path = "./core/graphman" }
6060
graphman-store = { path = "./core/graphman_store" }
6161
itertools = "0.13.0"
6262
lazy_static = "1.5.0"
63-
prost = "0.13"
64-
prost-types = "0.13"
63+
prost = "0.12.6"
64+
prost-types = "0.12.6"
6565
regex = "1.5.4"
6666
reqwest = "0.12.5"
6767
serde = { version = "1.0.126", features = ["rc"] }
@@ -79,14 +79,11 @@ syn = { version = "2.0.87", features = ["full"] }
7979
test-store = { path = "./store/test-store" }
8080
thiserror = "1.0.25"
8181
tokio = { version = "1.38.0", features = ["full"] }
82-
tonic = { version = "0.12.3", features = ["tls-roots", "gzip"] }
83-
tonic-build = { version = "0.12.3", features = ["prost"] }
82+
tonic = { version = "0.11.0", features = ["tls-roots", "gzip"] }
83+
tonic-build = { version = "0.11.0", features = ["prost"] }
8484
tower-http = { version = "0.5.2", features = ["cors"] }
8585
wasmparser = "0.118.1"
8686
wasmtime = "15.0.1"
87-
substreams = "=0.6.0"
88-
substreams-entity-change = "2"
89-
substreams-near-core = "=0.10.2"
9087

9188
# Incremental compilation on Rust 1.58 causes an ICE on build. As soon as graph node builds again, these can be removed.
9289
[profile.test]

chain/arweave/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ fn main() {
22
println!("cargo:rerun-if-changed=proto");
33
tonic_build::configure()
44
.out_dir("src/protobuf")
5-
.compile_protos(&["proto/arweave.proto"], &["proto"])
5+
.compile(&["proto/arweave.proto"], &["proto"])
66
.expect("Failed to compile Firehose Arweave proto(s)");
77
}

chain/arweave/src/protobuf/sf.arweave.r#type.v1.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
// This file is @generated by prost-build.
2+
#[allow(clippy::derive_partial_eq_without_eq)]
23
#[derive(Clone, PartialEq, ::prost::Message)]
34
pub struct BigInt {
45
#[prost(bytes = "vec", tag = "1")]
56
pub bytes: ::prost::alloc::vec::Vec<u8>,
67
}
8+
#[allow(clippy::derive_partial_eq_without_eq)]
79
#[derive(Clone, PartialEq, ::prost::Message)]
810
pub struct Block {
911
/// Firehose block version (unrelated to Arweave block version)
@@ -73,6 +75,7 @@ pub struct Block {
7375
pub poa: ::core::option::Option<ProofOfAccess>,
7476
}
7577
/// A succinct proof of access to a recall byte found in a TX
78+
#[allow(clippy::derive_partial_eq_without_eq)]
7679
#[derive(Clone, PartialEq, ::prost::Message)]
7780
pub struct ProofOfAccess {
7881
/// The recall byte option chosen; global offset of index byte
@@ -91,6 +94,7 @@ pub struct ProofOfAccess {
9194
#[prost(bytes = "vec", tag = "4")]
9295
pub chunk: ::prost::alloc::vec::Vec<u8>,
9396
}
97+
#[allow(clippy::derive_partial_eq_without_eq)]
9498
#[derive(Clone, PartialEq, ::prost::Message)]
9599
pub struct Transaction {
96100
/// 1 or 2 for v1 or v2 transactions. More allowable in the future
@@ -133,6 +137,7 @@ pub struct Transaction {
133137
#[prost(message, optional, tag = "12")]
134138
pub reward: ::core::option::Option<BigInt>,
135139
}
140+
#[allow(clippy::derive_partial_eq_without_eq)]
136141
#[derive(Clone, PartialEq, ::prost::Message)]
137142
pub struct Tag {
138143
#[prost(bytes = "vec", tag = "1")]

chain/ethereum/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ fn main() {
33

44
tonic_build::configure()
55
.out_dir("src/protobuf")
6-
.compile_protos(&["proto/ethereum.proto"], &["proto"])
6+
.compile(&["proto/ethereum.proto"], &["proto"])
77
.expect("Failed to compile Firehose Ethereum proto(s)");
88
}

chain/ethereum/src/protobuf/sf.ethereum.r#type.v2.rs

Lines changed: 71 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// This file is @generated by prost-build.
2+
#[allow(clippy::derive_partial_eq_without_eq)]
23
#[derive(Clone, PartialEq, ::prost::Message)]
34
pub struct Block {
45
#[prost(int32, tag = "1")]
@@ -31,6 +32,7 @@ pub struct Block {
3132
///
3233
/// WARN: this is a client-side optimization pattern and should be moved in the
3334
/// consuming code.
35+
#[allow(clippy::derive_partial_eq_without_eq)]
3436
#[derive(Clone, PartialEq, ::prost::Message)]
3537
pub struct HeaderOnlyBlock {
3638
#[prost(message, optional, tag = "5")]
@@ -39,6 +41,7 @@ pub struct HeaderOnlyBlock {
3941
/// BlockWithRefs is a lightweight block, with traces and transactions
4042
/// purged from the `block` within, and only. It is used in transports
4143
/// to pass block data around.
44+
#[allow(clippy::derive_partial_eq_without_eq)]
4245
#[derive(Clone, PartialEq, ::prost::Message)]
4346
pub struct BlockWithRefs {
4447
#[prost(string, tag = "1")]
@@ -50,23 +53,27 @@ pub struct BlockWithRefs {
5053
#[prost(bool, tag = "4")]
5154
pub irreversible: bool,
5255
}
56+
#[allow(clippy::derive_partial_eq_without_eq)]
5357
#[derive(Clone, PartialEq, ::prost::Message)]
5458
pub struct TransactionRefs {
5559
#[prost(bytes = "vec", repeated, tag = "1")]
5660
pub hashes: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
5761
}
62+
#[allow(clippy::derive_partial_eq_without_eq)]
5863
#[derive(Clone, PartialEq, ::prost::Message)]
5964
pub struct UnclesHeaders {
6065
#[prost(message, repeated, tag = "1")]
6166
pub uncles: ::prost::alloc::vec::Vec<BlockHeader>,
6267
}
68+
#[allow(clippy::derive_partial_eq_without_eq)]
6369
#[derive(Clone, PartialEq, ::prost::Message)]
6470
pub struct BlockRef {
6571
#[prost(bytes = "vec", tag = "1")]
6672
pub hash: ::prost::alloc::vec::Vec<u8>,
6773
#[prost(uint64, tag = "2")]
6874
pub number: u64,
6975
}
76+
#[allow(clippy::derive_partial_eq_without_eq)]
7077
#[derive(Clone, PartialEq, ::prost::Message)]
7178
pub struct BlockHeader {
7279
#[prost(bytes = "vec", tag = "1")]
@@ -156,11 +163,13 @@ pub struct BlockHeader {
156163
#[prost(message, optional, tag = "18")]
157164
pub base_fee_per_gas: ::core::option::Option<BigInt>,
158165
}
166+
#[allow(clippy::derive_partial_eq_without_eq)]
159167
#[derive(Clone, PartialEq, ::prost::Message)]
160168
pub struct BigInt {
161169
#[prost(bytes = "vec", tag = "1")]
162170
pub bytes: ::prost::alloc::vec::Vec<u8>,
163171
}
172+
#[allow(clippy::derive_partial_eq_without_eq)]
164173
#[derive(Clone, PartialEq, ::prost::Message)]
165174
pub struct TransactionTrace {
166175
/// consensus
@@ -281,9 +290,9 @@ pub mod transaction_trace {
281290
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
282291
pub fn as_str_name(&self) -> &'static str {
283292
match self {
284-
Self::TrxTypeLegacy => "TRX_TYPE_LEGACY",
285-
Self::TrxTypeAccessList => "TRX_TYPE_ACCESS_LIST",
286-
Self::TrxTypeDynamicFee => "TRX_TYPE_DYNAMIC_FEE",
293+
Type::TrxTypeLegacy => "TRX_TYPE_LEGACY",
294+
Type::TrxTypeAccessList => "TRX_TYPE_ACCESS_LIST",
295+
Type::TrxTypeDynamicFee => "TRX_TYPE_DYNAMIC_FEE",
287296
}
288297
}
289298
/// Creates an enum from field names used in the ProtoBuf definition.
@@ -299,6 +308,7 @@ pub mod transaction_trace {
299308
}
300309
/// AccessTuple represents a list of storage keys for a given contract's address and is used
301310
/// for AccessList construction.
311+
#[allow(clippy::derive_partial_eq_without_eq)]
302312
#[derive(Clone, PartialEq, ::prost::Message)]
303313
pub struct AccessTuple {
304314
#[prost(bytes = "vec", tag = "1")]
@@ -307,13 +317,15 @@ pub struct AccessTuple {
307317
pub storage_keys: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
308318
}
309319
/// TransactionTraceWithBlockRef
320+
#[allow(clippy::derive_partial_eq_without_eq)]
310321
#[derive(Clone, PartialEq, ::prost::Message)]
311322
pub struct TransactionTraceWithBlockRef {
312323
#[prost(message, optional, tag = "1")]
313324
pub trace: ::core::option::Option<TransactionTrace>,
314325
#[prost(message, optional, tag = "2")]
315326
pub block_ref: ::core::option::Option<BlockRef>,
316327
}
328+
#[allow(clippy::derive_partial_eq_without_eq)]
317329
#[derive(Clone, PartialEq, ::prost::Message)]
318330
pub struct TransactionReceipt {
319331
/// State root is an intermediate state_root hash, computed in-between transactions to make
@@ -338,6 +350,7 @@ pub struct TransactionReceipt {
338350
#[prost(message, repeated, tag = "4")]
339351
pub logs: ::prost::alloc::vec::Vec<Log>,
340352
}
353+
#[allow(clippy::derive_partial_eq_without_eq)]
341354
#[derive(Clone, PartialEq, ::prost::Message)]
342355
pub struct Log {
343356
#[prost(bytes = "vec", tag = "1")]
@@ -371,6 +384,7 @@ pub struct Log {
371384
#[prost(uint64, tag = "7")]
372385
pub ordinal: u64,
373386
}
387+
#[allow(clippy::derive_partial_eq_without_eq)]
374388
#[derive(Clone, PartialEq, ::prost::Message)]
375389
pub struct Call {
376390
#[prost(uint32, tag = "1")]
@@ -463,6 +477,7 @@ pub struct Call {
463477
#[prost(message, repeated, tag = "33")]
464478
pub account_creations: ::prost::alloc::vec::Vec<AccountCreation>,
465479
}
480+
#[allow(clippy::derive_partial_eq_without_eq)]
466481
#[derive(Clone, PartialEq, ::prost::Message)]
467482
pub struct StorageChange {
468483
#[prost(bytes = "vec", tag = "1")]
@@ -476,6 +491,7 @@ pub struct StorageChange {
476491
#[prost(uint64, tag = "5")]
477492
pub ordinal: u64,
478493
}
494+
#[allow(clippy::derive_partial_eq_without_eq)]
479495
#[derive(Clone, PartialEq, ::prost::Message)]
480496
pub struct BalanceChange {
481497
#[prost(bytes = "vec", tag = "1")]
@@ -534,22 +550,22 @@ pub mod balance_change {
534550
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
535551
pub fn as_str_name(&self) -> &'static str {
536552
match self {
537-
Self::Unknown => "REASON_UNKNOWN",
538-
Self::RewardMineUncle => "REASON_REWARD_MINE_UNCLE",
539-
Self::RewardMineBlock => "REASON_REWARD_MINE_BLOCK",
540-
Self::DaoRefundContract => "REASON_DAO_REFUND_CONTRACT",
541-
Self::DaoAdjustBalance => "REASON_DAO_ADJUST_BALANCE",
542-
Self::Transfer => "REASON_TRANSFER",
543-
Self::GenesisBalance => "REASON_GENESIS_BALANCE",
544-
Self::GasBuy => "REASON_GAS_BUY",
545-
Self::RewardTransactionFee => "REASON_REWARD_TRANSACTION_FEE",
546-
Self::RewardFeeReset => "REASON_REWARD_FEE_RESET",
547-
Self::GasRefund => "REASON_GAS_REFUND",
548-
Self::TouchAccount => "REASON_TOUCH_ACCOUNT",
549-
Self::SuicideRefund => "REASON_SUICIDE_REFUND",
550-
Self::SuicideWithdraw => "REASON_SUICIDE_WITHDRAW",
551-
Self::CallBalanceOverride => "REASON_CALL_BALANCE_OVERRIDE",
552-
Self::Burn => "REASON_BURN",
553+
Reason::Unknown => "REASON_UNKNOWN",
554+
Reason::RewardMineUncle => "REASON_REWARD_MINE_UNCLE",
555+
Reason::RewardMineBlock => "REASON_REWARD_MINE_BLOCK",
556+
Reason::DaoRefundContract => "REASON_DAO_REFUND_CONTRACT",
557+
Reason::DaoAdjustBalance => "REASON_DAO_ADJUST_BALANCE",
558+
Reason::Transfer => "REASON_TRANSFER",
559+
Reason::GenesisBalance => "REASON_GENESIS_BALANCE",
560+
Reason::GasBuy => "REASON_GAS_BUY",
561+
Reason::RewardTransactionFee => "REASON_REWARD_TRANSACTION_FEE",
562+
Reason::RewardFeeReset => "REASON_REWARD_FEE_RESET",
563+
Reason::GasRefund => "REASON_GAS_REFUND",
564+
Reason::TouchAccount => "REASON_TOUCH_ACCOUNT",
565+
Reason::SuicideRefund => "REASON_SUICIDE_REFUND",
566+
Reason::SuicideWithdraw => "REASON_SUICIDE_WITHDRAW",
567+
Reason::CallBalanceOverride => "REASON_CALL_BALANCE_OVERRIDE",
568+
Reason::Burn => "REASON_BURN",
553569
}
554570
}
555571
/// Creates an enum from field names used in the ProtoBuf definition.
@@ -576,6 +592,7 @@ pub mod balance_change {
576592
}
577593
}
578594
}
595+
#[allow(clippy::derive_partial_eq_without_eq)]
579596
#[derive(Clone, PartialEq, ::prost::Message)]
580597
pub struct NonceChange {
581598
#[prost(bytes = "vec", tag = "1")]
@@ -587,13 +604,15 @@ pub struct NonceChange {
587604
#[prost(uint64, tag = "4")]
588605
pub ordinal: u64,
589606
}
607+
#[allow(clippy::derive_partial_eq_without_eq)]
590608
#[derive(Clone, PartialEq, ::prost::Message)]
591609
pub struct AccountCreation {
592610
#[prost(bytes = "vec", tag = "1")]
593611
pub account: ::prost::alloc::vec::Vec<u8>,
594612
#[prost(uint64, tag = "2")]
595613
pub ordinal: u64,
596614
}
615+
#[allow(clippy::derive_partial_eq_without_eq)]
597616
#[derive(Clone, PartialEq, ::prost::Message)]
598617
pub struct CodeChange {
599618
#[prost(bytes = "vec", tag = "1")]
@@ -615,7 +634,8 @@ pub struct CodeChange {
615634
///
616635
/// Hence, we only index some of them, those that are costly like all the calls
617636
/// one, log events, return data, etc.
618-
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
637+
#[allow(clippy::derive_partial_eq_without_eq)]
638+
#[derive(Clone, PartialEq, ::prost::Message)]
619639
pub struct GasChange {
620640
#[prost(uint64, tag = "1")]
621641
pub old_value: u64,
@@ -676,27 +696,27 @@ pub mod gas_change {
676696
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
677697
pub fn as_str_name(&self) -> &'static str {
678698
match self {
679-
Self::Unknown => "REASON_UNKNOWN",
680-
Self::Call => "REASON_CALL",
681-
Self::CallCode => "REASON_CALL_CODE",
682-
Self::CallDataCopy => "REASON_CALL_DATA_COPY",
683-
Self::CodeCopy => "REASON_CODE_COPY",
684-
Self::CodeStorage => "REASON_CODE_STORAGE",
685-
Self::ContractCreation => "REASON_CONTRACT_CREATION",
686-
Self::ContractCreation2 => "REASON_CONTRACT_CREATION2",
687-
Self::DelegateCall => "REASON_DELEGATE_CALL",
688-
Self::EventLog => "REASON_EVENT_LOG",
689-
Self::ExtCodeCopy => "REASON_EXT_CODE_COPY",
690-
Self::FailedExecution => "REASON_FAILED_EXECUTION",
691-
Self::IntrinsicGas => "REASON_INTRINSIC_GAS",
692-
Self::PrecompiledContract => "REASON_PRECOMPILED_CONTRACT",
693-
Self::RefundAfterExecution => "REASON_REFUND_AFTER_EXECUTION",
694-
Self::Return => "REASON_RETURN",
695-
Self::ReturnDataCopy => "REASON_RETURN_DATA_COPY",
696-
Self::Revert => "REASON_REVERT",
697-
Self::SelfDestruct => "REASON_SELF_DESTRUCT",
698-
Self::StaticCall => "REASON_STATIC_CALL",
699-
Self::StateColdAccess => "REASON_STATE_COLD_ACCESS",
699+
Reason::Unknown => "REASON_UNKNOWN",
700+
Reason::Call => "REASON_CALL",
701+
Reason::CallCode => "REASON_CALL_CODE",
702+
Reason::CallDataCopy => "REASON_CALL_DATA_COPY",
703+
Reason::CodeCopy => "REASON_CODE_COPY",
704+
Reason::CodeStorage => "REASON_CODE_STORAGE",
705+
Reason::ContractCreation => "REASON_CONTRACT_CREATION",
706+
Reason::ContractCreation2 => "REASON_CONTRACT_CREATION2",
707+
Reason::DelegateCall => "REASON_DELEGATE_CALL",
708+
Reason::EventLog => "REASON_EVENT_LOG",
709+
Reason::ExtCodeCopy => "REASON_EXT_CODE_COPY",
710+
Reason::FailedExecution => "REASON_FAILED_EXECUTION",
711+
Reason::IntrinsicGas => "REASON_INTRINSIC_GAS",
712+
Reason::PrecompiledContract => "REASON_PRECOMPILED_CONTRACT",
713+
Reason::RefundAfterExecution => "REASON_REFUND_AFTER_EXECUTION",
714+
Reason::Return => "REASON_RETURN",
715+
Reason::ReturnDataCopy => "REASON_RETURN_DATA_COPY",
716+
Reason::Revert => "REASON_REVERT",
717+
Reason::SelfDestruct => "REASON_SELF_DESTRUCT",
718+
Reason::StaticCall => "REASON_STATIC_CALL",
719+
Reason::StateColdAccess => "REASON_STATE_COLD_ACCESS",
700720
}
701721
}
702722
/// Creates an enum from field names used in the ProtoBuf definition.
@@ -743,10 +763,10 @@ impl TransactionTraceStatus {
743763
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
744764
pub fn as_str_name(&self) -> &'static str {
745765
match self {
746-
Self::Unknown => "UNKNOWN",
747-
Self::Succeeded => "SUCCEEDED",
748-
Self::Failed => "FAILED",
749-
Self::Reverted => "REVERTED",
766+
TransactionTraceStatus::Unknown => "UNKNOWN",
767+
TransactionTraceStatus::Succeeded => "SUCCEEDED",
768+
TransactionTraceStatus::Failed => "FAILED",
769+
TransactionTraceStatus::Reverted => "REVERTED",
750770
}
751771
}
752772
/// Creates an enum from field names used in the ProtoBuf definition.
@@ -779,12 +799,12 @@ impl CallType {
779799
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
780800
pub fn as_str_name(&self) -> &'static str {
781801
match self {
782-
Self::Unspecified => "UNSPECIFIED",
783-
Self::Call => "CALL",
784-
Self::Callcode => "CALLCODE",
785-
Self::Delegate => "DELEGATE",
786-
Self::Static => "STATIC",
787-
Self::Create => "CREATE",
802+
CallType::Unspecified => "UNSPECIFIED",
803+
CallType::Call => "CALL",
804+
CallType::Callcode => "CALLCODE",
805+
CallType::Delegate => "DELEGATE",
806+
CallType::Static => "STATIC",
807+
CallType::Create => "CREATE",
788808
}
789809
}
790810
/// Creates an enum from field names used in the ProtoBuf definition.

chain/near/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ fn main() {
33
tonic_build::configure()
44
.out_dir("src/protobuf")
55
.extern_path(".sf.near.codec.v1", "crate::codec::pbcodec")
6-
.compile_protos(
6+
.compile(
77
&["proto/near.proto", "proto/substreams-triggers.proto"],
88
&["proto"],
99
)

chain/near/src/protobuf/receipts.v1.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// This file is @generated by prost-build.
2+
#[allow(clippy::derive_partial_eq_without_eq)]
23
#[derive(Clone, PartialEq, ::prost::Message)]
34
pub struct BlockAndReceipts {
45
#[prost(message, optional, tag = "1")]

0 commit comments

Comments
 (0)