graph, chain: code cleanup and refactor

Author: incrypto32

chain/ethereum/src/codec.rs

@@ -41,17 +41,13 @@ where
     }
 }
 
-// impl TryDecodeProto<[u8; 256], H2048> for &[u8] {}
-// impl TryDecodeProto<[u8; 32], H256> for &[u8] {}
-// impl TryDecodeProto<[u8; 20], H160> for &[u8] {}
-
 impl TryDecodeProto<[u8; 32], B256> for &[u8] {}
 impl TryDecodeProto<[u8; 256], B2048> for &[u8] {}
 impl TryDecodeProto<[u8; 20], Address> for &[u8] {}
 
-impl From<&BigInt> for alloy::primitives::U256 {
+impl From<&BigInt> for U256 {
     fn from(val: &BigInt) -> Self {
-        alloy::primitives::U256::from_be_slice(&val.bytes)
+        U256::from_be_slice(&val.bytes)
     }
 }
 
@@ -78,7 +74,7 @@ impl<'a> TryInto<EthereumCall> for CallAt<'a> {
                 .call
                 .value
                 .as_ref()
-                .map_or_else(|| alloy::primitives::U256::from(0), |v| v.into()),
+                .map_or_else(|| U256::from(0), |v| v.into()),
             gas_used: self.call.gas_consumed,
             input: Bytes::from(self.call.input.clone()),
             output: Bytes::from(self.call.return_data.clone()),

chain/ethereum/src/data_source.rs

@@ -1589,9 +1589,6 @@ fn string_to_b256(s: &str) -> B256 {
     sponge.update(&data);
     sponge.finalize(&mut result);
 
-    // This was deprecated but the replacement seems to not be available in the
-    // version web3 uses.
-    #[allow(deprecated)]
     B256::from_slice(&result)
 }
 

chain/ethereum/src/ethereum_adapter.rs

@@ -2047,6 +2047,7 @@ async fn filter_call_triggers_from_unsuccessful_transactions(
         match &block.block {
             BlockFinality::Final(ref block) => block
                 .transactions()
+                .ok_or_else(|| anyhow!("Block transactions not available"))?
                 .iter()
                 .filter(|transaction| transaction_hashes.contains(transaction.inner.tx_hash()))
                 .collect(),

graph/src/blockchain/types.rs

@@ -85,12 +85,6 @@ impl fmt::LowerHex for BlockHash {
     }
 }
 
-// impl From<H256> for BlockHash {
-//     fn from(hash: H256) -> Self {
-//         BlockHash(hash.as_bytes().into())
-//     }
-// }
-
 impl From<Vec<u8>> for BlockHash {
     fn from(bytes: Vec<u8>) -> Self {
         BlockHash(bytes.as_slice().into())

graph/src/components/ethereum/types.rs

@@ -34,8 +34,8 @@ impl BlockWrapper {
         self.0.header.timestamp
     }
 
-    pub fn transactions(&self) -> &[Transaction] {
-        &self.0.transactions.as_transactions().unwrap()
+    pub fn transactions(&self) -> Option<&[Transaction]> {
+        self.0.transactions.as_transactions()
     }
 
     pub fn inner(&self) -> &AlloyBlock {

graph/src/data_source/common.rs

@@ -415,7 +415,11 @@ impl CallDecl {
         self.expr.validate_args()
     }
 
-    pub fn address_for_log(&self, log: &Log, params: &[abi::DynSolParam]) -> Result<Address, Error> {
+    pub fn address_for_log(
+        &self,
+        log: &Log,
+        params: &[abi::DynSolParam],
+    ) -> Result<Address, Error> {
         self.address_for_log_with_abi(log, params)
     }
 

runtime/wasm/src/to_from/external.rs

@@ -16,7 +16,6 @@ use graph::{
     },
     runtime::FromAscObj,
 };
-use graph_runtime_derive::AscType;
 
 use crate::asc_abi::class::*;
 

tests/src/contract.rs

@@ -3,12 +3,13 @@ use std::str::FromStr;
 use graph::prelude::{
     lazy_static,
     serde_json::{self, Value},
-    web3::{
-        api::{Eth, Namespace},
-        contract::{tokens::Tokenize, Contract as Web3Contract, Options},
-        transports::Http,
-        types::{Address, Block, BlockId, BlockNumber, Bytes, TransactionReceipt, H256},
-    },
+};
+
+use web3::{
+    api::{Eth, Namespace},
+    contract::{tokens::Tokenize, Contract as Web3Contract, Options},
+    transports::Http,
+    types::{Address, Block, BlockId, BlockNumber, Bytes, TransactionReceipt, H256},
 };
 // web3 version 0.18 does not expose this; once the graph crate updates to
 // version 0.19, we can use web3::signing::SecretKey from the graph crate
@@ -161,16 +162,16 @@ impl Contract {
                 if contract.name == "DeclaredCallsContract" {
                     status!("contracts", "Emitting transfers from DeclaredCallsContract");
                     let addr1 = "0x1111111111111111111111111111111111111111"
-                        .parse::<graph::prelude::web3::types::Address>()
+                        .parse::<web3::types::Address>()
                         .unwrap();
                     let addr2 = "0x2222222222222222222222222222222222222222"
-                        .parse::<graph::prelude::web3::types::Address>()
+                        .parse::<web3::types::Address>()
                         .unwrap();
                     let addr3 = "0x3333333333333333333333333333333333333333"
-                        .parse::<graph::prelude::web3::types::Address>()
+                        .parse::<web3::types::Address>()
                         .unwrap();
                     let addr4 = "0x4444444444444444444444444444444444444444"
-                        .parse::<graph::prelude::web3::types::Address>()
+                        .parse::<web3::types::Address>()
                         .unwrap();
 
                     contract

tests/tests/runner_tests.rs

@@ -15,9 +15,7 @@ use graph::env::{EnvVars, TEST_WITH_NO_REORG};
 use graph::ipfs::test_utils::add_files_to_local_ipfs_node_for_testing;
 use graph::object;
 use graph::prelude::alloy::primitives::{Address, B256, U256};
-use graph::prelude::{
-    hex, CheapClone, DeploymentHash, SubgraphAssignmentProvider, SubgraphName, SubgraphStore,
-};
+use graph::prelude::{hex, CheapClone, SubgraphAssignmentProvider, SubgraphName, SubgraphStore};
 use graph_tests::fixture::ethereum::{
     chain, empty_block, generate_empty_blocks_for_range, genesis, push_test_command, push_test_log,
     push_test_polling_trigger,