fix some comments

messari · Jan 24, 2023 · c83c3aa · c83c3aa
1 parent 8c32a2d
commit c83c3aa
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 231 deletions.
diff --git a/common/proto/evm_token.proto → eth-balance/proto/eth_balance.proto b/common/proto/evm_token.proto → eth-balance/proto/eth_balance.proto
@@ -11,7 +11,6 @@ message Token {
   string name = 2;
   string symbol = 3;
   uint64 decimals = 4;
-  optional string total_supply = 5;
 }
 
 message Transfers {

diff --git a/eth-balance/src/lib.rs b/eth-balance/src/lib.rs
@@ -1,10 +1,8 @@
-#[rustfmt::skip]
 pub mod pb;
 
-use substreams_helper::pb::evm_token::v1 as token;
-// use pb::evm_token::v1 as token;
 use substreams::Hex;
 use substreams_ethereum::pb::eth as pbeth;
+use substreams_helper::pb::evm_token::v1 as token;
 use substreams_helper::token as token_helper;
 
 #[substreams::handlers::map]
@@ -26,7 +24,7 @@ fn map_balances(block: pbeth::v2::Block) -> Result<token::Transfers, substreams:
             }
         }
         transfers.push(token::Transfer {
-            tx_hash: Hex(&transaction.hash).to_string(),
+            tx_hash: Hex::encode(&transaction.hash),
             block_number: block.number,
             timestamp: block
                 .header
@@ -38,8 +36,8 @@ fn map_balances(block: pbeth::v2::Block) -> Result<token::Transfers, substreams:
                 .seconds as u64,
             log_index: transaction.index,
             token: token_helper::get_eth_token(),
-            to: Hex(&transaction.to).to_string(),
-            from: Hex(&transaction.from).to_string(),
+            to: Hex::encode(&transaction.to),
+            from: Hex::encode(&transaction.from),
             amount: token_helper::bigint_to_string(transaction.value.clone()),
             amount_usd: None,
             balance_changes: balance_changes,

diff --git a/eth-balance/src/pb/messari.token.v1.rs b/eth-balance/src/pb/messari.token.v1.rs
diff --git a/eth-balance/substreams.yaml b/eth-balance/substreams.yaml
@@ -8,9 +8,9 @@ imports:
 
 protobuf:
   files:
-    - evm_token.proto
+    - eth_balance.proto
   importPaths:
-    - ../common/proto
+    - ./proto
 
 binaries:
   default:
@@ -20,7 +20,6 @@ binaries:
 modules:
   - name: map_balances
     kind: map
-    initialBlock: 0
     inputs:
       - source: sf.ethereum.type.v2.Block
     output:

diff --git a/substreams-helper/src/token.rs b/substreams-helper/src/token.rs
@@ -8,14 +8,14 @@ pub fn get_eth_token() -> Option<Token> {
         address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE".to_string(),
         name: "Ethereum".to_string(),
         symbol: "ETH".to_string(),
-        decimals: 18 as u64,
-        total_supply: None,
+        decimals: 18_u64,
     };
 
     Some(eth_token)
 }
 
 // TODO: replace this with substreams::scalar::BigInt once the wrapper is integrated
+// TODO: make this an impl of fmt::Display
 pub fn bigint_to_string(number: Option<pbeth::v2::BigInt>) -> String {
     number
         .as_ref()

diff --git a/substreams-helper/substreams.yaml b/substreams-helper/substreams.yaml
@@ -8,10 +8,10 @@ imports:
 
 protobuf:
   files:
-    - evm_token.proto
+    - eth_balance.proto
     -
   importPaths:
-    - ../common/proto
+    - ../eth-balance/proto
 
 binaries:
   default: