Merge remote-tracking branch 'upstream/main' into fraser/ENG-769/stor…

…age-snapshot
astriaorg · Dec 10, 2024 · 5eab713 · 5eab713
2 parents f24f75e + 6e91760
commit 5eab713
Show file tree

Hide file tree

Showing 11 changed files with 331 additions and 75 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -81,9 +81,10 @@ itoa = "1.0.10"
 jsonrpsee = { version = "0.20" }
 pbjson-types = "0.6"
 # Note that when updating the penumbra versions, vendored types in `proto/sequencerapis/astria_vendored` may need to be updated as well.
-penumbra-ibc = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.80.7", default-features = false }
-penumbra-proto = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.80.7" }
-penumbra-tower-trace = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.80.7" }
+# can update to a tagged version when https://github.com/penumbra-zone/penumbra/commit/ac7abacc9bb09503d6fd6a396bc0b6850079084e is released
+penumbra-ibc = { git = "https://github.com/penumbra-zone/penumbra.git", rev = "ac7abacc9bb09503d6fd6a396bc0b6850079084e", default-features = false }
+penumbra-proto = { git = "https://github.com/penumbra-zone/penumbra.git", rev = "ac7abacc9bb09503d6fd6a396bc0b6850079084e" }
+penumbra-tower-trace = { git = "https://github.com/penumbra-zone/penumbra.git", rev = "ac7abacc9bb09503d6fd6a396bc0b6850079084e" }
 pin-project-lite = "0.2.13"
 prost = "0.12"
 rand = "0.8.5"

diff --git a/crates/astria-bridge-contracts/CHANGELOG.md b/crates/astria-bridge-contracts/CHANGELOG.md
@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Changed
+
+- Update `idna` dependency to resolve cargo audit warning [#1869](https://github.com/astriaorg/astria/pull/1869).
+
+### Fixed
+
 - Read the provided contract's `decimals` function, falling back to a hardcoded
   value of 18 if the call fails.
   [#1762](https://github.com/astriaorg/astria/pull/1762)

diff --git a/crates/astria-bridge-withdrawer/CHANGELOG.md b/crates/astria-bridge-withdrawer/CHANGELOG.md
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Update `idna` dependency to resolve cargo audit warning [#1869](https://github.com/astriaorg/astria/pull/1869).
+
 ## [1.0.1] - 2024-11-01
 
 ### Fixed

diff --git a/crates/astria-cli/CHANGELOG.md b/crates/astria-cli/CHANGELOG.md
@@ -13,16 +13,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add `fee-assets` subcommand to `sequencer` CLI [#1816](https://github.com/astriaorg/astria/pull/1816).
 
-### Fixed
-
-- Fixed ICS20 withdrawal source when using channel with more than one
-  port/channel combo. [#1768](https://github.com/astriaorg/astria/pull/1768)
-
 ### Changed
 
-- Removed default values from `--sequencer.chain-id` and `--sequencer-url` arguments
+- Update `idna` dependency to resolve cargo audit warning [#1869](https://github.com/astriaorg/astria/pull/1869).
+- Remove default values from `--sequencer.chain-id` and `--sequencer-url` arguments
   [#1792](https://github.com/astriaorg/astria/pull/1792)
 
+### Fixed
+
+- Fix ICS20 withdrawal source when using channel with more than one
+  port/channel combo. [#1768](https://github.com/astriaorg/astria/pull/1768)
+
 ## [0.5.1] - 2024-10-23
 
 ### Added

diff --git a/crates/astria-composer/CHANGELOG.md b/crates/astria-composer/CHANGELOG.md
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Update `idna` dependency to resolve cargo audit warning [#1869](https://github.com/astriaorg/astria/pull/1869).
+
 ## [1.0.0] - 2024-10-25
 
 ### Changed

diff --git a/crates/astria-conductor/CHANGELOG.md b/crates/astria-conductor/CHANGELOG.md
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Update `idna` dependency to resolve cargo audit warning [#1869](https://github.com/astriaorg/astria/pull/1869).
+
 ## [1.0.0] - 2024-10-25
 
 ### Changed

diff --git a/crates/astria-core/CHANGELOG.md b/crates/astria-core/CHANGELOG.md
@@ -12,28 +12,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Initial release.
-- Added method `TracePrefixed::leading_channel` to read the left-most channel of
-  a trace prefixed ICS20 asset [#1768](https://github.com/astriaorg/astria/pull/1768)
-- Added `impl Protobuf for Address<Bech32m>` [#1802](https://github.com/astriaorg/astria/pull/1802)
+- Add method `TracePrefixed::leading_channel` to read the left-most channel of
+  a trace prefixed ICS20 asset [#1768](https://github.com/astriaorg/astria/pull/1768).
+- Add `impl Protobuf for Address<Bech32m>` [#1802](https://github.com/astriaorg/astria/pull/1802).
 
 ### Changed
 
-- Moved `astria_core::crypto` to `astria-core-crypto` and reexported
+- Move `astria_core::crypto` to `astria-core-crypto` and reexport
   `astria_core_crypto as crypto` (this change is transparent)
-  [#1800](https://github.com/astriaorg/astria/pull/1800/)
-- Moved definitions of address domain type to `astria-core-address` and
-  reexported items using the same aliases [#1802](https://github.com/astriaorg/astria/pull/1802)
-
-### Changed
-
+  [#1800](https://github.com/astriaorg/astria/pull/1800/).
+- Move definitions of address domain type to `astria-core-address` and
+  reexport items using the same aliases [#1802](https://github.com/astriaorg/astria/pull/1802).
 - Move all Astria APIs generated from the Protobuf spec from `astria_core::generated`
   to `astria_core::generated::astria`
-  [#1825](https://github.com/astriaorg/astria/pull/1825)
+  [#1825](https://github.com/astriaorg/astria/pull/1825).
+- Update `idna` dependency to resolve cargo audit warning [#1869](https://github.com/astriaorg/astria/pull/1869).
 
 ### Removed
 
-- Removed method `TracePrefixed::last_channel` [#1768](https://github.com/astriaorg/astria/pull/1768)
-- Removed method `SigningKey::try_address` [#1800](https://github.com/astriaorg/astria/pull/1800/)
-- Removed inherent methods `Address::try_from_raw` and `Address::to_raw`
-  [#1802](https://github.com/astriaorg/astria/pull/1802)
-- Removed `AddressBuilder::with_iter` from public interface [#1802](https://github.com/astriaorg/astria/pull/1802)
+- Remove method `TracePrefixed::last_channel` [#1768](https://github.com/astriaorg/astria/pull/1768).
+- Remove method `SigningKey::try_address` [#1800](https://github.com/astriaorg/astria/pull/1800/).
+- Remove inherent methods `Address::try_from_raw` and `Address::to_raw`
+  [#1802](https://github.com/astriaorg/astria/pull/1802).
+- Remove `AddressBuilder::with_iter` from public interface [#1802](https://github.com/astriaorg/astria/pull/1802).
diff --git a/crates/astria-sequencer-relayer/CHANGELOG.md b/crates/astria-sequencer-relayer/CHANGELOG.md
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Update `idna` dependency to resolve cargo audit warning [#1869](https://github.com/astriaorg/astria/pull/1869).
+
 ## [1.0.0] - 2024-10-25
 
 ### Changed

diff --git a/crates/astria-sequencer/CHANGELOG.md b/crates/astria-sequencer/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Index all event attributes [#1786](https://github.com/astriaorg/astria/pull/1786).
 - Consolidate action handling to single module [#1759](https://github.com/astriaorg/astria/pull/1759).
 - Ensure all deposit assets are trace prefixed [#1807](https://github.com/astriaorg/astria/pull/1807).
+- Update `idna` dependency to resolve cargo audit warning [#1869](https://github.com/astriaorg/astria/pull/1869).
 - Provide and use new `Storage` struct, wrapping `cnidarium::Storage` [#1801](https://github.com/astriaorg/astria/pull/1801).
 - Provide and use new `Snapshot` struct, wrapping `cnidarium::Snapshot` and
   holding a cache of recently-read values [#1801](https://github.com/astriaorg/astria/pull/1801).

diff --git a/crates/astria-sequencer/Cargo.toml b/crates/astria-sequencer/Cargo.toml
@@ -34,7 +34,7 @@ telemetry = { package = "astria-telemetry", path = "../astria-telemetry", featur
 
 anyhow = "1.0.89"
 borsh = { version = "1.5.1", features = ["bytes", "derive"] }
-cnidarium = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.80.7", features = [
+cnidarium = { git = "https://github.com/penumbra-zone/penumbra.git", rev = "ac7abacc9bb09503d6fd6a396bc0b6850079084e", features = [
   "metrics",
 ] }
 ibc-proto = { version = "0.41.0", features = ["server"] }