Correct derivation of Penumbra asset ID

Rather than manually computing the asset ID, we use the existing `penumbra_asset::asset::Metadata` structure to derive it from the metadata. This also ensures that we're running our transported `Metadata` objects through the (de)serialization code we'll eventually use to process them in the client.
prax-wallet · Apr 11, 2024 · 5ac5062 · 5ac5062
1 parent 0b81755
commit 5ac5062
Show file tree

Hide file tree

Showing 9 changed files with 120 additions and 112 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /target
+/tools/compiler/target
 .DS_Store
 /.idea
diff --git a/registry/penumbra-testnet-deimos-6.json b/registry/penumbra-testnet-deimos-6.json
@@ -197,12 +197,12 @@
           "exponent": 6
         }
       ],
-      "base": "uosmo",
-      "display": "osmo",
+      "base": "transfer/channel-0/uosmo",
+      "display": "transfer/channel-0/osmo",
       "name": "Osmosis",
       "symbol": "OSMO",
       "penumbraAssetId": {
-        "inner": "pjiYlm5+VallEe+wo+t8QNFsNKUyPtRB3AFvi0Cb6AI="
+        "inner": "jIowYEpoMr+LQYqjDVEnQO6hyzb9raVxbO1GLyDxlhI="
       },
       "images": [
         {
@@ -221,12 +221,12 @@
           "exponent": 6
         }
       ],
-      "base": "uion",
-      "display": "ion",
+      "base": "transfer/channel-0/uion",
+      "display": "transfer/channel-0/ion",
       "name": "Ion",
       "symbol": "ION",
       "penumbraAssetId": {
-        "inner": "KCzsvepTyhh+1zBj5xaBf2+mLoFV1n/YD55xRDN3kAw="
+        "inner": "KX8cjRGFpZUkZCwCtUX8Pi2lEyO5g0oPVr8WhsLgkwg="
       },
       "images": [
         {
@@ -245,12 +245,12 @@
           "exponent": 6
         }
       ],
-      "base": "factory/osmo1zlkzu72774ynac53necz46u4ycqtp36wedrar0/willyz",
-      "display": "willyz",
+      "base": "transfer/channel-0/factory/osmo1zlkzu72774ynac53necz46u4ycqtp36wedrar0/willyz",
+      "display": "transfer/channel-0/willyz",
       "name": "Willyz",
       "symbol": "WILLYZ",
       "penumbraAssetId": {
-        "inner": "nhVpxXo2RTn91ldkmDlPWogWZPH7PfLDq813YUo2TRE="
+        "inner": "ra98J77CX10Us2s6+d7bebfpm1Q3+UOycPfaaEeeuAY="
       },
       "images": [
         {
@@ -263,66 +263,57 @@
       "description": "The controlled staking asset for Noble Chain",
       "denomUnits": [
         {
-          "denom": "transfer/channel-3/ustake",
-          "aliases": [
-            "microstake"
-          ]
+          "denom": "transfer/channel-3/ustake"
         },
         {
           "denom": "transfer/channel-3/stake",
           "exponent": 6
         }
       ],
-      "base": "ustake",
-      "display": "stake",
+      "base": "transfer/channel-3/ustake",
+      "display": "transfer/channel-3/stake",
       "name": "Stake",
       "symbol": "STAKE",
       "penumbraAssetId": {
-        "inner": "W+FJMVYhwDLC0dOa5OkDTpxyHUfjO6f6BhsrwHltjgk="
+        "inner": "hGwO3SuE1/D05ooLMUVVe7XvYbAFnxAUbIRIZdG3TwI="
       }
     },
     {
       "description": "Love is a test tokenfactory asset controlled by the Strangelove Team",
       "denomUnits": [
         {
-          "denom": "transfer/channel-3/ulove",
-          "aliases": [
-            "microlove"
-          ]
+          "denom": "transfer/channel-3/ulove"
         },
         {
           "denom": "transfer/channel-3/love",
           "exponent": 6
         }
       ],
-      "base": "ulove",
-      "display": "love",
+      "base": "transfer/channel-3/ulove",
+      "display": "transfer/channel-3/love",
       "name": "Love",
       "symbol": "LOVE",
       "penumbraAssetId": {
-        "inner": "IeuQ1Y5T62mLaez/2WaDLm6e8CbDw9E4WJpe6Q9++AE="
+        "inner": "Hqn6gTCqE7mCBsVa4agsTFmrO0Rip5xmLcipnGKH9AI="
       }
     },
     {
       "description": "USD Coin",
       "denomUnits": [
         {
-          "denom": "transfer/channel-3/uusdc",
-          "aliases": [
-            "microusdc"
-          ]
+          "denom": "transfer/channel-3/uusdc"
         },
         {
           "denom": "transfer/channel-3/usdc",
           "exponent": 6
         }
       ],
-      "base": "uusdc",
-      "display": "usdc",
+      "base": "transfer/channel-3/uusdc",
+      "display": "transfer/channel-3/usdc",
       "name": "USD Coin",
       "symbol": "USDC",
       "penumbraAssetId": {
-        "inner": "ziENb4v2dxNHmbUzRAVK/tuDL7gtVaJpA8ZdEIkh0Qk="
+        "inner": "CKBQapu+DkQpsKyTfKESLTV19/NPWR5sNZtvQsd3Hw8="
       },
       "images": [
         {
@@ -334,22 +325,19 @@
       "description": "USDLR is a fiat-backed stablecoin issued by Stable. Stable pays DeFi protocols who distribute USDLR.",
       "denomUnits": [
         {
-          "denom": "transfer/channel-3/uusdlr",
-          "aliases": [
-            "microusdlr"
-          ]
+          "denom": "transfer/channel-3/uusdlr"
         },
         {
           "denom": "transfer/channel-3/usdlr",
           "exponent": 6
         }
       ],
-      "base": "uusdlr",
-      "display": "usdlr",
+      "base": "transfer/channel-3/uusdlr",
+      "display": "transfer/channel-3/usdlr",
       "name": "USDLR by Stable",
       "symbol": "USDLR",
       "penumbraAssetId": {
-        "inner": "nd4l/VXn/XaePOgpqr9V/JN010HaGi1svkjMLrgFOAA="
+        "inner": "+jDercxZxs90BjC91PrWyA53/p7uN3ZcSJj3N0mHjhI="
       },
       "images": [
         {

diff --git a/tools/compiler/Cargo.lock b/tools/compiler/Cargo.lock
diff --git a/tools/compiler/Cargo.toml b/tools/compiler/Cargo.toml
@@ -15,3 +15,5 @@ regress = "0.9.1"
 reqwest = { version = "0.12.3", features = ["json"] }
 thiserror = "1.0.58"
 tokio = { version = "1.37.0", features = ["full"] }
+tracing-subscriber = "0.3"
+tracing = "0.1"
diff --git a/tools/compiler/src/lib.rs b/tools/compiler/src/lib.rs
@@ -1,6 +1,5 @@
 pub mod error;
 pub mod github;
-pub mod metadata;
 pub mod parser;
 pub mod processor;
 pub mod querier;
diff --git a/tools/compiler/src/main.rs b/tools/compiler/src/main.rs
@@ -3,5 +3,6 @@ use penumbra_registry::processor::generate_registry;
 
 #[tokio::main]
 async fn main() -> AppResult<()> {
+    tracing_subscriber::fmt::init();
     generate_registry().await
 }
diff --git a/tools/compiler/src/metadata.rs b/tools/compiler/src/metadata.rs
diff --git a/tools/compiler/src/parser.rs b/tools/compiler/src/parser.rs
@@ -2,7 +2,7 @@ use std::fs;
 use std::path::Path;
 
 use anyhow::anyhow;
-use penumbra_proto::penumbra::core::asset::v1 as pb;
+use penumbra_asset::asset::Metadata;
 use serde::{Deserialize, Serialize};
 
 use crate::error::AppResult;
@@ -12,7 +12,7 @@ use crate::error::AppResult;
 pub struct ChainConfig {
     pub chain_id: String,
     pub ibc_assets: Vec<IbcConfig>,
-    pub native_assets: Vec<pb::Metadata>,
+    pub native_assets: Vec<Metadata>,
 }
 
 #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
@@ -48,7 +48,7 @@ pub fn get_chain_configs() -> AppResult<Vec<ChainConfig>> {
     fs::create_dir_all(registry_dir)?;
     let chain_dirs = fs::read_dir(LOCAL_INPUT_DIR)?;
 
-    chain_dirs
+    Ok(chain_dirs
         .into_iter()
         .map(|dir_entry| -> AppResult<ChainConfig> {
             let chain_path = dir_entry?.path();
@@ -74,5 +74,6 @@ pub fn get_chain_configs() -> AppResult<Vec<ChainConfig>> {
             };
             Ok(chain_config)
         })
-        .collect()
+        .filter_map(|result| result.ok())
+        .collect())
 }