From 7a4ccef16e940ce7e97e415c4d6b06bb9bcba389 Mon Sep 17 00:00:00 2001 From: Henry de Valence Date: Tue, 30 Jan 2024 00:08:52 -0800 Subject: [PATCH] asset: delete cargo-culted fields in DenomMetadata These were copied over from the bank.Metadata proto but: - they're never used by any of our tooling - searching the cosmos/chain-registry reveals they're never used in the rest of the ecosystem - we can't parse the cosmos sdk data anyways, because it does bespoke field renaming So no reason to keep it and definite reasons to remove it. --- crates/core/asset/src/asset/denom_metadata.rs | 8 - .../src/gen/penumbra.core.asset.v1alpha1.rs | 7 - .../gen/penumbra.core.asset.v1alpha1.serde.rs | 35 ---- .../proto/src/gen/proto_descriptor.bin.no_lfs | Bin 345031 -> 344666 bytes .../penumbra/core/asset/v1alpha1/asset.pb.go | 159 ++++++++---------- .../penumbra/core/asset/v1alpha1/asset.proto | 5 - 6 files changed, 69 insertions(+), 145 deletions(-) diff --git a/crates/core/asset/src/asset/denom_metadata.rs b/crates/core/asset/src/asset/denom_metadata.rs index 6a06113e76..4d879b420a 100644 --- a/crates/core/asset/src/asset/denom_metadata.rs +++ b/crates/core/asset/src/asset/denom_metadata.rs @@ -43,8 +43,6 @@ pub(super) struct Inner { display_index: usize, name: String, symbol: String, - uri: String, - uri_hash: String, } impl DomainType for DenomMetadata { @@ -59,8 +57,6 @@ impl From<&Inner> for pb::DenomMetadata { display: inner.units[inner.display_index].denom.clone(), name: inner.name.clone(), symbol: inner.symbol.clone(), - uri: inner.uri.clone(), - uri_hash: inner.uri_hash.clone(), penumbra_asset_id: Some(inner.id.into()), denom_units: inner.units.clone().into_iter().map(|x| x.into()).collect(), } @@ -127,8 +123,6 @@ impl TryFrom for Inner { description: value.description, name: value.name, symbol: value.symbol, - uri: value.uri, - uri_hash: value.uri_hash, }) } } @@ -249,8 +243,6 @@ impl Inner { description: String::new(), name: String::new(), symbol: String::new(), - uri: String::new(), - uri_hash: String::new(), } } } diff --git a/crates/proto/src/gen/penumbra.core.asset.v1alpha1.rs b/crates/proto/src/gen/penumbra.core.asset.v1alpha1.rs index 2e983b61ba..d98126dbf4 100644 --- a/crates/proto/src/gen/penumbra.core.asset.v1alpha1.rs +++ b/crates/proto/src/gen/penumbra.core.asset.v1alpha1.rs @@ -79,13 +79,6 @@ pub struct DenomMetadata { /// be the same as the display. #[prost(string, tag = "6")] pub symbol: ::prost::alloc::string::String, - /// URI to a document (on or off-chain) that contains additional information. Optional. - #[prost(string, tag = "7")] - pub uri: ::prost::alloc::string::String, - /// URIHash is a sha256 hash of a document pointed by URI. It's used to verify that - /// the document didn't change. Optional. - #[prost(string, tag = "8")] - pub uri_hash: ::prost::alloc::string::String, /// the asset ID on Penumbra for this denomination. #[prost(message, optional, tag = "1984")] pub penumbra_asset_id: ::core::option::Option, diff --git a/crates/proto/src/gen/penumbra.core.asset.v1alpha1.serde.rs b/crates/proto/src/gen/penumbra.core.asset.v1alpha1.serde.rs index 353b283513..d04dbfc30f 100644 --- a/crates/proto/src/gen/penumbra.core.asset.v1alpha1.serde.rs +++ b/crates/proto/src/gen/penumbra.core.asset.v1alpha1.serde.rs @@ -339,12 +339,6 @@ impl serde::Serialize for DenomMetadata { if !self.symbol.is_empty() { len += 1; } - if !self.uri.is_empty() { - len += 1; - } - if !self.uri_hash.is_empty() { - len += 1; - } if self.penumbra_asset_id.is_some() { len += 1; } @@ -367,12 +361,6 @@ impl serde::Serialize for DenomMetadata { if !self.symbol.is_empty() { struct_ser.serialize_field("symbol", &self.symbol)?; } - if !self.uri.is_empty() { - struct_ser.serialize_field("uri", &self.uri)?; - } - if !self.uri_hash.is_empty() { - struct_ser.serialize_field("uriHash", &self.uri_hash)?; - } if let Some(v) = self.penumbra_asset_id.as_ref() { struct_ser.serialize_field("penumbraAssetId", v)?; } @@ -393,9 +381,6 @@ impl<'de> serde::Deserialize<'de> for DenomMetadata { "display", "name", "symbol", - "uri", - "uri_hash", - "uriHash", "penumbra_asset_id", "penumbraAssetId", ]; @@ -408,8 +393,6 @@ impl<'de> serde::Deserialize<'de> for DenomMetadata { Display, Name, Symbol, - Uri, - UriHash, PenumbraAssetId, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -438,8 +421,6 @@ impl<'de> serde::Deserialize<'de> for DenomMetadata { "display" => Ok(GeneratedField::Display), "name" => Ok(GeneratedField::Name), "symbol" => Ok(GeneratedField::Symbol), - "uri" => Ok(GeneratedField::Uri), - "uriHash" | "uri_hash" => Ok(GeneratedField::UriHash), "penumbraAssetId" | "penumbra_asset_id" => Ok(GeneratedField::PenumbraAssetId), _ => Err(serde::de::Error::unknown_field(value, FIELDS)), } @@ -466,8 +447,6 @@ impl<'de> serde::Deserialize<'de> for DenomMetadata { let mut display__ = None; let mut name__ = None; let mut symbol__ = None; - let mut uri__ = None; - let mut uri_hash__ = None; let mut penumbra_asset_id__ = None; while let Some(k) = map_.next_key()? { match k { @@ -507,18 +486,6 @@ impl<'de> serde::Deserialize<'de> for DenomMetadata { } symbol__ = Some(map_.next_value()?); } - GeneratedField::Uri => { - if uri__.is_some() { - return Err(serde::de::Error::duplicate_field("uri")); - } - uri__ = Some(map_.next_value()?); - } - GeneratedField::UriHash => { - if uri_hash__.is_some() { - return Err(serde::de::Error::duplicate_field("uriHash")); - } - uri_hash__ = Some(map_.next_value()?); - } GeneratedField::PenumbraAssetId => { if penumbra_asset_id__.is_some() { return Err(serde::de::Error::duplicate_field("penumbraAssetId")); @@ -534,8 +501,6 @@ impl<'de> serde::Deserialize<'de> for DenomMetadata { display: display__.unwrap_or_default(), name: name__.unwrap_or_default(), symbol: symbol__.unwrap_or_default(), - uri: uri__.unwrap_or_default(), - uri_hash: uri_hash__.unwrap_or_default(), penumbra_asset_id: penumbra_asset_id__, }) } diff --git a/crates/proto/src/gen/proto_descriptor.bin.no_lfs b/crates/proto/src/gen/proto_descriptor.bin.no_lfs index ff340c08d641994a3f967c65db2c3f78acf37443..e497564b31dba8e341a0c26596b8490f0f8821c0 100644 GIT binary patch delta 908 zcmYjPO>YuW6rK0po#}9)w7ftmpQT07)@a;lf*1p00QU`0z(Tv~uaNi=yKy&*E?pXT zCM-0r=*pjncpi5YoqO&#mG zz+RCJR>$4sI81F5x+`nG1OUhH%6y1G>=yPz1iS8yn~*h)4!xet20Z~?FSs_eOpkTg zgRYm^;ctW-c!p!^eBl)z$?aoYToV}_Wohcm6Yo#CIq!3tH`y^o6Kz1ZImsIr|cv z(Ofg@)YblTIwshZ_ExF=SW{a4KD0obZmk{{2$s`QIgp_>qbetA`1g*VXGYtBiwQGJ al|uyG?9H-rxvU5*iKVdU%d%o`RQ~}YJ6F2^ delta 1274 zcmZvaO>YuG7{}S!fn5gL!iE+~Ul@zhR@)|;Y7;aKr-r6flfIbLg6)=F%0|1}z}DD{ znE28UfX0i7N3SLvO#A{~ysC*G!mC&Rvn=4j!@&OMdH&DyduHa>%h9hFqn{oy`S${Q z`<%?TU$Z~bkM^_3&xIJ1&l*-r;nG}qOMGhMOvT?pU2oP?s<*8`7a==4(X1SPKf^*A z4FrzgUEiRI&YO`BRJz?+PAtl;BSxuALYllx;^|$!yS2_;hwI#Ms%Iyr?eaOt=1zk< zwc28}u3Ppzck8;#tB&nLHMwpWmTNh-{+L^K&1szILM`!or`_Ep#-c1JdIUuiwWlPg zaJ1EvGUP~%y^=g0MUz*^So*2p5o2%*jd-)J-?({;i!s6TFXX9X*{*5uqjTX{;_L2g zlb-a<36$ilB#z+DO7G7TbYLmgrf6b%aK63KZM2#jAM z>7GJjY2s2(pGhu9`b`Y{Q(mFXNCW=dD0NtsR#G}@G>vIC7q<=kxFj&S9l zbir7m@qW6XtZ2!BhP~2Ci`y1Vl12~6k?aith2#S^=GT@4+F>6J615Ney`YhP*hhm# z?ZZBrBo0rf<9=&M*mW9#Zi!K`ArhjAK?3}GGSx*>aa>hW^U+k%tEy_=b%q3(K{H)y z56ht4*M|@ijgju