Liquidity.Party/tycho-protocol-sdk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "chore: update format! macro use to satisfy latest clippy version (#194)" (#196)

Browse Source 
This reverts commit f29de67f1f.
This commit is contained in:
Louise Poole
2025-04-25 18:09:38 +02:00
committed by GitHub
parent f29de67f1f
commit 409cf15864
38 changed files with 1680 additions and 1361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
substreams/crates/substreams-helper/src/hex.rs
View File

@@ -4,6 +4,6 @@ pub trait Hexable {
impl<T: AsRef<[u8]>> Hexable for T {
fn to_hex(&self) -> String {
format!("0x{encoded}", encoded = hex::encode(self))
format!("0x{}", hex::encode(self))
}
}

53
substreams/crates/tycho-substreams/src/abi/erc20.rs
View File

@@ -19,7 +19,7 @@ pub mod functions {
&[ethabi::ParamType::Address, ethabi::ParamType::Address],
maybe_data.unwrap(),
)
.map_err(|e| format!("unable to decode call.input: {e:?}"))?;
.map_err(|e| format!("unable to decode call.input: {:?}", e))?;
values.reverse();
Ok(Self {
owner: values
@@ -55,7 +55,7 @@ pub mod functions {
}
pub fn output(data: &[u8]) -> Result<substreams::scalar::BigInt, String> {
let mut values = ethabi::decode(&[ethabi::ParamType::Uint(256usize)], data.as_ref())
.map_err(|e| format!("unable to decode output data: {e:?}"))?;
.map_err(|e| format!("unable to decode output data: {:?}", e))?;
Ok({
let mut v = [0 as u8; 32];
values
@@ -132,7 +132,7 @@ pub mod functions {
&[ethabi::ParamType::Address, ethabi::ParamType::Uint(256usize)],
maybe_data.unwrap(),
)
.map_err(|e| format!("unable to decode call.input: {e:?}"))?;
.map_err(|e| format!("unable to decode call.input: {:?}", e))?;
values.reverse();
Ok(Self {
spender: values
@@ -178,7 +178,7 @@ pub mod functions {
}
pub fn output(data: &[u8]) -> Result<bool, String> {
let mut values = ethabi::decode(&[ethabi::ParamType::Bool], data.as_ref())
.map_err(|e| format!("unable to decode output data: {e:?}"))?;
.map_err(|e| format!("unable to decode output data: {:?}", e))?;
Ok(values
.pop()
.expect("one output data should have existed")
@@ -246,7 +246,7 @@ pub mod functions {
return Err("no data to decode".to_string());
}
let mut values = ethabi::decode(&[ethabi::ParamType::Address], maybe_data.unwrap())
.map_err(|e| format!("unable to decode call.input: {e:?}"))?;
.map_err(|e| format!("unable to decode call.input: {:?}", e))?;
values.reverse();
Ok(Self {
owner: values
@@ -273,7 +273,7 @@ pub mod functions {
}
pub fn output(data: &[u8]) -> Result<substreams::scalar::BigInt, String> {
let mut values = ethabi::decode(&[ethabi::ParamType::Uint(256usize)], data.as_ref())
.map_err(|e| format!("unable to decode output data: {e:?}"))?;
.map_err(|e| format!("unable to decode output data: {:?}", e))?;
Ok({
let mut v = [0 as u8; 32];
values
@@ -355,7 +355,7 @@ pub mod functions {
}
pub fn output(data: &[u8]) -> Result<substreams::scalar::BigInt, String> {
let mut values = ethabi::decode(&[ethabi::ParamType::Uint(8usize)], data.as_ref())
.map_err(|e| format!("unable to decode output data: {e:?}"))?;
.map_err(|e| format!("unable to decode output data: {:?}", e))?;
Ok({
let mut v = [0 as u8; 32];
values
@@ -437,7 +437,7 @@ pub mod functions {
}
pub fn output(data: &[u8]) -> Result<String, String> {
let mut values = ethabi::decode(&[ethabi::ParamType::String], data.as_ref())
.map_err(|e| format!("unable to decode output data: {e:?}"))?;
.map_err(|e| format!("unable to decode output data: {:?}", e))?;
Ok(values
.pop()
.expect("one output data should have existed")
@@ -514,7 +514,7 @@ pub mod functions {
}
pub fn output(data: &[u8]) -> Result<String, String> {
let mut values = ethabi::decode(&[ethabi::ParamType::String], data.as_ref())
.map_err(|e| format!("unable to decode output data: {e:?}"))?;
.map_err(|e| format!("unable to decode output data: {:?}", e))?;
Ok(values
.pop()
.expect("one output data should have existed")
@@ -591,7 +591,7 @@ pub mod functions {
}
pub fn output(data: &[u8]) -> Result<substreams::scalar::BigInt, String> {
let mut values = ethabi::decode(&[ethabi::ParamType::Uint(256usize)], data.as_ref())
.map_err(|e| format!("unable to decode output data: {e:?}"))?;
.map_err(|e| format!("unable to decode output data: {:?}", e))?;
Ok({
let mut v = [0 as u8; 32];
values
@@ -668,7 +668,7 @@ pub mod functions {
&[ethabi::ParamType::Address, ethabi::ParamType::Uint(256usize)],
maybe_data.unwrap(),
)
.map_err(|e| format!("unable to decode call.input: {e:?}"))?;
.map_err(|e| format!("unable to decode call.input: {:?}", e))?;
values.reverse();
Ok(Self {
to: values
@@ -714,7 +714,7 @@ pub mod functions {
}
pub fn output(data: &[u8]) -> Result<bool, String> {
let mut values = ethabi::decode(&[ethabi::ParamType::Bool], data.as_ref())
.map_err(|e| format!("unable to decode output data: {e:?}"))?;
.map_err(|e| format!("unable to decode output data: {:?}", e))?;
Ok(values
.pop()
.expect("one output data should have existed")
@@ -791,7 +791,7 @@ pub mod functions {
],
maybe_data.unwrap(),
)
.map_err(|e| format!("unable to decode call.input: {e:?}"))?;
.map_err(|e| format!("unable to decode call.input: {:?}", e))?;
values.reverse();
Ok(Self {
from: values
@@ -845,7 +845,7 @@ pub mod functions {
}
pub fn output(data: &[u8]) -> Result<bool, String> {
let mut values = ethabi::decode(&[ethabi::ParamType::Bool], data.as_ref())
.map_err(|e| format!("unable to decode output data: {e:?}"))?;
.map_err(|e| format!("unable to decode output data: {:?}", e))?;
Ok(values
.pop()
.expect("one output data should have existed")
@@ -929,19 +929,20 @@ pub mod events {
.topics
.get(0)
.expect("bounds already checked")
.as_ref()
== Self::TOPIC_ID;
.as_ref() ==
Self::TOPIC_ID;
}
pub fn decode(log: &substreams_ethereum::pb::eth::v2::Log) -> Result<Self, String> {
let mut values =
ethabi::decode(&[ethabi::ParamType::Uint(256usize)], log.data.as_ref())
.map_err(|e| format!("unable to decode log.data: {e:?}"))?;
.map_err(|e| format!("unable to decode log.data: {:?}", e))?;
values.reverse();
Ok(Self {
owner: ethabi::decode(&[ethabi::ParamType::Address], log.topics[1usize].as_ref())
.map_err(|e| {
format!(
"unable to decode param 'owner' from topic of type 'address': {e:?}"
"unable to decode param 'owner' from topic of type 'address': {:?}",
e
)
})?
.pop()
@@ -953,7 +954,8 @@ pub mod events {
spender: ethabi::decode(&[ethabi::ParamType::Address], log.topics[2usize].as_ref())
.map_err(|e| {
format!(
"unable to decode param 'spender' from topic of type 'address': {e:?}"
"unable to decode param 'spender' from topic of type 'address': {:?}",
e
)
})?
.pop()
@@ -1007,18 +1009,21 @@ pub mod events {
.topics
.get(0)
.expect("bounds already checked")
.as_ref()
== Self::TOPIC_ID;
.as_ref() ==
Self::TOPIC_ID;
}
pub fn decode(log: &substreams_ethereum::pb::eth::v2::Log) -> Result<Self, String> {
let mut values =
ethabi::decode(&[ethabi::ParamType::Uint(256usize)], log.data.as_ref())
.map_err(|e| format!("unable to decode log.data: {e:?}"))?;
.map_err(|e| format!("unable to decode log.data: {:?}", e))?;
values.reverse();
Ok(Self {
from: ethabi::decode(&[ethabi::ParamType::Address], log.topics[1usize].as_ref())
.map_err(|e| {
format!("unable to decode param 'from' from topic of type 'address': {e:?}")
format!(
"unable to decode param 'from' from topic of type 'address': {:?}",
e
)
})?
.pop()
.expect(INTERNAL_ERR)
@@ -1028,7 +1033,7 @@ pub mod events {
.to_vec(),
to: ethabi::decode(&[ethabi::ParamType::Address], log.topics[2usize].as_ref())
.map_err(|e| {
format!("unable to decode param 'to' from topic of type 'address': {e:?}")
format!("unable to decode param 'to' from topic of type 'address': {:?}", e)
})?
.pop()
.expect(INTERNAL_ERR)

2729
substreams/crates/tycho-substreams/src/abi/weth.rs
View File

File diff suppressed because it is too large Load Diff

4
substreams/crates/tycho-substreams/src/attributes.rs
View File

@@ -24,7 +24,7 @@ pub fn json_serialize_address_list(addresses: &[Vec<u8>]) -> Vec<u8> {
json_serialize_value(
addresses
.iter()
.map(|a| format!("0x{encoded}", encoded = hex::encode(a)))
.map(|a| format!("0x{}", hex::encode(a)))
.collect::<Vec<_>>(),
)
}
@@ -40,7 +40,7 @@ pub fn json_serialize_bigint_list(values: &[BigInt]) -> Vec<u8> {
json_serialize_value(
values
.iter()
.map(|v| format!("0x{encoded}", encoded = hex::encode(v.to_signed_bytes_be())))
.map(|v| format!("0x{}", hex::encode(v.to_signed_bytes_be())))
.collect::<Vec<_>>(),
)
}

40
substreams/crates/tycho-substreams/src/balances.rs
View File

@@ -64,9 +64,12 @@ pub fn store_balance_changes(deltas: BlockBalanceDeltas, store: impl StoreAdd<Bi
.balance_deltas
.iter()
.for_each(|delta| {
let component = String::from_utf8(delta.component_id.clone())
.expect("delta.component_id is not valid utf-8!");
let balance_key = format!("{component}:{token}", token = hex::encode(&delta.token));
let balance_key = format!(
"{0}:{1}",
String::from_utf8(delta.component_id.clone())
.expect("delta.component_id is not valid utf-8!"),
hex::encode(&delta.token)
);
let current_ord = delta.ord;
previous_ordinal
.entry(balance_key.clone())
@@ -74,7 +77,8 @@ pub fn store_balance_changes(deltas: BlockBalanceDeltas, store: impl StoreAdd<Bi
// ordinals must arrive in increasing order
if *ord >= current_ord {
panic!(
"Invalid ordinal sequence for {balance_key}: {ord} >= {current_ord}",
"Invalid ordinal sequence for {}: {} >= {}",
balance_key, *ord, current_ord
);
}
*ord = current_ord;
@@ -319,12 +323,17 @@ mod tests {
}
}
fn store_deltas() -> StoreDeltas {
let comp_id = "0x42c0ffee".to_string();
let comp_id = "0x42c0ffee"
.to_string()
.as_bytes()
.to_vec();
let token_0 = hex::decode("bad999").unwrap();
let token_1 = hex::decode("babe00").unwrap();
let t0_key = format!("{comp_id}:{token}", token = hex::encode(token_0));
let t1_key = format!("{comp_id}:{token}", token = hex::encode(token_1));
let t0_key =
format!("{}:{}", String::from_utf8(comp_id.clone()).unwrap(), hex::encode(token_0));
let t1_key =
format!("{}:{}", String::from_utf8(comp_id.clone()).unwrap(), hex::encode(token_1));
StoreDeltas {
deltas: vec![
StoreDelta {
@@ -385,15 +394,26 @@ mod tests {
#[test]
fn test_store_balances() {
let comp_id = "0x42c0ffee".to_string();
let comp_id = "0x42c0ffee"
.to_string()
.as_bytes()
.to_vec();
let token_0 = hex::decode("bad999").unwrap();
let token_1 = hex::decode("babe00").unwrap();
let deltas = block_balance_deltas();
let store = <MockStore as StoreNew>::new();
store_balance_changes(deltas, store.clone());
let res_0 = store.get_last(format!("{comp_id}:{token}", token = hex::encode(token_0)));
let res_1 = store.get_last(format!("{comp_id}:{token}", token = hex::encode(token_1)));
let res_0 = store.get_last(format!(
"{}:{}",
String::from_utf8(comp_id.clone()).unwrap(),
hex::encode(token_0)
));
let res_1 = store.get_last(format!(
"{}:{}",
String::from_utf8(comp_id.clone()).unwrap(),
hex::encode(token_1)
));
assert_eq!(res_0, Some(BigInt::from_str("+999").unwrap()));
assert_eq!(res_1, Some(BigInt::from_str("+150").unwrap()));

2
substreams/crates/tycho-substreams/src/models.rs
View File

@@ -238,7 +238,7 @@ impl ProtocolComponent {
/// - `tx`: Reference to the associated transaction.
pub fn at_contract(id: &[u8]) -> Self {
Self {
id: format!("0x{encoded}", encoded = hex::encode(id)),
id: format!("0x{}", hex::encode(id)),
tokens: Vec::new(),
contracts: vec![id.to_vec()],
static_att: Vec::new(),

2
substreams/ethereum-ambient/src/modules/2_store_pool_balances.rs
View File

@@ -11,7 +11,7 @@ pub fn store_pool_balances(changes: BlockPoolChanges, balance_store: StoreAddBig
let pool_hash_hex = hex::encode(&balance_delta.pool_hash);
balance_store.add(
balance_delta.ordinal,
format!("{pool_hash_hex}:{type}", type = balance_delta.token_type),
format!("{}:{}", pool_hash_hex, balance_delta.token_type),
BigInt::from_signed_bytes_be(&balance_delta.token_delta),
);
}

2
substreams/ethereum-ambient/src/modules/3_map_changes.rs
View File

@@ -315,7 +315,7 @@ fn map_changes(
let pool_hash_hex = hex::encode(balance_delta.pool_hash);
let pool = match pool_store.get_last(pool_hash_hex.clone()) {
Some(pool) => pool,
None => panic!("Pool not found in store for given hash: {pool_hash_hex}"),
None => panic!("Pool not found in store for given hash: {}", pool_hash_hex),
};
let token_type = substreams::key::segment_at(&store_delta.key, 1);
let token_index = if token_type == "quote" { 1 } else { 0 };

8
substreams/ethereum-balancer-v2/build.rs
View File

@@ -26,10 +26,10 @@ fn main() -> Result<()> {
let contract_name = file_name.split('.').next().unwrap();
let input_path = format!("{abi_folder}/{file_name}");
let output_path = format!("{output_folder}/{contract_name}.rs");
let input_path = format!("{}/{}", abi_folder, file_name);
let output_path = format!("{}/{}.rs", output_folder, contract_name);
mod_rs_content.push_str(&format!("pub mod {contract_name};\n"));
mod_rs_content.push_str(&format!("pub mod {};\n", contract_name));
if std::path::Path::new(&output_path).exists() {
continue;
@@ -40,7 +40,7 @@ fn main() -> Result<()> {
.write_to_file(&output_path)?;
}
let mod_rs_path = format!("{output_folder}/mod.rs");
let mod_rs_path = format!("{}/mod.rs", output_folder);
let mut mod_rs_file = fs::File::create(mod_rs_path)?;
mod_rs_file.write_all(mod_rs_content.as_bytes())?;

18
substreams/ethereum-balancer-v2/src/modules.rs
View File

@@ -53,7 +53,7 @@ pub fn store_components(map: BlockTransactionProtocolComponents, store: StoreSet
tx_pc
.components
.into_iter()
.for_each(|pc| store.set(0, format!("pool:{id}", id = &pc.id[..42]), &pc.id))
.for_each(|pc| store.set(0, format!("pool:{0}", &pc.id[..42]), &pc.id))
});
}
@@ -73,10 +73,10 @@ pub fn map_relative_balances(
if let Some(ev) =
abi::vault::events::PoolBalanceChanged::match_and_decode(vault_log.log)
{
let component_id = format!("0x{id}", id = hex::encode(ev.pool_id));
let component_id = format!("0x{}", hex::encode(ev.pool_id));
if store
.get_last(format!("pool:{id}", id = &component_id[..42]))
.get_last(format!("pool:{}", &component_id[..42]))
.is_some()
{
for (token, delta) in ev
@@ -95,10 +95,10 @@ pub fn map_relative_balances(
}
}
} else if let Some(ev) = abi::vault::events::Swap::match_and_decode(vault_log.log) {
let component_id = format!("0x{id}", id = hex::encode(ev.pool_id));
let component_id = format!("0x{}", hex::encode(ev.pool_id));
if store
.get_last(format!("pool:{id}", id = &component_id[..42]))
.get_last(format!("pool:{}", &component_id[..42]))
.is_some()
{
deltas.extend_from_slice(&[
@@ -121,9 +121,9 @@ pub fn map_relative_balances(
} else if let Some(ev) =
abi::vault::events::PoolBalanceManaged::match_and_decode(vault_log.log)
{
let component_id = format!("0x{id}", id = hex::encode(ev.pool_id));
let component_id = format!("0x{}", hex::encode(ev.pool_id));
if store
.get_last(format!("pool:{id}", id = &component_id[..42]))
.get_last(format!("pool:{}", &component_id[..42]))
.is_some()
{
deltas.extend_from_slice(&[BalanceDelta {
@@ -230,7 +230,7 @@ pub fn map_protocol_changes(
&block,
|addr| {
components_store
.get_last(format!("pool:0x{id}", id = hex::encode(addr)))
.get_last(format!("pool:0x{0}", hex::encode(addr)))
.is_some() ||
addr.eq(VAULT_ADDRESS)
},
@@ -251,7 +251,7 @@ pub fn map_protocol_changes(
if address != VAULT_ADDRESS {
// We reconstruct the component_id from the address here
let id = components_store
.get_last(format!("pool:0x{id}", id = hex::encode(address)))
.get_last(format!("pool:0x{}", hex::encode(address)))
.unwrap(); // Shouldn't happen because we filter by known components in
// `extract_contract_changes_builder`
change.mark_component_as_updated(&id);

8
substreams/ethereum-curve/build.rs
View File

@@ -26,10 +26,10 @@ fn main() -> Result<()> {
let contract_name = file_name.split('.').next().unwrap();
let input_path = format!("{abi_folder}/{file_name}");
let output_path = format!("{output_folder}/{contract_name}.rs");
let input_path = format!("{}/{}", abi_folder, file_name);
let output_path = format!("{}/{}.rs", output_folder, contract_name);
mod_rs_content.push_str(&format!("pub mod {contract_name};\n"));
mod_rs_content.push_str(&format!("pub mod {};\n", contract_name));
if std::path::Path::new(&output_path).exists() {
continue;
@@ -40,7 +40,7 @@ fn main() -> Result<()> {
.write_to_file(&output_path)?;
}
let mod_rs_path = format!("{output_folder}/mod.rs");
let mod_rs_path = format!("{}/mod.rs", output_folder);
let mut mod_rs_file = fs::File::create(mod_rs_path)?;
mod_rs_file.write_all(mod_rs_content.as_bytes())?;

30
substreams/ethereum-curve/src/pool_factories.rs
View File

@@ -39,7 +39,7 @@ fn address_to_bytes_with_0x(address: &[u8; 20]) -> Vec<u8> {
/// Converts address bytes into a string containing a leading `0x`.
fn address_to_string_with_0x(address: &[u8]) -> String {
format!("0x{encoded}", encoded = hex::encode(address))
format!("0x{}", hex::encode(address))
}
/// Function that swaps `WETH` addresses for `ETH` address for specific factory types that decide
@@ -499,8 +499,8 @@ pub fn address_map(
name: "stateless_contract_addr_0".into(),
// Call views_implementation() on CRYPTO_SWAP_NG_FACTORY
value: format!(
"call:0x{factory}:views_implementation()",
factory = hex::encode(CRYPTO_SWAP_NG_FACTORY)
"call:0x{}:views_implementation()",
hex::encode(CRYPTO_SWAP_NG_FACTORY)
)
.into(),
change: ChangeType::Creation.into(),
@@ -579,8 +579,8 @@ pub fn address_map(
name: "stateless_contract_addr_0".into(),
// Call views_implementation() on CRYPTO_SWAP_NG_FACTORY
value: format!(
"call:0x{factory}:views_implementation()",
factory = hex::encode(CRYPTO_SWAP_NG_FACTORY)
"call:0x{}:views_implementation()",
hex::encode(CRYPTO_SWAP_NG_FACTORY)
)
.into(),
change: ChangeType::Creation.into(),
@@ -589,8 +589,8 @@ pub fn address_map(
name: "stateless_contract_addr_1".into(),
// Call math_implementation() on CRYPTO_SWAP_NG_FACTORY
value: format!(
"call:0x{factory}:math_implementation()",
factory = hex::encode(CRYPTO_SWAP_NG_FACTORY)
"call:0x{}:math_implementation()",
hex::encode(CRYPTO_SWAP_NG_FACTORY)
)
.into(),
change: ChangeType::Creation.into(),
@@ -651,14 +651,14 @@ pub fn address_map(
}),
},
vec![EntityChanges {
component_id: format!("0x{id}"),
component_id: format!("0x{}", id),
attributes: vec![
Attribute {
name: "stateless_contract_addr_0".into(),
// Call views_implementation() on TRICRYPTO_FACTORY
value: format!(
"call:0x{factory}:views_implementation()",
factory = hex::encode(TRICRYPTO_FACTORY)
"call:0x{}:views_implementation()",
hex::encode(TRICRYPTO_FACTORY)
)
.into(),
change: ChangeType::Creation.into(),
@@ -667,8 +667,8 @@ pub fn address_map(
name: "stateless_contract_addr_1".into(),
// Call math_implementation() on TRICRYPTO_FACTORY
value: format!(
"call:0x{factory}:math_implementation()",
factory = hex::encode(TRICRYPTO_FACTORY)
"call:0x{}:math_implementation()",
hex::encode(TRICRYPTO_FACTORY)
)
.into(),
change: ChangeType::Creation.into(),
@@ -907,14 +907,14 @@ pub fn address_map(
}),
},
vec![EntityChanges {
component_id: format!("0x{id}"),
component_id: format!("0x{}", id),
attributes: vec![
Attribute {
name: "stateless_contract_addr_0".into(),
// Call views_implementation() on TWOCRYPTO_FACTORY
value: format!(
"call:0x{factory}:views_implementation()",
factory = hex::encode(TWOCRYPTO_FACTORY)
"call:0x{}:views_implementation()",
hex::encode(TWOCRYPTO_FACTORY)
)
.into(),
change: ChangeType::Creation.into(),

4
substreams/ethereum-curve/src/pools.rs
View File

@@ -99,7 +99,7 @@ fn create_component(
}),
},
vec![EntityChanges {
component_id: format!("0x{pool_address}", pool_address = pool.address.clone()),
component_id: format!("0x{}", pool.address.clone()),
attributes: zip(
pool.attribute_keys
.clone()
@@ -127,7 +127,7 @@ fn parse_params(params: &str) -> Result<HashMap<String, PoolQueryParams>, anyhow
.split(PARAMS_SEPERATOR)
.map(|param| {
let pool: PoolQueryParams = serde_qs::from_str(param)
.with_context(|| format!("Failed to parse pool query params: {param}"))?;
.with_context(|| format!("Failed to parse pool query params: {0}", param))?;
Ok((pool.tx_hash.clone(), pool))
})
.collect::<Result<HashMap<_, _>>>()

8
substreams/ethereum-ekubo-v2/build.rs
View File

@@ -26,10 +26,10 @@ fn main() -> Result<()> {
let contract_name = file_name.split('.').next().unwrap();
let input_path = format!("{abi_folder}/{file_name}");
let output_path = format!("{output_folder}/{contract_name}.rs");
let input_path = format!("{}/{}", abi_folder, file_name);
let output_path = format!("{}/{}.rs", output_folder, contract_name);
mod_rs_content.push_str(&format!("pub mod {contract_name};\n"));
mod_rs_content.push_str(&format!("pub mod {};\n", contract_name));
if std::path::Path::new(&output_path).exists() {
continue;
@@ -40,7 +40,7 @@ fn main() -> Result<()> {
.write_to_file(&output_path)?;
}
let mod_rs_path = format!("{output_folder}/mod.rs");
let mod_rs_path = format!("{}/mod.rs", output_folder);
let mut mod_rs_file = fs::File::create(mod_rs_path)?;
mod_rs_file.write_all(mod_rs_content.as_bytes())?;

2
substreams/ethereum-pancakeswap-v3/src/modules/2_store_pools.rs
View File

@@ -30,7 +30,7 @@ pub fn store_pools(pools_created: BlockChanges, store: StoreSetIfNotExistsProto<
)
.to_u64(),
};
store.set_if_not_exists(0, format!("Pool:{pool_address}"), &pool);
store.set_if_not_exists(0, format!("{}:{}", "Pool", pool_address), &pool);
}
}
}

2
substreams/ethereum-pancakeswap-v3/src/modules/3_map_events.rs
View File

@@ -41,7 +41,7 @@ pub fn map_events(
.logs
.iter()
.filter_map(|log| {
let key = format!("Pool:{address}", address = log.address.to_hex());
let key = format!("{}:{}", "Pool", log.address.to_hex());
// Skip if the log is not from a known pool.
if let Some(pool) = pools_store.get_last(key) {
log_to_event(log, pool, &tx)

2
substreams/ethereum-pancakeswap-v3/src/modules/4_map_and_store_balance_changes.rs
View File

@@ -29,7 +29,7 @@ pub fn store_pools_balances(balances_deltas: BlockBalanceDeltas, store: StoreAdd
}
fn event_to_balance_deltas(event: PoolEvent) -> Vec<BalanceDelta> {
let address = format!("0x{addr}", addr = event.pool_address)
let address = format!("0x{}", event.pool_address)
.as_bytes()
.to_vec();
match event.r#type.unwrap() {

8
substreams/ethereum-pancakeswap-v3/src/modules/4_map_and_store_liquidity.rs
View File

@@ -20,7 +20,7 @@ pub fn store_pool_current_tick(events: Events, store: StoreSetInt64) {
.into_iter()
.filter_map(event_to_current_tick)
.for_each(|(pool, ordinal, new_tick_index)| {
store.set(ordinal, format!("pool:{pool}"), &new_tick_index.into())
store.set(ordinal, format!("pool:{0}", pool), &new_tick_index.into())
});
}
@@ -36,7 +36,7 @@ pub fn map_liquidity_changes(
.map(|e| {
(
pools_current_tick_store
.get_at(e.log_ordinal, format!("pool:{pool_addr}", pool_addr = &e.pool_address))
.get_at(e.log_ordinal, format!("pool:{0}", &e.pool_address))
.unwrap_or(0),
e,
)
@@ -57,14 +57,14 @@ pub fn store_liquidity(ticks_deltas: LiquidityChanges, store: StoreSetSumBigInt)
LiquidityChangeType::Delta => {
store.sum(
changes.ordinal,
format!("pool:{addr}", addr = hex::encode(&changes.pool_address)),
format!("pool:{0}", hex::encode(&changes.pool_address)),
BigInt::from_signed_bytes_be(&changes.value),
);
}
LiquidityChangeType::Absolute => {
store.set(
changes.ordinal,
format!("pool:{addr}", addr = hex::encode(&changes.pool_address)),
format!("pool:{0}", hex::encode(&changes.pool_address)),
BigInt::from_signed_bytes_be(&changes.value),
);
}

6
substreams/ethereum-pancakeswap-v3/src/modules/4_map_and_store_ticks.rs
View File

@@ -34,11 +34,7 @@ pub fn store_ticks_liquidity(ticks_deltas: TickDeltas, store: StoreAddBigInt) {
deltas.iter().for_each(|delta| {
store.add(
delta.ordinal,
format!(
"pool:{addr}:tick:{index}",
addr = hex::encode(&delta.pool_address),
index = delta.tick_index,
),
format!("pool:{0}:tick:{1}", hex::encode(&delta.pool_address), delta.tick_index,),
BigInt::from_signed_bytes_be(&delta.liquidity_net_delta),
);
});

3
substreams/ethereum-pancakeswap-v3/src/modules/5_map_protocol_changes.rs
View File

@@ -86,8 +86,7 @@ pub fn map_protocol_changes(
BigInt::from_str(&String::from_utf8(store_delta.old_value).unwrap())
.unwrap()
.is_zero();
let attribute_name =
format!("ticks/{index}/net-liquidity", index = tick_delta.tick_index);
let attribute_name = format!("ticks/{}/net-liquidity", tick_delta.tick_index);
let attribute = Attribute {
name: attribute_name,
value: new_value_bigint.to_signed_bytes_be(),

14
substreams/ethereum-sfrax/src/modules.rs
View File

@@ -85,9 +85,9 @@ pub fn map_relative_balances(
abi::stakedfrax_contract::events::Withdraw::match_and_decode(vault_log.log)
{
let address_bytes_be = vault_log.address();
let address_hex = format!("0x{encoded}", encoded = hex::encode(address_bytes_be));
let address_hex = format!("0x{}", hex::encode(address_bytes_be));
if store
.get_last(format!("pool:{address_hex}"))
.get_last(format!("pool:{}", address_hex))
.is_some()
{
deltas.extend_from_slice(&[
@@ -119,10 +119,10 @@ pub fn map_relative_balances(
abi::stakedfrax_contract::events::Deposit::match_and_decode(vault_log.log)
{
let address_bytes_be = vault_log.address();
let address_hex = format!("0x{encoded}", encoded = hex::encode(address_bytes_be));
let address_hex = format!("0x{}", hex::encode(address_bytes_be));
if store
.get_last(format!("pool:{address_hex}"))
.get_last(format!("pool:{}", address_hex))
.is_some()
{
deltas.extend_from_slice(&[
@@ -154,10 +154,10 @@ pub fn map_relative_balances(
abi::stakedfrax_contract::events::DistributeRewards::match_and_decode(vault_log.log)
{
let address_bytes_be = vault_log.address();
let address_hex = format!("0x{encoded}", encoded = hex::encode(address_bytes_be));
let address_hex = format!("0x{}", hex::encode(address_bytes_be));
if store
.get_last(format!("pool:{address_hex}"))
.get_last(format!("pool:{}", address_hex))
.is_some()
{
deltas.extend_from_slice(&[BalanceDelta {
@@ -231,7 +231,7 @@ pub fn map_protocol_changes(
&block,
|addr| {
components_store
.get_last(format!("pool:0x{encoded}", encoded = hex::encode(addr)))
.get_last(format!("pool:0x{0}", hex::encode(addr)))
.is_some()
},
&mut transaction_contract,

26
substreams/ethereum-sfraxeth/src/modules.rs
View File

@@ -117,11 +117,10 @@ pub fn store_reward_cycles(block_reward_cycles: BlockRewardCycles, store: StoreS
.reward_cycles
.into_iter()
.for_each(|reward_cycle| {
let address_hex =
format!("0x{encoded}", encoded = hex::encode(&reward_cycle.vault_address));
let address_hex = format!("0x{}", hex::encode(&reward_cycle.vault_address));
store.set(
reward_cycle.ord,
format!("reward_cycle:{address_hex}"),
format!("reward_cycle:{}", address_hex),
&reward_cycle.next_reward_amount,
);
});
@@ -142,10 +141,10 @@ pub fn map_relative_balances(
abi::sfraxeth_contract::events::Withdraw::match_and_decode(vault_log.log)
{
let address_bytes_be = vault_log.address();
let address_hex = format!("0x{encoded}", encoded = hex::encode(address_bytes_be));
let address_hex = format!("0x{}", hex::encode(address_bytes_be));
if store
.get_last(format!("pool:{address_hex}"))
.get_last(format!("pool:{}", address_hex))
.is_some()
{
substreams::log::info!(
@@ -176,9 +175,9 @@ pub fn map_relative_balances(
abi::sfraxeth_contract::events::Deposit::match_and_decode(vault_log.log)
{
let address_bytes_be = vault_log.address();
let address_hex = format!("0x{encoded}", encoded = hex::encode(address_bytes_be));
let address_hex = format!("0x{}", hex::encode(address_bytes_be));
if store
.get_last(format!("pool:{address_hex}"))
.get_last(format!("pool:{}", address_hex))
.is_some()
{
deltas.extend_from_slice(&[
@@ -205,9 +204,9 @@ pub fn map_relative_balances(
.is_some()
{
let address_bytes_be = vault_log.address();
let address_hex = format!("0x{encoded}", encoded = hex::encode(address_bytes_be));
let address_hex = format!("0x{}", hex::encode(address_bytes_be));
if store
.get_last(format!("pool:{address_hex}"))
.get_last(format!("pool:{}", address_hex))
.is_some()
{
// When the NextRewardsCycle event is emitted:
@@ -222,12 +221,13 @@ pub fn map_relative_balances(
if let Some(last_reward_amount) = reward_store
.deltas
.iter()
.find(|el| el.key == format!("reward_cycle:{address_hex}"))
.find(|el| el.key == format!("reward_cycle:{}", address_hex))
.map(|el| el.old_value.clone())
{
substreams::log::info!(
"Reward cycle balance change: address {address_hex}, sfraxEth amount {amount}",
amount = BigInt::from_signed_bytes_be(&last_reward_amount)
"Reward cycle balance change: address {}, sfraxEth amount {}",
address_hex,
BigInt::from_signed_bytes_be(&last_reward_amount)
);
deltas.push(BalanceDelta {
ord: vault_log.ordinal(),
@@ -319,7 +319,7 @@ pub fn map_protocol_changes(
&block,
|addr| {
components_store
.get_last(format!("pool:0x{encoded}", encoded = hex::encode(addr)))
.get_last(format!("pool:0x{0}", hex::encode(addr)))
.is_some()
},
&mut transaction_changes,

8
substreams/ethereum-template-factory/build.rs
View File

@@ -26,10 +26,10 @@ fn main() -> Result<()> {
let contract_name = file_name.split('.').next().unwrap();
let input_path = format!("{abi_folder}/{file_name}");
let output_path = format!("{output_folder}/{contract_name}.rs");
let input_path = format!("{}/{}", abi_folder, file_name);
let output_path = format!("{}/{}.rs", output_folder, contract_name);
mod_rs_content.push_str(&format!("pub mod {contract_name};\n"));
mod_rs_content.push_str(&format!("pub mod {};\n", contract_name));
if std::path::Path::new(&output_path).exists() {
continue;
@@ -40,7 +40,7 @@ fn main() -> Result<()> {
.write_to_file(&output_path)?;
}
let mod_rs_path = format!("{output_folder}/mod.rs");
let mod_rs_path = format!("{}/mod.rs", output_folder);
let mut mod_rs_file = fs::File::create(mod_rs_path)?;
mod_rs_file.write_all(mod_rs_content.as_bytes())?;

8
substreams/ethereum-template-singleton/build.rs
View File

@@ -26,10 +26,10 @@ fn main() -> Result<()> {
let contract_name = file_name.split('.').next().unwrap();
let input_path = format!("{abi_folder}/{file_name}");
let output_path = format!("{output_folder}/{contract_name}.rs");
let input_path = format!("{}/{}", abi_folder, file_name);
let output_path = format!("{}/{}.rs", output_folder, contract_name);
mod_rs_content.push_str(&format!("pub mod {contract_name};\n"));
mod_rs_content.push_str(&format!("pub mod {};\n", contract_name));
if std::path::Path::new(&output_path).exists() {
continue;
@@ -40,7 +40,7 @@ fn main() -> Result<()> {
.write_to_file(&output_path)?;
}
let mod_rs_path = format!("{output_folder}/mod.rs");
let mod_rs_path = format!("{}/mod.rs", output_folder);
let mut mod_rs_file = fs::File::create(mod_rs_path)?;
mod_rs_file.write_all(mod_rs_content.as_bytes())?;

2
substreams/ethereum-uniswap-v2/src/modules/3_map_pool_events.rs
View File

@@ -95,7 +95,7 @@ fn handle_sync(
});
for (i, reserve_bytes) in reserves_bytes.iter().enumerate() {
let attribute_name = format!("reserve{i}");
let attribute_name = format!("reserve{}", i);
// By using a HashMap, we can overwrite the previous value of the reserve attribute if
// it is for the same pool and the same attribute name (reserves).
tx_change.entity_changes.insert(

2
substreams/ethereum-uniswap-v2/src/store_key.rs
View File

@@ -5,7 +5,7 @@ pub enum StoreKey {
impl StoreKey {
pub fn get_unique_pool_key(&self, key: &str) -> String {
format!("{prefix}:{key}", prefix = self.unique_id())
format!("{}:{}", self.unique_id(), key)
}
pub fn unique_id(&self) -> String {

2
substreams/ethereum-uniswap-v3-logs-only/src/modules/2_store_pools.rs
View File

@@ -18,7 +18,7 @@ pub fn store_pools(pools_created: BlockEntityChanges, store: StoreSetIfNotExists
token1: component_change.tokens[1].clone(),
created_tx_hash: change.tx.as_ref().unwrap().hash.clone(),
};
store.set_if_not_exists(0, format!("Pool:{pool_address}"), &pool);
store.set_if_not_exists(0, format!("{}:{}", "Pool", pool_address), &pool);
}
}
}

2
substreams/ethereum-uniswap-v3-logs-only/src/modules/3_map_events.rs
View File

@@ -41,7 +41,7 @@ pub fn map_events(
.logs
.iter()
.filter_map(|log| {
let key = format!("Pool:{address}", address = log.address.to_hex());
let key = format!("{}:{}", "Pool", log.address.to_hex());
// Skip if the log is not from a known uniswapV3 pool.
if let Some(pool) = pools_store.get_last(key) {
log_to_event(log, pool, &tx)

2
substreams/ethereum-uniswap-v3-logs-only/src/modules/4_map_and_store_liquidity.rs
View File

@@ -20,7 +20,7 @@ pub fn store_pool_current_tick(events: Events, store: StoreSetInt64) {
.into_iter()
.filter_map(event_to_current_tick)
.for_each(|(pool, ordinal, new_tick_index)| {
store.set(ordinal, format!("pool:{pool}"), &new_tick_index.into())
store.set(ordinal, format!("pool:{0}", pool), &new_tick_index.into())
});
}

2
substreams/ethereum-uniswap-v3/src/modules/2_store_pools.rs
View File

@@ -19,7 +19,7 @@ pub fn store_pools(pools_created: BlockChanges, store: StoreSetIfNotExistsProto<
token1: component_change.tokens[1].clone(),
created_tx_hash: change.tx.as_ref().unwrap().hash.clone(),
};
store.set_if_not_exists(0, format!("Pool:{pool_address}"), &pool);
store.set_if_not_exists(0, format!("{}:{}", "Pool", pool_address), &pool);
}
}
}

2
substreams/ethereum-uniswap-v3/src/modules/3_map_balance_changes.rs
View File

@@ -24,7 +24,7 @@ pub fn map_balance_changes(
{
// Skip if the log is not from a known uniswapV3 pool.
if let Some(pool) =
pools_store.get_last(format!("Pool:{address}", address = &log.address.to_hex()))
pools_store.get_last(format!("{}:{}", "Pool", &log.address.to_hex()))
{
tx_deltas.extend(get_log_changed_balances(log, &pool))
} else {

2
substreams/ethereum-uniswap-v3/src/modules/5_map_pool_events.rs
View File

@@ -38,7 +38,7 @@ pub fn map_pool_events(
for (log, call_view) in trx.logs_with_calls() {
// Skip if the log is not from a known uniswapV3 pool.
if let Some(pool) =
pools_store.get_last(format!("Pool:{address}", address = &log.address.to_hex()))
pools_store.get_last(format!("{}:{}", "Pool", &log.address.to_hex()))
{
let changed_attributes = get_log_changed_attributes(
log,

2
substreams/ethereum-uniswap-v3/src/storage/pool_storage.rs
View File

@@ -108,7 +108,7 @@ impl<'a> UniswapPoolStorage<'a> {
// We need this to keep the references to the names alive until we call
// `get_changed_attributes()`
for tick_idx in ticks_idx.iter() {
tick_names.push(format!("ticks/{tick_idx}/net-liquidity"));
tick_names.push(format!("ticks/{}/net-liquidity", tick_idx));
}
// Then, iterate over ticks_idx and tick_names simultaneously

20
substreams/ethereum-uniswap-v3/src/storage/utils.rs
View File

@@ -32,18 +32,30 @@ pub fn left_pad(input: &[u8], padding_value: u8) -> [u8; 32] {
pub fn read_bytes(buf: &[u8], offset: usize, number_of_bytes: usize) -> &[u8] {
let buf_length = buf.len();
if buf_length < number_of_bytes {
panic!("attempting to read {number_of_bytes} bytes in buffer size {buf_length}",)
panic!(
"attempting to read {number_of_bytes} bytes in buffer size {buf_size}",
number_of_bytes = number_of_bytes,
buf_size = buf.len()
)
}
if offset > (buf_length - 1) {
panic!("offset {offset} exceeds buffer size {buf_length}")
panic!(
"offset {offset} exceeds buffer size {buf_size}",
offset = offset,
buf_size = buf.len()
)
}
let end = buf_length - 1 - offset;
let start_opt = (end + 1).checked_sub(number_of_bytes);
if start_opt.is_none() {
panic!(
"number of bytes {number_of_bytes} with offset {offset} exceeds buffer size {buf_length}"
"number of bytes {number_of_bytes} with offset {offset} exceeds buffer size
{buf_size}",
number_of_bytes = number_of_bytes,
offset = offset,
buf_size = buf.len()
)
}
let start = start_opt.unwrap();
@@ -146,7 +158,7 @@ mod tests {
fn encode_hex(bytes: &[u8]) -> String {
let mut s = String::with_capacity(bytes.len() * 2);
for &b in bytes {
write!(&mut s, "{b:02x}").unwrap();
write!(&mut s, "{:02x}", b).unwrap();
}
s
}

2
substreams/ethereum-uniswap-v4/src/modules/2_store_pools.rs
View File

@@ -18,7 +18,7 @@ pub fn store_pools(pools_created: BlockEntityChanges, store: StoreSetIfNotExists
currency1: component_change.tokens[1].clone(),
created_tx_hash: change.tx.as_ref().unwrap().hash.clone(),
};
store.set_if_not_exists(0, format!("pool:{pool_address}"), &pool);
store.set_if_not_exists(0, format!("{}:{}", "pool", pool_address), &pool);
}
}
}

8
substreams/ethereum-uniswap-v4/src/modules/3_map_events.rs
View File

@@ -50,7 +50,7 @@ fn log_to_event(
// We need to track initialization again to keep track of pool current tick, which is set on
// initialization and changed on swaps.
let pool_id = init.id.to_vec().to_hex();
let pool = pools_store.get_last(format!("pool:{pool_id}"))?;
let pool = pools_store.get_last(format!("{}:{}", "pool", &pool_id))?;
Some(PoolEvent {
log_ordinal: event.ordinal,
pool_id,
@@ -67,7 +67,7 @@ fn log_to_event(
})
} else if let Some(swap) = Swap::match_and_decode(event) {
let pool_id = swap.id.to_vec().to_hex();
let pool = pools_store.get_last(format!("pool:{pool_id}"))?;
let pool = pools_store.get_last(format!("{}:{}", "pool", &pool_id))?;
Some(PoolEvent {
log_ordinal: event.ordinal,
pool_id,
@@ -102,7 +102,7 @@ fn log_to_event(
// })
} else if let Some(modify_liquidity) = ModifyLiquidity::match_and_decode(event) {
let pool_id = modify_liquidity.id.to_vec().to_hex();
let pool = pools_store.get_last(format!("pool:{pool_id}"))?;
let pool = pools_store.get_last(format!("{}:{}", "pool", &pool_id))?;
Some(PoolEvent {
log_ordinal: event.ordinal,
pool_id,
@@ -124,7 +124,7 @@ fn log_to_event(
.id
.to_vec()
.to_hex();
let pool = pools_store.get_last(format!("pool:{pool_id}"))?;
let pool = pools_store.get_last(format!("{}:{}", "pool", &pool_id))?;
Some(PoolEvent {
log_ordinal: event.ordinal,
pool_id: pool_id.clone(),

2
substreams/ethereum-uniswap-v4/src/modules/4_store_current_sqrtprice.rs
View File

@@ -17,7 +17,7 @@ pub fn store_pool_current_sqrt_price(events: Events, store: StoreSetBigInt) {
.into_iter()
.filter_map(event_to_current_sqrt_price)
.for_each(|(pool, ordinal, new_tick_index)| {
store.set(ordinal, format!("pool:{pool}"), &new_tick_index)
store.set(ordinal, format!("pool:{0}", pool), &new_tick_index)
});
}

2
substreams/ethereum-uniswap-v4/src/modules/4_store_current_tick.rs
View File

@@ -14,7 +14,7 @@ pub fn store_pool_current_tick(events: Events, store: StoreSetInt64) {
.into_iter()
.filter_map(event_to_current_tick)
.for_each(|(pool, ordinal, new_tick_index)| {
store.set(ordinal, format!("pool:{pool}"), &new_tick_index.into())
store.set(ordinal, format!("pool:{0}", pool), &new_tick_index.into())
});
}
fn event_to_current_tick(event: PoolEvent) -> Option<(String, u64, i32)> {