diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md index 76436ebaac..345b75ab60 100644 --- a/COMPATIBILITY.md +++ b/COMPATIBILITY.md @@ -9,3 +9,4 @@ | 7 (Testnet 78) | v0.78.x | v0.37.5 | v1 | | 7 (Mainnet) | v0.79.x | v0.37.x | v1 | | 8 (Mainnet) | v0.80.x | v0.37.x | v1 | +| 9 (Mainnet) | v0.81.x | v0.37.x | v1 | diff --git a/Cargo.lock b/Cargo.lock index 38a1904f32..89f30cbd4e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1245,7 +1245,7 @@ dependencies = [ [[package]] name = "cnidarium" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "async-trait", @@ -1281,7 +1281,7 @@ dependencies = [ [[package]] name = "cnidarium-component" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "async-trait", @@ -1319,7 +1319,7 @@ dependencies = [ [[package]] name = "cometindex" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "async-trait", @@ -1680,7 +1680,7 @@ dependencies = [ [[package]] name = "decaf377-fmd" -version = "0.80.11" +version = "0.81.0" dependencies = [ "ark-ff", "ark-serialize", @@ -1695,7 +1695,7 @@ dependencies = [ [[package]] name = "decaf377-frost" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ff", @@ -1710,7 +1710,7 @@ dependencies = [ [[package]] name = "decaf377-ka" -version = "0.80.11" +version = "0.81.0" dependencies = [ "ark-ff", "decaf377", @@ -4223,7 +4223,7 @@ dependencies = [ [[package]] name = "pcli" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ff", @@ -4304,7 +4304,7 @@ dependencies = [ [[package]] name = "pclientd" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "assert_cmd", @@ -4356,7 +4356,7 @@ dependencies = [ [[package]] name = "pd" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ff", @@ -4509,7 +4509,7 @@ dependencies = [ [[package]] name = "penumbra-app" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ff", @@ -4598,7 +4598,7 @@ dependencies = [ [[package]] name = "penumbra-asset" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ff", @@ -4638,7 +4638,7 @@ dependencies = [ [[package]] name = "penumbra-auction" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ff", @@ -4693,7 +4693,7 @@ dependencies = [ [[package]] name = "penumbra-auto-https" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "axum-server", @@ -4705,7 +4705,7 @@ dependencies = [ [[package]] name = "penumbra-bench" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-bls12-377", @@ -4749,7 +4749,7 @@ dependencies = [ [[package]] name = "penumbra-community-pool" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ff", @@ -4781,7 +4781,7 @@ dependencies = [ [[package]] name = "penumbra-compact-block" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ff", @@ -4816,7 +4816,7 @@ dependencies = [ [[package]] name = "penumbra-custody" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "argon2", @@ -4852,7 +4852,7 @@ dependencies = [ [[package]] name = "penumbra-dex" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ff", @@ -4914,7 +4914,7 @@ dependencies = [ [[package]] name = "penumbra-distributions" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "async-trait", @@ -4932,7 +4932,7 @@ dependencies = [ [[package]] name = "penumbra-eddy" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ff", @@ -4950,7 +4950,7 @@ dependencies = [ [[package]] name = "penumbra-fee" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ff", @@ -4977,7 +4977,7 @@ dependencies = [ [[package]] name = "penumbra-funding" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "async-trait", @@ -5000,7 +5000,7 @@ dependencies = [ [[package]] name = "penumbra-governance" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ff", @@ -5054,7 +5054,7 @@ dependencies = [ [[package]] name = "penumbra-ibc" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ff", @@ -5091,7 +5091,7 @@ dependencies = [ [[package]] name = "penumbra-keys" -version = "0.80.11" +version = "0.81.0" dependencies = [ "aes", "anyhow", @@ -5138,7 +5138,7 @@ dependencies = [ [[package]] name = "penumbra-measure" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "bytesize", @@ -5156,7 +5156,7 @@ dependencies = [ [[package]] name = "penumbra-mock-client" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "cnidarium", @@ -5173,7 +5173,7 @@ dependencies = [ [[package]] name = "penumbra-mock-consensus" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "bytes", @@ -5193,7 +5193,7 @@ dependencies = [ [[package]] name = "penumbra-mock-tendermint-proxy" -version = "0.80.11" +version = "0.81.0" dependencies = [ "hex", "pbjson-types", @@ -5208,7 +5208,7 @@ dependencies = [ [[package]] name = "penumbra-num" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ff", @@ -5245,7 +5245,7 @@ dependencies = [ [[package]] name = "penumbra-parameter-setup" -version = "0.80.11" +version = "0.81.0" dependencies = [ "ark-groth16", "ark-serialize", @@ -5262,7 +5262,7 @@ dependencies = [ [[package]] name = "penumbra-proof-params" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ec", @@ -5290,7 +5290,7 @@ dependencies = [ [[package]] name = "penumbra-proof-setup" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ec", @@ -5317,7 +5317,7 @@ dependencies = [ [[package]] name = "penumbra-proto" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "async-trait", @@ -5351,7 +5351,7 @@ dependencies = [ [[package]] name = "penumbra-sct" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ff", @@ -5387,7 +5387,7 @@ dependencies = [ [[package]] name = "penumbra-shielded-pool" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ff", @@ -5441,7 +5441,7 @@ dependencies = [ [[package]] name = "penumbra-stake" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ff", @@ -5494,7 +5494,7 @@ dependencies = [ [[package]] name = "penumbra-tct" -version = "0.80.11" +version = "0.81.0" dependencies = [ "ark-ed-on-bls12-377", "ark-ff", @@ -5526,7 +5526,7 @@ dependencies = [ [[package]] name = "penumbra-tct-property-test" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "futures", @@ -5538,7 +5538,7 @@ dependencies = [ [[package]] name = "penumbra-tct-visualize" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "axum", @@ -5568,7 +5568,7 @@ dependencies = [ [[package]] name = "penumbra-tendermint-proxy" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "chrono", @@ -5600,7 +5600,7 @@ dependencies = [ [[package]] name = "penumbra-test-subscriber" -version = "0.80.11" +version = "0.81.0" dependencies = [ "tracing", "tracing-subscriber 0.3.18", @@ -5608,7 +5608,7 @@ dependencies = [ [[package]] name = "penumbra-tower-trace" -version = "0.80.11" +version = "0.81.0" dependencies = [ "futures", "hex", @@ -5629,7 +5629,7 @@ dependencies = [ [[package]] name = "penumbra-transaction" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-ff", @@ -5684,7 +5684,7 @@ dependencies = [ [[package]] name = "penumbra-txhash" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "blake2b_simd 1.0.2", @@ -5697,7 +5697,7 @@ dependencies = [ [[package]] name = "penumbra-view" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-std", @@ -5755,7 +5755,7 @@ dependencies = [ [[package]] name = "penumbra-wallet" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-std", @@ -5841,7 +5841,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pindexer" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "chrono", @@ -5936,7 +5936,7 @@ dependencies = [ [[package]] name = "pmonitor" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "assert_cmd", @@ -7781,7 +7781,7 @@ checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" [[package]] name = "summonerd" -version = "0.80.11" +version = "0.81.0" dependencies = [ "anyhow", "ark-groth16", diff --git a/Cargo.toml b/Cargo.toml index 53c468687f..bef547916b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -105,7 +105,7 @@ push = false [workspace.package] authors = ["Penumbra Labs { let destination_chain_address = to; - let (ephemeral_return_address, _) = app - .config - .full_viewing_key - .ephemeral_address(OsRng, AddressIndex::from(*source)); + let ephemeral_return_address = if *use_transparent_address { + let ivk = app.config.full_viewing_key.incoming(); + + ivk.transparent_address() + .parse::
() + .expect("we round-trip from a valid transparent address") + } else { + app.config + .full_viewing_key + .ephemeral_address(OsRng, AddressIndex::from(*source)) + .0 + }; let timeout_height = match timeout_height { Some(h) => h.clone(), @@ -1132,7 +1141,9 @@ impl TxCmd { return_address: ephemeral_return_address, // TODO: impl From for ChannelId source_channel: ChannelId::from_str(format!("channel-{}", channel).as_ref())?, - use_compat_address: *use_compat_address, + use_compat_address: false, + ics20_memo: "".to_string(), + use_transparent_address: *use_transparent_address, }; let plan = Planner::new(OsRng) diff --git a/crates/bin/pcli/src/command/view/address.rs b/crates/bin/pcli/src/command/view/address.rs index 587b896a4c..2c724ed870 100644 --- a/crates/bin/pcli/src/command/view/address.rs +++ b/crates/bin/pcli/src/command/view/address.rs @@ -16,9 +16,9 @@ pub struct AddressCmd { /// Output in base64 format, instead of the default bech32. #[clap(long)] base64: bool, - /// Use compat (bech32, not bech32m) address encoding, for compatibility with some IBC chains. + /// Use transparent (bech32, 32-byte) address encoding, for compatibility with some IBC chains. #[clap(long)] - compat: bool, + transparent: bool, /// Print the current FVK #[clap(long)] fvk: bool, @@ -49,8 +49,13 @@ impl AddressCmd { "{}", base64::engine::general_purpose::STANDARD.encode(address.to_vec()), ); - } else if self.compat { - println!("{}", address.compat_encoding()); + } else if self.transparent { + if index != 0 { + return Err(anyhow::anyhow!( + "warning: index must be 0 to use transparent address encoding" + )); + } + println!("{}", fvk.incoming().transparent_address()); } else { if self.fvk { eprintln!("🔥 CAUTION: POSSESSION OF THE FOLLOWING FULL VIEWING KEY WILL"); diff --git a/crates/bin/pcli/src/terminal.rs b/crates/bin/pcli/src/terminal.rs index a13f03d65b..95bf433242 100644 --- a/crates/bin/pcli/src/terminal.rs +++ b/crates/bin/pcli/src/terminal.rs @@ -11,7 +11,7 @@ use penumbra_keys::{ }; use penumbra_proof_params::GROTH16_PROOF_LENGTH_BYTES; use penumbra_sct::Nullifier; -use penumbra_shielded_pool::{Note, NoteView}; +use penumbra_shielded_pool::{EncryptedBackref, Note, NoteView}; use penumbra_tct::structure::Hash; use penumbra_transaction::{view, ActionPlan, ActionView, TransactionPlan, TransactionView}; use termion::{color, input::TermRead}; @@ -82,6 +82,8 @@ fn pretty_print_transaction_plan( balance_commitment: dummy_commitment(), nullifier: Nullifier(Fq::default()), rk: dummy_pk(), + encrypted_backref: EncryptedBackref::try_from([0u8; 0]) + .expect("can create dummy encrypted backref"), }, auth_sig: dummy_sig(), proof: dummy_proof_spend(), diff --git a/crates/bin/pd/src/cli.rs b/crates/bin/pd/src/cli.rs index 80e1b00500..5c2b71ddb8 100644 --- a/crates/bin/pd/src/cli.rs +++ b/crates/bin/pd/src/cli.rs @@ -133,7 +133,8 @@ pub enum RootCommand { #[clap(long, display_order = 200)] comet_home: Option, /// If set, force a migration to occur even if the chain is not halted. - /// Will not override a detected mismatch in state versions. + /// Will not override a detected mismatch in state versions, or on signs + /// of corruption. This is "expert mode" and potentially destructive. #[clap(long, display_order = 1000)] force: bool, /// If set, edit local state to permit the node to start, despite diff --git a/crates/bin/pd/src/main.rs b/crates/bin/pd/src/main.rs index 35815c7d5a..59bca2cdbc 100644 --- a/crates/bin/pd/src/main.rs +++ b/crates/bin/pd/src/main.rs @@ -12,7 +12,7 @@ use cnidarium::Storage; use metrics_exporter_prometheus::PrometheusBuilder; use pd::{ cli::{NetworkCommand, Opt, RootCommand}, - migrate::Migration::{Mainnet1, ReadyToStart}, + migrate::Migration::{Mainnet2, ReadyToStart}, network::{ config::{get_network_dir, parse_tm_address, url_has_necessary_parts}, generate::NetworkConfig, @@ -473,7 +473,7 @@ async fn main() -> anyhow::Result<()> { let genesis_start = pd::migrate::last_block_timestamp(pd_home.clone()).await?; tracing::info!(?genesis_start, "last block timestamp"); - Mainnet1 + Mainnet2 .migrate(pd_home.clone(), comet_home, Some(genesis_start), force) .instrument(pd_migrate_span) .await diff --git a/crates/bin/pd/src/migrate.rs b/crates/bin/pd/src/migrate.rs index ad6e612a9e..bb61b860a5 100644 --- a/crates/bin/pd/src/migrate.rs +++ b/crates/bin/pd/src/migrate.rs @@ -5,6 +5,7 @@ //! This module declares how local `pd` state should be altered, if at all, //! in order to be compatible with the network post-chain-upgrade. mod mainnet1; +mod mainnet2; mod reset_halt_bit; mod simple; mod testnet72; @@ -56,6 +57,9 @@ pub enum Migration { /// Mainnet-1 migration: /// - Restore IBC packet commitments for improperly handled withdrawal attempts Mainnet1, + /// Mainnet-2 migration: + /// - no-op + Mainnet2, } impl Migration { @@ -79,6 +83,17 @@ impl Migration { storage.latest_snapshot().is_chain_halted().await || force, "to run a migration, the chain halt bit must be set to `true` or use the `--force` cli flag" ); + + // Assert that the local chain state version is not corrupted, see `v0.80.10` release notes. + let latest_version = storage.latest_version(); + let block_height = storage.latest_snapshot().get_block_height().await?; + ensure!( + latest_version == block_height || force, + "local chain state version is corrupted: {} != {}", + latest_version, + block_height + ); + tracing::info!("started migration"); // If this is `ReadyToStart`, we need to reset the halt bit and return early. @@ -94,6 +109,9 @@ impl Migration { Migration::Mainnet1 => { mainnet1::migrate(storage, pd_home.clone(), genesis_start).await?; } + Migration::Mainnet2 => { + mainnet2::migrate(storage, pd_home.clone(), genesis_start).await?; + } // We keep historical migrations around for now, this will help inform an abstracted // design. Feel free to remove it if it's causing you trouble. _ => unimplemented!("the specified migration is unimplemented"), diff --git a/crates/bin/pd/src/migrate/mainnet2.rs b/crates/bin/pd/src/migrate/mainnet2.rs new file mode 100644 index 0000000000..32a4c4d364 --- /dev/null +++ b/crates/bin/pd/src/migrate/mainnet2.rs @@ -0,0 +1,103 @@ +//! Migration for shipping consensus-breaking IBC changes, fixing +//! how withdrawals from Penumbra to Noble are handled, and ensures that IBC +//! error messages from counterparty chains are processed. +use cnidarium::{StateDelta, Storage}; +use jmt::RootHash; +use penumbra_app::app::StateReadExt as _; +use penumbra_app::app_version::migrate_app_version; +use penumbra_governance::StateWriteExt; +use penumbra_sct::component::clock::EpochManager; +use penumbra_sct::component::clock::EpochRead; +use std::path::PathBuf; +use tracing::instrument; + +use crate::network::generate::NetworkConfig; + +/// Run the full migration, emitting a new genesis event, representing historical state. +/// +/// This will have the effect of reinserting packets which had acknowledgements containing +/// errors, and erroneously removed from state, as if the acknowledgements had contained successes. +#[instrument] +pub async fn migrate( + storage: Storage, + pd_home: PathBuf, + genesis_start: Option, +) -> anyhow::Result<()> { + // Setup: + let initial_state = storage.latest_snapshot(); + let chain_id = initial_state.get_chain_id().await?; + let root_hash = initial_state + .root_hash() + .await + .expect("chain state has a root hash"); + // We obtain the pre-upgrade hash solely to log it as a result. + let pre_upgrade_root_hash: RootHash = root_hash.into(); + let pre_upgrade_height = initial_state + .get_block_height() + .await + .expect("chain state has a block height"); + let post_upgrade_height = pre_upgrade_height.wrapping_add(1); + + let mut delta = StateDelta::new(initial_state); + let (migration_duration, post_upgrade_root_hash) = { + let start_time = std::time::SystemTime::now(); + + migrate_app_version(&mut delta, 9).await?; + + // Reset the application height and halt flag. + delta.ready_to_start(); + delta.put_block_height(0u64); + + // Finally, commit the changes to the chain state. + let post_upgrade_root_hash = storage.commit_in_place(delta).await?; + tracing::info!(?post_upgrade_root_hash, "post-migration root hash"); + + ( + start_time.elapsed().expect("start is set"), + post_upgrade_root_hash, + ) + }; + storage.release().await; + + // The migration is complete, now we need to generate a genesis file. To do this, we need + // to lookup a validator view from the chain, and specify the post-upgrade app hash and + // initial height. + let app_state = penumbra_app::genesis::Content { + chain_id, + ..Default::default() + }; + let mut genesis = NetworkConfig::make_genesis(app_state.clone()).expect("can make genesis"); + genesis.app_hash = post_upgrade_root_hash + .0 + .to_vec() + .try_into() + .expect("infallible conversion"); + + genesis.initial_height = post_upgrade_height as i64; + genesis.genesis_time = genesis_start.unwrap_or_else(|| { + let now = tendermint::time::Time::now(); + tracing::info!(%now, "no genesis time provided, detecting a testing setup"); + now + }); + let checkpoint = post_upgrade_root_hash.0.to_vec(); + let genesis = NetworkConfig::make_checkpoint(genesis, Some(checkpoint)); + let genesis_json = serde_json::to_string(&genesis).expect("can serialize genesis"); + tracing::info!("genesis: {}", genesis_json); + let genesis_path = pd_home.join("genesis.json"); + std::fs::write(genesis_path, genesis_json).expect("can write genesis"); + + let validator_state_path = pd_home.join("priv_validator_state.json"); + let fresh_validator_state = crate::network::generate::NetworkValidator::initial_state(); + std::fs::write(validator_state_path, fresh_validator_state).expect("can write validator state"); + + tracing::info!( + pre_upgrade_height, + post_upgrade_height, + ?pre_upgrade_root_hash, + ?post_upgrade_root_hash, + duration = migration_duration.as_secs(), + "successful migration!" + ); + + Ok(()) +} diff --git a/crates/bin/pd/src/network/generate.rs b/crates/bin/pd/src/network/generate.rs index 437c255e3b..cefb71750c 100644 --- a/crates/bin/pd/src/network/generate.rs +++ b/crates/bin/pd/src/network/generate.rs @@ -428,8 +428,8 @@ pub fn network_generate( /// Represents initial allocations to the testnet. #[derive(Debug, Deserialize)] pub struct NetworkAllocation { - #[serde(deserialize_with = "string_u64")] - pub amount: u64, + #[serde(deserialize_with = "string_u128")] + pub amount: u128, pub denom: String, pub address: String, } @@ -670,17 +670,17 @@ impl TryFrom for shielded_pool_genesis::Allocation { } } -fn string_u64<'de, D>(deserializer: D) -> Result +fn string_u128<'de, D>(deserializer: D) -> Result where D: de::Deserializer<'de>, { - struct U64StringVisitor; + struct U128StringVisitor; - impl<'de> de::Visitor<'de> for U64StringVisitor { - type Value = u64; + impl<'de> de::Visitor<'de> for U128StringVisitor { + type Value = u128; fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { - formatter.write_str("a string containing a u64 with optional underscores") + formatter.write_str("a string containing a u128 with optional underscores") } fn visit_str(self, v: &str) -> Result @@ -688,10 +688,17 @@ where E: de::Error, { let r = v.replace('_', ""); - r.parse::().map_err(E::custom) + r.parse::().map_err(E::custom) } fn visit_u64(self, v: u64) -> Result + where + E: de::Error, + { + Ok(v as u128) + } + + fn visit_u128(self, v: u128) -> std::prelude::v1::Result where E: de::Error, { @@ -699,7 +706,7 @@ where } } - deserializer.deserialize_any(U64StringVisitor) + deserializer.deserialize_any(U128StringVisitor) } #[cfg(test)] diff --git a/crates/core/app/src/app_version.rs b/crates/core/app/src/app_version.rs index 276d64b471..e45acf17ab 100644 --- a/crates/core/app/src/app_version.rs +++ b/crates/core/app/src/app_version.rs @@ -1,6 +1,6 @@ /// Representation of the Penumbra application version. Notably, this is distinct /// from the crate version(s). This number should only ever be incremented. -pub const APP_VERSION: u64 = 8; +pub const APP_VERSION: u64 = 9; cfg_if::cfg_if! { if #[cfg(feature="component")] { diff --git a/crates/core/app/src/app_version/component.rs b/crates/core/app/src/app_version/component.rs index ff38395027..891ee61882 100644 --- a/crates/core/app/src/app_version/component.rs +++ b/crates/core/app/src/app_version/component.rs @@ -16,6 +16,7 @@ fn version_to_software_version(version: u64) -> &'static str { 6 => "v0.77.x", 7 => "v0.79.x", 8 => "v0.80.x", + 9 => "v0.81.x", _ => "unknown", } } diff --git a/crates/core/app/src/server/consensus.rs b/crates/core/app/src/server/consensus.rs index cd357ab277..5eae5010fc 100644 --- a/crates/core/app/src/server/consensus.rs +++ b/crates/core/app/src/server/consensus.rs @@ -221,6 +221,13 @@ impl Consensus { async fn end_block(&mut self, end_block: request::EndBlock) -> response::EndBlock { let latest_state_version = self.storage.latest_version(); tracing::info!(height = ?end_block.height, ?latest_state_version, "ending block"); + if latest_state_version >= end_block.height as u64 { + tracing::warn!( + %latest_state_version, + %end_block.height, + "chain state version is ahead of the block height, this is an unexpected corruption of chain state" + ); + } let events = self.app.end_block(&end_block).await; trace_events(&events); diff --git a/crates/core/app/tests/common/ibc_tests/relayer.rs b/crates/core/app/tests/common/ibc_tests/relayer.rs index 488e68dcca..4b76f6d0d3 100644 --- a/crates/core/app/tests/common/ibc_tests/relayer.rs +++ b/crates/core/app/tests/common/ibc_tests/relayer.rs @@ -1485,6 +1485,8 @@ impl MockRelayer { source_channel: ChannelId::from_str("channel-0")?, // Penumbra <-> Penumbra so false use_compat_address: false, + use_transparent_address: false, + ics20_memo: "".to_string(), }; // There will need to be `Spend` and `Output` actions // within the transaction in order for it to balance diff --git a/crates/core/component/dex/Cargo.toml b/crates/core/component/dex/Cargo.toml index d4eb923904..4c70f895b7 100644 --- a/crates/core/component/dex/Cargo.toml +++ b/crates/core/component/dex/Cargo.toml @@ -3,6 +3,10 @@ name = "penumbra-dex" version = {workspace = true} edition = {workspace = true} +[[test]] +name = "penumbra-dex-integration-tests" +path = "tests/integration/mod.rs" + [features] component = [ "cnidarium-component", diff --git a/crates/core/component/dex/src/component/router/route_and_fill.rs b/crates/core/component/dex/src/component/router/route_and_fill.rs index f72443de6c..4d7b5476a8 100644 --- a/crates/core/component/dex/src/component/router/route_and_fill.rs +++ b/crates/core/component/dex/src/component/router/route_and_fill.rs @@ -44,11 +44,21 @@ pub trait HandleBatchSwaps: StateWrite + Sized { // executions up to the specified `execution_budget` parameter. let execution_circuit_breaker = ExecutionCircuitBreaker::new(execution_budget); + // We clamp the deltas to the maximum input for batch swaps. + let clamped_delta_1 = delta_1.min(MAX_RESERVE_AMOUNT.into()); + let clamped_delta_2 = delta_2.min(MAX_RESERVE_AMOUNT.into()); + + tracing::debug!( + ?clamped_delta_1, + ?clamped_delta_2, + "clamped deltas to maximum amount" + ); + let swap_execution_1_for_2 = self .route_and_fill( trading_pair.asset_1(), trading_pair.asset_2(), - delta_1, + clamped_delta_1, params.clone(), execution_circuit_breaker.clone(), ) @@ -58,7 +68,7 @@ pub trait HandleBatchSwaps: StateWrite + Sized { .route_and_fill( trading_pair.asset_2(), trading_pair.asset_1(), - delta_2, + clamped_delta_2, params.clone(), execution_circuit_breaker, ) @@ -67,6 +77,7 @@ pub trait HandleBatchSwaps: StateWrite + Sized { let (lambda_2, unfilled_1) = match &swap_execution_1_for_2 { Some(swap_execution) => ( swap_execution.output.amount, + // The unfilled amount of asset 1 is the trade input minus the amount consumed, plus the excess. delta_1 - swap_execution.input.amount, ), None => (0u64.into(), delta_1), @@ -148,9 +159,10 @@ pub trait RouteAndFill: StateWrite + Sized { where Self: 'static, { - tracing::debug!(?input, ?asset_1, ?asset_2, "starting route_and_fill"); + tracing::debug!(?input, ?asset_1, ?asset_2, "prepare to route and fill"); if input == Amount::zero() { + tracing::debug!("no input, short-circuit exit"); return Ok(None); } @@ -162,13 +174,12 @@ pub trait RouteAndFill: StateWrite + Sized { // An ordered list of execution traces that were used to fill the trade. let mut traces: Vec> = Vec::new(); - let max_delta_1: Amount = MAX_RESERVE_AMOUNT.into(); - // Termination conditions: // 1. We have no more `delta_1` remaining // 2. A path can no longer be found // 3. We have reached the `RoutingParams` specified price limit // 4. The execution circuit breaker has been triggered based on the number of path searches and executions + // 5. An unrecoverable error occurred during the execution of the route. loop { // Check if we have exceeded the execution circuit breaker limits. if execution_circuit_breaker.exceeded_limits() { @@ -196,21 +207,20 @@ pub trait RouteAndFill: StateWrite + Sized { break; } - // We split off the entire batch swap into smaller chunks to avoid causing - // a series of overflow in the DEX. + // We prepare the input for this execution round, which is the remaining unfilled amount of asset 1. let delta_1 = Value { - amount: total_unfilled_1.min(max_delta_1), asset_id: asset_1, + amount: total_unfilled_1, }; - tracing::debug!(?path, delta_1 = ?delta_1.amount, "found path, filling up to spill price"); + tracing::debug!(?path, ?delta_1, "found path, filling up to spill price"); - let execution = Arc::get_mut(self) + let execution_result = Arc::get_mut(self) .expect("expected state to have no other refs") .fill_route(delta_1, &path, spill_price) .await; - let execution = match execution { + let swap_execution = match execution_result { Ok(execution) => execution, Err(FillError::ExecutionOverflow(position_id)) => { // We have encountered an overflow during the execution of the route. @@ -233,24 +243,25 @@ pub trait RouteAndFill: StateWrite + Sized { // Immediately track the execution in the state. (total_output_2, total_unfilled_1) = { - let lambda_2 = execution.output; - let unfilled_1 = Value { - amount: total_unfilled_1 - .checked_sub(&execution.input.amount) - .expect("unable to subtract unfilled input from total input"), - asset_id: asset_1, - }; - tracing::debug!(input = ?delta_1.amount, output = ?lambda_2.amount, unfilled = ?unfilled_1.amount, "filled along best path"); + // The exact amount of asset 1 that was consumed in this execution round. + let consumed_input = swap_execution.input; + // The output of this execution round is the amount of asset 2 that was filled. + let produced_output = swap_execution.output; + + tracing::debug!(consumed_input = ?consumed_input.amount, output = ?produced_output.amount, "filled along best path"); - assert_eq!(lambda_2.asset_id, asset_2); - assert_eq!(unfilled_1.asset_id, asset_1); + // Sanity check that the input and output assets are correct. + assert_eq!(produced_output.asset_id, asset_2); + assert_eq!(consumed_input.asset_id, asset_1); // Append the traces from this execution to the outer traces. - traces.append(&mut execution.traces.clone()); + traces.append(&mut swap_execution.traces.clone()); ( - total_output_2 + lambda_2.amount, - total_unfilled_1 - delta_1.amount + unfilled_1.amount, + // The total output of asset 2 is the sum of all outputs. + total_output_2 + produced_output.amount, + // The total unfilled amount of asset 1 is the remaining unfilled amount minus the amount consumed. + total_unfilled_1 - consumed_input.amount, ) }; @@ -260,7 +271,7 @@ pub trait RouteAndFill: StateWrite + Sized { } // Ensure that we've actually executed, or else bail out. - let Some(accurate_max_price) = execution.max_price() else { + let Some(accurate_max_price) = swap_execution.max_price() else { tracing::debug!("no traces in execution, exiting route_and_fill"); break; }; @@ -278,8 +289,7 @@ pub trait RouteAndFill: StateWrite + Sized { } } - // If we didn't execute against any position at all, there - // are no execution records to return. + // If we didn't execute against any position at all, there are no execution records to return. if traces.is_empty() { return Ok(None); } else { @@ -287,6 +297,7 @@ pub trait RouteAndFill: StateWrite + Sized { traces, input: Value { asset_id: asset_1, + // The total amount of asset 1 that was actually consumed across rounds. amount: input - total_unfilled_1, }, output: Value { diff --git a/crates/core/component/dex/src/swap_execution.rs b/crates/core/component/dex/src/swap_execution.rs index c14daa213c..a602ce74c6 100644 --- a/crates/core/component/dex/src/swap_execution.rs +++ b/crates/core/component/dex/src/swap_execution.rs @@ -9,7 +9,9 @@ use serde::{Deserialize, Serialize}; #[serde(try_from = "pb::SwapExecution", into = "pb::SwapExecution")] pub struct SwapExecution { pub traces: Vec>, + /// The input value that was consumed. pub input: Value, + /// The output value that was produced. pub output: Value, } diff --git a/crates/core/component/dex/tests/integration/harness.rs b/crates/core/component/dex/tests/integration/harness.rs new file mode 100644 index 0000000000..a9348fd592 --- /dev/null +++ b/crates/core/component/dex/tests/integration/harness.rs @@ -0,0 +1,313 @@ +//! This module contains a testing harness which allows us to exercise common dex functionality. +//! +//! The basic flow is that you build up a `TestingStrategy` given a `TestingStrategyBuilder`, +//! and then run this strategy on an empty dex, in order to get an outcome. +//! The strategy involves setting up certain positions, and then performing a batch swap +//! with particular swap flows combined together. +//! +//! The outcome consists of the remaining reserves for each position, and the output for each swapper. +use cnidarium::{Snapshot, StateDelta, TempStorage}; +use cnidarium_component::{ActionHandler, Component}; +use penumbra_asset::asset; +use penumbra_dex::{ + component::{Dex, PositionRead, StateReadExt}, + lp::{ + position::{self, Position}, + Reserves, + }, + swap::{self, proof::SwapProof, SwapPlaintext}, + BatchSwapOutputData, DirectedTradingPair, PositionClose, PositionOpen, PositionWithdraw, Swap, + TradingPair, +}; +use penumbra_keys::test_keys; +use penumbra_num::Amount; +use penumbra_proto::core::component::dex::v1::ZkSwapProof; +use penumbra_sct::{ + component::{clock::EpochManager, source::SourceContext}, + epoch::Epoch, +}; +use rand_core::{CryptoRngCore, OsRng}; +use std::{mem, sync::Arc}; +use tendermint::abci::request::EndBlock; + +struct DexTester { + storage: TempStorage, + height: u8, + handle: Option>, +} + +impl DexTester { + async fn init() -> anyhow::Result { + let mut out = Self { + storage: TempStorage::new().await?, + height: 0, + handle: None, + }; + Dex::init_chain(out.handle(), Some(&Default::default())).await; + Ok(out) + } + + fn handle(&mut self) -> &mut StateDelta { + if let None = self.handle { + self.handle = Some(self.consume_handle()); + } + // NO-PANIC: we defined this above. + self.handle.as_mut().unwrap() + } + + fn consume_handle(&mut self) -> StateDelta { + match mem::replace(&mut self.handle, None) { + Some(x) => x, + None => { + let mut out = StateDelta::new(self.storage.latest_snapshot()); + out.put_mock_source(self.height); + out.put_block_height(self.height.into()); + out.put_epoch_by_height( + self.height.into(), + Epoch { + index: 0, + start_height: 0, + }, + ); + out + } + } + } + + async fn position_open(&mut self, tx: PositionOpen) -> anyhow::Result<()> { + let handle = self.handle(); + tx.check_and_execute(handle).await?; + Ok(()) + } + + async fn position_close(&mut self, tx: PositionClose) -> anyhow::Result<()> { + let handle = self.handle(); + tx.check_and_execute(handle).await?; + Ok(()) + } + + async fn position_withdraw(&mut self, tx: PositionWithdraw) -> anyhow::Result<()> { + let handle = self.handle(); + tx.check_and_execute(handle).await?; + Ok(()) + } + + async fn position_by_id(&mut self, id: &position::Id) -> anyhow::Result> { + let handle = self.handle(); + handle.position_by_id(id).await + } + + async fn swap(&mut self, tx: Swap) -> anyhow::Result<()> { + let handle = self.handle(); + tx.check_and_execute(handle).await?; + Ok(()) + } + + async fn end_block(&mut self) -> anyhow::Result<()> { + let handle = self.consume_handle(); + let mut temp_handle = Arc::new(handle); + Dex::end_block( + &mut temp_handle, + &EndBlock { + height: self.height.into(), + }, + ) + .await; + self.storage + .commit(Arc::into_inner(temp_handle).unwrap()) + .await?; + self.height += 1; + Ok(()) + } + + async fn previous_bsod( + &mut self, + trading_pair: TradingPair, + ) -> anyhow::Result> { + assert!( + self.height >= 1, + "did not call `end_block` before calling `previous_bsod`" + ); + let height = u64::from(self.height - 1); + let handle = self.handle(); + let bsod = handle.output_data(height, trading_pair).await?; + Ok(bsod) + } +} + +/// This allows incrementally building up a test strategy. +pub struct TestingStrategyBuilder<'rng> { + rng: &'rng mut dyn CryptoRngCore, + strategy: TestingStrategy, + asset1: asset::Id, + asset2: asset::Id, +} + +impl<'rng> TestingStrategyBuilder<'rng> { + pub fn new(rng: &'rng mut dyn CryptoRngCore, asset1: asset::Id, asset2: asset::Id) -> Self { + Self { + rng, + strategy: TestingStrategy::new(asset1, asset2), + asset1, + asset2, + } + } + + pub fn with_position(mut self, reserves1: Amount, reserves2: Amount) -> Self { + let position = Position::new( + &mut self.rng, + DirectedTradingPair::new(self.asset1, self.asset2), + 0, + 1u64.into(), + 1u64.into(), + Reserves { + r1: reserves1, + r2: reserves2, + }, + ); + self.strategy.positions.push(position); + self + } + + pub fn with_swap(mut self, amount: Amount) -> Self { + let pair = TradingPair::new(self.asset1, self.asset2); + let plaintext = SwapPlaintext::new( + &mut OsRng, + pair, + if pair.asset_1() == self.asset1 { + amount + } else { + 0u64.into() + }, + if pair.asset_2() == self.asset1 { + amount + } else { + 0u64.into() + }, + Default::default(), + test_keys::ADDRESS_0.clone(), + ); + let swap = swap::Body { + trading_pair: plaintext.trading_pair, + delta_1_i: plaintext.delta_1_i, + delta_2_i: plaintext.delta_2_i, + fee_commitment: plaintext.claim_fee.commit(Default::default()), + payload: plaintext.encrypt(test_keys::FULL_VIEWING_KEY.outgoing()), + }; + self.strategy.swaps.push(swap); + self + } + + pub fn build(self) -> TestingStrategy { + self.strategy + } +} + +pub struct TestingStrategy { + asset1: asset::Id, + asset2: asset::Id, + positions: Vec, + swaps: Vec, +} + +impl TestingStrategy { + fn new(asset1: asset::Id, asset2: asset::Id) -> Self { + Self { + asset1, + asset2, + positions: Vec::new(), + swaps: Vec::new(), + } + } + + /// Run a given strategy, producing a result. + /// + /// With the current strategy implementation, this function will: + /// - create all the positions built up here, + /// - perform a batch swap with all the flows built up here, + /// - withdraw and close all positions. + pub async fn run(self) -> anyhow::Result { + let mut dex = DexTester::init().await?; + + let mut position_ids = Vec::new(); + for position in self.positions { + position_ids.push(position.id()); + let tx = PositionOpen { position }; + dex.position_open(tx).await?; + } + dex.end_block().await?; + + for body in &self.swaps { + let swap = Swap { + proof: SwapProof::try_from(ZkSwapProof { + inner: vec![0u8; 192], + }) + .expect("should be able to create dummy proof"), + body: body.clone(), + }; + dex.swap(swap).await?; + } + dex.end_block().await?; + + let bsod = dex + .previous_bsod(TradingPair::new(self.asset1, self.asset2)) + .await?; + for position_id in position_ids.iter().copied() { + dex.position_close(PositionClose { position_id }).await?; + } + dex.end_block().await?; + + let mut position_reserves = Vec::new(); + for position_id in position_ids { + let position = dex + .position_by_id(&position_id) + .await? + .expect("position should have been created"); + + dex.position_withdraw(PositionWithdraw { + position_id, + reserves_commitment: position + .reserves + .balance(&position.phi.pair) + .commit(Default::default()), + sequence: 0, + }) + .await?; + + position_reserves.push(( + position + .reserves_for(self.asset1) + .expect("position should have reserves"), + position + .reserves_for(self.asset2) + .expect("position should have reserves"), + )); + } + dex.end_block().await?; + + let mut outputs = Vec::new(); + for swap in self.swaps { + let bsod = bsod.unwrap(); + let (a, b) = bsod.pro_rata_outputs((swap.delta_1_i, swap.delta_2_i)); + let (a, b) = if bsod.trading_pair.asset_1() == self.asset1 { + (a, b) + } else { + (b, a) + }; + outputs.push((a, b)); + } + + Ok(TestingOutcome { + position_reserves, + outputs, + }) + } +} + +#[derive(Debug, Clone, PartialEq)] +pub struct TestingOutcome { + /// The reserves of each position, in the order of the strategy. + pub position_reserves: Vec<(Amount, Amount)>, + /// The outcome of the swap. + pub outputs: Vec<(Amount, Amount)>, +} diff --git a/crates/core/component/dex/tests/integration/mod.rs b/crates/core/component/dex/tests/integration/mod.rs new file mode 100644 index 0000000000..bbe0a6148e --- /dev/null +++ b/crates/core/component/dex/tests/integration/mod.rs @@ -0,0 +1,2 @@ +#![allow(dead_code)] +mod harness; diff --git a/crates/core/component/shielded-pool/src/backref.rs b/crates/core/component/shielded-pool/src/backref.rs new file mode 100644 index 0000000000..7eef7f4d96 --- /dev/null +++ b/crates/core/component/shielded-pool/src/backref.rs @@ -0,0 +1,217 @@ +use anyhow::Result; +use chacha20poly1305::{ + aead::{Aead, NewAead}, + ChaCha20Poly1305, Nonce, +}; + +use penumbra_keys::BackreferenceKey; +use penumbra_sct::Nullifier; +use penumbra_tct as tct; + +pub const ENCRYPTED_BACKREF_LEN: usize = 48; + +#[derive(Clone, Debug, Eq, PartialEq)] +pub struct Backref { + note_commitment: tct::StateCommitment, +} + +#[derive(Clone, Debug)] +pub struct EncryptedBackref { + /// The inner bytes can either have 0 or `ENCRYPTED_BACKREF_LEN` bytes. + bytes: Vec, +} + +impl Backref { + pub fn new(note_commitment: tct::StateCommitment) -> Self { + Self { note_commitment } + } + + pub fn encrypt(&self, brk: &BackreferenceKey, nullifier: &Nullifier) -> EncryptedBackref { + let cipher = ChaCha20Poly1305::new(&brk.0); + + // Nonce is the first 12 bytes of the nullifier + let nonce_bytes = &nullifier.to_bytes()[..12]; + let nonce = Nonce::from_slice(&nonce_bytes); + + let plaintext = self.note_commitment.0.to_bytes(); + + let ciphertext = cipher + .encrypt(nonce, plaintext.as_ref()) + .expect("encryption should succeed "); + + EncryptedBackref { bytes: ciphertext } + } +} + +impl EncryptedBackref { + pub fn is_empty(&self) -> bool { + self.bytes.is_empty() + } + + pub fn len(&self) -> usize { + self.bytes.len() + } + + pub fn dummy() -> Self { + Self { bytes: vec![] } + } + + /// Decrypts the encrypted backref, returning a backref if the decryption is successful, + /// or `None` if the encrypted backref is zero-length. + pub fn decrypt( + &self, + brk: &BackreferenceKey, + nullifier: &Nullifier, + ) -> Result> { + // We might have a 0-length encrypted backref, which + // is treated as a valid value and means that the note has no backref. + if self.is_empty() { + return Ok(None); + } + + let cipher = ChaCha20Poly1305::new(&brk.0); + + let nonce_bytes = &nullifier.to_bytes()[..12]; + let nonce = Nonce::from_slice(&nonce_bytes); + + let plaintext = cipher + .decrypt(nonce, self.bytes.as_ref()) + .map_err(|_| anyhow::anyhow!("decryption error"))?; + + let note_commitment_bytes: [u8; 32] = plaintext + .try_into() + .map_err(|_| anyhow::anyhow!("decryption error"))?; + + let backref = Backref::try_from(note_commitment_bytes) + .map_err(|_| anyhow::anyhow!("decryption error"))?; + + Ok(Some(backref)) + } +} + +impl TryFrom<[u8; 32]> for Backref { + type Error = anyhow::Error; + + fn try_from(bytes: [u8; 32]) -> Result { + Ok(Self { + note_commitment: tct::StateCommitment::try_from(bytes) + .map_err(|_| anyhow::anyhow!("invalid note commitment"))?, + }) + } +} + +// EncryptedBackrefs can either have 0 or ENCRYPTED_BACKREF_LEN bytes. + +impl TryFrom<[u8; ENCRYPTED_BACKREF_LEN]> for EncryptedBackref { + type Error = anyhow::Error; + + fn try_from(bytes: [u8; ENCRYPTED_BACKREF_LEN]) -> Result { + Ok(Self { + bytes: bytes.to_vec(), + }) + } +} + +impl TryFrom<[u8; 0]> for EncryptedBackref { + type Error = anyhow::Error; + + fn try_from(bytes: [u8; 0]) -> Result { + Ok(Self { + bytes: bytes.to_vec(), + }) + } +} + +impl From for Vec { + fn from(encrypted_backref: EncryptedBackref) -> Vec { + encrypted_backref.bytes + } +} + +#[cfg(test)] +mod tests { + use super::*; + use proptest::prelude::*; + + use penumbra_asset::{asset, Value}; + use penumbra_keys::keys::{Bip44Path, SeedPhrase, SpendKey}; + + use crate::{Note, Rseed}; + + proptest! { + #[test] + fn encrypted_backref_zero_length(seed_phrase_randomness in any::<[u8; 32]>(), amount_to_send in any::(), rseed_randomness in any::<[u8; 32]>()) { + let seed_phrase = SeedPhrase::from_randomness(&seed_phrase_randomness); + let sk = SpendKey::from_seed_phrase_bip44(seed_phrase, &Bip44Path::new(0)); + let fvk = sk.full_viewing_key(); + let brk = fvk.backref_key(); + + let ivk = fvk.incoming(); + let (sender, _dtk_d) = ivk.payment_address(0u32.into()); + + let value_to_send = Value { + amount: amount_to_send.into(), + asset_id: asset::Cache::with_known_assets() + .get_unit("upenumbra") + .unwrap() + .id(), + }; + let rseed = Rseed(rseed_randomness); + + let note = Note::from_parts(sender, value_to_send, rseed).expect("valid note"); + let note_commitment: penumbra_tct::StateCommitment = note.commit(); + let nk = *sk.nullifier_key(); + let mut sct = tct::Tree::new(); + + sct.insert(tct::Witness::Keep, note_commitment).unwrap(); + let state_commitment_proof = sct.witness(note_commitment).unwrap(); + let nullifier = Nullifier::derive(&nk, state_commitment_proof.position(), ¬e_commitment); + + let encrypted_backref = EncryptedBackref::dummy(); + assert!(encrypted_backref.is_empty()); + assert_eq!(encrypted_backref.len(), 0); + + // Decrypting a zero-length encrypted backref should return `None`. + let decrypted_backref = encrypted_backref.decrypt(&brk, &nullifier).unwrap(); + assert_eq!(decrypted_backref, None); + } + } + + proptest! { + #[test] + fn encrypted_backref_round_trip(seed_phrase_randomness in any::<[u8; 32]>(), amount_to_send in any::(), rseed_randomness in any::<[u8; 32]>()) { + let seed_phrase = SeedPhrase::from_randomness(&seed_phrase_randomness); + let sk = SpendKey::from_seed_phrase_bip44(seed_phrase, &Bip44Path::new(0)); + let fvk = sk.full_viewing_key(); + let brk = fvk.backref_key(); + + let ivk = fvk.incoming(); + let (sender, _dtk_d) = ivk.payment_address(0u32.into()); + + let value_to_send = Value { + amount: amount_to_send.into(), + asset_id: asset::Cache::with_known_assets() + .get_unit("upenumbra") + .unwrap() + .id(), + }; + let rseed = Rseed(rseed_randomness); + + let note = Note::from_parts(sender, value_to_send, rseed).expect("valid note"); + let note_commitment: penumbra_tct::StateCommitment = note.commit(); + let nk = *sk.nullifier_key(); + let mut sct = tct::Tree::new(); + + sct.insert(tct::Witness::Keep, note_commitment).unwrap(); + let state_commitment_proof = sct.witness(note_commitment).unwrap(); + let nullifier = Nullifier::derive(&nk, state_commitment_proof.position(), ¬e_commitment); + + let backref = Backref::new(note_commitment); + let encrypted_backref = backref.encrypt(&brk, &nullifier); + + let decrypted_backref = encrypted_backref.decrypt(&brk, &nullifier).unwrap(); + + assert_eq!(Some(backref), decrypted_backref); + } + } +} diff --git a/crates/core/component/shielded-pool/src/ics20_withdrawal.rs b/crates/core/component/shielded-pool/src/ics20_withdrawal.rs index c452d5d703..ed95901dac 100644 --- a/crates/core/component/shielded-pool/src/ics20_withdrawal.rs +++ b/crates/core/component/shielded-pool/src/ics20_withdrawal.rs @@ -41,6 +41,13 @@ pub struct Ics20Withdrawal { // Whether to use a "compat" (bech32, non-m) address for the return address in the withdrawal, // for compatability with chains that expect to be able to parse the return address as bech32. pub use_compat_address: bool, + + // Arbitrary string data to be included in the `memo` field + // of the ICS-20 FungibleTokenPacketData for this withdrawal. + // Commonly used for packet forwarding support, or other protocols that may support usage of the memo field. + pub ics20_memo: String, + // Whether to use a transparent address for the return address in the withdrawal. + pub use_transparent_address: bool, } #[cfg(feature = "component")] @@ -107,6 +114,7 @@ impl DomainType for Ics20Withdrawal { type Proto = pb::Ics20Withdrawal; } +#[allow(deprecated)] impl From for pb::Ics20Withdrawal { fn from(w: Ics20Withdrawal) -> Self { pb::Ics20Withdrawal { @@ -118,10 +126,13 @@ impl From for pb::Ics20Withdrawal { timeout_time: w.timeout_time, source_channel: w.source_channel.to_string(), use_compat_address: w.use_compat_address, + ics20_memo: w.ics20_memo.to_string(), + use_transparent_address: w.use_transparent_address, } } } +#[allow(deprecated)] impl TryFrom for Ics20Withdrawal { type Error = anyhow::Error; fn try_from(s: pb::Ics20Withdrawal) -> Result { @@ -148,15 +159,22 @@ impl TryFrom for Ics20Withdrawal { timeout_time: s.timeout_time, source_channel: ChannelId::from_str(&s.source_channel)?, use_compat_address: s.use_compat_address, + ics20_memo: s.ics20_memo, + use_transparent_address: s.use_transparent_address, }) } } impl From for pb::FungibleTokenPacketData { fn from(w: Ics20Withdrawal) -> Self { - let return_address = match w.use_compat_address { - true => w.return_address.compat_encoding(), - false => w.return_address.to_string(), + let ordinary_return_address = w.return_address.to_string(); + + let return_address = if w.use_transparent_address { + w.return_address + .encode_as_transparent_address() + .unwrap_or_else(|| ordinary_return_address) + } else { + ordinary_return_address }; pb::FungibleTokenPacketData { @@ -164,7 +182,7 @@ impl From for pb::FungibleTokenPacketData { denom: w.denom.to_string(), receiver: w.destination_chain_address, sender: return_address, - memo: "".to_string(), + memo: w.ics20_memo, } } } diff --git a/crates/core/component/shielded-pool/src/lib.rs b/crates/core/component/shielded-pool/src/lib.rs index 84d112ed52..04109d614e 100644 --- a/crates/core/component/shielded-pool/src/lib.rs +++ b/crates/core/component/shielded-pool/src/lib.rs @@ -25,6 +25,9 @@ pub mod nullifier_derivation; pub mod output; pub mod spend; +pub mod backref; +pub use backref::{Backref, EncryptedBackref}; + pub use convert::{ConvertCircuit, ConvertProof, ConvertProofPrivate, ConvertProofPublic}; pub use nullifier_derivation::{ NullifierDerivationCircuit, NullifierDerivationProof, NullifierDerivationProofPrivate, diff --git a/crates/core/component/shielded-pool/src/note.rs b/crates/core/component/shielded-pool/src/note.rs index e695544b3e..2f9a24c5d4 100644 --- a/crates/core/component/shielded-pool/src/note.rs +++ b/crates/core/component/shielded-pool/src/note.rs @@ -108,6 +108,17 @@ pub enum Error { impl Note { pub fn controlled_by(&self, fvk: &FullViewingKey) -> bool { if let Some(address_index) = fvk.address_index(&self.address()) { + // Check if this note is associated with the wallet's transparent address. + if fvk + .incoming() + .transparent_address() + .parse::
() + .expect("constructed transparent address is always valid") + == self.address() + { + return true; + } + // Get the expected clue key and check it matches what is on the provided note address. let (expected_address, _) = fvk.incoming().payment_address(address_index); let expected_ck_d = expected_address.clue_key(); diff --git a/crates/core/component/shielded-pool/src/spend/action.rs b/crates/core/component/shielded-pool/src/spend/action.rs index 2a548a592a..83517d6748 100644 --- a/crates/core/component/shielded-pool/src/spend/action.rs +++ b/crates/core/component/shielded-pool/src/spend/action.rs @@ -9,6 +9,7 @@ use penumbra_txhash::{EffectHash, EffectingData}; use serde::{Deserialize, Serialize}; use crate::SpendProof; +use crate::{backref::ENCRYPTED_BACKREF_LEN, EncryptedBackref}; #[derive(Clone, Debug)] pub struct Spend { @@ -23,6 +24,7 @@ pub struct Body { pub balance_commitment: balance::Commitment, pub nullifier: Nullifier, pub rk: VerificationKey, + pub encrypted_backref: EncryptedBackref, } impl EffectingData for Body { @@ -91,6 +93,7 @@ impl From for pb::SpendBody { balance_commitment: Some(msg.balance_commitment.into()), nullifier: Some(msg.nullifier.into()), rk: Some(msg.rk.into()), + encrypted_backref: msg.encrypted_backref.into(), } } } @@ -117,10 +120,26 @@ impl TryFrom for Body { .try_into() .context("malformed rk")?; + // `EncryptedBackref` must have 0 or `ENCRYPTED_BACKREF_LEN` bytes. + let encrypted_backref: EncryptedBackref; + if proto.encrypted_backref.len() == ENCRYPTED_BACKREF_LEN { + let bytes: [u8; ENCRYPTED_BACKREF_LEN] = proto + .encrypted_backref + .try_into() + .map_err(|_| anyhow::anyhow!("invalid encrypted backref"))?; + encrypted_backref = EncryptedBackref::try_from(bytes) + .map_err(|_| anyhow::anyhow!("invalid encrypted backref"))?; + } else if proto.encrypted_backref.len() == 0 { + encrypted_backref = EncryptedBackref::dummy(); + } else { + return Err(anyhow::anyhow!("invalid encrypted backref length")); + } + Ok(Body { balance_commitment, nullifier, rk, + encrypted_backref, }) } } diff --git a/crates/core/component/shielded-pool/src/spend/plan.rs b/crates/core/component/shielded-pool/src/spend/plan.rs index a79fd41d99..1602badd0b 100644 --- a/crates/core/component/shielded-pool/src/spend/plan.rs +++ b/crates/core/component/shielded-pool/src/spend/plan.rs @@ -9,7 +9,7 @@ use rand_core::{CryptoRng, RngCore}; use serde::{Deserialize, Serialize}; use super::{Body, Spend, SpendProof}; -use crate::{Note, Rseed, SpendProofPrivate, SpendProofPublic}; +use crate::{Backref, Note, Rseed, SpendProofPrivate, SpendProofPublic}; /// A planned [`Spend`](Spend). #[derive(Clone, Debug, Deserialize, Serialize)] @@ -75,10 +75,14 @@ impl SpendPlan { /// Construct the [`spend::Body`] described by this [`SpendPlan`]. pub fn spend_body(&self, fvk: &FullViewingKey) -> Body { + // Construct the backreference for this spend. + let backref = Backref::new(self.note.commit()); + let encrypted_backref = backref.encrypt(&fvk.backref_key(), &self.nullifier(fvk)); Body { balance_commitment: self.balance().commit(self.value_blinding), nullifier: self.nullifier(fvk), rk: self.rk(fvk), + encrypted_backref, } } diff --git a/crates/core/keys/src/address.rs b/crates/core/keys/src/address.rs index 4251e40e78..85939a858f 100644 --- a/crates/core/keys/src/address.rs +++ b/crates/core/keys/src/address.rs @@ -23,6 +23,8 @@ pub use view::AddressView; use crate::{fmd, ka, keys::Diversifier}; +pub const TRANSPARENT_ADDRESS_BECH32_PREFIX: &str = "tpenumbra"; + /// The length of an [`Address`] in bytes. pub const ADDRESS_LEN_BYTES: usize = 80; @@ -224,6 +226,27 @@ impl Address { recipient: format!("{}", self), } } + + /// Encodes the address as a transparent address if it has zero diversifier and clue key. + /// Returns `None` if the address doesn't meet the requirements for a transparent address. + pub fn encode_as_transparent_address(&self) -> Option { + // Check if diversifier is zero + if self.diversifier().0 != [0u8; 16] { + return None; + } + + // Check if clue key is identity + if self.clue_key().0 != [0u8; 32] { + return None; + } + + // If both are zero, encode the transmission key + Some(bech32str::encode( + &self.transmission_key().0, + TRANSPARENT_ADDRESS_BECH32_PREFIX, + bech32str::Bech32, + )) + } } #[derive(Clone, Debug, Serialize, Deserialize)] @@ -319,7 +342,29 @@ impl std::str::FromStr for Address { type Err = anyhow::Error; fn from_str(s: &str) -> Result { - if s.starts_with(bech32str::compat_address::BECH32_PREFIX) { + if s.starts_with(TRANSPARENT_ADDRESS_BECH32_PREFIX) { + let dzero = Diversifier([0u8; 16]); + + let pk_dzero_bytes: [u8; 32] = + bech32str::decode(s, TRANSPARENT_ADDRESS_BECH32_PREFIX, bech32str::Bech32)? + .try_into() + .map_err(|bytes: Vec| { + anyhow::anyhow!("wrong length {}, expected 32", bytes.len()) + })?; + let pk_dzero = ka::Public(pk_dzero_bytes); + + let ck_id = fmd::ClueKey([0u8; 32]); + + let address = Self::from_components(dzero, pk_dzero, ck_id) + .ok_or_else(|| anyhow::anyhow!("could not reconstruct transparent address"))?; + + // Verify this is a valid transparent address, bailing if not + if address.encode_as_transparent_address().is_none() { + return Err(anyhow::anyhow!("invalid transparent address components")); + } + + Ok(address) + } else if s.starts_with(bech32str::compat_address::BECH32_PREFIX) { pb::Address { inner: bech32str::decode( s, diff --git a/crates/core/keys/src/keys/diversifier.rs b/crates/core/keys/src/keys/diversifier.rs index e10379889f..99fb27b8b9 100644 --- a/crates/core/keys/src/keys/diversifier.rs +++ b/crates/core/keys/src/keys/diversifier.rs @@ -107,6 +107,15 @@ impl DiversifierKey { let cipher = Aes128::new(&key); cipher.decrypt_block(&mut block); + // Special case for the null ciphertext. This enables transparent addresses (which have + // a null diversifier) to use account 0. + if diversifier.0 == [0u8; 16] { + return AddressIndex { + account: 0, + randomizer: [0; 12], + }; + } + let mut index_bytes = [0; DIVERSIFIER_LEN_BYTES]; index_bytes.copy_from_slice(&block); @@ -295,4 +304,15 @@ mod tests { assert_eq!(index2, index); } } + + proptest! { + #[test] + fn diversifier_encryption_null_ciphertext( + key in diversifier_key_strategy() + ) { + let diversifier = Diversifier([0; 16]); + let index = key.index_for_diversifier(&diversifier); + assert_eq!(index, AddressIndex::new(0)); + } + } } diff --git a/crates/core/keys/src/keys/fvk.rs b/crates/core/keys/src/keys/fvk.rs index e9a029578f..44239700bf 100644 --- a/crates/core/keys/src/keys/fvk.rs +++ b/crates/core/keys/src/keys/fvk.rs @@ -12,7 +12,7 @@ use crate::keys::wallet_id::WalletId; use crate::{ fmd, ka, prf, rdsa::{SpendAuth, VerificationKey}, - Address, AddressView, + Address, AddressView, BackreferenceKey, }; use super::{AddressIndex, DiversifierKey, IncomingViewingKey, NullifierKey, OutgoingViewingKey}; @@ -120,6 +120,11 @@ impl FullViewingKey { &self.ak } + /// Construct the backreference key for this full viewing key. + pub fn backref_key(&self) -> BackreferenceKey { + BackreferenceKey::derive(self.outgoing()).clone() + } + /// Hashes the full viewing key into an [`WalletId`]. pub fn wallet_id(&self) -> WalletId { let hash_result = hash_2( diff --git a/crates/core/keys/src/keys/ivk.rs b/crates/core/keys/src/keys/ivk.rs index 1338e830d4..7302161cc6 100644 --- a/crates/core/keys/src/keys/ivk.rs +++ b/crates/core/keys/src/keys/ivk.rs @@ -44,6 +44,25 @@ impl IncomingViewingKey { ) } + /// Derive the (encoding of the) transparent address for the given IVK. + /// + /// This intentionally returns a `String` rather than an `Address`, as it's not + /// safe to truncate arbitrary addresses. + pub fn transparent_address(&self) -> String { + // The transparent address uses an all-zero diversifier. + let dzero = Diversifier([0u8; 16]); + let g_dzero = dzero.diversified_generator(); + let pk_dzero = self.ivk.diversified_public(&g_dzero); + let ck_id = fmd::ClueKey([0u8; 32]); + + let address = Address::from_components(dzero, pk_dzero, ck_id).expect("valid address"); + + // This should never fail as we just constructed a valid transparent address + address + .encode_as_transparent_address() + .expect("address meets transparent requirements") + } + /// Derive an ephemeral address for the provided account. pub fn ephemeral_address( &self, @@ -180,11 +199,53 @@ impl IncomingViewingKeyVar { #[cfg(test)] mod test { - use crate::keys::{Bip44Path, SeedPhrase, SpendKey}; + use crate::{ + keys::{Bip44Path, SeedPhrase, SpendKey}, + test_keys, + }; use proptest::prelude::*; + use std::str::FromStr; use super::*; + #[test] + fn transparent_address_generation_and_parsing() { + // Use test seed phrase for test vector + let seed_phrase = SeedPhrase::from_str(test_keys::SEED_PHRASE).expect("valid seed phrase"); + let spend_key = SpendKey::from_seed_phrase_bip44(seed_phrase, &Bip44Path::new(0)); + let ivk = spend_key.full_viewing_key().incoming(); + + let transparent_address_str = ivk.transparent_address(); + + let reconstructed: Address = transparent_address_str + .parse() + .expect("can parse transparent address"); + + assert!(ivk.views_address(&reconstructed)); + + let address_index = ivk.address_index(&reconstructed).expect("views address"); + + let actual_address = ivk.payment_address(address_index).0; + + // The diversifiers will not match, as the encryption of the 0 account `AddressIndex` + // is not the null ciphertext, so when deriving `actual_address` from the 0 account + // `AddressIndex`, we end up with a different diversifier. + assert_ne!(reconstructed.diversifier(), actual_address.diversifier()); + // The transmission keys also will not match, as the null diversifier is not the + // same as the diversifier for the 0 account `AddressIndex`. + assert_ne!( + reconstructed.transmission_key(), + actual_address.transmission_key() + ); + // The clue keys should not match, as the clue key is zeroed out + assert_ne!(reconstructed.clue_key(), actual_address.clue_key()); + + println!("Transparent address: {}", transparent_address_str); + println!("Reconstructed address: {}", reconstructed); + println!("Address index: {:?}", address_index); + println!("Actual address for index: {}", actual_address); + } + #[test] fn views_address_succeeds_on_own_address() { let rng = rand::rngs::OsRng; diff --git a/crates/core/keys/src/lib.rs b/crates/core/keys/src/lib.rs index 81c8c8be7f..a880e51832 100644 --- a/crates/core/keys/src/lib.rs +++ b/crates/core/keys/src/lib.rs @@ -14,7 +14,7 @@ pub mod test_keys; pub use address::{Address, AddressVar, AddressView}; pub use keys::FullViewingKey; -pub use symmetric::PayloadKey; +pub use symmetric::{BackreferenceKey, PayloadKey}; fn fmt_hex>(data: T, f: &mut std::fmt::Formatter) -> std::fmt::Result { write!(f, "{}", hex::encode(data)) diff --git a/crates/core/keys/src/symmetric.rs b/crates/core/keys/src/symmetric.rs index 4e383d15c3..cc04585ed4 100644 --- a/crates/core/keys/src/symmetric.rs +++ b/crates/core/keys/src/symmetric.rs @@ -344,3 +344,20 @@ impl TryFrom<&[u8]> for WrappedMemoKey { Ok(Self(bytes)) } } + +/// Represents a symmetric `ChaCha20Poly1305` key used for Spend backreferences. +#[derive(Debug, Copy, Clone, PartialEq, Eq)] +pub struct BackreferenceKey(pub Key); + +impl BackreferenceKey { + pub fn derive(ovk: &OutgoingViewingKey) -> Self { + let mut kdf_params = blake2b_simd::Params::new(); + kdf_params.personal(b"Penumbra_Backref"); + kdf_params.hash_length(32); + let mut kdf = kdf_params.to_state(); + kdf.update(&ovk.to_bytes()); + + let key = kdf.finalize(); + Self(*Key::from_slice(key.as_bytes())) + } +} diff --git a/crates/core/transaction/src/view.rs b/crates/core/transaction/src/view.rs index 14cbe2c915..e4cd0f800c 100644 --- a/crates/core/transaction/src/view.rs +++ b/crates/core/transaction/src/view.rs @@ -517,11 +517,14 @@ mod test { #[cfg(test)] fn dummy_spend() -> spend::Spend { + use penumbra_shielded_pool::EncryptedBackref; + spend::Spend { body: spend::Body { balance_commitment: dummy_commitment(), nullifier: Nullifier(Fq::default()), rk: dummy_pk(), + encrypted_backref: EncryptedBackref::dummy(), }, auth_sig: dummy_sig(), proof: dummy_proof_spend(), diff --git a/crates/core/transaction/tests/generate_transaction_signing_test_vectors.rs b/crates/core/transaction/tests/generate_transaction_signing_test_vectors.rs index 085d1e6d5b..969d1c55ef 100644 --- a/crates/core/transaction/tests/generate_transaction_signing_test_vectors.rs +++ b/crates/core/transaction/tests/generate_transaction_signing_test_vectors.rs @@ -557,6 +557,8 @@ fn ics20_withdrawal_strategy() -> impl Strategy { timeout_time: 0u64, source_channel: ChannelId::default(), use_compat_address: false, + use_transparent_address: false, + ics20_memo: String::default(), }, ) } diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_0.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_0.txt index 4284d2a0b8..f2d4266629 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_0.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_0.txt @@ -1 +1 @@ -9e73992b95b90d5cb6e67e0d111214d6473902cb32151baf9fee37480ae3841c6d30d64323b26f51b91db797369fa6f099e8ae900211e0376fa77c52ca59771e \ No newline at end of file +c21d59db60453a6dd7ca12b4d1cd1cc8081c7d8ccf8c1c77124096021c85ce6f71ea81584138e400ced5116fe3bc005dfd612111d1fc9f7803a31f085a1771cd \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_1.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_1.txt index 563b05f2cd..3968644aad 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_1.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_1.txt @@ -1 +1 @@ -a29371cb3627441e0d1938399f6cf630829bb722c475bbf69db08cadb652d12f067cf2b5a8ca9792bf940b0899b1897dfda338b1dbcd09c5160e795bbc3b6361 \ No newline at end of file +7526468a388a4ee6be53a825f96f54052d193b5c0558dc190dde73f7ed222c8c17689dcb05bd1efe871bc4dfdb7b6d9c9b9fb0709c26d1df54f02cabbc9e489d \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_10.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_10.txt index 938966f8a7..04ce465066 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_10.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_10.txt @@ -1 +1 @@ -bf1468170ef936887f9e861f10e55b5b189c79dc323eecc38ecf89186455280b0b6377356fe1948f31809d921714f08a1218e2aa5fe039a95f2dfeec50a79396 \ No newline at end of file +19d49249253ff9d119936839c806a5c93c621055583884e331ab9a3d20c5e2a0d0e5a1e28a02721b04ee7d909aaa56559f2db93cd12f3cbd459741f83a99e745 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_11.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_11.txt index abff50d3ef..7fd58b55c8 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_11.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_11.txt @@ -1 +1 @@ -ce462753553b47ef87a246e01c7481661dad7dfb4310d31c8406df180437d0110f0d15d3d102fdb016c7a700ca0eed0b0d8ecce354937801fb85ea8cc1f3c44e \ No newline at end of file +e1d67de14607ebed02d6142eea32d2fde7abb7e7ca6ce0adf7b22f7cb68bb635c4784becd1ff75f2553746fda51acc360a80c2ee3ba46130d6ee84280e986b86 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_12.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_12.txt index 8ff69ce53f..e20b1c720d 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_12.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_12.txt @@ -1 +1 @@ -2cd8be2841ab2d84ca3651058441aa9516fd11a3bd273a8e6ff7368e23ced5d7535eac3ec9c51d3e5bf0b034accbdacdd6a5bd1c49ec389b1fcc9ec793887903 \ No newline at end of file +fc4ea663296554be580b3b2070dff2a43c77f76cd5d4a1535e05ebfecc87612756c332cb3f04001e3e24aae9177aa2b4c6c2d15537122ed5457b920a6a5a28f0 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_13.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_13.txt index af90f7d73a..40315d1d6c 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_13.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_13.txt @@ -1 +1 @@ -809e2b176709aed953224d16e3aab487f37660bce1f48b1376aa13c657cf4648e09381b6fb17e7b025a4cddf848a73138b7d979debde1cd804008c09ac8e9316 \ No newline at end of file +9b06df17a172483e4be5efcb5ab83b7bcf379d5ef3bd2530a468d082b23ac68925f05967cca25807d1d21d971e3f8dd2502a8e7c3301aeaecf876744b649f57b \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_14.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_14.txt index c1b76ef4ca..144b2ef7bc 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_14.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_14.txt @@ -1 +1 @@ -2e0b87b60f276f08899fa9be690d733bd949138d768d81680950935af7fcd46acfefa661b74eefcc42e5e37109323587145e77fc2d0e83faba08209ae05ff907 \ No newline at end of file +6cbf16540a8d063548f3cbae75543a278377d6d4a3df9b346582cc5e4f7cdd3875d9fdd0b02a9270acaea19118948e83eb4617816ae8d074950dda36f3d6f51e \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_15.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_15.txt index 01a2b8e11d..7afbcec66c 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_15.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_15.txt @@ -1 +1 @@ -7f1de934b32d6d846fa7c0cad6e40012039b633837f98a57878c9d08e5df3769a7bf54b82f1bf2973a785b2dad9d3dafc889da66cc30ee7556c597af1f927a8e \ No newline at end of file +6c75137b7b6925d1cd793861b33a2ee31c9234f83b7a4cb2a4999f80f2c5765acd35efa6fe43429f3f542bc3d9e2a22db6bc42de5218783eb1909fead675bce4 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_16.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_16.txt index 8758bf088e..18385d4bd0 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_16.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_16.txt @@ -1 +1 @@ -69b9d287cf63fdbdce8a940adcdcbf4166dc01dbb8f45e1c4eccb02d1f932fd4ff6f8196f37ea07387dc23010f53e4d55cb9cd2f8efeb28d28bc9cbcd721ed58 \ No newline at end of file +9feb663064ae4da04d49de9d226465b1995f84d339e5017839797355cdaf6c78735d19f548c0e051055d001fdaaa4bc89ed56fd4c4b23ae680bcb788a7652aa6 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_17.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_17.txt index 0d2d2cd826..3ecaa4cd71 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_17.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_17.txt @@ -1 +1 @@ -5ffbd0c46efb39f9d685613ba32902f6ad1e624e43067c341aef4ea5312c86e36da50301fa2272e3eec3e7ba1601036a4e8a39ae44dd6db7debe03016ae4f3e6 \ No newline at end of file +094f3f150f19ab3f9d90f951249c0d2d25d934b991a394926b8d748324e55c8076507eb3906d0b0ca0d6d947a123e7442e61bef4cfd77026fb1e34280d29fad3 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_18.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_18.txt index 29739dbaae..8f8c0b8c24 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_18.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_18.txt @@ -1 +1 @@ -3fb12b16b36925001b89b083052796fb2652e9ef22389f115a65a211f6411d519c7e8e2c1442681b8591151efe2bfcf56b1e28788796619ab16c03da937cfd46 \ No newline at end of file +dab248626a03ca12ddeb8fa26198b0cf086c41a191695c63133b0d8d57c60ed0efd684019c2509b3b2f78a84bfdb378a463af14b9a5e3f5c1b3c49255f177863 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_19.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_19.txt index 6d6f7ba798..6bcdf42d80 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_19.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_19.txt @@ -1 +1 @@ -546017f17576f94b4b2359c8a73ee4d46f77daf1f309fb26bd5e8649338a135b5d1c1fd10ec9c326f95a91b22fff23dc8c27e380cc780550c16533c7ee03547a \ No newline at end of file +1cb81939e71cb53372dad5349febf57c74d7030953baa4bcccf8b87e31fa4a2ff891b15e26ccb614d4e16d7b7c5e298086d952d139f867fee844e30087e42a8f \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_2.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_2.txt index b3fbf3dd08..9e0be0dc01 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_2.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_2.txt @@ -1 +1 @@ -e4460f3c5068ac4e4d077da569745073b66f4ea32d62cb3c329813135ebc389aecadfbdab4fb6f36c5bad55c154c4cd6daeca8672bae8933580839bb9639a717 \ No newline at end of file +9cc31bcff4aee3d58b862a2395e91831cbece591d8b86e8e2212db945f98a21551799a7795af277d278758b1088cc869f542bf19972dd67e6a45ac04fa240295 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_20.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_20.txt index 327b9fcf3d..14306823b3 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_20.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_20.txt @@ -1 +1 @@ -dfe0bb6c511b1e504cb39b615f321f444732c249e564d53f14575fbf47a204bdef390aaf3c0f7b230f1818c1d5ad12120d2119eb856798d5de1a0f4ab1d4b20b \ No newline at end of file +69fc9b63206b8d3d039dce4c6dc5cfbfa3d56df1ab35a47a4e5fd44b16dfb4ef54e35a23c3d4fa2120ee2d3acc8f877086e92c0b726c0c1bf69a1d25edbb9416 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_21.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_21.txt index 0a96dc9a62..80c652612c 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_21.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_21.txt @@ -1 +1 @@ -b27ef3fb5d60dfe6414de303bcb4792223945572c4167ec0d1c0de6bdeb88bd7d270dd03b34a6b2c244f58e98cf8dffb5348a259635002469ae02fed1aa2401a \ No newline at end of file +e521793606782a907b1f91e59194c4c3ea561edb4de925f390af36827acbe7ac49d5db507572007efdda2fecbc87c1a9fbc15efca3a92c0ef537ee8667dad2dd \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_22.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_22.txt index 3151ffaf8d..72f4ae9cf6 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_22.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_22.txt @@ -1 +1 @@ -af167c0dbbb3daa0f9cb289fb3cdd7e11c2acd09d93111d36bbb8370e685747ab677d91813ed24e5e7466122b331e2a21399fbd204c1d9e7b31f5c9d335b71cc \ No newline at end of file +26b98113e860dee1544274cf3ea0b94688ef02b4be99cf7d795a2e15766565916d357df69c69acf1d1d0d09c17f5dd26333932e7fff32596aacafa57ab811bea \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_23.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_23.txt index 9fe81b797c..a2789a3dc2 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_23.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_23.txt @@ -1 +1 @@ -e97f01590e58dd68fa5708250d9e8667db1241c3000aa7e4e1839d30b7988c65f8d438957d89d755c3c4f1fe35908c705d97cf3d237002287ab5059574393270 \ No newline at end of file +72d76e27b0a9aacaec1b4a606c9186ab933427d1d7c518e7b279a03da543ee489b8c83fb95dd07fc26f6da2b9672ee8f96232cbb779cb1b92b990a38bf8b7d89 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_24.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_24.txt index 229453797e..afc95b0e58 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_24.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_24.txt @@ -1 +1 @@ -a1c704853d82d4dec1287ffcdbc68cb2e84309525fc148f10092d1824e30ab15679171f2ab81a71d8891cccb8a7f6abdbae5505ab80ce80343f8cc411ad55162 \ No newline at end of file +8a1312ac43402a7038e881378fe4d61757d9543d58e5101e0037ccd033bb58ff928658984ae31eac819a7815f4a96f04bf7f9dcb3b62bbb7a0b355f9458a9480 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_25.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_25.txt index 941f230296..dd12c6f04f 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_25.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_25.txt @@ -1 +1 @@ -507fb0aec0310a59261302a5e50ae8df2cdd8e4073d21201e1bf7ca5cb54e4a8f85b6033174919e7811dafce5cc83e968826b0cb8eb037b78c4dc248123d1331 \ No newline at end of file +56d89852683e0b1bc11ea6eb8b4fd49a9cd8508ed0b67af22c95e2ebc72a5e93691b0978f832f0369b670d45e40fbf94fce949aaf695c0c3539436d31d2940f9 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_26.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_26.txt index 47ccf70bd5..7bcff90dc1 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_26.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_26.txt @@ -1 +1 @@ -91d7d9b5e761ea32d02fff8bf0d0eb3cd70af80af2ae01009308c282a13163de68c8911f22f61399cc543cf3a03f31c725f973ef54e8c341a70412c392c8d5fb \ No newline at end of file +fccf046817b6319e270f6403c55fa983d725f7ca70da7404842796a1b845c64e9e35280e1996f3aeb0303b044a67c08d34c8d9385641d2192677ceb3bbc9c12f \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_27.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_27.txt index 75cb008b8a..11afc01ae0 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_27.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_27.txt @@ -1 +1 @@ -8e2bceb912bb2b69089d5348e0e2a1e472e10f34c96ece0f3ee1c63929c6a983e110a7c0917dec3b64d8c0389c642de023baecbf01ce74b7bdf077ecb236aba8 \ No newline at end of file +42cb9c0702f36a797c9b0c2f7f44f412fb8d5445c7a665436b6658fad4155822a0ff9cd77c05305c22661f95ff3ab10198ccabe7ddd459b60c88b3a51851e753 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_28.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_28.txt index 520a717a8f..7235eb7223 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_28.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_28.txt @@ -1 +1 @@ -e7e2888bb68215390a053e84530fe3c99f723e5710ee4c2c841c41cf1d01c038569177fd063c2ba31d974d3c21039920c9b533e8c40173e2beb65853f014470b \ No newline at end of file +ac7a3e93a7ff399b0c0333d8ddfef3ef6a89e6aa3ba1d3a3fe51d0ae453b6bd95bf7e32a57c94102fad79af47b71303cfc61060931a646c8f1fee8ac3eaa2932 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_29.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_29.txt index 6f9f4f5296..a75a67180b 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_29.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_29.txt @@ -1 +1 @@ -c300f0a663c828f2b34a16af4387d007b51598348f9f89cdd38a6d2da5f45d5d84287c7df592f064ff33133c9456afdba115a769c8d69d9928d0a81e9d6a9d23 \ No newline at end of file +1d8fd4c68c59776fd200b7bc23ed2a0899d4d5ff5615fe4de296e06ad5d32423b7a5403665736bba946f656e792f74e97262e4458f8f9a180f00bec78ce1fc47 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_3.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_3.txt index 4348243474..f2ba8f275f 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_3.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_3.txt @@ -1 +1 @@ -38e3833889cd54dda12b577933dcc36d5679e399bed7c0b94d8e9e17c2651d95e70e201b81d376341ad76c136989805ba936cb9e62b62136b6710f81a51cafc8 \ No newline at end of file +460bc7b6884f942bd5be17230f2360aedbbacec366ad4273fc538b61748ca00a9118aae2fb1fd73bec2b60858fc2f2bbaef3c58b5a1858d3bb14846279ea0dae \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_30.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_30.txt index cd7ee7765d..8311e2fc92 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_30.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_30.txt @@ -1 +1 @@ -dab12cb667e33b0064b735dd0dd7237ff6b6e4ecef5fb0e9e413f9beec2cc2d70a0a2e1ef31292fa4df3385f26ccb7077b73915530a43805e71245834add315c \ No newline at end of file +2316212605ebc444a755cd24811fa6dc763dffc4498f396200b78461e2d3568c29341bbb161667f7b51177ccb316a2312bfa511a728d5be9eaa4749793e6ca31 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_31.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_31.txt index 53a3be7ebc..1d4c9da8a0 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_31.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_31.txt @@ -1 +1 @@ -9eb0ff68c2281870c1738caa57d29b0198012759e1a0eec9b52c0c666ea3e90e5bbfc454c711fccca2bf2e55c91be48f208259d9f616548e2765628132f93ab8 \ No newline at end of file +1ff4a0cac3e5ac1e56dfc6a134b74e4198a4f44af7ff4e6e2840cb0d0d533699704952759cc50d2c7f5d5491169894a01e5e575bff7a28dd47b24852c8342073 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_32.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_32.txt index 197e65b683..c7d0825534 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_32.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_32.txt @@ -1 +1 @@ -3762a00f04f7cc8fa41aeddaa28baef78800801581540436c651ed68e53f8816c30c88d923227e54717833479b0cb6a4762061a64cf49bbe2a037631f35340ec \ No newline at end of file +a574ec310686c09728e763fbf0f1b3ba5a2b8698bbc619a7b204769b99ba9371d8aba58fa414f0e7c2e6e22058e2c2aa693be6f2bc64179a96fe88f58d2c8fa0 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_33.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_33.txt index b3fe25b188..b3ebea5bf9 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_33.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_33.txt @@ -1 +1 @@ -16d67249c208a6807b6aa74f650f718dabb02696ca4cd4234a99313c13aeea0d58a086e266db3272972b40a7ed0de6ce102ecf6070da1255c2ebb94d39ed6cb0 \ No newline at end of file +4b5f402856760c0f41016a1d12df15708cee1343f8ff63b59594844faf7466cc1e171d0ffbb9226a87201b82aff695d3d7be5466ebbe7f926a1918bdb4d9a61e \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_34.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_34.txt index 8198192499..3ba525ed64 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_34.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_34.txt @@ -1 +1 @@ -6d5ac8b140d9b5fadd1397104ea05c34a88607130acd4946e6acc88010eec7c7e56b4edbef91107cea1641b0a35eeb0ea5310630e9add59c4f655746bb2d47a1 \ No newline at end of file +c695de6e3db638e6d67f43ea6b369e24f43f6afd2503c947ea6b76cb5ac0c90e89cead1d5704824267e69d9f432a01fda2089eec613ee5809a2b7111631d3dc5 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_35.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_35.txt index 6de6d24cf7..b3a061c573 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_35.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_35.txt @@ -1 +1 @@ -f0eeff0095d519be0843af4625742dc1516e5f8a8ece7bd4fb246e1149ccdf0e4bcbd556a53458b01c742c291488cf574c9ebe89991712aec3bb3ef056e2b7ee \ No newline at end of file +ea396477ed0844d5d651fb2f91b7ac43d15b7f6b5a9ad6bf2db0e21196009a39045bce8c4905600c6e4fe1462acf84d5975b5d3812699fdad92469d57dd32766 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_36.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_36.txt index a9a2674e30..31c6b350a9 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_36.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_36.txt @@ -1 +1 @@ -909d6e657ca5e03ee7fee8edfdfb651d233528716eb38664f9f281c05ea74f995706809d3d4bcfb48c5446f722f10ba0d3bcfba6dcbca5358bb251b790bcb4c4 \ No newline at end of file +7f3300d804b1d1b00b558e9ed6daaf85c2c932a9fdbd47235e9c733057e61714e685e1f406d56ef53041ee82baeafd458ab69c013599a26eb12ff433a66f54dc \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_37.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_37.txt index 297aae830e..1c0e7bab30 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_37.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_37.txt @@ -1 +1 @@ -0e9fb80f112cf8058a30b3bfc3c9ae7a4e2809e5d4d99f4555eee506b4d226b7c7d8cec6ca9b1288564b4718b497ab97784789434e03003103e3be6d416a6cc1 \ No newline at end of file +2c41c642c9bb98317904665f494a28c314397700c952c26a7f5372e770a9f269a9039a63c27e38b12b17f8212f1a448a3985887d8092fa3149ccb920e37cbd16 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_38.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_38.txt index 7dda4450c1..992d38d63e 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_38.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_38.txt @@ -1 +1 @@ -1452b5729be2e4050d58a4452873dc90c316367f0cff6567cb3b7522cdcdc89fa1632559142f48d51e86bcdf948c8328e6240282292b18933f7dfabae7849d54 \ No newline at end of file +1d51f07575a6f629f1590a8e9ef6dbee44d7c4efbccdeeed625206a52bb6812f13e903b27eb45e213ecde24a5a7e3bdb5571d3456071c8289cd2df31f084511f \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_39.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_39.txt index cc3e3a251e..a066368796 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_39.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_39.txt @@ -1 +1 @@ -315713693488a6048f23099ec9b85bf9ddc12a912c920745b355627d9e682862b518cae29e5333d69d259c16ef8f5d4f1c8368bce2cd2c395eff620fbbd0da43 \ No newline at end of file +1b47f2edc0cd08b2b0654e3c85aef5698f244554c1ace94bd5fea401b2025239a964d4422dcb93eb4d77db8b2373cd13a6570c25b7ae304775109004421cea7c \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_4.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_4.txt index 69be6692bf..e9c07322d1 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_4.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_4.txt @@ -1 +1 @@ -e1b0bf57b4f98bc6d43a0276d26d7261e6c6a95bac927dac95e36b67b4891d5eefdcdbc2b646575e566e5148166bf1e9d9c1f37b5737941183080ef587f7cc9f \ No newline at end of file +54c3cb40fc87871c96354ba0ad8e63edf4e978d033247cb8782da36b525505cc2de65eb756c138505d6be396546b9b759cd20abb28c82a75ceeaea02820c0161 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_40.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_40.txt index a9b3533abd..85d7bcbdd6 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_40.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_40.txt @@ -1 +1 @@ -edf7089cb08bbf91e1b719d3ec2003277925b9a9d253b8985e6bb55b21d84129641fc5c6bb036d4595b3eda9f9b9a4a9e416889f98391f27fb1c82f671f5f959 \ No newline at end of file +923506f9aa0838c9308b68e1693232ce84feeb558b4d6c18b55afb33997aaeeedc188829034dc4d20feccf6e50d1d925bb708b24cc0db6d431678e3e4dca3fe0 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_41.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_41.txt index 12c51f4085..66e8e5887b 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_41.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_41.txt @@ -1 +1 @@ -81476307c5227bf5fc1a5e6894b4b2ff5c6fb4feab1abe6be29f4d4dad7d867eae0498e7c423cfa427483bfba990f26e78fbf45d18920233d12b89d44fed14cc \ No newline at end of file +7ec83d830e726d381f51c019f9a15e0597ba1ea63ce4eefa8d75af504431dc41dc451d3c795473a20e3877d5ea516c0414e2d39dcf17c0d8ea2f00a00c8b3c4d \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_42.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_42.txt index ea4745830b..7366635f49 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_42.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_42.txt @@ -1 +1 @@ -928292972397812d1df67f6438b04bb185ca953ad6b8e71c0c558d34e60947172bbb0baa6ba803bab66169b0023ad82bafe8c1d3ac3502b54215b39cec66ebae \ No newline at end of file +ef4d482ba75f4a74e986429e7673f8359d29988059e7d9dd71b00ccc16553f519bf18ddb41180de503bc5a358445f4c35e2f6619d70f812ef6f6e4c0a3fc8e77 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_43.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_43.txt index b487eee9b1..8804af2508 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_43.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_43.txt @@ -1 +1 @@ -9c794cbc9b48f25e2e0669240accb516761abe9c5c1a0b8efdafbca248aa4796cb729965355b348aa48c9e50c58993d65593c55faba00afdc623e213bdc66143 \ No newline at end of file +821725eeeca45f93c76a2d0a5df279ce8c1328030d90432d43978249e7fd91533c0a01ffe41f297fce034082e02f0f9e81a0e86ab1ed6017361fa5c24b4e0651 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_44.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_44.txt index 4118752b95..0827140faa 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_44.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_44.txt @@ -1 +1 @@ -a640df95ba3f1301bec45e49ed99f439b5f58c831a20c3275e97b1949dc98ae390788b13f119ef11018cd1d055ef8098b15637ff47c04a91228ea47f322691eb \ No newline at end of file +bd97eaf2ff5144c56067a8ae459b8e5db006a5e42b3876a0dd2eb70a589c2b2a482d91328c895ea6600a9d97d981817e7c4e95430bdba9c56d484c6c29b7c96e \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_45.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_45.txt index 436d8b301c..8f33391df7 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_45.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_45.txt @@ -1 +1 @@ -090a3261cb11cde58e7f7be2f54336cf142918713537ae7b6dcef0cd14ef563f7c2765d56a380bb33e2bc9ab89fd3cda6749240412b25df439f1a658965aee71 \ No newline at end of file +91587fd2aad74276e8fa5b609628fda9a20de9090ec2916c32e892e02d2cf97d0e123e987b045048aa15be37a734c224e62da0bc40f4d0eb2e0a2c7aeaedfc3d \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_46.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_46.txt index 3ec442fcef..dde27b635e 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_46.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_46.txt @@ -1 +1 @@ -264526b00ee9983fb65770d93cb4103ecd4b56b34cbe1d0a2afcbf19224c5fcae08362fec63020d5d67b7c8a6aabba7bb80cdcef7295bf8065781645e48d55a3 \ No newline at end of file +ac5190cd94e2a2d66994d7b0e707be7ad6ebe9a7eb1263c98a43a39c2fd297ef2418674f3cb6d44e10f79caf63a7574646dd8b0bf26fde39dd456020747cadd3 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_47.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_47.txt index d51b5f7e3e..a3bccec161 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_47.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_47.txt @@ -1 +1 @@ -6cd5bc7761a077d46a1fa37c3191df6c4ba38b0cbbaf190bc1a7e9fa900e369f1c31ceab32dc0479d27daad3163d20f1630fee6ac7dd7fb5b4f17ac9fd04b53a \ No newline at end of file +592e68352576d8c519f99b752873d69a75b6818690e7e427f606e9ce898f5556126deea899d66fa2374fba30d75f0056634e3cf47de0b52dd7db4ea35ed3b54c \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_48.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_48.txt index d2b5e94b65..6ed6d558ea 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_48.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_48.txt @@ -1 +1 @@ -7970bba9f22cb7ae8a9129d07eae124db1343be40a70a01280d1162f7324b74e137b7c792f7bc411b2a0964291df27eb77da940cbaee62c3dcf83160ef5d8c6d \ No newline at end of file +6b6027c14de173fff0a6274a833f45b9cadfce54981419c2f0ce83e1e026fb95aa14fd063d65ae99104a83301715e2b526456e8522151880c7808fa82ac8c260 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_49.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_49.txt index 244d71dad1..1ced34119a 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_49.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_49.txt @@ -1 +1 @@ -e310717d8fc6a54de17aadb828132413995a688be186487ea48a8cf1a754a33c121dea4edcbc989863d730eb6258704285c09562eb206e1fbcf24675862adf72 \ No newline at end of file +238db40b89eed2c77c0c423d3699126bf428d1e01c2b4d06a6be90552779cfea66465dd91bce1bed67e5f233eeca661134261cc185599822ebd84ed7228a31e5 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_5.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_5.txt index 6d14582565..f68c569b01 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_5.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_5.txt @@ -1 +1 @@ -ef60123290ebd67ab8f02e54c8b3b7e0b56a783acce7f9db2c4c4042ab7dc757ae36391b13e8f537b4ed6a904661229e94e2f85fa2e16ed6d7367606d6f094f2 \ No newline at end of file +2e86bb0892b69a0d2307c78997c3d26122f0d1250bb057e64d02753f03cd8c445c2b2e0b1bef597b9d5b1f5a0a8752283b5609907989b92d4c7b4bfd2d722527 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_50.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_50.txt index 73af3e683f..d05a13e99b 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_50.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_50.txt @@ -1 +1 @@ -be9e30233325c98ea883e6a8066111cc254a11326bba13b206fac8ce490da13ea099fcf62b6f7ba2a49e198f1de4acedfbaa2cbfec09755d416f3fe0d36ea3ff \ No newline at end of file +dbcaa59a898c191bf28bf23d80b4efb08ae11c0fd98def06eb5d721a4e31adecb797b33c82bf19134fe1336abdd2c9e4866e89807da18af1b440678aed3acd10 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_51.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_51.txt index 960fab2272..8f5813e2ae 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_51.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_51.txt @@ -1 +1 @@ -131b45d707e6e5087e0ee60cf847b9d2f9171fbf949715fc0df1a5c69e8fed4f0120e1067f61abb6730cb21b663b31c384c080de47b75213c491c46b048f09eb \ No newline at end of file +868b0c8e2bd7e6a14f047ae015a07877273620afd863d729fd1ba05d6d5ee7ef238e5b7f81cc1d72c63c54ef12ff79ae88d746531e6031559b8135d7daddf787 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_52.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_52.txt index f4eb2a9ff6..810e005c6f 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_52.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_52.txt @@ -1 +1 @@ -b86a4c80edda50d67c18cfa492cbf03b3951c94a7ee3d73fd0fa74427098db8fdc7ef946fd6b64972bf3b3d2ed4fa175d466c746a522158424e8f3a5fd63f53a \ No newline at end of file +629a88eba85b041a6d00cf0768407f443b45c3d7be0cf4274d7a03477e7b2b6af0df1bbecc763d1aeb04ef99e9da92a0d0d570b4f2ef4bfb168da6a7314a896a \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_53.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_53.txt index 8512b3598f..d31b974bf8 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_53.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_53.txt @@ -1 +1 @@ -d9d7ae31d0469531c08b995a5177186642e8271a99160a19ba018aa972f376e1eccb02c7ed9802d07aefd46433491555e1a14e857f24200baa00050b547b0f1f \ No newline at end of file +0ec857f4dd865cfee94a8daad54f600c9ac4a237d025146c3d8a919a97821c3483887b59f9f7eb636376eedfc78d2176af84db7afd791082a842ca77b9a09117 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_54.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_54.txt index b148d97fa5..9009edcb7a 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_54.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_54.txt @@ -1 +1 @@ -9c75bcb67d510cb224460d1426bed6c20462f274dd70fd2447be751c5735b1f5e792ca49b9a75766b8bcdf77dbbb8df03910c8f2dab411ad9c362f76a27b939a \ No newline at end of file +df0bc62bccc1b5699c9ba64d93dbe623488f6a4f866bdc44194547360dc7f7f552b8f87b749c1c02d0fc4d7c36e47e33df6f2d0e26e945f40487bd2d69ab0e27 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_55.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_55.txt index 563b4da502..25dce3bd57 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_55.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_55.txt @@ -1 +1 @@ -0483a21011f661985a2bf337d450ae41532f458e9c11d63b5b5a54d75632bd1c5959afe1714818936ecd7714408f46ff39fc4ea80c69dddd8ac11a22529e2ace \ No newline at end of file +90a9376a2ce24e03d892a35b6bfb2bf927bb6871af3a2dadc9efd32d048746277333e4f3b5d22e7e9c335a246872dbe1b46d474c68b69c6818fae86d3f0e19f2 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_56.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_56.txt index 64b5a21dd1..91d6423b4f 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_56.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_56.txt @@ -1 +1 @@ -ad5702bf8eb5e6499397c6d40d2a5baa38d3fbfa705f1ab95a69190529d710a183408747ac320dffc50bc6773e637bc819844e561ef5f6d8f7c541493aa1ae8c \ No newline at end of file +ff6ff99af1dddcaeb182d851b280b219ed8b98004d8292cfcf8d69dbdea0c8f5c3b302aa9ee3c5337fa8940bb424793425018dd03e6c375365a1a17299d38120 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_57.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_57.txt index 4b13995e1f..3e3d2de663 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_57.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_57.txt @@ -1 +1 @@ -757df1d31c6840a4b5158a10cc1bf8157c6fb8089495a8de76792b3f23c3aafe72e56819a16a8055b65ab6f97ccd5094dea27729dc070ecf65aa2b37b1195a0d \ No newline at end of file +0415057bb2db5b058806d1f5ab5cc728b8b47ba5d32efe15d2a43803aececce23b569da93d883d4e32a0035df30c461bf4312e649891d15bb115cbd22e276ca8 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_58.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_58.txt index 698a6f3521..a5e8bb0c07 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_58.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_58.txt @@ -1 +1 @@ -b878991664578bbe458d35cc1df8bdd4b5bd892eda8395fcbfaa88bda1d8f9ea26cd9f14400f4bec239ca0392c4a62623ed0251af5e39a61666dc387547e4695 \ No newline at end of file +80afdcac7c23436af59c4e48cb8f390292068ce45938c21f97b632446a64c93459f5167928b72314226c26251c11092345df64dcf9cde7279a900b4d89672466 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_59.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_59.txt index fd06b74bdf..4626246f82 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_59.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_59.txt @@ -1 +1 @@ -5f3a0b3cad21dbde5579050d8f469a2e55ca2814be2a5d57ebe91fedaff9dc438543d4660a3c0a86f507e0de19f6d28a7659dd07d9f9c9150cb6a6d3cf5dc272 \ No newline at end of file +bfccc8654b9b9a9f737bd94e9b3d6a9950c28294e661a71f7796eeac71ed736de53a5f96566f0003bc2c3c4435a9bac5e221f210dc898271c4d9b615f78b9262 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_6.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_6.txt index 5046847203..77fc5a82cd 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_6.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_6.txt @@ -1 +1 @@ -477cfcffa8b548f6fab669743ddc05dc681f67a2ebaedb43b5d1d4a20e616d600353291660e170f171e497eb689af063f9b545cd1c99248c82b5af72a27603c0 \ No newline at end of file +597c542ba74bce385524eb5cf22d5d645dcc476bf7efd11529c6312b0e6aabd57b725362bfabb517f47270048c3c82e5ceb1b872761ca65b8e03d8380c815e60 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_60.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_60.txt index dcdb12185e..97685d3e2a 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_60.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_60.txt @@ -1 +1 @@ -2659a2374d9ccaba2139ca2895900187e5e1d20696d9433df7bc0495c366ce7b3d220d525725a5dcb682f42acf31326ddcf3f38ca191606ac4394aed2741abae \ No newline at end of file +4b8c3036d331d0b7cd806e6cac92799cfcf0b891c85c04a55e89f77458007b57728a912bb4cae70e93c244b93e29cb07fb4b1623d5906222e1600444bba05bc0 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_61.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_61.txt index 30930193be..3f8a813d59 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_61.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_61.txt @@ -1 +1 @@ -ec33ddb4030bb3e8e04faf7341e780b6c71ef0d03b5a14fcc4211fddbace7a94a532db288198081f99f7998fc21981cc2887b0ec9a66f1d4dd2c44cab88ec50a \ No newline at end of file +c365f0ddd921df788b1033598b566dd8b3752ca85bf5b3d956656d4d311413abedbb5db8c384afeb8d2f46e765d6f8cc149c5d47f411c7a2b4b089e46768bedc \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_62.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_62.txt index 597466e292..a2426f7756 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_62.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_62.txt @@ -1 +1 @@ -5dfe267e35f5dfde1f9a7ce3749994749b1499e731feebd2826312d093afd764f53270b8c4d0f7cb4a0027364d6cc16b067c9782573d48817ff2faf1e26f3944 \ No newline at end of file +6b1b44830d7731f60b4f44548157fca21ac99fd7f434f3c7f0b0d0c1d1bbae3989eee2a14924dd2fe2579618201fb1eccf424fa6d91c2bfd7b40a79e2907771d \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_63.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_63.txt index 43d39bd5af..16c8e2859a 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_63.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_63.txt @@ -1 +1 @@ -4c11e590aca4e0a30f1a112098a0aa52fd32673cee1e4e13b2e906f72cedf5c42ab7682e4d1d63442f0799384d68d90d26dcfdaad120383f0c3d991ade72f6ae \ No newline at end of file +90f1281a2e9e4d2e3a52ac1e186820a4ce87c3b4abf36806716540126c2ea03ca8e8b165672ddc4007f440de709a633c3069d519ca968b9205e2aec31a4fd9b5 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_64.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_64.txt index 01ddb74ed0..bac026a8f7 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_64.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_64.txt @@ -1 +1 @@ -00cdabde4f9492b560d52a65d5440c8a802e5717ebe481e3054091bff16ce1d36d48f6b8acf02ac5eb41b2a6375ec5c27e542af023a563138c5bf03dba9dd276 \ No newline at end of file +26dced25bdebfaa8c66384af78557a775812d9a96127cd47c77264964a85ee5d9763f2d48948a7a9c838b2838278d174b38de243ccde19ed92b86e9a43e42ac6 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_65.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_65.txt index 0ad2347d31..8db6bad35a 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_65.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_65.txt @@ -1 +1 @@ -4b9833eb48c7829222cde1aa6e8b6c751af1a3a35a9aa407a18efe30ba8e297339666026e7eb801b6def009085dcf19a6e23cdcaa11b30301822ce3ef913363b \ No newline at end of file +075e6749f0c9f1533dee8a71edb0ea34561bdf89db2e924239509015240673adef1f4b3635d1dc29ca4089fc8768622737f872afd1256b19d4233e6ba7e7f29a \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_66.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_66.txt index dd30812906..755cd2e6df 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_66.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_66.txt @@ -1 +1 @@ -1470fa3d5ee3d05dec9e73a4a1daee0cf1e94747472adf4c2107238b0e4cfa581438480e00cda92997d31a13baa76760c4265afb10f8832ffd10a5d36f41839c \ No newline at end of file +7d51d2f5e9ddccdf5c3911ee194eb2072a8c16d20897a6a7e502306d48b69da4fed5097580c3e15eb0746a6aaef1049aa7b451f655c9583431d7e831c21627a7 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_67.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_67.txt index f0edeeb86b..c7473450b9 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_67.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_67.txt @@ -1 +1 @@ -32eced012e6578ad7ac84f164444adb736c4700ceaf84cabc12b2a5809150a8409d39b0598e1f36733f08db982391a760675c897fbcfd331b25fb9c0d29caf4e \ No newline at end of file +096245fc4457e10833fd2302e7e65667a0f6555d8471ec4b7ae45c190c86edbeb30211256e59d09f65238aaaa5df966380e37a1bbeed8bd7a1f8ed841d4781b4 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_68.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_68.txt index 566d1a7604..85bc850503 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_68.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_68.txt @@ -1 +1 @@ -9f86dd743cd336ae76e41a7e6762f630c5610c9e7fcf5261264a59939ada97a710e7ff1d0d3855f7d5bd8e8e33797c571c4153d19f4f43d1fa5e5f897df5782c \ No newline at end of file +4c93ac290851b6d6874981fbf951d4ad9a200981730685050c9ffefce20a8134c82d5f4326f8581b847dfa8effc93b1d86b4b2124ce5bd9e117d33fe15571b85 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_69.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_69.txt index 40e95607e9..6523252f9b 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_69.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_69.txt @@ -1 +1 @@ -ea83e935f93abd603d4754a4c26ad0224653e19a00d0e40cd25f00ddaa5acebeada497ea4b4cf96b6af467107a7ee4efd142de9a121a4d48a857845f52744abd \ No newline at end of file +be9dadf2b0ecc91c0c31538f8705a6392a7db537488d33a96485f8ac0db2b9262a74d8e729f474dbf2e760dbaf9e2a309e4e9f13149ef2adde8b340d4549073b \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_7.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_7.txt index c24813bdcc..6d7c860431 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_7.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_7.txt @@ -1 +1 @@ -7e87f599ca36e3c9797c54be2239aeb9431d4421d28c5223073a6489806a632314519f172404479238e301ae234cea747ba1ac8808d577edf6128c433130b015 \ No newline at end of file +d5dfdb0998871d421532ffa1bbd41273f1215362f3515e74a74875bdd9dffb714a282e51c09fb09f798212e5709a956b6baba3e2c396c82089a50c5b4d677af9 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_70.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_70.txt index 36e9e85bdc..07f0f83163 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_70.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_70.txt @@ -1 +1 @@ -cdfacfe67692eafa2b0f3659511f4dd03157437c3598a623bf4fc6a94ee129f281d16200291a1556c7cf1f389e7e2975ec2f23e229efb702665ab18bf1bab9c2 \ No newline at end of file +e6d8939e72059a47c2ae7353e01bb1049fa79e331f83533efbb7fc6732bd4b164dc60fc78dd73c28a23b574894089dd22784fd0d2ee07c7c70a63795039c9025 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_71.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_71.txt index d5ccdaa2bb..e66f966dbe 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_71.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_71.txt @@ -1 +1 @@ -aad5e1df7dca3514de2321afd5ef501cec063b1bde35ea75744e49c20af80a926ea05a7fe5cbb9c9da05df5b97fe0ff16474a36529be449506274ea37200a0fc \ No newline at end of file +4222d68864f792cec53f2bc9042765b2a9f0c1df467fb9456a7e733998475eab051aa2d3fbd8fee640d60d537b2208acb434a6f60203ac8378e7a84809619c69 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_72.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_72.txt index 7805a17a30..f34fbecb3a 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_72.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_72.txt @@ -1 +1 @@ -936cd628ce09442def5c028ac328347b566f0f947e0f0647740655dbf587d8d15e3f00745f0d3fa3009f9abc6cf96488f70fa7fb0d0d05b879ebf7222ab32aea \ No newline at end of file +9bbb950f06c632d0c690b8ef3701e410623f0287ad45512e5a39345e21aaaca38fa69523f16d7a0a714bc4dd11d7a3e35381255621250d3e534cef1d563bcab9 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_73.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_73.txt index 0169219d5b..83a694e23e 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_73.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_73.txt @@ -1 +1 @@ -9dcad47517dbea198604f7b54bdbff87d9d5ed1c8b6f3b06a84fdfcc55496bbd26ec354b4885af3b6d444e03b96dbf27d69535667636a696e2016cb4216f20f6 \ No newline at end of file +96a0ea2f00e6c545ea330abec444220fba22eb8a9ab80e92376aa6ceb9f8bee2c823eeb038fbd28c876a114662fde3c9a0618f7f1e0e3c6cc4a9d28c9192d256 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_74.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_74.txt index 5b658753f2..05aafa541e 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_74.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_74.txt @@ -1 +1 @@ -1902d128894cbbeb3c32f388aadf1d3366c4be85940a10f5fbbed8435fc46f79ec8e2b6b4f4babc8bc3b943131aa1a2050393d8ca71c17ba9203dc4590b393c4 \ No newline at end of file +b887c1d62f1ffcc9d3c1bce41129ff0f7cba576dfd34befe7918baaf118e3b1d0a5bf1c05c697dbb86fd3e1944fbac95460e8d40025677ea81f7081a3c9bd112 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_75.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_75.txt index 74c22905f7..f44b20eb90 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_75.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_75.txt @@ -1 +1 @@ -86a39b2cd9ddb300c73e200254bdac705ca2dea4146202eab52a17dee86e36684792dd99ee9184cbe3bc0921660e39bd79e039f935a629636969b38ecfacc663 \ No newline at end of file +a05813d079a2ab7d7973d287f0cd0e24b3c085cdbb24df476c1994620b50f60ea89d94a0a6182a6695a36a10b8ccfe073ac3b285157f6b40b1bcea9010fb1773 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_76.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_76.txt index 5a4b806b49..567ed0c1f8 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_76.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_76.txt @@ -1 +1 @@ -1706ba637a0b4929582e329745d3e8185043c10dc993362e1aa7bb0dda9bddf1dbe977c974afaf8d531267d5767919855a34506c88510085f802645e6364838a \ No newline at end of file +d04296c45c7cc145d3382e594db0ffe5a7d8f9e6e2f60cf18b4cffb90210f7eb703c65a7de40d4969cab1ed13021eead8d5850cfbaba85c0dfdbf27ecda5042a \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_77.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_77.txt index d8e201a5f7..6eaabbd7ca 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_77.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_77.txt @@ -1 +1 @@ -99b63d744567e892bfb2bc51767b7a0ec1a8250aea923b941776a9d7fc5b4aadd47f68997b106ac675b0b152d4da9a769e79040d73f6b5e30be535aede44ac07 \ No newline at end of file +e1d7ace1bf7aa8d8e6e63c38c0b383a4f1a4f1a794f7ea7553f7fb23004afd309475611bc47acfbe4297fc738a324be5e942c5e4b4049546afc2dcfd23c95440 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_78.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_78.txt index 5f3ace6cda..16cf9d0e9b 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_78.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_78.txt @@ -1 +1 @@ -9e9bf0ee47ccb01def23551cfb2f09094ef10072f135fa746789fae405655e6143ec04f34b9034224216dd6688d6dce91524cce710ba74dac5c50b78903d8206 \ No newline at end of file +9a112caf4d30b54c157435b9f5e7acf5fd17b228f56a0e6c048a707943a0a200184ed26b9e2658aedd72143252aa3f0e711a2566608f5d4c295222ddae24905c \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_79.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_79.txt index f1c33626e0..69f19da8d6 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_79.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_79.txt @@ -1 +1 @@ -cdebfd3eaa16a6c117d15451b7c9a2b180dc83fc845a2ad8503b8a79390f03bf429120f4a1df2f888fe37b70af0b99b46fc5903607ca3cfd9cec6dce894a29ba \ No newline at end of file +9fce27e3ccc577a4d6d1c981f9bd110c924e79146cce6a19c92c1aac85508b6e09e24dbf93cf5931368de09b17ef5992ca467351c5151bff8d41a9489d781c4e \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_8.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_8.txt index 0e77f27e2a..19a447f702 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_8.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_8.txt @@ -1 +1 @@ -560e3ccce602b51527e70cfc70cee5a6fbdd806b992d0121282f1dce976de7da21bc0fe43de7eb326ea014786ff11720123215ff26c9441d92c0f070e1c588df \ No newline at end of file +dc1bfe97a404b448dee10458475f2c576721a3be3d027c0d48d4cfcc1ba6927422b532a205e5f933654d4ed3f287ee280c614dce29d3dd6c500b832f234cb973 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_80.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_80.txt index 09dc1abe3d..6533a0a0a2 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_80.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_80.txt @@ -1 +1 @@ -0c25b098f758b43516e3b2017c5a1f84c387d102c4c665aff6d1b8df941ef0bb15ca6d2dfcbdaff409cffcce9214f054930fea68870e10f7e3a7b531cb649395 \ No newline at end of file +c41076dc36ec247480fd71fed9d6528b66fed49c3a99a09e61ba5d2cfae337074114ba320abc0d1b16454af883f53b051ebd08e6639b704cef86714e1229527c \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_81.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_81.txt index a1ae6aa1a6..7ae2df62f2 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_81.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_81.txt @@ -1 +1 @@ -bcb0d63847cb04888db8a225311e26867fad10f88a4c2698a6fc7f06f51bd74de72d145b33b981afd3b75ebc004e48800b0a541a77f1d24d7be8ea395776e793 \ No newline at end of file +440000b753954f8be6a705cb2d9f1fa0245c189c9b027449af0b4fab325b4739ba9172930ac6544af73da136cf7d72707a8bab4a86ca1a88e5d74719c56844ee \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_82.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_82.txt index c75c67b3d7..9d95f06548 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_82.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_82.txt @@ -1 +1 @@ -fe872322f09b93492f240671ff2c06b22d946fa3c6dfcf433e4d48b49ed6662a3ac3c01c1ad4a8a1f9bc6765d4e1e3f0530382a27e5c7fe478f12dfb7e8f6e8f \ No newline at end of file +15a46c9abae48ac5b05600b1fb0722b35a42ade07b146599778b9a8f7792cff2326e5d4be58b2147e03fb4db7f4271628b8b4e729a8a2b7290ae4f8d19e91a03 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_83.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_83.txt index ad722e5fbe..042aa5dbe6 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_83.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_83.txt @@ -1 +1 @@ -5d6a63214f57c620576e315586594311354be066c7d4cca7fd1b06568ff039b59032bc2a782d8a0960bb8b8f912fbd091de5b35d91813faa99cd9c53592ab3a1 \ No newline at end of file +3c9cd51ed30111a1a461d80a16c578b1c56bcf1ca11ebc449809fc57ca634f3d36105992d8a232ed7626b395be7e2b129dfb7f09d4eae01cdff594edb6653d2a \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_84.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_84.txt index 89273cf289..13419d3e9c 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_84.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_84.txt @@ -1 +1 @@ -431a4e07f6ba31488657fed2cf14d88d401d4461d690ed3f7f0bbb6e615b82375ac6cd717df8d1374b445c402ee25d8b75c53ffc2e4f3e70dbb47ecb954105af \ No newline at end of file +93569f1bcb45721347651073011fefcc5d66e169cb242bfd6f63a4243c544f15d69c153f469b78a067a0e33ef2306b6579f997965ca8a7ee34ee58aade0cb5fd \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_85.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_85.txt index a2eaa73230..d4629cffef 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_85.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_85.txt @@ -1 +1 @@ -7865a2541657b2454d4c97d3fb72a80ab1453afc1266bb95f3cff0900e0ec441521bc806dbfa4e78d0ab5f37e6ca4607a71a006851e901a4d944f4d38301a815 \ No newline at end of file +6eb43d21881f614d948ed3627513149695ac3b63ffeea2076490f6fc76c805a08a7dc138eb8e067cf5e808a93905e25eeb1942cf54c355a179967c5511f1c38b \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_86.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_86.txt index faff9343f4..a4124d2694 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_86.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_86.txt @@ -1 +1 @@ -9c30c053de8434869f884ee946bd0db8a22b215f7f6d85bd2df46b0a533f904b272103c5039ccd1380ca04ddcc4a68bf528155077bfe97c666c1eaddda62f3a3 \ No newline at end of file +13c834fbbe639c1ebfc0b63691a3031c08f06f050ac3ef9319fdd89c05d8cb5dffee6cf085a3e56f6118f907b7511fbedbfb4ac47236c414a21bda5d41e0c3a4 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_87.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_87.txt index aa51ceab8b..fd168d350f 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_87.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_87.txt @@ -1 +1 @@ -362edd5f9ac5cfccfbf45ece906a7ca613bcb971f00c6f4c1f5c96a3d6f58a5a370b659ae47a09ea7950b93575e0c77258a6e642f33a2b5af770b4e2f76307a9 \ No newline at end of file +8a89cc370473639dc424b66797becf85c509a4f168445567def898f8b37a6ca7485f424381a7edb97dc5d66f589e44a611c9b7e84802fd815c0eed53e9e2a47d \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_88.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_88.txt index 533ba78b31..e9e1c745d7 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_88.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_88.txt @@ -1 +1 @@ -a6f3ac2926705a47861c9e4704c7494a79c1da31642b8c0ed4c3f1706ff0fc3dcafee7283a26982a003d7c7de2214de532ce137cf00dd51690357f49e882a125 \ No newline at end of file +19b1d8974b992f2fc9bccea47ffcf33fa9a7d5a955c5b6f1857808693bcf6bc3ab7c0b62adc1156ad2875de3fb133e8259d77f4ff968e3058b08deddd0591ece \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_89.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_89.txt index 91eb5dbe20..866933620e 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_89.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_89.txt @@ -1 +1 @@ -1f4ea6317004a0ccee3698eb0d4e3a85eca6ae49706b4acc68c4e5019c90fd595e609b65deb104164cdc453ee3c71eb63c7ddc2eb7446c33d5b4b54923554785 \ No newline at end of file +81ba37364d520fcff07c76d54432455ac962859b5a34443d20f28676045722258f06796bc3d6e32b43df4437e087abd1677ef23925f1fca4519c27ed606ec358 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_9.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_9.txt index 0087bbb014..58d529a1bf 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_9.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_9.txt @@ -1 +1 @@ -e8a16df33a41d0937200725c09f992a60606e80d5efed27ec8c57156c1be9a0a4024ccb7d70b2b95438d2ee588f753738c410d54137e73bff18c62bc5d45b79e \ No newline at end of file +e2ac71084dce38c445885989e1fc49e404bd4046cd67252b1010ecabe928e121ced52e433f4e606778acba5a59733e56b3e631baf4483f3153a83e7c168ee6da \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_90.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_90.txt index 4c284c594b..1acef23a81 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_90.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_90.txt @@ -1 +1 @@ -ab7d270ef50a23b764acd071398da9499161e1dd870a3426bae1841a658095c6d8a1d186b8ea95fd53ee98b38be02364d58564ec0a9a1c67e748726874b419bb \ No newline at end of file +75be981fdd20806a2356608139b4038074dc11b2aa33ad0277af2e296138aa199e7576a7ec2b70272d6d4a86da0becf9eddc04d73d711ceb274b38b82c6ccf76 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_91.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_91.txt index 5d743aa8b3..6bd63375e8 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_91.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_91.txt @@ -1 +1 @@ -ab347ac5278811962e5b5d4297e704dbcc17cdc9b99d4a9ce424b2f74cd3578c250fbfe7f0521718064c5121ccda038f68c5f1df96f1b3707ed8322a60f93477 \ No newline at end of file +eb94f3cecd9f96711db19d4307b033620cd9840de99118db8825a5a3c840ed2b44bbbf1861590cdee86acdcd417b870a16aa7076bcf8d77d6c4806eb530f9495 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_92.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_92.txt index 25f8399dcd..fd0ffcbed8 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_92.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_92.txt @@ -1 +1 @@ -36f48312315dd0e5061d1990fef967ece484b21b94c86ee989acfe3d856f203df8e09ef5599e50c4abfc0db44a8a8d7921af442cb418d93684877e5353940d22 \ No newline at end of file +a1372f0997ce31b01645905b0919f8b5be41c912ea3356bf52d3c154eef6db3d37d9df1ba08b45f931386a099be1d2234b73689113cea3596065202b231fbefc \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_93.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_93.txt index 84c90b2ca7..caebe329f8 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_93.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_93.txt @@ -1 +1 @@ -3b437bee53675b38a2519028ba7484e324237360619026826861e1411a98c84c000c4fce05606ddf556438ac1b7ec5d9d4e3cc626d5c5754b43b01dd17688131 \ No newline at end of file +0f29647c62519870d193a8f7dd32fbc526751a00a63ebfb46c1bf10f9bfbe5becfe721237e11522db7922500cad5d2bf3431f5c56fb265b3299bd91b449a7540 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_94.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_94.txt index d3e7303237..6f33dd0ecc 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_94.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_94.txt @@ -1 +1 @@ -2a4f4ed0decef08aa2a9a4cbf92c0af59943134f84ec908af41b28752f5601e7834ec8a145758ce5934ac84e3804d1b1f519bd27b8e366529f3f5f54eca8f70e \ No newline at end of file +fff32cf501d959178e8a0b0a21685fce7deb635ff47538b7c61b53fc086494dd8ab4df73f8170a444bc072483729be6cc86b87f4ac843b51de2da359a03747b4 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_95.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_95.txt index a71d05fb91..8c9f9ff9ea 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_95.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_95.txt @@ -1 +1 @@ -38bb20dbfba2720725ea233bc236b6fd4ca8f1223f5bed7cc37916b8da95ae9e8bd5043fb3a63cc7d9fcd6699f5c6efd6acf2ce6d710abb92edd074f56ca934c \ No newline at end of file +1a5dcbb8913ff99a93d578e656454b08d027052cbe8e3639c8385fa8aa3c6124de2d7d40e9f973ef17a7fc072707172574e186c72f5c2dbae615ba17c96dc318 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_96.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_96.txt index ed576c77d7..b0520e1fe4 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_96.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_96.txt @@ -1 +1 @@ -ac546fe08aaa6e76cb76c5958dfcc6aa4a7e181fe7f6e81622501f142b94bc91fcd7456571c6837cf63a308a989817e425e5e166db7e6f83836afa251a124f5f \ No newline at end of file +8aea1c997c29de07451837ccd10b5d8b29c051753f8fafbaff9e285ca5b9f584b751fcc91c6aadab5cf49b3b54b9bf71055de7e713b5135564afb399ac3e79ab \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_97.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_97.txt index 658f52c2e8..287a503402 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_97.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_97.txt @@ -1 +1 @@ -28cc29485b0e9cf4d92df7b85430b7d90d1d7b9380d5855064674dd74de2ee531c2dad7acad45e1d39a484d24d14b065eb786878ad1263df456a942977780c51 \ No newline at end of file +3370ae42ef8ac4b38a616de1b627c78b01d225a3e42e32cf8ac1f9b25cb3390e72ae261cb52818dcc97acc03718bb8c322ab297a9e63a2ece642f50cb8715848 \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_98.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_98.txt index 8014118c07..667ef252f4 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_98.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_98.txt @@ -1 +1 @@ -15cad26010f8acfc4c7238911c655fea43ff8604d3a96daff3c7e51c3ed6727145b185fdac3278000a41be8c7f228dfe3282f54631c8d58000c05181a7894537 \ No newline at end of file +03f1447361ab12b58fdf874c5c5f5ce13c9ea2799d7dfc3f9f7c901e113d266e7190150d5b5ff8c1cf64a4f1b17f3f6914c5241b776b92d8b731f902c0faf78a \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/effect_hash_99.txt b/crates/core/transaction/tests/signing_test_vectors/effect_hash_99.txt index b66c1bc9d6..e07757035d 100644 --- a/crates/core/transaction/tests/signing_test_vectors/effect_hash_99.txt +++ b/crates/core/transaction/tests/signing_test_vectors/effect_hash_99.txt @@ -1 +1 @@ -588256d6077a82fa68ed82ca5ba1c43086158c21874ccbd1927d59cf065a9b62feff874fd93532e59cec30811873a568c098945575ac139a1a0b0e9a5d1ae3e2 \ No newline at end of file +2e4e94accb52fc6480fc54681c16e25c4675222991a0b9513aec24f2c25b52fcccabd287e9989de24cc80040198fa73780eec5b22b56c016f70ead1008d07f1b \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_0.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_0.json index c2de0e410a..6b975ad5f6 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_0.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_0.json @@ -1,103 +1,48 @@ { "actions": [ { - "validatorVote": { - "body": { - "proposal": "734178146", - "vote": { - "vote": "VOTE_YES" + "positionWithdraw": { + "reserves": { + "r1": { + "lo": "13648740409960435" }, - "identityKey": { - "ik": "M+KCjFBoz26jhphK5GxrofTA5S1FjNumOTpvxDql5FU=" - }, - "governanceKey": { - "gk": "0K9/IhGDnY0HM7cKc6BzfZqH+woUX8N5BFzt9+t97gg=" - }, - "reason": { - "reason": "MaTOG8ZA81BaGY6snYzK" + "r2": { + "lo": "756856335878883454" } }, - "authSig": { - "inner": "erfSdVw34DGkIbzsI5fD4G3YzsV0NuCJxPl1wEB8MwNdrOmqIXIy9ecDDozV3yW1NdH1EO0Rz23scMbiFIiPAw==" - } - } - }, - { - "positionOpen": { - "position": { - "phi": { - "component": { - "p": { - "lo": "398983242223267371" - }, - "q": { - "lo": "174252255376395430" - } - }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - } - }, - "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "state": { - "state": "POSITION_STATE_ENUM_CLOSED" - }, - "reserves": { - "r1": { - "lo": "9696041976274794" - }, - "r2": { - "lo": "462018430045093463" - } - }, - "closeOnFill": true - } - } - }, - { - "actionDutchAuctionWithdraw": { - "auctionId": { - "inner": "xsRCOlxNHiX/h9AeLtuHVj2+c7JWQXmLz8UFuTTO0Ts=" + "positionId": { + "inner": "STNeLtIut4nZAZOgE2tGZMRof1ge1GThQiZ0S3ReG20=" }, - "seq": "45580760", - "reservesInput": { - "amount": { - "lo": "12303585269341678" - }, - "assetId": { + "pair": { + "asset1": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "reservesOutput": { - "amount": { - "lo": "324597899784941655" }, - "assetId": { + "asset2": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } - } + }, + "sequence": "1" } }, { - "ibcRelayAction": { - "rawAction": { - "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", - "value": "CrIBCMq4tpgEEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgoI5NbuKxD/vetKQKCW5+KZteqBGBICCgAaCgjk1u4rEP+960oijwFwZW51bWJyYTF4aHhqN3Z5ejRydWxhdXh3enF4NGNsdnltd2w4d2szcXA3enU4cWpqdW5yMGt2ZXo0aGd0bnpudnJyNmhoc2g5djU3bjJseGFsZHdxMmpzd2QyNW1jYTk0YzZ1MnQ0dXd6Z2c1azgycDM1Mmp1OG14NTcwaDB0M2R4eG5xcGw1cmo4OXQweg==" + "proposalSubmit": { + "proposal": { + "title": "eruqiigybuwslelyedqzuejy-9415523", + "description": "bnsgnfxdfqopuoofieudfassceif-7983516", + "signaling": {} + }, + "depositAmount": { + "lo": "755307093195598306" } } } ], "transactionParameters": { - "expiryHeight": "1826436459", - "chainId": "jmuxcavzgvycljsrxop-0521683", + "expiryHeight": "8043970505", + "chainId": "dgptroyoifjvsxy-559380648", "fee": { "amount": { - "lo": "427956015384633665" + "lo": "428924731905324533" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_0.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_0.proto index 42e07d6378..2222eb3865 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_0.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_0.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_1.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_1.json index 0300054b52..c485b8a62d 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_1.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_1.json @@ -1,70 +1,88 @@ { "actions": [ { - "spend": { - "note": { + "delegatorVote": { + "proposal": "286307412", + "vote": { + "vote": "VOTE_ABSTAIN" + }, + "stakedNote": { "value": { "amount": { - "lo": "249542111138297168" + "lo": "965008044730558251" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "rseed": "af2HMr6hiFiXbXL7hxqASnkIu4v1nWyH091K1IR87CY=", + "rseed": "DKvrR+33qH0rNwzGTLZ7BytFeywORVp9SFSGIPo+w3s=", "address": { - "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" + "inner": "tHyqi8wKOJiTWujshfjeniX+e73+SiPet3hPVmyHRK7TKDXh3ftdVewnIYBJ+q49Pf9udcPZ3zwoIgD22Y80d1jCUClkuJUQyUl9r+k7eMA=" } }, - "position": "200439803088859", - "randomizer": "MCGyFbsV3GXSA+WA5Ipt21wV+fJ0Y3TEJWg5/qNjaQQ=", - "valueBlinding": "MzF0d53Fx5MjUtLfICPna/fGWcXRzpM5ecGlQhuTSQA=", - "proofBlindingR": "VOPP3EWjk0VjNaGU/f66PnyiojOzZCWT7e+FQlFJ1RA=", - "proofBlindingS": "dmxCcD7H9/cFaASVo9gI/bux4kLZjZy2qtDI9MWr8QI=" + "unbondedAmount": { + "lo": "856875799536450720" + }, + "randomizer": "4bLpMrQK4sp15R1TwSSKSYkVh7LmrkL/JRs/VCj3RwA=", + "proofBlindingR": "/ZTy73s+6KTQq6Fa7Tqtn2ijQ92hxrJzW8NE/jsECws=", + "proofBlindingS": "kSTFmJfxYmzP6Oz/NSz1F2QyphpNBbMv/VkrI4wc9gY=" } }, { - "ics20Withdrawal": { - "amount": { - "lo": "335778073335232026" - }, - "denom": { - "denom": "a6leIUKF1" - }, - "destinationChainAddress": "penumbra1fzzu6myekvlxnzm4x46wadwc76kl9lkxf2t82ursjvrrdj7mvv8uuhf7a2u5mctfr023gzymv8hdjefwgllzefxcj6v062t6dqsfhvn086lf7dxzfa5dqnmhkz68ejkpgg5ses", - "returnAddress": { - "inner": "otLSCSQj8/hbrdG9hRRy4ZpdFxNl8tfb4LzYBsW/3joqFEVDUrjiNgIXJBVMkI2dxh7Zsg4L/4dMY5OyBlb1Y4Jt7yvUw2B8ECiEfDng0+8=" - }, - "timeoutHeight": { - "revisionNumber": "737713399", - "revisionHeight": "776870533" - }, - "sourceChannel": "channel-0" + "positionClose": { + "positionId": { + "inner": "mWKapNvCm90g1IWxv+uJe2tQfO/8EbqgqJLOHpNvw3Q=" + } } }, { - "validatorDefinition": { - "validator": { - "identityKey": { - "ik": "0scIlCi+81Xi9nz30a163DEm0weNm+Oov7iYrx+18RE=" + "swap": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "consensusKey": "93yzpXc188/5cD/ZlWUFh6b+iaQYy8Tb1qrDlx7WMXo=", - "name": "test validator", - "enabled": true, - "governanceKey": { - "gk": "0scIlCi+81Xi9nz30a163DEm0weNm+Oov7iYrx+18RE=" - } + "delta1I": { + "lo": "172115022418412250" + }, + "delta2I": { + "lo": "390057480338960044" + }, + "claimFee": { + "amount": {} + }, + "claimAddress": { + "inner": "JT1/ZJ+iB8W0iZMZKVFoIZW20DLowy12+0vfTBs1mQsdw1afpt9fmzm1qTXFxdJQKLFbH9qTPZBMg7aRQ8511pX5MAW25/sEp/z0Ma6euAw=" + }, + "rseed": "A9M6CvemjSOCEuOgmck4KTBtfRdLO1twdJaaavRksbk=" + }, + "feeBlinding": "XKdgjOFg63dnRC5KdJlXusch7dGJo0jJV4RuVsPoVgE=", + "proofBlindingR": "XymF/MXGu2wpOGMmgMF0sLyMHp+9JSnj1JZgVRELKgk=", + "proofBlindingS": "ZxTyxkXX8pFb+AflaTsFfZRCTNpSAlzD/yExu6ogKwE=" + } + }, + { + "proposalDepositClaim": { + "proposal": "44639541", + "depositAmount": { + "lo": "831458677785504978" }, - "authSig": "MN69gIpNoQoELJ47xVpuP2bHP8oHgB0mZYhPj4y+Jg6/dNPrDaiVmo8v5EBcQORRh/8BzUqgXAriW3RYE5feAg==" + "outcome": { + "failed": {} + } } } ], "transactionParameters": { - "expiryHeight": "6438003618", - "chainId": "pddecmnehumdhrpq-22107829567509516577", + "expiryHeight": "9905625936", + "chainId": "tbkcxzbfrvtotoyjfkbeiicnz-7099071456", "fee": { "amount": { - "lo": "795664371410932296" + "lo": "210806993933744197" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_1.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_1.proto index a4582aab1d..b6b6512367 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_1.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_1.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_10.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_10.json index 035ac52c29..884f9e033f 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_10.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_10.json @@ -1,66 +1,100 @@ { "actions": [ - { - "delegate": { - "validatorIdentity": { - "ik": "2DD/chk5YdK22L1I3rTCZx/w58xmyEcBwGyhNQYaliw=" - }, - "epochIndex": "669", - "unbondedAmount": { - "lo": "270330855486289586" - }, - "delegationAmount": { - "lo": "328798106370388332" - } - } - }, { "proposalSubmit": { "proposal": { - "title": "ywvqymndsk-75270024643337517299763461", - "description": "kxfokuhbfdqzuxijmqgaidkatkq-690630951763", + "title": "vkdhsftlg-6340666030193708661", + "description": "kwoeai-4793102263178515169356716579", "signaling": {} }, "depositAmount": { - "lo": "216221221416320389" + "lo": "12909196238215414" } } }, { - "delegatorVote": { - "proposal": "432345648", - "vote": { - "vote": "VOTE_ABSTAIN" - }, - "stakedNote": { - "value": { + "positionOpen": { + "position": { + "phi": { + "component": { + "p": { + "lo": "601933346084361823" + }, + "q": { + "lo": "199758989564752483" + } + }, + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } + }, + "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "state": { + "state": "POSITION_STATE_ENUM_CLOSED" + }, + "reserves": { + "r1": { + "lo": "194218140268482907" + }, + "r2": { + "lo": "760758746492025233" + } + }, + "closeOnFill": true + } + } + }, + { + "actionDutchAuctionSchedule": { + "description": { + "input": { "amount": { - "lo": "550593064295398233" + "lo": "610494058979516937" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "rseed": "bwyn4V7Tfmc9yXPHIBJFkmX7c681Y9DlmZYcf6pSn7I=", - "address": { - "inner": "lsaxy+MS9biAcPNVyhx3bUpjbDFkA28S3kfC9nSVzmzSHfqADz+XPPOQCIu1YSugfrBAKN2YVxDDYDsvrvuEuY70+NUYNPwLdfzPWwsRMnk=" + "outputId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "maxOutput": { + "lo": "828438600773162744" + }, + "minOutput": { + "lo": "957584202670255169" + }, + "startHeight": "753301358", + "endHeight": "753301359", + "stepCount": "828250991", + "nonce": "hVRRXBjJ7eAkQnDET157fullW1Wlr1/rjFmIJ2rYOdo=" + } + } + }, + { + "communityPoolSpend": { + "value": { + "amount": { + "lo": "790523462100311735" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } - }, - "unbondedAmount": { - "lo": "21769842851469698" - }, - "randomizer": "0ny8l9DX6ysyFucrB9D41g4aNXW4WyPCARE9io7epQA=", - "proofBlindingR": "3OJ0tnH7l8fdEvGzqCgQk+kjvUI24caRhJIfl4JJQAw=", - "proofBlindingS": "n2mdBevmqaNlrVEuEPowouYfx7NAOUuuyZJb2A9TVws=" + } } } ], "transactionParameters": { - "expiryHeight": "8313699849", - "chainId": "inqirnjanjgtgxedavvxghxm-46721656813046370851", + "expiryHeight": "368984369", + "chainId": "jmqptcwrkav-5457786122718644", "fee": { "amount": { - "lo": "37721920543956097" + "lo": "265854478781762380" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_10.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_10.proto index f1d4eb52ea..ba4f128e0a 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_10.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_10.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_11.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_11.json index eeca148317..bc7b06d031 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_11.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_11.json @@ -1,15 +1,61 @@ { "actions": [ + { + "proposalDepositClaim": { + "proposal": "476535853", + "depositAmount": { + "lo": "457976547602208863" + }, + "outcome": { + "passed": {} + } + } + }, + { + "validatorDefinition": { + "validator": { + "identityKey": { + "ik": "zuyRIEJWVK2dpcaKirMbYupX6+YQDhsvcpgB7CFzfQk=" + }, + "consensusKey": "pWNqTlOLYxW3n5Glqfe6eEi9WE6X42zWR60FT2SzFXs=", + "name": "test validator", + "enabled": true, + "governanceKey": { + "gk": "zuyRIEJWVK2dpcaKirMbYupX6+YQDhsvcpgB7CFzfQk=" + } + }, + "authSig": "MnQWxc65YUuZ296yuIBOPDygR2xLmejXKR0ekSgqkAv8m0ZJT/lcfWaXizFp59texkHm968PmAzZt+Sm7DB+Aw==" + } + }, + { + "ics20Withdrawal": { + "amount": { + "lo": "794267246988967938" + }, + "denom": { + "denom": "aS5Ku6V" + }, + "destinationChainAddress": "penumbra1v6h62h953vntq5jp8lpfu424lwvgm7nzz2n7wjcdu67ku72t5f5lvcan8yfqxay0jhxwnuw6zn65avcrqdnkgklrjmmjrj239fq6xk58suawkah58p74l9t6drkwhfusf4at8e", + "returnAddress": { + "inner": "etUoNpY+qCM5uRT2wpef+fhvq0VUcT+v6xrSyufqmzQcMA/oeI2/YSe313vTHFt1o9jCuHLUcyni4zcsQ1tMA0BJZiyQ+FwH0iX9ceVr6jo=" + }, + "timeoutHeight": { + "revisionNumber": "11935217", + "revisionHeight": "840842800" + }, + "sourceChannel": "channel-0" + } + }, { "positionOpen": { "position": { "phi": { "component": { "p": { - "lo": "865621029223473641" + "lo": "293930272935182406" }, "q": { - "lo": "567864319188342557" + "lo": "612882438959240485" } }, "pair": { @@ -27,82 +73,23 @@ }, "reserves": { "r1": { - "lo": "938832450736689138" + "lo": "299648845398725632" }, "r2": { - "lo": "220353419636592453" + "lo": "576213583086569982" } }, "closeOnFill": true } } - }, - { - "undelegate": { - "validatorIdentity": { - "ik": "xjH3q4FsVhNAtt7ISWe4yeXT/F+MruUB9+WDYreHUBg=" - }, - "unbondedAmount": { - "lo": "341356978208017584" - }, - "delegationAmount": { - "lo": "846223282829032270" - }, - "fromEpoch": { - "index": "1915", - "startHeight": "1915" - } - } - }, - { - "output": { - "value": { - "amount": { - "lo": "99812450319143273" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "destAddress": { - "inner": "rZRFbfrM59o7a7+lolfPl0BJX9mPT5S8vPG08wlPS1TJDVj5fHo3f/WRa17i2IpY5anUyUmeLIE3lKjRBNV2LHlByAbcRVUhp/132yzteVk=" - }, - "rseed": "3FafkTL4oUuD+/v2PTLmrXVLH4KwFfdQq0XGFOanm+c=", - "valueBlinding": "LBJkisKxlgIN9uX7x5U92JF+4IsVxRB8oHtnWGKBUAQ=", - "proofBlindingR": "2aAiHFlj++GqzA9dLqliVJB2rz3svGtTKX6JydP2DAQ=", - "proofBlindingS": "P1Ax3awrhXZRkj55xvnY7SvsB+bRMqxCyQk1IsxPMQM=" - } - }, - { - "spend": { - "note": { - "value": { - "amount": { - "lo": "940466547384632123" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "rseed": "i9nIgnNYF55sp8uQpRD5kjYNAKqcmb1VpI+8o2aCrk0=", - "address": { - "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" - } - }, - "position": "149669412111651", - "randomizer": "T3LUefDmpsP2/7UJMXrU2Drjaz8dikboSA+DmK7eYQA=", - "valueBlinding": "FI7wp6A/PNp+zBMWXJTjrRBR/EWGZlNV0hR6CEPrygA=", - "proofBlindingR": "SKJdII9hVPr3CUpx6Rys4LkvBcBX5BRUS5yQjSABVQo=", - "proofBlindingS": "4RO4d31wAx6maHCh/zLC/7qE/60N24Upv95tQlhDPw4=" - } } ], "transactionParameters": { - "expiryHeight": "6803636500", - "chainId": "slkpgwkdatdteqoarghkztadqh-015356829677349995503", + "expiryHeight": "2820938358", + "chainId": "aipxuwczhmeahwkjvapclzewxn-30943551359469479819555740", "fee": { "amount": { - "lo": "964126453046043546" + "lo": "260292030400142383" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_11.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_11.proto index 2d3ba809f9..f72f241824 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_11.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_11.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_12.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_12.json index 6a54185220..5428f35bea 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_12.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_12.json @@ -1,10 +1,51 @@ { "actions": [ { - "communityPoolDeposit": { + "validatorVote": { + "body": { + "proposal": "737860699", + "vote": { + "vote": "VOTE_NO" + }, + "identityKey": { + "ik": "2zSKoclsheomE1Z2zPe0KBF8c1uD1J50St6CMmebA8U=" + }, + "governanceKey": { + "gk": "xEzm3ufW9SI0vCFCAYW0XRD2dIuECpK19iKSUIoF9wA=" + }, + "reason": { + "reason": "n6Nj7UbCD1e" + } + }, + "authSig": { + "inner": "OC8hSOl6VCOqZq+wlR7rBt7ngeGUhgS7FSdxkxphYg01FgT0MoYzf/KII+a2wNGiFm1IkhQzQ+TMDF6CUhTXAQ==" + } + } + }, + { + "ics20Withdrawal": { + "amount": { + "lo": "644001588327089470" + }, + "denom": { + "denom": "1rZ9U0PMnnq7EVVvLM15YY9hQSDLkyTp" + }, + "destinationChainAddress": "penumbra1lk0edk6s9gkrmcepuaamk75qf74eu3t6tgqudxmkyegz9g2urscmu0ruwckt3vvjkrmurztncc5gzkqxvlct8fm7cnnc3qluxyc5vfuhjgcrktegj564g0gvlf3jrqleuztzwt", + "returnAddress": { + "inner": "52JzuK+NtoZzgJC64t7LqVneBzxFrgBHxcP/+R/BjvydnPWp62FDo82qx+h+szaIbmmSE3Z+CbHOonCxoL/o0bvB4I4UC1XV2oAlnaKLF1M=" + }, + "timeoutHeight": { + "revisionNumber": "613171166", + "revisionHeight": "316680151" + }, + "sourceChannel": "channel-0" + } + }, + { + "communityPoolSpend": { "value": { "amount": { - "lo": "842479024237700718" + "lo": "467365412505888176" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" @@ -13,37 +54,19 @@ } }, { - "ibcRelayAction": { - "rawAction": { - "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", - "value": "CrQBCPKY0aUCEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgwI2J/62gIQioDf5wFA+PD3o5216oEYEgIKABoMCNif+toCEIqA3+cBIo8BcGVudW1icmExMGxkamV0MGdrZGxlMjdqenhjcG04ZXIwanFuZXZqdnhseDJqdnBlMzNnM2dzNXBkdWhodjhhd3NmOHp5bXIzODUwNHJuOTlnODNuZXhyY3NjenZuNWhtcm5qc3p5dThoZTByN3ZrNThqMDRodDQ4N2N0eTBkeDM2eDR1OHRwc2VnZ2h5ZnU=" + "actionDutchAuctionEnd": { + "auctionId": { + "inner": "PJ1+32nRIYQgCvf8clmG1FlohFzqkSsObd1MAcJ0sGY=" } } - }, - { - "undelegateClaim": { - "validatorIdentity": { - "ik": "t1Oeu+lPkxKLBOapLc4pfn6AFVKYXWZfEUfEg1uaKls=" - }, - "penalty": { - "inner": "AAAAAAAAAAAAAAAAAAAAAP7FbVz6rNnoPkJa7mMfigo=" - }, - "unbondingAmount": { - "lo": "801434380644204905" - }, - "balanceBlinding": "kZoXFQc+EG9iJspeEjjurco7HwTtH49pssWng7WktgM=", - "proofBlindingR": "T2scn3ZvdkoA07DNLRtT2sR5O3xvhBt8KAWvhJOxNg0=", - "proofBlindingS": "z8N4Q7nfBP4mONZviIoU7A7XFNbmZvqA3XJcI4yG/gY=", - "unbondingStartHeight": "21401" - } } ], "transactionParameters": { - "expiryHeight": "4435935439", - "chainId": "jtdlkbidulz-665965532517491243", + "expiryHeight": "5967159869", + "chainId": "dkpqfakzletaqbyshaugajusqrixyh-90872977", "fee": { "amount": { - "lo": "767764384364047948" + "lo": "958926249489581173" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_12.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_12.proto index 3aeb9dd429..fe469bbfb8 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_12.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_12.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_13.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_13.json index 6dae7ba65e..e937f94dcb 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_13.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_13.json @@ -1,26 +1,67 @@ { "actions": [ { - "positionClose": { - "positionId": { - "inner": "mSHwo2i5YzvPusdoOrhcYl1stJIFrRR7mOTlufZ9mK0=" + "actionDutchAuctionWithdraw": { + "auctionId": { + "inner": "7VqkK8r4+LjEjibDjcy6lEyQOMrD1GOLhHlgNZVbxuY=" + }, + "seq": "344260043", + "reservesInput": { + "amount": { + "lo": "202717122495478987" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "reservesOutput": { + "amount": { + "lo": "852915895491359987" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } } } }, { - "positionClose": { - "positionId": { - "inner": "KrohYFW3AiAxd3Sdfuydpbp7Lp2G9fNQwra0eFnPQkk=" + "validatorDefinition": { + "validator": { + "identityKey": { + "ik": "kFLH+THPqFcgmeHkHB1P1TH3T0ZoRqXFULot1IVoUQo=" + }, + "consensusKey": "0lEUYNdTh0nbyZhuxF8mCR9k7YWl+zCZwoWAiv1EWXA=", + "name": "test validator", + "enabled": true, + "governanceKey": { + "gk": "kFLH+THPqFcgmeHkHB1P1TH3T0ZoRqXFULot1IVoUQo=" + } + }, + "authSig": "OnyVtDsEae29pj948f6bDEKiZ5MSolrkSdzhtogOpgR8M9/NHG3uFThCbPXfexG9L0g8vocy+AsswOx4tzlfAA==" + } + }, + { + "communityPoolOutput": { + "value": { + "amount": { + "lo": "362303330762116970" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "address": { + "inner": "lych9nwg5qpEJgZayUVwZQEOqBKSBPstKrfLy2Gu7nkuY19p04NNG5bmGELYF3lGa9r0EQja9uFPnlvj4R/ULlGReWs7IEKytEGZE9b6gQg=" } } } ], "transactionParameters": { - "expiryHeight": "3949352929", - "chainId": "qrfschiqxdgzxb-892924459211469308974498987534", + "expiryHeight": "2862319137", + "chainId": "bvqvpyxzxrdkbsakjyfdbfdnvsns-2146", "fee": { "amount": { - "lo": "769594145860330082" + "lo": "826167708543284896" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_13.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_13.proto index d4d37d1b9e..79600f3c49 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_13.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_13.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_14.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_14.json index 01e3641917..b4a7a3000b 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_14.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_14.json @@ -1,37 +1,101 @@ { "actions": [ { - "proposalDepositClaim": { - "proposal": "689883150", - "depositAmount": { - "lo": "169393152499615694" - }, - "outcome": { - "failed": {} + "ibcRelayAction": { + "rawAction": { + "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", + "value": "CrMBCPyRmdwCEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgsI4vejvgMQjqbra0DwwOqiuLu2iBgSAgoAGgsI4vejvgMQjqbrayKPAXBlbnVtYnJhMXphZjVoNnpwNThnODdzbmhwendxOGNxYW1obW51MGNwZW5wdGs0aDNrNGhscnI5Nzdza3hrcTY2NGNrdm45eXR4cGp1eG1mbndwbTN0bjhqdTRtcmVnNHA3dnp5dHZmdXhlM205eXV4djU2ZjY3ZWtmdHdwYWZyZTRqNXEzdHM2MnB4cXMy" } } }, { - "delegate": { - "validatorIdentity": { - "ik": "wqA9fnZGn9YTV8TB7X9XmyYUMdcDvA7aW1KNHGa1TJE=" + "swapClaim": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "delta1I": { + "lo": "903962750346066958" + }, + "delta2I": { + "lo": "64239544125562429" + }, + "claimFee": { + "amount": {} + }, + "claimAddress": { + "inner": "ntQ86q2E4T5q5xMfPa8+6Y6UUr4gnvysSCxrrTAEULTwhJBAsGDkW9M3DoB8ZxSoZsUNgHa/MLmZTjrBOcTpsHhTs5c7xmeGEs/YYFTXD/g=" + }, + "rseed": "yddOunWKNbZba/amCZxMkRn3/6fYYaE2RrQIZy27420=" }, - "epochIndex": "6726", - "unbondedAmount": { - "lo": "972176713087358483" + "outputData": { + "delta1": { + "lo": "815550387" + }, + "delta2": { + "lo": "421335002" + }, + "lambda1": { + "lo": "623" + }, + "lambda2": { + "lo": "1368" + }, + "unfilled1": { + "lo": "1848" + }, + "unfilled2": { + "lo": "473" + }, + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } }, - "delegationAmount": { - "lo": "885414211593882465" - } + "epochDuration": "1000", + "proofBlindingR": "OMDsm6GKR3aOoN01s0slY5N+oYx7LRsXtEg5axJyewo=", + "proofBlindingS": "5FYCaEdllB89f+pIAJAzl7FpCeM0nfclOext0rhXmQY=" + } + }, + { + "spend": { + "note": { + "value": { + "amount": { + "lo": "192835527635686891" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "rseed": "5YY05QrCmAKHSGOOnWpTMKo2YFFXdETsXar+9TTYZZo=", + "address": { + "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" + } + }, + "position": "91417552315437", + "randomizer": "4jIEG9lbOj7O6noC4qfzXHHMxjr0KsiFJk5KVeS4OwQ=", + "valueBlinding": "KO7e8Dr5D6HPytuslNOAPKAn/rKF2JBD6/tJbqPLKAE=", + "proofBlindingR": "dCCdi1sZm5xCe3FhPLr8vNJKXoBQ5OF0DNFNEUJDwQ8=", + "proofBlindingS": "AKib8uL1JVgDjrPJtX3/0MBfcDUYvhqhr6xt+tydywk=" } } ], "transactionParameters": { - "expiryHeight": "3715525953", - "chainId": "jolxe-84624395377984128911110845038766", + "expiryHeight": "1619113480", + "chainId": "ybe-043596547717848724790145571744", "fee": { "amount": { - "lo": "646445886750715744" + "lo": "565216682890262079" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_14.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_14.proto index a3eed28f2d..f90f053770 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_14.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_14.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_15.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_15.json index 932276b4a1..96ee473ba2 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_15.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_15.json @@ -1,94 +1,66 @@ { "actions": [ { - "actionDutchAuctionSchedule": { - "description": { - "input": { - "amount": { - "lo": "231578760967679311" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "outputId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "maxOutput": { - "lo": "360702053577727975" - }, - "minOutput": { - "lo": "591896268862969971" - }, - "startHeight": "320984777", - "endHeight": "320984778", - "stepCount": "19059694", - "nonce": "DgLu0ujwXu6r+0U1HpbNZUpfE/iS6vbiMjIzmKgm3AU=" - } - } - }, - { - "validatorVote": { - "body": { - "proposal": "384177720", - "vote": { - "vote": "VOTE_ABSTAIN" - }, - "identityKey": { - "ik": "O6xPGcRRVrK0042t4m+J8PBVSlOM0xlwS4LJkzX4KE0=" - }, - "governanceKey": { - "gk": "oOW+9MNtd4PRe0UZmXSTnbXuOv74R7+vJoJ6LlZi2Qo=" - }, - "reason": { - "reason": "r07EPg2ECnZ" - } + "undelegate": { + "validatorIdentity": { + "ik": "1edcSaV2YSnQlv4fYAk5qBsIeuxMDGgzctO2IOYZhP4=" }, - "authSig": { - "inner": "Rjw/r4oM7JUaZcahZlBRumOF/sINrJ/vFwlaqPkudgYM3rqxrKFa8VxA9gUhM+SXgyShCjh2GmwQWjzma6S1Ag==" - } - } - }, - { - "proposalDepositClaim": { - "proposal": "691542328", - "depositAmount": { - "lo": "418660932352186677" + "unbondedAmount": { + "lo": "652405107337655181" + }, + "delegationAmount": { + "lo": "423191983562764026" }, - "outcome": { - "failed": {} + "fromEpoch": { + "index": "531", + "startHeight": "531" } } }, { - "validatorVote": { - "body": { - "proposal": "595107598", - "vote": { - "vote": "VOTE_NO" + "positionOpen": { + "position": { + "phi": { + "component": { + "p": { + "lo": "405908343509531556" + }, + "q": { + "lo": "286261227439288925" + } + }, + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } }, - "identityKey": { - "ik": "D4p1+/sXPi2xJ1v2PHnl5omrdyxWgjaX8vAc/WIjeBw=" + "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "state": { + "state": "POSITION_STATE_ENUM_CLOSED" }, - "governanceKey": { - "gk": "JjiCtDXSugaWvP3XVVoaA6X2PuzCOuPG2u9LsbE+QQg=" + "reserves": { + "r1": { + "lo": "24069323774632283" + }, + "r2": { + "lo": "870580343836603525" + } }, - "reason": { - "reason": "r0nwI6OflMNRPU9dozwvop" - } - }, - "authSig": { - "inner": "btD6IH7D6iH8B26GsYJ9bl0jCZZ8hrZJkuV95IweFA4J1uy/8f4qjm9rrjWs4MJ006QZ8yNgo2TtdYTdX3lsAQ==" + "closeOnFill": true } } } ], "transactionParameters": { - "expiryHeight": "9386398041", - "chainId": "hiosqhjfhw-080", + "expiryHeight": "8897284399", + "chainId": "ylobq-86104941540550730124", "fee": { "amount": { - "lo": "240731926496182685" + "lo": "667876737206031395" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_15.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_15.proto index c435d0f3ad..cfced1f645 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_15.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_15.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_16.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_16.json index 182122b81d..6fb6a8f68c 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_16.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_16.json @@ -1,75 +1,38 @@ { "actions": [ { - "output": { - "value": { - "amount": { - "lo": "665243018704234334" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "destAddress": { - "inner": "puRp8NgFocLXMDpXf2y63cuji9w3tMH+icEs6KQB7JqYyruGjmUv71JnwR7CmbaB20COEmdvq6cV3TTddICCOdPQkdRwFQe8OtWEI2fRUG8=" - }, - "rseed": "UtaNH374qOTRLFP2gClqi8vwqqlM0QU4x0IVzrCPK7Y=", - "valueBlinding": "P2/M83YwziB4lZo2M5LAHx133bXHqhGotjU9LA2QeAE=", - "proofBlindingR": "WOxubf85he0s/TmzLuevDKznRbdWN6KnlXlmQv3HHQE=", - "proofBlindingS": "6cHNZ83GZJH9j5gE/wcgLDvoP4XnaY/nXYfg5es12Ao=" + "actionDutchAuctionEnd": { + "auctionId": { + "inner": "NpcQh7WutIgNuB4gLZHMULBHfoTEIn9nH0I/ZJW5vE8=" + } } }, { "output": { "value": { "amount": { - "lo": "548954363798842727" + "lo": "83459036698122992" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, "destAddress": { - "inner": "nCrK2JVnC+mRPi8CZwJFxsqmvfAT9u2UHDvUW0bgBx+mhXCLMWAThHXOew8LHv2SxkIKFOChd2br0lczfIbQorfe+gzfIKACNvhmu8GQf90=" + "inner": "WpiLWbXoQ1iJjRjJdAmnRRBKGDjthrHX0hFQNLiC25enO58sCgLaBGT/3T1jJPD1RIANnt/qaq08MxEdJlr7Joosa/K+/FdUyrRFmZYqG4k=" }, - "rseed": "34TaN76I7FbIUw1//Ej/maokRw8FMmu1oNVuK5nGgE4=", - "valueBlinding": "z7Ozu8zHAJoEHo7ZiSYio/3JcwuJ3baHexE5A4VjtQM=", - "proofBlindingR": "w1eBEhcL1NW6yScs314mLnIz6W9EsnAvrRGqqH47/AU=", - "proofBlindingS": "VY9lnY7BFZc/NqxmpTcRURObxxAbytnll0TCE52EEwo=" - } - }, - { - "ibcRelayAction": { - "rawAction": { - "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", - "value": "CrMBCJzB/pQCEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgsI6PD0yQIQpoXkdECgh6mWnrXqgRgSAgoAGgsI6PD0yQIQpoXkdCKPAXBlbnVtYnJhMWc5eTQzODk5ZXNycXM0ZnVhZmhyOWo1dWUydjl1anRkbHM2eTM5NjVjbnU2cWh3ZHprY2xtejd4bXRwZjhhcnpjcWZqOGg1a3k1cHFodnk3NGtzam5zZTNjMnM4c3BtZzhrcGtzbjZza3k1cXQ5Zjd1cGVjNHV1NGFkYW5xNTZyNTR3NGVs" - } - } - }, - { - "undelegate": { - "validatorIdentity": { - "ik": "lORJ0OqoRdtKpIyybfzjmoR/NXffzc3T2AGt++oPUVY=" - }, - "unbondedAmount": { - "lo": "178683478111234115" - }, - "delegationAmount": { - "lo": "570675219026179388" - }, - "fromEpoch": { - "index": "7429", - "startHeight": "7429" - } + "rseed": "hn+qhyQtQdnNbLfNdHQwnwgMzs1eflt4hI4mqzi+mQM=", + "valueBlinding": "nV6a0O13yBeAhah+wcm/aNUhJdUiq8Mua3ujBa0QNgA=", + "proofBlindingR": "Eej14sL2Skl0SYxXTq7ciHKCD3JtByH6Sq6Elc/6EQo=", + "proofBlindingS": "XrcmXBBaJdntvIAF12U1/8f50jXEKPl1Qgpt2EwKbhA=" } } ], "transactionParameters": { - "expiryHeight": "9325916248", - "chainId": "ghwhyscwxe-1815907713", + "expiryHeight": "5735637417", + "chainId": "uqzlchsr-4173002039288", "fee": { "amount": { - "lo": "677300168596627378" + "lo": "293556492150926753" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_16.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_16.proto index afb6464f70..c1ded59077 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_16.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_16.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_17.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_17.json index 6d20c57e41..3046c5dc06 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_17.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_17.json @@ -1,32 +1,76 @@ { "actions": [ { - "ibcRelayAction": { - "rawAction": { - "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", - "value": "CrIBCNny78ABEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgoIsaHPLhDVifVjQLiBv8aeteqBGBICCgAaCgixoc8uENWJ9WMijwFwZW51bWJyYTEyOGxyZzBwM2owdWdmazY0OGF4OTQ3emN1c3V0NWx6NGRhc3Izc3VkNzh2YTI0ejM0c2tla2h5YTBjbDl3eXRodG10enBqOXFnNHN3OGxzeDh0Y3NtNHc0eHl0ZHo4aDVzZHBuN2tkc2RlNXE2YXU4OWg0c3FjbHZlemQweHJ5anV6YW1hbg==" + "actionDutchAuctionWithdraw": { + "auctionId": { + "inner": "Ebkw77OmywWGtpcB2gTOVNdaKPoVty4ds+3Wwae9+T8=" + }, + "seq": "566502593", + "reservesInput": { + "amount": { + "lo": "153567350831122269" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "reservesOutput": { + "amount": { + "lo": "729359186201394366" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } } } }, { - "proposalSubmit": { - "proposal": { - "title": "ukhtnhaurljoogduvrtu-8886604389569723108242099", - "description": "dcfkvrcduxgvpufyfpxvwdis-8399792816821765872420", - "signaling": {} + "validatorDefinition": { + "validator": { + "identityKey": { + "ik": "gmSFpOpq6qAbdJIkfigBbyxxcJtBpFGZF9UogI0aLxE=" + }, + "consensusKey": "iEaJjSBKrHH8a1/TGFda05/odkKHCnMPwW7fIn0OHEc=", + "name": "test validator", + "enabled": true, + "governanceKey": { + "gk": "gmSFpOpq6qAbdJIkfigBbyxxcJtBpFGZF9UogI0aLxE=" + } + }, + "authSig": "NCD5R43L97s8o/wyqW6IPXiQePB2xdSWku0jTKGkzwg1d/Ooc/Y2BekBPiLexY9p68/TUXiveXicz6LoEyVSAQ==" + } + }, + { + "actionDutchAuctionWithdraw": { + "auctionId": { + "inner": "0JUM/Bm6bTFjVmdWO+Z7LRjxpOcZsenc7KzDtlm5h6E=" + }, + "seq": "757578885", + "reservesInput": { + "amount": { + "lo": "646532044673010656" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "depositAmount": { - "lo": "321526110022575246" + "reservesOutput": { + "amount": { + "lo": "465630247405672762" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } } } } ], "transactionParameters": { - "expiryHeight": "8869240622", - "chainId": "ejncirwpcmcnhwqfbueioddpxl-552696602438162813836332962848", + "expiryHeight": "7162048338", + "chainId": "flsotzgnlautqbiqldcfdubkdokkgjfa-8149786884447743", "fee": { "amount": { - "lo": "719278308610776819" + "lo": "318135002609846213" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_17.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_17.proto index d682c2642f..00257e5dc2 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_17.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_17.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_18.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_18.json index 3562285edd..6d87c2fa5a 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_18.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_18.json @@ -1,29 +1,7 @@ { "actions": [ { - "validatorVote": { - "body": { - "proposal": "433868762", - "vote": { - "vote": "VOTE_ABSTAIN" - }, - "identityKey": { - "ik": "yJF7/ir86z9K3eqh+snchgVsoEAGDXwaWe1WIMiIGXE=" - }, - "governanceKey": { - "gk": "WrIbtJlyIHOBaxtMPTGL+8n004KJyVMvlrZMNyRm7QM=" - }, - "reason": { - "reason": "WSvLXG4muw" - } - }, - "authSig": { - "inner": "Iu+RtCKmmSEl9eBqebhuCP/LbXXgtP7TMi7IHHkDXAx5nPg2mX3n0MnB6/4gRQQFOuGoF6f/g4s0XEpo3bjWAA==" - } - } - }, - { - "swapClaim": { + "swap": { "swapPlaintext": { "tradingPair": { "asset1": { @@ -34,93 +12,103 @@ } }, "delta1I": { - "lo": "465829374333220447" + "lo": "450679538706493777" }, "delta2I": { - "lo": "389404366201733039" + "lo": "126319367589660389" }, "claimFee": { "amount": {} }, "claimAddress": { - "inner": "0yIYHUybwtBLPJRAJ5oz7BGZpNCnymWZhskANWNYIJQfk28YKNXiv9SKseFBbmc+U775aAWXmhnq1aBDIFF8K0q4ASW3yJFayBin6Ewm2Jw=" + "inner": "nyfCnOPq/1SWlTT2wOepXQF+/ehlsJ3Sn0kta4riMRouq/tPDTMLcYHacbha1Md4SHXNFGVOL5p5AkF/pygXIzFG+B5yTrlX3rSO3KrW3O4=" }, - "rseed": "48Mi68EtOvpNOm9Wqq51eKYrT/WnkJs7KkE4OVR38yk=" + "rseed": "h1KMCuKQmFka8/s14LU14A66ckPnJs5A2z6OIdNc+dU=" }, - "outputData": { - "delta1": { - "lo": "1143809394" - }, - "delta2": { - "lo": "1844876929" - }, - "lambda1": { - "lo": "385" - }, - "lambda2": { - "lo": "791" + "feeBlinding": "pOIGo0maX17pK/KbJvpKwigBaoPMf7j01RbLknrajwE=", + "proofBlindingR": "i4iyNAiwXlB/+b1Wu+Py8waJ1FtrnlSG7OaIcGxtfRA=", + "proofBlindingS": "daEoKVFBRQj/gV9k0tPRfQjJ+ffR7TlfS13JdVqgfAU=" + } + }, + { + "validatorVote": { + "body": { + "proposal": "4539776", + "vote": { + "vote": "VOTE_YES" }, - "unfilled1": { - "lo": "971" + "identityKey": { + "ik": "WP+biPTRsC6aO0nrUPPP38evF59Wjr/Xi82LGDBUHDo=" }, - "unfilled2": { - "lo": "1804" + "governanceKey": { + "gk": "qBGLawt1UEBg7vu+RB5porcvFmoXz7lttdkB3hxhBBE=" }, - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "reason": { + "reason": "A" } }, - "epochDuration": "1000", - "proofBlindingR": "CfFvwjnrqD67ft4nN/eVwOLc/cy/mr1xxLcPoF2kbQ8=", - "proofBlindingS": "CM4A5MbjLTKDCOfeDmo1i/FQrDdwl4k8j5mJegejqgo=" - } - }, - { - "proposalDepositClaim": { - "proposal": "671185253", - "depositAmount": { - "lo": "666618712589078695" - }, - "outcome": { - "failed": {} + "authSig": { + "inner": "mL+/i1+0igt/vp+S6lkfls86nKNe4DetR+Wyi70B2xC0/Ub+3UgInp2Wl8PhnDzJlutoDulkWEA/MtXgaJMxBA==" } } }, { - "spend": { - "note": { + "delegatorVote": { + "proposal": "801264827", + "vote": { + "vote": "VOTE_NO" + }, + "stakedNote": { "value": { "amount": { - "lo": "962700825601223425" + "lo": "195361192567010760" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "rseed": "fw6l4n267ydP+FhsT5t3ycPgFONk7/pe0wqAEe4iVZc=", + "rseed": "seTFE2ojTZRrt/OdFw1qeIOvyXpxIhmrhYd8euDCXxM=", "address": { - "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" + "inner": "sCQeR13Tdg+kGq8gAp3QGZZkF61wC6867fA3DNjKAkKyFIZTPfiUqNn9lhkeeGMffzHpi5gEje1k6FFeA2yGX/Q8wA4kG4U0zexRON8Kons=" } }, - "position": "128408031194944", - "randomizer": "gMLA/74F63g/N8UM+OIeVm+mduZHjirsIl/bqKzHiAM=", - "valueBlinding": "FL4tJUpwkfNdtnnHdNT5CUIOhztk3d1JiaKqrAjRwAE=", - "proofBlindingR": "ls1c0Q4tIxf1X1sXC+hCz1vTxWhPhlOeOiBmpXMM0w8=", - "proofBlindingS": "1Yoo9U5k9QLlWy3l0XT8/Jc4xmWbifGtaGTztuTTSBI=" + "unbondedAmount": { + "lo": "120455252963122179" + }, + "randomizer": "HcAiK2z13CfVanylI6HmWv54CpFHyx52djlnPJ33xAE=", + "proofBlindingR": "tHpxdl4BpoixbDRntX4zCTSUch9vJHAHLDwdvMgRdhE=", + "proofBlindingS": "v8KUvc/dQ55r2j3XBeCJxdf/sINVjaS/ynF4snpWWRI=" + } + }, + { + "validatorVote": { + "body": { + "proposal": "924123106", + "vote": { + "vote": "VOTE_NO" + }, + "identityKey": { + "ik": "uFS2zE4/p7yjRy6AHccIXyMImI/uf0fapsLl02U60P0=" + }, + "governanceKey": { + "gk": "HqGZu1LcOIG5COBEQbgHUnqHFyscIO4cA0B5a81cAAY=" + }, + "reason": { + "reason": "3SH4MAys2CLxCDc3kYOAQ" + } + }, + "authSig": { + "inner": "hKvl5MGPmrvn32dTAjabn7ZOO8QM4MCnYsJNLXNHCAQmYJKP2g/bI5jOcVBD/U2ZrNYoG+uZQLjdemDgWNrRAw==" + } } } ], "transactionParameters": { - "expiryHeight": "8541370643", - "chainId": "brcmtu-524583", + "expiryHeight": "7447856114", + "chainId": "rlem-824222727", "fee": { "amount": { - "lo": "384877841729248457" + "lo": "247564217065442218" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_18.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_18.proto index 1dab4560d9..d77ef47f0a 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_18.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_18.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_19.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_19.json index e1d6941cd1..27810599cb 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_19.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_19.json @@ -5,48 +5,123 @@ "note": { "value": { "amount": { - "lo": "228486500547001620" + "lo": "374513108587660340" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "rseed": "xw+w2iczOily4Bmg9rhwyNvmKa7+Ro3OXycf/wYc4+o=", + "rseed": "qU8p2IbvAmG6UPKSPnAcgK/dv84gnRM4W/1eeelUbmw=", "address": { "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" } }, - "position": "191064233123894", - "randomizer": "QmtBrveSkpfEHougeurA2mxXatitIfUyKVVhD2tfQAM=", - "valueBlinding": "H/U0LiwlCiEdvlPMNEPwTZNo3kM3awxsyAvMUaozZAQ=", - "proofBlindingR": "MQf3qCecQ0me3cbTSajlk/R7opNXFangjO+AZ+zovwc=", - "proofBlindingS": "P05XWu6efIOJLSXEMj8dAwKJZDkN049/iqV+INLQGg4=" + "position": "138656546134518", + "randomizer": "NpardAFYa2LUJEB4Pq956AOXutHHx3MrssCVF95OAwQ=", + "valueBlinding": "XPVuUOvHT1j2+e0cLpyuhPm/+R6IwvYdqrmjiACKEgA=", + "proofBlindingR": "gq+DZDRbyoIWdS7O4pWSR9ZXXfFHssGQu/9+aMdvkwI=", + "proofBlindingS": "z95DYs2fH1oiUK20Wz+Nav1BFRLzzt9FbbkKstZcZwM=" } }, { - "undelegateClaim": { - "validatorIdentity": { - "ik": "D2QCjRUFQ8AGjzhxjaUXVDCps1XNZvl7tt0C5KVMpso=" + "delegatorVote": { + "proposal": "527938867", + "vote": { + "vote": "VOTE_YES" }, - "penalty": { - "inner": "AAAAAAAAAAAAAAAAAAAAAP8uSOinHeaa1Cw8nuy/sVw=" + "stakedNote": { + "value": { + "amount": { + "lo": "149450715781062372" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "rseed": "yo48PbKNbUEU7jyeXRrIswPLFYkAng7uVr9Ip0u7X6I=", + "address": { + "inner": "/Hsw0yO3A05arKMTb+W4QxUYOB25mOJiwFpv7ev8eaMJBA11/1bn41JMvh4l2Q+/T2Jq0uNLAMFKCuu+k9Z8JxhPfCaYJa19m+rvAHQq+2c=" + } }, - "unbondingAmount": { - "lo": "892544287019598744" + "unbondedAmount": { + "lo": "280447089898539148" }, - "balanceBlinding": "mjYsMVw0OwxBVQ3tn/iznkFqZVqfFT4knlbP7kd8sAM=", - "proofBlindingR": "nkuCJkhdID0lifnPFr8cXANIr5bPo/WznHMoMZ9GSg8=", - "proofBlindingS": "OKjF1U8UKmNSRt30GiLb5RWP1kr7/aA4Rk7HslqB2AI=", - "unbondingStartHeight": "69459" + "randomizer": "Nkh1WUu5uk4ysLcorHdvnCRH4k0tpNC+V6x21debdwI=", + "proofBlindingR": "myupnMvxJ7xDDofYk1HnWJDSCMlI9vZuJcwkIqMdUgQ=", + "proofBlindingS": "3iTppN6W+R06YdxnjRHUDZ9PGDrxMKCzz9OzJiSQ+wM=" + } + }, + { + "positionOpen": { + "position": { + "phi": { + "component": { + "p": { + "lo": "719197237497167624" + }, + "q": { + "lo": "397950788870789469" + } + }, + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } + }, + "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "state": { + "state": "POSITION_STATE_ENUM_OPENED" + }, + "reserves": { + "r1": { + "lo": "994274473767032393" + }, + "r2": { + "lo": "167793417364581357" + } + }, + "closeOnFill": true + } + } + }, + { + "actionDutchAuctionSchedule": { + "description": { + "input": { + "amount": { + "lo": "520308649858419396" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "outputId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "maxOutput": { + "lo": "12336872967049834" + }, + "minOutput": { + "lo": "119920714743932160" + }, + "startHeight": "974259539", + "endHeight": "974259540", + "stepCount": "733403711", + "nonce": "k3bqBuCTxNbl7Er14ns58STMZLjPBEJY3m0l4sCD38E=" + } } } ], "transactionParameters": { - "expiryHeight": "7871232772", - "chainId": "i-38738156725540269211759315", + "expiryHeight": "720551258", + "chainId": "omiqcayqzvmwnjlxt-4103988138361544885895", "fee": { "amount": { - "lo": "834034513930156666" + "lo": "275742935622991629" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_19.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_19.proto index a4e7182830..41633ed110 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_19.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_19.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_2.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_2.json index 371a01d0e6..472593af9e 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_2.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_2.json @@ -1,55 +1,62 @@ { "actions": [ { - "positionWithdraw": { - "reserves": { - "r1": { - "lo": "448142028566267796" - }, - "r2": { - "lo": "159939578440165984" - } + "actionDutchAuctionEnd": { + "auctionId": { + "inner": "VYezwv97G9nQNRn35nV4WebMP8okHfbjnOmQimlJZOo=" + } + } + }, + { + "undelegateClaim": { + "validatorIdentity": { + "ik": "TgEbWhKRGwXVT7X07V3oOkiDKnfLhhAPR7/I5cFs6js=" }, - "positionId": { - "inner": "BI2WURu9pwvwJKDnC9cwjFSnunkzpqQEo1HhNJ6i2Lc=" + "penalty": { + "inner": "AAAAAAAAAAAAAAAAAAAAAP2lEZzgdfb9If8uSOinHec=" }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "unbondingAmount": { + "lo": "236192147324642655" }, - "sequence": "1" + "balanceBlinding": "pcSyp+0ZI12xnL61ZCjjfzSI/zpgIjL+m/mL3m50mwI=", + "proofBlindingR": "0CgdNtZxyopCf/8ZcaCx7ytEGjsU0d6xYaBy0S77Vgw=", + "proofBlindingS": "ZrPhroQaUNR99M8WZSN7rN/c+jZt34Kpo0BgDek7FwI=", + "unbondingStartHeight": "26047" + } + }, + { + "actionDutchAuctionEnd": { + "auctionId": { + "inner": "HrmEHmN2Bz2Vp6avUKXAj7BOuyb4j/0EYuFCpbL7hIc=" + } } }, { - "output": { - "value": { - "amount": { - "lo": "453684090974683838" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "ics20Withdrawal": { + "amount": { + "lo": "911737673908180412" + }, + "denom": { + "denom": "FErOXYGQDpVw" + }, + "destinationChainAddress": "penumbra1tvlwe4mh85v03v7avstvx8a7kepgdu5g9lv4lzqdzpll0f39denssc78e9a7vw8rsay6kexxd3wvvpg32evnacrrqt80fcwsy6mlxj87kyn7msudpqglng7sf48wxghg38ct59", + "returnAddress": { + "inner": "FMYEYGRLbJ101Z6T3WSBhQ/+e2TEuRyBOq6tRqhsqJNzxeL9Wqb8l1m6YE29DKuwKDSFv7YrE87dA7/APT2eqwYCmwkcOCerJpfdqY1/CpM=" }, - "destAddress": { - "inner": "dd95Ud+vmNutjKWK+7UJPgtHizVjx45bEokyQtR7oT4/JYCruYZMzhsBvhmqjFA5eXEFhbk4yb66rfWp8ja3KdEo/PksHMdMmOcO2FpBP3w=" + "timeoutHeight": { + "revisionNumber": "903092555", + "revisionHeight": "978594169" }, - "rseed": "Jh0drx757DZE3ndNdnopPf/SuPIIxVrGTujOSvmu3Z0=", - "valueBlinding": "lq+gtuIgMgT3n+MbhMmtk7SxGh+QIHZWQmSe3HxC8AM=", - "proofBlindingR": "FG0uL0Of+v8LBP82ixIQ24Ljr6fDEjkLP0HVcZqApwY=", - "proofBlindingS": "4uaJAArj6b69w+seF29Cv9hRfnWmL9kZT7jsVh+FjwM=" + "sourceChannel": "channel-0" } } ], "transactionParameters": { - "expiryHeight": "5511246800", - "chainId": "fvbnjrbyirmhgsrtpnwtykibntihvt-688696", + "expiryHeight": "3955178049", + "chainId": "ilsk-1087364960", "fee": { "amount": { - "lo": "228194173552427870" + "lo": "907150153473128157" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_2.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_2.proto index 4c766050c1..d2a6d602ac 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_2.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_2.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_20.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_20.json index 97775a9f08..2cb3e033b5 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_20.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_20.json @@ -1,31 +1,61 @@ { "actions": [ { - "communityPoolSpend": { - "value": { - "amount": { - "lo": "917708635555222740" + "actionDutchAuctionSchedule": { + "description": { + "input": { + "amount": { + "lo": "852903475409611982" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "assetId": { + "outputId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + }, + "maxOutput": { + "lo": "106360354624939678" + }, + "minOutput": { + "lo": "729172063334541035" + }, + "startHeight": "464161322", + "endHeight": "464161323", + "stepCount": "996995986", + "nonce": "Tlmo86ylsGCMpVscVBPXQixErC+XNy/9eTbfKvuoO2A=" } } }, { - "actionDutchAuctionEnd": { - "auctionId": { - "inner": "szCiZisOXrERqpzOkyvnLAYj1m6nJiuM5gXysKNJWqQ=" + "validatorVote": { + "body": { + "proposal": "491603755", + "vote": { + "vote": "VOTE_YES" + }, + "identityKey": { + "ik": "mvbp79FxNcwJDRNz533JdrwGSpCduI7KYOpwLNorOz4=" + }, + "governanceKey": { + "gk": "mFBPjK0cZjm6tnSblfbvxA28DjHoYtxfPKvYPwzNMhE=" + }, + "reason": { + "reason": "U9584s0" + } + }, + "authSig": { + "inner": "5EuZSh0QqnLMsMJzY93mSFmBxzk4arCfb55iJqzi7QGXJIhwcfI9NbZohFf5eQu5GjINNmh+HccR/rdyYmVlAQ==" } } } ], "transactionParameters": { - "expiryHeight": "5861263868", - "chainId": "q-921525899986864461645755934", + "expiryHeight": "6430231960", + "chainId": "uzovlndphgwcmxrqavmbmfx-72884303434896050268298352", "fee": { "amount": { - "lo": "194766905819855844" + "lo": "427556939212154174" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_20.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_20.proto index 88ae7e136d..3e31e682f8 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_20.proto +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_20.proto @@ -1,11 +1,19 @@ -5’2 +©ª¥ +¢ 0 -Ô©ÏìÄä–Þ " - )êœ/3qö¤‡çé\$pAô£VùƒëN]+;Ï2,©j -'²$ -" - ³0¢f+^±ªœÎ“+ç,#Ön§&+Œæò°£IZ¤3ü“ïêq-921525899986864461645755934 +ÎÙñ»’æ‡ë " + )êœ/3qö¤‡çé\$pAô£VùƒëN]+;Ï2,©j" + )êœ/3qö¤‡çé\$pAô£VùƒëN]+;Ï2,©j +žÍêœÝÅ÷¼" +ëÍƹĢ +(ª”ªÝ0«”ªÝ8’ç³ÛB NY¨ó¬¥°`Œ¥[T×B,D¬/—7/ýy6ß*û¨;` +§¢£ +]«Žµê" + šöéïÑq5Ì sç}Év¼J¸ŽÊ`êp,Ú+;>"" + ˜POŒ­f9º¶t›•öïÄ ¼1èbÜ_<«Ø? Í2* +U9584s0B +@äK™JªrÌ°ÂscÝæHYÇ98j°Ÿožb&¬âí—$ˆpqò=5¶h„Wùy ¹2 6h~Çþ·rbeeH˜›–ú2uzovlndphgwcmxrqavmbmfx-72884303434896050268298352 -ä÷“Û€ïüÙ \ No newline at end of file +¾Êù×Õ˜¿÷ \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_21.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_21.json index 4464d5d3d9..5c3a07fa91 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_21.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_21.json @@ -1,33 +1,5 @@ { "actions": [ - { - "delegatorVote": { - "proposal": "121003569", - "vote": { - "vote": "VOTE_NO" - }, - "stakedNote": { - "value": { - "amount": { - "lo": "659701247588815343" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "rseed": "eVXL+cwVvEbw94yx6Y4GwdT7fD74D5arK577wavN3L0=", - "address": { - "inner": "Ues2mUiCHO1TLPpiZ5nhS1KOkAq5oBQ0bhT4YQJWq069kBkcsnu4wVXTHo+OKYELBddtTDK3GtkVXaGbb/10kOfRb7JedlL1fsJ3OJhG49A=" - } - }, - "unbondedAmount": { - "lo": "489765041566529319" - }, - "randomizer": "qDmxGszrYPzqiRi8pRDriYo0XeluMaY+LaeBsfLPSAE=", - "proofBlindingR": "0ci8CrVKQYvh0brJHYN/XphpE5aCtTXkb6ZnB2fvpRE=", - "proofBlindingS": "8JxyowxnuAzm6TrvuKXPmlZANCbgABRP67RBigLeNg4=" - } - }, { "swapClaim": { "swapPlaintext": { @@ -40,37 +12,37 @@ } }, "delta1I": { - "lo": "856865201767983171" + "lo": "889307568205361427" }, "delta2I": { - "lo": "669679229868599527" + "lo": "568711178708103792" }, "claimFee": { "amount": {} }, "claimAddress": { - "inner": "XbdvNRhbP4luPjXFjLAuvdKyoNzTSdZy3ccMZr35Mf5kNZgFWoDu+EvkAP/ZHgwuJq6XyvaGDQomyfIyk58ffd+PFoCJAoe5nTr1DW4NeD4=" + "inner": "A/iBmUMOQaHw6wlJNW5zEHjf9j8ZxoOypZNoSoPRGMEkJX0AU6Xy29kMaH2X4293iMDW9anGDJVIvEhtU9cJXarVopygkQyt0i180FEdNEg=" }, - "rseed": "Y14bb0icw5Dqm2m6HSANFRjAzrt8PQKkjzQ7I0flZ7E=" + "rseed": "Gd18Qxp4KzDUjswZSGoZ1P+Ob9ENgf8shU+R/qQ0lyA=" }, "outputData": { "delta1": { - "lo": "1789764782" + "lo": "577955577" }, "delta2": { - "lo": "263535163" + "lo": "386358974" }, "lambda1": { - "lo": "322" + "lo": "50" }, "lambda2": { - "lo": "1415" + "lo": "585" }, "unfilled1": { - "lo": "338" + "lo": "1242" }, "unfilled2": { - "lo": "1392" + "lo": "378" }, "tradingPair": { "asset1": { @@ -82,52 +54,60 @@ } }, "epochDuration": "1000", - "proofBlindingR": "OfCsd2XlcOA85BwRjol+QPoFOE5vUvvUvMgEf5y76Ag=", - "proofBlindingS": "YbH+W2oXNb1MKmKl8KxGx8iYHmwwpmzVzmFWoYvCSQY=" + "proofBlindingR": "CpJM3sZk6FW3lMhC2TMjSoY3MnE3BD1Ux8OK8aG56AM=", + "proofBlindingS": "ZwXx+fhJOtQZG3NvSNWfeIgc2ed1IJnkaBHSGsps9Q8=" } }, { - "swap": { - "swapPlaintext": { - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "delta1I": { - "lo": "145727323355446220" - }, - "delta2I": { - "lo": "432213987928087988" - }, - "claimFee": { - "amount": {} - }, - "claimAddress": { - "inner": "0Q5F3OVQoSL982AQLDfegNpwIE8I4I3cvEEh7JUlUr8MH7dGPLORXsvbUEVai2wvht/Ug/tdjz4l0z4wa3VnsIb7TYTih5nbpGC3IbyxdUc=" - }, - "rseed": "cOGPni5ZhqvZMo8/R4OeVarCjqn6ASQLXMQmqXRic28=" + "ics20Withdrawal": { + "amount": { + "lo": "622833085392615376" + }, + "denom": { + "denom": "VWNlsr20B1kesWvCKUqnn" }, - "feeBlinding": "IJLrByzc+Mo8f7yIHFk0ii8VAaouqg/8QOSEajMCugI=", - "proofBlindingR": "TgFi8UTAISRBmw4RyV7Wf+Q7Ib5+fGX4hxl7eA0QVgE=", - "proofBlindingS": "WjtjjKRqGfUwYFX70NNu0/LV0eEjVp15w7kifmPpNgo=" + "destinationChainAddress": "penumbra1v90epag3cywwh0yzyhtg9gkm2290ksedwx58c8y452325ugamkc7zdn42twrngv47ttvy3nlynutxw69x32cv66tcu4huwpt2n62jnyav3aamwtvv2uqzjka77jx6qyeyyd42v", + "returnAddress": { + "inner": "6jb2b1WTNptB8HGTVx0+WdG0uEzaeTNRCmlzYTTspH/K86A5hUmKRhmqwFg1UkRAoTUTTWIRcJnP+r1uGU0Wpuz1geJ6Hj7Y09P2IF3MLNw=" + }, + "timeoutHeight": { + "revisionNumber": "734267909", + "revisionHeight": "94646215" + }, + "sourceChannel": "channel-0" } }, { - "proposalWithdraw": { - "proposal": "368149084" + "communityPoolDeposit": { + "value": { + "amount": { + "lo": "38307922394150101" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } + } + }, + { + "communityPoolDeposit": { + "value": { + "amount": { + "lo": "684122539102630178" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } } } ], "transactionParameters": { - "expiryHeight": "6138363882", - "chainId": "ccsdv-258389131009338200158065480", + "expiryHeight": "4401171500", + "chainId": "ouqrrjupnfzj-181537784", "fee": { "amount": { - "lo": "930887027958765775" + "lo": "207487367950478689" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_21.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_21.proto index fee9f006af..a5527d7a0a 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_21.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_21.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_22.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_22.json index f08c732734..f54fbc49a9 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_22.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_22.json @@ -1,53 +1,71 @@ { "actions": [ { - "proposalDepositClaim": { - "proposal": "347679757", - "depositAmount": { - "lo": "39878010524424389" + "ics20Withdrawal": { + "amount": { + "lo": "572239724687197090" }, - "outcome": { - "passed": {} + "denom": { + "denom": "A2MGbzORYRg41K8GwMytJ1oqZ0x08" + }, + "destinationChainAddress": "penumbra1hka24z0t5kqff8msam89fwuj60zx3f6xpej0qu49tw5uwy5wak2pn6ugazu79r90t5s0m3q03mmkssdps8mju0ru3dtas0dfeg9e5m7dyq7usdpvwlhpwel9zz6ucq3twl3g2r", + "returnAddress": { + "inner": "WG1ai0Eo+VBmKuIT9vHnMLYfe24xYc2bsheBAZ1ewrwugYutcjPhxhyPIiV4KibWHijW8byStrrKCdid57odQZbX81iR2avskBL2cr0CZEI=" + }, + "timeoutHeight": { + "revisionNumber": "345822725", + "revisionHeight": "838775103" + }, + "sourceChannel": "channel-0" + } + }, + { + "ics20Withdrawal": { + "amount": { + "lo": "390857031570369572" + }, + "denom": { + "denom": "2" + }, + "destinationChainAddress": "penumbra1q2ghutkfmpwq4ct2zvjqpksvwdg5xkkq0tg25fde5s87tvp7ucm7y2g693awtxdq0te0j0g7ky69aymk2yc7835tk4qgl36x395w4j7gvtf8ck5dnf7w0xp6quz9d5hzvfpg63", + "returnAddress": { + "inner": "TXxuazPdQ/sgLgIMxQWVdf/NLf72N/jSQyHiHJ2wAiGk7ZtL1jZfjQ196ATbfyVi3Co2MwTkCKJlCxU0c+COY3tNcbC/9UZJbehTlulvmRk=" + }, + "timeoutHeight": { + "revisionNumber": "752492919", + "revisionHeight": "158576005" + }, + "sourceChannel": "channel-0" + } + }, + { + "actionDutchAuctionEnd": { + "auctionId": { + "inner": "a2OfCkeK70+VP2oQgtk5BHUyev6nMFBIRDEVywdyXbo=" } } }, { - "swap": { - "swapPlaintext": { - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "delta1I": { - "lo": "440428726584271908" - }, - "delta2I": { - "lo": "429081527681360989" - }, - "claimFee": { - "amount": {} - }, - "claimAddress": { - "inner": "btIatxMHVsfJzP8cJlEZhpw7QzCB0kqLa7fhKV9KM7As3xwueWnEjfh9MAv6/6EDQAVJm+x1mq+/dzGi7OIjVxvqJns5hp0h87f96ZzHBTc=" - }, - "rseed": "0TJR8ExhmjYVlHjJ+fAdH2SSR50UYS5pDCN3N2pPNQs=" - }, - "feeBlinding": "3Qmcx7XB08EfEMpYp/9GcAF7ZTf9Qm9N37uFErdZ2wE=", - "proofBlindingR": "jvGIwY/gcXg2G73YnyW6AfeGVCVpCrNY7VcIQsq8DwE=", - "proofBlindingS": "F4qHttIr3R/UNFdEm1U805YiRaXcMgIhj5IGpxiFIQc=" + "delegate": { + "validatorIdentity": { + "ik": "+BH/P8+1GUpxabAH/z35qtpDT0+7N+Q43i5T0A+Pttk=" + }, + "epochIndex": "2415", + "unbondedAmount": { + "lo": "672535459083675043" + }, + "delegationAmount": { + "lo": "489404686650619208" + } } } ], "transactionParameters": { - "expiryHeight": "4115851543", - "chainId": "ibtrcnbbmgtashboaxr-27900", + "expiryHeight": "880562544", + "chainId": "qaatugygphxmbsuledhdot-1879023991321521745", "fee": { "amount": { - "lo": "471103972333688096" + "lo": "480035210485212500" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_22.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_22.proto index 18b65cf6cf..4b073c9332 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_22.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_22.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_23.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_23.json index c2538bae0a..380b79fbf2 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_23.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_23.json @@ -1,91 +1,38 @@ { "actions": [ { - "validatorDefinition": { - "validator": { - "identityKey": { - "ik": "DvwiJ9bN60KPMzHMs1KIUMuppPKPmXn5lizNuCGB6wk=" - }, - "consensusKey": "aBWF1uPo9dVfwcMoROQnHNxy+iuE7eMdj8sECh8cB1g=", - "name": "test validator", - "enabled": true, - "governanceKey": { - "gk": "DvwiJ9bN60KPMzHMs1KIUMuppPKPmXn5lizNuCGB6wk=" - } + "delegate": { + "validatorIdentity": { + "ik": "1v9Ntnd7yc+RwdVM6gUV0iRCfmTg4eE9zLpS8MURXxo=" }, - "authSig": "TjiZTZRWMEoFa5UnPF4scItN8DPsmGgK0R6uoAa39Qbw5/MAmyne9gt5ARVm5gND8hLMaDpi1eDgi+u5BbDzAg==" + "epochIndex": "9683", + "unbondedAmount": { + "lo": "7195608283177206" + }, + "delegationAmount": { + "lo": "608116032648238037" + } } }, { "proposalSubmit": { "proposal": { - "title": "nrgko-809545601310671678", - "description": "gxewuzssoyxxiznqopxkse-65537443", + "title": "hkupgxtnkcjecxfxb-59864250696317978994561595148302", + "description": "rfn-61385793505989969484", "signaling": {} }, "depositAmount": { - "lo": "647327870098465088" + "lo": "275107701206158898" } } - }, - { - "delegatorVote": { - "proposal": "23311205", - "vote": { - "vote": "VOTE_YES" - }, - "stakedNote": { - "value": { - "amount": { - "lo": "635944744656676444" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "rseed": "0rQLhLFlR3y785DdJ6OlMq49j56TmdUY5lwi/YfRg7k=", - "address": { - "inner": "G+R6IvqDsCJcuStriBxbiql+VXCQkOGh90AIftnrSltId15fo8QdUuCZsOyy9qC2GiXNwvSxXsiWJSGRNaXpC/7Rk5jLWXpZY5MDIWQPn1s=" - } - }, - "unbondedAmount": { - "lo": "767165115394179115" - }, - "randomizer": "8GllYi3tpIMlHho4Z4gZgg9iEJJheIzhimLYwtp1NgE=", - "proofBlindingR": "/alTSasPEKJn0xiqwF5qlCV2x4Qwy/oqWYV6uKJzoQA=", - "proofBlindingS": "Di02t6dpSzo0K5RzwV+mPaPVAp0CkUKfHBD1qi8tKgc=" - } - }, - { - "spend": { - "note": { - "value": { - "amount": { - "lo": "500462582178833477" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "rseed": "xxpg24o6wn0pNp4ybxgeBCH5Xw4kbrUIdRLtouYPmsw=", - "address": { - "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" - } - }, - "position": "47329853871088", - "randomizer": "vq3SgPTqdcDt0eZI7mpikA3RrVicRftI7SrvXcbkvgM=", - "valueBlinding": "k+6ARtUryFLoovYGXrGDsRlA1B9Et6YnSxK4ae7sjwI=", - "proofBlindingR": "CosujW/HLe7W5I81tpE8vvjw0rw6sK+R3q91tj25pgM=", - "proofBlindingS": "4JGEFlHAHGbESb3xfWm1cW1t4N2boYHu1NTbqXLDdww=" - } } ], "transactionParameters": { - "expiryHeight": "5300559743", - "chainId": "wjwtdknusjcorzupfwmosxoyil-13456808", + "expiryHeight": "61488075", + "chainId": "hhjevsgvz-1092128947010650909", "fee": { "amount": { - "lo": "806313302663231749" + "lo": "383385177669936477" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_23.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_23.proto index fb37894049..b67a2f31fb 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_23.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_23.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_24.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_24.json index f9e072907d..4c7cd2490e 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_24.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_24.json @@ -1,72 +1,47 @@ { "actions": [ { - "spend": { - "note": { - "value": { - "amount": { - "lo": "922384207425927935" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "rseed": "8y15DjAPg/i2TPCAOJlgKrTQSQNm2UHKLpJl52H7SKs=", - "address": { - "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" - } + "proposalDepositClaim": { + "proposal": "120412060", + "depositAmount": { + "lo": "406855896174763759" }, - "position": "41332451622106", - "randomizer": "pYbb7GzU1/8FGbOriG+C4LGm1oqnbI2tA4+ZggADmQI=", - "valueBlinding": "/pP8i12FCmrOPB8IF6toWO0/UqCRnSf1/2nXtEptngE=", - "proofBlindingR": "tvJYTWTz/Hw0yraNTwlbUioB8tAx73k8jalIutF7rQ4=", - "proofBlindingS": "Bh38gN8X7P1gFK/ZR59ERQPEpLxnZpmuXRau5tjIMws=" + "outcome": { + "passed": {} + } } }, { - "positionOpen": { - "position": { - "phi": { - "component": { - "p": { - "lo": "432506193895602060" - }, - "q": { - "lo": "155003316029288568" - } - }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - } - }, - "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "state": { - "state": "POSITION_STATE_ENUM_OPENED" + "actionDutchAuctionWithdraw": { + "auctionId": { + "inner": "KCAPhirtUtS/ZA9fay6BvCNsEhSQL6puJNATWVtNRNU=" + }, + "seq": "998480260", + "reservesInput": { + "amount": { + "lo": "93405552749813887" }, - "reserves": { - "r1": { - "lo": "34496988622358459" - }, - "r2": { - "lo": "779446111142524338" - } + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "reservesOutput": { + "amount": { + "lo": "641266880841386287" }, - "closeOnFill": true + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } } } } ], "transactionParameters": { - "expiryHeight": "4919243771", - "chainId": "xcfzzb-445743933420689579348779436", + "expiryHeight": "6491370664", + "chainId": "awrtfzbpxviybwnynzvgdfn-048515371193116354", "fee": { "amount": { - "lo": "673851707019371333" + "lo": "851456879934364220" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_24.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_24.proto index 42893199d5..f85fd1b1ab 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_24.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_24.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_25.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_25.json index f68407aaea..4dff60b3d9 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_25.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_25.json @@ -1,77 +1,67 @@ { "actions": [ { - "ibcRelayAction": { - "rawAction": { - "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", - "value": "CrMBCPP8zbICEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgsIxvbjSxCL0fqiA0DAmL7QoLXqgRgSAgoAGgsIxvbjSxCL0fqiAyKPAXBlbnVtYnJhMXJ3bmo2Y3k5Nm42NXhodjhkZW1hNG02MGZnOWdxamd2aDA3bnA4ODNlY3dxdHJlMGY5NnR2MDRyeDU3dXlwa2YydDQ5YXVlZjM4a2h2d2tmNWprc3hzOXl3Njl3cDh0emo3NTB4MjBlbHRlcDdzdHRjbXZjd241aDRhMHNsNGs5eTlzaDcy" - } - } - }, - { - "proposalSubmit": { - "proposal": { - "title": "kcrksmeyxustsnjbr-60", - "description": "krcxzlpefqzl-75956368", - "signaling": {} + "ics20Withdrawal": { + "amount": { + "lo": "538804046481988255" }, - "depositAmount": { - "lo": "38351685330180206" - } + "denom": { + "denom": "6" + }, + "destinationChainAddress": "penumbra1hnuy4trv58qp3cksy836hyl30gpcpzgrradclyymeuy3ap3j63kguppjmwtm7v22kpgjhjzdr8r0ma432jqqksyetfdd76e3w87ma75e7gy0tpzjh8fh7897u5l2xxl5rvpsld", + "returnAddress": { + "inner": "1VSLf2jK4cvdqEmMN6sE4sJIZc9cJ68vtHPnwD9odx36M2t9RtVVhteE0mo8BN1zGKIBu9uyG+pZNJI/kVQNzMckCXFPpTZH1StBWBBsYk0=" + }, + "timeoutHeight": { + "revisionNumber": "851314526", + "revisionHeight": "827304652" + }, + "sourceChannel": "channel-0" } }, { - "communityPoolOutput": { - "value": { + "actionDutchAuctionWithdraw": { + "auctionId": { + "inner": "5w/bjjPeej6uKczEuGx+Y29PsGP+/tJJgC1s/6JgHOQ=" + }, + "seq": "696467549", + "reservesInput": { "amount": { - "lo": "415888003349099833" + "lo": "859317660454529936" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "address": { - "inner": "zK3UmgXb59dD/4C9/L7P4htU0Ee1rPiWWdUU5AoyqgkW4nLr3VF6ORk2JhOyQlZKIvievUOuytmQvtylncSglmyC0qDP8zz+DWw+/FYHFCo=" + "reservesOutput": { + "amount": { + "lo": "696900593541143710" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } } } }, { - "swap": { - "swapPlaintext": { - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "delta1I": { - "lo": "920853597152247593" - }, - "delta2I": { - "lo": "677865656587699464" - }, - "claimFee": { - "amount": {} - }, - "claimAddress": { - "inner": "i9huSFlTnxHEv1AumWjld1PfJ9s63YrojO92xAVyzfIcVG0Z3SCKJQOFUDc0GbzEqz9IWdvFshvu5KQ0T8djRxauxxR1w3RiD0oMuYoRMCM=" + "communityPoolSpend": { + "value": { + "amount": { + "lo": "714145704592906157" }, - "rseed": "++fkdOajvAONYLoezkuIU6nXn/mC+2ndEgwdHS4FMcg=" - }, - "feeBlinding": "Q0DcLLLIqaOvq7gv2Y1rZ7/w29SF94i8cR5VQxly7QE=", - "proofBlindingR": "2NRy+/3HlDXi9fCZaKrlJQ7IN5T6yaep4lKDe2t7zQo=", - "proofBlindingS": "3WBWe6fyQgkjStsyOQjW/n1y/prYDzB2Gr7f4PCfsws=" + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } } } ], "transactionParameters": { - "expiryHeight": "8982080025", - "chainId": "hwbwaix-06083225540254", + "expiryHeight": "3784034497", + "chainId": "ibulijblmzgtdgymkj-718510258553330849115", "fee": { "amount": { - "lo": "516487876813519810" + "lo": "13587429238892639" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_25.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_25.proto index a2e7175dd4..729bf23b4b 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_25.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_25.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_26.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_26.json index 3a583e3c6b..3a5a801115 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_26.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_26.json @@ -1,50 +1,48 @@ { "actions": [ { - "delegate": { - "validatorIdentity": { - "ik": "/QXLeKKs5nNDGUlootWZo28F38EKtleJ2Dxmz877u5M=" + "proposalSubmit": { + "proposal": { + "title": "zeywfcdsvjgzksgbtututtjefa-28853910783667841305365644150", + "description": "lipqxjmosregeftvjdtdigm-62", + "signaling": {} }, - "epochIndex": "3335", - "unbondedAmount": { - "lo": "268055427198280602" - }, - "delegationAmount": { - "lo": "311754073549817714" + "depositAmount": { + "lo": "28331719177698758" } } }, { - "actionDutchAuctionWithdraw": { - "auctionId": { - "inner": "lBXbj4Fgh8SAUcCnvlW0iL9mC1F+Hjr4h2GmuK7hr4Y=" - }, - "seq": "477900847", - "reservesInput": { - "amount": { - "lo": "494921779002903251" + "positionWithdraw": { + "reserves": { + "r1": { + "lo": "880990439135497488" }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "r2": { + "lo": "169746615128594561" } }, - "reservesOutput": { - "amount": { - "lo": "229786067440132976" + "positionId": { + "inner": "8ILW1neZZGlzNWVNICKdjwQNsvmfHXCe+rt83WWYOPs=" + }, + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" }, - "assetId": { + "asset2": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } - } + }, + "sequence": "1" } } ], "transactionParameters": { - "expiryHeight": "3655773457", - "chainId": "cobadoodnjhaiy-3702176186175231025", + "expiryHeight": "2498312553", + "chainId": "gnamgtbskhkrwtcjzqll-533676462220084624189983359806", "fee": { "amount": { - "lo": "398478972940299008" + "lo": "199236916972045568" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_26.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_26.proto index ee9c97ef96..457b639e0c 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_26.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_26.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_27.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_27.json index 7d56648601..681caaf5ed 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_27.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_27.json @@ -1,64 +1,71 @@ { "actions": [ { - "proposalDepositClaim": { - "proposal": "783703894", - "depositAmount": { - "lo": "541796731181788074" + "positionWithdraw": { + "reserves": { + "r1": { + "lo": "391652752710033147" + }, + "r2": { + "lo": "134680846198451576" + } }, - "outcome": { - "failed": {} - } - } - }, - { - "ics20Withdrawal": { - "amount": { - "lo": "743252449930510089" + "positionId": { + "inner": "dbQIe9jI3aXHe22PAuV7L0momu24S/N5d3WVam9h62k=" }, - "denom": { - "denom": "w9T8N98Xtft1poSBQ1jezl1Xmck7WH" + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "destinationChainAddress": "penumbra1hvtr8r7rmtnrq3jn2mrlnhsktekj8zlskuf25q3d22f3v50v55y2npqzyf9y89ctn6kmepzj9nqz52x2pyvvva4cuqsmeze0zjm49qq9qc8z29pxyh3dnf9y0e43nendsehn0h", - "returnAddress": { - "inner": "Ie/tWniyp+44jUlOZ/KSu4KFuLu+Mkws94JRU3nsFgeLM4PJeYoDYfOmqa7Te4szDUw58IWoobdWbjJAFqJc4PhuYO3Bd1kt5EeQlO8xBQg=" - }, - "timeoutHeight": { - "revisionNumber": "741829678", - "revisionHeight": "639300954" - }, - "sourceChannel": "channel-0" + "sequence": "1" } }, { - "delegate": { - "validatorIdentity": { - "ik": "6jpPsfC8Gf4MZQAEyzqse4OqVDAh0fnL56zaW18vxpo=" + "actionDutchAuctionWithdraw": { + "auctionId": { + "inner": "93m/+jsrOHxCSZvzq+cm09XMISwDwqUY/4hIzdNwiaM=" }, - "epochIndex": "7014", - "unbondedAmount": { - "lo": "906211565715551935" + "seq": "752971574", + "reservesInput": { + "amount": { + "lo": "94416025260118401" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "delegationAmount": { - "lo": "299646488738841482" + "reservesOutput": { + "amount": { + "lo": "422650680203065585" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } } } }, { - "ibcRelayAction": { - "rawAction": { - "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", - "value": "CrQBCL708JQFEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgwIy86PzgEQl6S5lwJAoJi0v6G16oEYEgIKABoMCMvOj84BEJekuZcCIo8BcGVudW1icmExenByNTBmYXhxY2VseWh0OTRndmV2NGR2cjJjcWV1bTlkZmVremhzd25tNm1jdTdranNrY2FwYzh1NXRkc3VuZnk4ajhnaGhzbngwbHBuZmZ2MGx4aHp4dm1tOWM3bW1hMmxydnJrMnIydHhzaDI0ZHE5NnZxeHNycXh4bjY4Z2drM3phMjQ=" + "proposalDepositClaim": { + "proposal": "859418530", + "depositAmount": { + "lo": "957563707595716672" + }, + "outcome": { + "slashed": {} } } } ], "transactionParameters": { - "expiryHeight": "8445758137", - "chainId": "xvpoqcklthqfksylyqqsfgejn-514070812", + "expiryHeight": "3799422114", + "chainId": "hblyjouvwnqvfnsxgdhddtaavcmrlb-44050048334365776635834380897", "fee": { "amount": { - "lo": "62518833093538551" + "lo": "588370223284432782" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_27.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_27.proto index 2695477b4e..c73bdeeab1 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_27.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_27.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_28.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_28.json index 391ca92071..b4bbd28424 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_28.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_28.json @@ -1,47 +1,29 @@ { "actions": [ { - "ibcRelayAction": { - "rawAction": { - "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", - "value": "CrMBCLyz6zQSC2RlZmF1bHRQb3J0GgljaGFubmVsLTAiC2RlZmF1bHRQb3J0KgljaGFubmVsLTAyZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA6DAjg27KVARDrgt/YA0Dwx/PeobXqgRgSAgoAGgwI4NuylQEQ64Lf2AMijwFwZW51bWJyYTE3NjM3bWZoaHk5am04OGx6anEyeDY0NzZmamp3azc5ankycTBodnEwOXgwcGxrM2dsbGRreG4yenFranp6a2hwamx1MDJoMGY4YXZ5OTZ2cDVodXNtOXVrcHF5cHJ6OXB4ZW53N2p3Z2Q4c2FwZnpycTR4cWZsc2RrdWNrMmNlZzZzdmNtag==" + "communityPoolOutput": { + "value": { + "amount": { + "lo": "841433255504353733" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "address": { + "inner": "waUs/UYwv/hsAsQLifKDqgKE1Z/NfXoM0v/zrAYg77z2uHDqM28JDuYwSbBEEDdUJD6wiWuPpv7n5jkXEdrbc9nWQwVxWCG37IRrUnIawbc=" } } }, { - "positionOpen": { - "position": { - "phi": { - "component": { - "p": { - "lo": "774789359106044111" - }, - "q": { - "lo": "402420811295523927" - } - }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - } - }, - "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "state": { - "state": "POSITION_STATE_ENUM_OPENED" - }, - "reserves": { - "r1": { - "lo": "763030398612671458" - }, - "r2": { - "lo": "649126515653168617" - } - }, - "closeOnFill": true + "proposalSubmit": { + "proposal": { + "title": "tzghwlmstdvdsm-945549054283516287874154", + "description": "czoootkzeynfznsrdbqwkccps-4759530430344035191885", + "signaling": {} + }, + "depositAmount": { + "lo": "685651008831161278" } } }, @@ -49,14 +31,14 @@ "positionWithdraw": { "reserves": { "r1": { - "lo": "750752079886260961" + "lo": "580050595495280666" }, "r2": { - "lo": "897781783702494740" + "lo": "881206186437646783" } }, "positionId": { - "inner": "y0uPPUR3gz4uFZdtwKALgY3H0lL+8IRMIZTAIPnDxk8=" + "inner": "vnq33IGSwoxgPf8f7mbPawvuCf5nWEQYGCfwrt6Gpsw=" }, "pair": { "asset1": { @@ -68,33 +50,14 @@ }, "sequence": "1" } - }, - { - "ics20Withdrawal": { - "amount": { - "lo": "409200163497891676" - }, - "denom": { - "denom": "Mbuwd8yp3q5YAmM1V2hN5885" - }, - "destinationChainAddress": "penumbra17syd3uwnfjdfsvu7k3amnd7n3azg7eqz8p5mpd0k54hn6efgptg5zk69j9hmfzdwcyml9gp37ke3s9qt6j7nsm2d4psqajr8weel2pdv9dj92p4mfksy8y7wu870kwvalyqlq8", - "returnAddress": { - "inner": "s0I1iXp2esXR6gQl6NhRHjhHX0ZsStm02CTMO4AugfdFOOmpwkVNr++7M+gasvMXb0Lxu+UCVdlQ+IjvJOxQpnZix8+9v1CxXMD/ah+6zLI=" - }, - "timeoutHeight": { - "revisionNumber": "422915132", - "revisionHeight": "258344837" - }, - "sourceChannel": "channel-0" - } } ], "transactionParameters": { - "expiryHeight": "4923194389", - "chainId": "ihcgxxqkhbvefbdkdgdnrut-115", + "expiryHeight": "5578173011", + "chainId": "agcluxlgrbgatyeqgtfbfphvplgk-7462389386317254", "fee": { "amount": { - "lo": "664252986094135210" + "lo": "708175036828087322" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_28.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_28.proto index 6ef37b98db..283ce2bd28 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_28.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_28.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_29.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_29.json index b24641bf2e..72b25155d3 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_29.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_29.json @@ -3,51 +3,74 @@ { "validatorVote": { "body": { - "proposal": "284956779", + "proposal": "175315831", "vote": { - "vote": "VOTE_YES" + "vote": "VOTE_ABSTAIN" }, "identityKey": { - "ik": "zwa90BizdLKHBr7podM1nq1N9nWrmnDPM2vuILNPcSo=" + "ik": "kKxjvSE0AikJN4iJdJg8RNCF8e61hvg6YKbZnol7h3A=" }, "governanceKey": { - "gk": "LlsJYxRy7uSVLWAJ/gU5GCJQV6ErMEGJkDliyCUpsAU=" + "gk": "clTuu7wZVhvbu4SKCq5ioO0tSX0d+yAEYLr9O8foUBI=" }, "reason": { - "reason": "gOG78117V3KSEJa9Usetiav5" + "reason": "oFySNt25WU5e0" } }, "authSig": { - "inner": "wDyN6yGx6Epnv/P7pK/vPG6R+4jjh1i7cpa8cY2dnQHOy/5YBBo34rcqnjMYcIjglWobb3a07u2ke7xdfdLWAg==" + "inner": "Kl36kXfcQb0Vvkyn6ZdBXRWKSBzNFw4OuJqkSS6ylQyfdkfz6frjYdvuVmosFPq6AvgLonDQXuDfAH7FWjT2AQ==" } } }, { - "ics20Withdrawal": { - "amount": { - "lo": "724571558176573681" - }, - "denom": { - "denom": "OONIY11e" - }, - "destinationChainAddress": "penumbra1hrgv7fzh0vgq49adz6ydqnqgy23v6n9qhjrze526uuw4g5dfyaz4aqpjl3kyq0qg3dqh43ecpmuea4yk7f5q0sjqy0ew603tklcj7ya0423szgwd8vzxa7x2h35re99zu7qf7l", - "returnAddress": { - "inner": "F4MDyCqggl2Zynn7rCOdzyeqbBuGObQcGsXvM+KyUsDz7Ku23Pj65ZvN5peYr5xsYTaXnw/asUKrP/HKCrrcw9qkFNIyp2Mh+v7mh1HFAiI=" - }, - "timeoutHeight": { - "revisionNumber": "412249556", - "revisionHeight": "834100005" + "validatorVote": { + "body": { + "proposal": "360316857", + "vote": { + "vote": "VOTE_NO" + }, + "identityKey": { + "ik": "CtSQBAJkCsQbhOBgPXZ/AVvXRkINCXyogRtwX0CZJMQ=" + }, + "governanceKey": { + "gk": "0jTtM1R3bF/JaALffpy8IzultQfbQ3jH9lXuplW0bwo=" + }, + "reason": { + "reason": "c" + } }, - "sourceChannel": "channel-0" + "authSig": { + "inner": "aL6k2ip09qW/aAMQq0OD2Sz7Iy/b+tbl8ibEfD8SIRLnls1Lwdl3MW8JmrYF2LhmAZWFw/TNnPoZFVUiXsduAQ==" + } + } + }, + { + "ibcRelayAction": { + "rawAction": { + "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", + "value": "CrMBCImvjpsBEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgsIkLyXigMQ49LqJEDoseHAvLu2iBgSAgoAGgsIkLyXigMQ49LqJCKPAXBlbnVtYnJhMTVwdGVhaHN0OTI3Yzc2bDh1d3d3aHdlcDJ1NGdwa2twc3N5MHRteTVzbWc3amRyMDJ6dnRoMHY3bnR6NnhjdmdzdGRtOTR6ZHhncW1tZGhycHZuZTN1bDdjc3NkczVwejBxbGN0Y3Zzemd3ejhyOTdoNjY2NHI4a3ozanNjbHEzYzk2dDN3" + } + } + }, + { + "communityPoolSpend": { + "value": { + "amount": { + "lo": "50200221473260678" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } } } ], "transactionParameters": { - "expiryHeight": "1145458065", - "chainId": "ywhlvhz-2", + "expiryHeight": "9866448180", + "chainId": "fghavcyccbyypkwjlxsvyyubqidu-66266543671378545040626714023162", "fee": { "amount": { - "lo": "269386633792776289" + "lo": "593500410798779545" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_29.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_29.proto index 7258dece90..cba8f23492 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_29.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_29.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_3.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_3.json index f0d7883931..5a8ddcc679 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_3.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_3.json @@ -1,21 +1,14 @@ { "actions": [ - { - "positionClose": { - "positionId": { - "inner": "MxfYVdViQku0zvQK8xy1i3XOuLfoG/a2E7d2I5cJZL8=" - } - } - }, { "actionDutchAuctionWithdraw": { "auctionId": { - "inner": "1UdBQ7NvuyTDgd7GBZ+XTBjKhJeLJwixq3I24n76DFo=" + "inner": "GIeMr7DFhS+ZHk0kW8xcoGQ9xqoHayyuZxk6jjePjsc=" }, - "seq": "755250957", + "seq": "109381838", "reservesInput": { "amount": { - "lo": "244631310223081423" + "lo": "690045170569843391" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" @@ -23,7 +16,7 @@ }, "reservesOutput": { "amount": { - "lo": "516329710970286444" + "lo": "594818984540846586" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" @@ -32,24 +25,17 @@ } }, { - "proposalSubmit": { - "proposal": { - "title": "mibvwkjciemkcrxgtvyvtxkfzfgoacpa-9", - "description": "hgfsyjxyh-5475912394187894970427750187231", - "signaling": {} - }, - "depositAmount": { - "lo": "593187291875051726" - } + "proposalWithdraw": { + "proposal": "487435772" } } ], "transactionParameters": { - "expiryHeight": "5396625052", - "chainId": "yljcjoiuafnxvuq-7", + "expiryHeight": "3447268373", + "chainId": "boewmqmxnszyzs-418522021941263194854639", "fee": { "amount": { - "lo": "22479363999064335" + "lo": "920856250494544725" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_3.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_3.proto index 4f7bcdc5d1..c207a78e64 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_3.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_3.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_30.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_30.json index 572bda2a2b..facd39e84a 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_30.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_30.json @@ -1,41 +1,112 @@ { "actions": [ - { - "positionClose": { - "positionId": { - "inner": "JNlZbQ6eTfCk3ZvKDIGVpJcMFrHy1FuD8jlgcVhntP8=" - } - } - }, { "validatorVote": { "body": { - "proposal": "141432201", + "proposal": "562583793", "vote": { - "vote": "VOTE_YES" + "vote": "VOTE_ABSTAIN" }, "identityKey": { - "ik": "7ZmADeMHe0sv6lyJSyvZGvR53Z84jbO5C7AOFhBcrfU=" + "ik": "SOzXxIxK5R/1vHJMt6aWEQ+5CUJJV7z1onruAGwWpAw=" }, "governanceKey": { - "gk": "BIHAvjVvjIX5qkvAeH8HhCKP8vn+N3k7R0OL5KI5eAs=" + "gk": "uJEUAFSWydVfAflQ93ZkgI/cx7xVyzpAG0KHx5JNYwM=" }, "reason": { - "reason": "k" + "reason": "7On53pv1S8OQc00KD0C" } }, "authSig": { - "inner": "xOjjUPyioMyIcftsbsE4HJTYHYIAHT5Uy+rQkkTKaQrA2XvB2n2YIBEzJD5aeBQmfdqcoTXX1A28mAqvxdtSAA==" + "inner": "lF85fzTz/UmUHoGw8+x3WWaPL0pKhuMyYw7STgsMWA2V8gvAbbferq5wRUg54ZzIO8gkEI/xQy/q4bLOKNEYAg==" } } + }, + { + "positionWithdraw": { + "reserves": { + "r1": { + "lo": "479450995904680622" + }, + "r2": { + "lo": "416504719801172622" + } + }, + "positionId": { + "inner": "4v3grb2IxJDWvL8/h12ARdgmuAZZpR7eEFVTRZQacRw=" + }, + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "sequence": "1" + } + }, + { + "actionDutchAuctionWithdraw": { + "auctionId": { + "inner": "Ho/7MB95RxmUpGqdcPN+JgAhCaZYD69QdJonugVY47o=" + }, + "seq": "998157938", + "reservesInput": { + "amount": { + "lo": "547010197706405044" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "reservesOutput": { + "amount": { + "lo": "365369505345850532" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } + } + }, + { + "swap": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "delta1I": { + "lo": "662816719872494187" + }, + "delta2I": { + "lo": "501213225487402860" + }, + "claimFee": { + "amount": {} + }, + "claimAddress": { + "inner": "iaeSLPsdGPzHehplRYA8F9uMpCx1RPRNneHYdkEy6UHOxtpPz1o7E8CiB06DpI1xfWQsbLCJ7h36WuSnlMn1WGlbKzaPuY1d6vtj+qarrdA=" + }, + "rseed": "Gh3V4AGznPcMQlpvWoTPerjODcDb9Li35HnSXJkgX60=" + }, + "feeBlinding": "+auA4qzOBHSjSCizxajeMtJtA84qQ2NZpTkbMMgOFAI=", + "proofBlindingR": "U9MU++b1WPs6qeXVwy4r25tqK3XfB++Ov6xovrxv4g8=", + "proofBlindingS": "a0BMH0epaO1iCy1axFSfMkRLxQwTtSLtOKbqOR/tfww=" + } } ], "transactionParameters": { - "expiryHeight": "4260242574", - "chainId": "lnpbgakxdstypxan-148472", + "expiryHeight": "8517358055", + "chainId": "apbrkwhfe-86", "fee": { "amount": { - "lo": "726144367654748884" + "lo": "158696527542475687" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_30.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_30.proto index 486356f0ee..9753bdefbe 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_30.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_30.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_31.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_31.json index e6c0a77cd4..e383abc354 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_31.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_31.json @@ -1,45 +1,43 @@ { "actions": [ { - "delegate": { - "validatorIdentity": { - "ik": "ueLG2LHLS2GZyPeo/UkATJkEuggas+KdnLmiAs1BWko=" + "ics20Withdrawal": { + "amount": { + "lo": "3373881155391355" }, - "epochIndex": "7583", - "unbondedAmount": { - "lo": "15793144669807645" + "denom": { + "denom": "0uC" }, - "delegationAmount": { - "lo": "334282447469022874" - } + "destinationChainAddress": "penumbra1xm0z5x3n7gm5fwpg5szzrp5rh9lkhw4krp5sdyau0m583xlresj04m28tgluxlz2wlp48cfw4x5ayxgehq8pdkwmkatmfxmhy5zlrazl2hc8a02dsf4w2ex0xsv9c0hwectyrs", + "returnAddress": { + "inner": "9bYmDKXUX0u0R4ktQQy6j0ysqLM3adW2VI02twIetL9b488iRLJ6HIggCKijCD7kLadsiRZkQuso8wVf2C1YT4roBJu0qH+/2yYK/Z/snQ8=" + }, + "timeoutHeight": { + "revisionNumber": "838289593", + "revisionHeight": "507170589" + }, + "sourceChannel": "channel-0" } }, { - "communityPoolDeposit": { + "communityPoolSpend": { "value": { "amount": { - "lo": "723749552762830993" + "lo": "228861155409067192" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } } } - }, - { - "positionClose": { - "positionId": { - "inner": "D7uR3PXUhytuF/wIfwgsG7BOPRTb8bJPUJqE5d6zA18=" - } - } } ], "transactionParameters": { - "expiryHeight": "1442141052", - "chainId": "wptbrepftqnteycltrh-5668754710518", + "expiryHeight": "9733323270", + "chainId": "boztic-225159793053704637422672", "fee": { "amount": { - "lo": "593192677678758686" + "lo": "535445417177531765" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_31.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_31.proto index aba700e5e3..969b64fb17 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_31.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_31.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_32.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_32.json index 15afc832ba..4342830c6b 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_32.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_32.json @@ -1,51 +1,88 @@ { "actions": [ { - "communityPoolSpend": { + "output": { "value": { "amount": { - "lo": "830032257325867060" + "lo": "683967104019159683" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } - } + }, + "destAddress": { + "inner": "5w8fKUyN9az1FZW+zyRIVM8MBPJJr3PBM8z4garRQeB5RKRsC1bGpfYJoqLgiLcwWbkNjuPhIKATbG0PTOm4KWemIrGpuKFfcxOdzANqT4I=" + }, + "rseed": "kGvDwltvUt0XaDvom7BAR/Cg/UoGfMSwnbw+Qy0rhpI=", + "valueBlinding": "nkYemPQdMQVNE6shnwP/cLc4tmZtuKvSWmuA0dKdlgA=", + "proofBlindingR": "CihFqnnjT+MVktW6hkcTM6xKH5WyAG04MW8PcCb5+As=", + "proofBlindingS": "s5LlLZR5jGbCNGE+PuBD0JdCGYKKbi/v9pXdgpHA3Q4=" } }, { - "communityPoolOutput": { - "value": { - "amount": { - "lo": "765295340711300336" + "actionDutchAuctionSchedule": { + "description": { + "input": { + "amount": { + "lo": "556987000536685822" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "assetId": { + "outputId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "address": { - "inner": "q6OGR0MtzNDQt/oJ/Menvk9vDLF+ghUOuNgyRxBuLuTW6nbWjmqSjA4iJtJzxleDIROi11QzHC1WEdXh8tUAzCtKFg08BtYS0KpDoVRKZoM=" + }, + "maxOutput": { + "lo": "750040748028024585" + }, + "minOutput": { + "lo": "186891007157415161" + }, + "startHeight": "194658727", + "endHeight": "194658728", + "stepCount": "132805553", + "nonce": "rtcKscHQURhKtugN+Qcq48d0QN4C9h36jPu/E0I8wD4=" } } }, { - "communityPoolSpend": { - "value": { - "amount": { - "lo": "348142522858618524" + "swap": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - } + "delta1I": { + "lo": "982870698043577558" + }, + "delta2I": { + "lo": "801433640509618021" + }, + "claimFee": { + "amount": {} + }, + "claimAddress": { + "inner": "csfOXHOGRrhyxi1QOVvFqagqs7Fqk36sXiFvrVmib3M4tYcj0AJhpvTQ/aIUKTGtDC6M2tpLcgkseOxMdDObao7mW2sXnbGrtkYOcq3crW0=" + }, + "rseed": "W8rMZdLgzB8BhHLzwL5kuIMr98qRBduvpm3Yw6VaGdk=" + }, + "feeBlinding": "vVjD8Pir0OP4KHJt+KfusK7AAOK5wT1XPe5sc9NbkQM=", + "proofBlindingR": "hWM7a1i8fChcrLGBjug/wboxzqEFSSA/hif9w5BkEwo=", + "proofBlindingS": "/h49Or3gyiZFGMynWyCkkFoFzSOvcP9pEJx2Ox8aPws=" } } ], "transactionParameters": { - "expiryHeight": "8774516062", - "chainId": "rtmoomqavqvk-603221567641366559425121", + "expiryHeight": "6607534054", + "chainId": "kirrw-5175515559057", "fee": { "amount": { - "lo": "699952821662761401" + "lo": "884810138001915342" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_32.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_32.proto index 08fbd80986..39d54124fa 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_32.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_32.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_33.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_33.json index 757ed8383d..18032166c9 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_33.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_33.json @@ -1,22 +1,36 @@ { "actions": [ { - "proposalWithdraw": { - "proposal": "326690332" + "actionDutchAuctionEnd": { + "auctionId": { + "inner": "oJxjTrOBvgM3n2xUo3gII6NJfmjeMA6ciPAAyYKzqLU=" + } } }, { - "proposalWithdraw": { - "proposal": "32683854" + "undelegate": { + "validatorIdentity": { + "ik": "hjd7IQ6pMmfhPLDEi/NrhH42C1efZ+TaMWT12Hf2EGM=" + }, + "unbondedAmount": { + "lo": "948735157995383286" + }, + "delegationAmount": { + "lo": "590180895818609087" + }, + "fromEpoch": { + "index": "274", + "startHeight": "274" + } } } ], "transactionParameters": { - "expiryHeight": "379781162", - "chainId": "vmp-730888803729620", + "expiryHeight": "9972610432", + "chainId": "wmsisavjuqozrioxdvxrbhdg-31708058506325193159590", "fee": { "amount": { - "lo": "509390978610964123" + "lo": "689945274860011745" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_33.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_33.proto index c0ed91d76f..a4b269ed72 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_33.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_33.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_34.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_34.json index f188903452..49e7eb78a6 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_34.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_34.json @@ -1,10 +1,17 @@ { "actions": [ + { + "actionDutchAuctionEnd": { + "auctionId": { + "inner": "HHtNxwMSJ6F1P0SmGwyCZNDR9dTdwQOlzpwC2MoGZq4=" + } + } + }, { "communityPoolSpend": { "value": { "amount": { - "lo": "567411047180918499" + "lo": "608983241186304112" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" @@ -13,61 +20,41 @@ } }, { - "communityPoolOutput": { + "communityPoolSpend": { "value": { "amount": { - "lo": "134335054560426875" + "lo": "502909648486318144" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } - }, - "address": { - "inner": "rf4jm0otOkE/2MhHd2FbVbh6JDZCVuVJvA+HSgrBKi9r2Dz2/Jwq7BTx9D2qy/iogStl/+btLhHU1vz/5ljwa9QsI3HtsADOEDJK1grFD6s=" } } }, { "undelegateClaim": { "validatorIdentity": { - "ik": "DMoriA1O6850+k1D5KJfpkS3pyXnQ8olcEs3uEYbSKM=" - }, - "penalty": { - "inner": "AAAAAAAAAAAAAAAAAAAAAP52yLQ5WBBiTdLxqfvnbIw=" - }, - "unbondingAmount": { - "lo": "924905935703523117" - }, - "balanceBlinding": "0Hqt52XGLzTo3HjziSdvtKDDdlFfK5eiZE4g7kcNBAI=", - "proofBlindingR": "Q893WcuijPGA5XKY37eliQHbbGwqPth+61KsoRcdDgs=", - "proofBlindingS": "lKHu82NrCRm0L934qC6/+QJ73g7ROz32YpSnFAIPxww=", - "unbondingStartHeight": "69210" - } - }, - { - "undelegateClaim": { - "validatorIdentity": { - "ik": "R3LnktqQoEV1pp+jZ7xB7sjqkfwIZHR+WjoAixXndJc=" + "ik": "jEWeQ/vN2lwyQMWI4pOSAtu/veNeDQvvHklGWpRZj4A=" }, "penalty": { - "inner": "AAAAAAAAAAAAAAAAAAAAAP/5ckdFOO801qFh5Pdl/Ys=" + "inner": "AAAAAAAAAAAAAAAAAAAAAP92X9itq59Vmz0HyEtdzGQ=" }, "unbondingAmount": { - "lo": "179386025472799049" + "lo": "8971566673412279" }, - "balanceBlinding": "qdEf9wzGCi5RdysBUZ4DdZmttBc4ysDdZm/4UEsyRgM=", - "proofBlindingR": "GWcPXubEwOE2wJH3a4yAqYy5OPJZgSbHN5Q7SX3J9gk=", - "proofBlindingS": "jzurW8jRcffVwtYl88JSzd2fKCAeyv2MFOn+9dORTwA=", - "unbondingStartHeight": "29104" + "balanceBlinding": "LUmPZW9pTKKLP8zpUeYzXx4gDWNSx4gz/ynE2bocxQA=", + "proofBlindingR": "1XPp9qjsFdsqhaHBwcb72BXi54wWt4OOljnF2pIpwgI=", + "proofBlindingS": "4dpKFpIFSS8U9jdCMgDuL3AOg8stOCIxgqH+0weDhQM=", + "unbondingStartHeight": "95137" } } ], "transactionParameters": { - "expiryHeight": "4047898859", - "chainId": "duoqkrgeymhrkors-7241458566280794217392", + "expiryHeight": "1182098208", + "chainId": "ckdecafjpvpxutt-38", "fee": { "amount": { - "lo": "69710397248927342" + "lo": "743337841359999839" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_34.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_34.proto index eddaa80e4e..f915bc60eb 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_34.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_34.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_35.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_35.json index 94089c6844..34c9e6bced 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_35.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_35.json @@ -1,73 +1,102 @@ { "actions": [ { - "communityPoolOutput": { - "value": { + "actionDutchAuctionWithdraw": { + "auctionId": { + "inner": "zBhm7pQ0uFiWqb6jJEk2K3YoEH4eGxjPLZQQe0712oo=" + }, + "seq": "149584489", + "reservesInput": { "amount": { - "lo": "880336588245684328" + "lo": "612856394714058480" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "address": { - "inner": "eMayb1AMb8x6ULVMR9qFZiSm4qyqpXRcvB2w4APoJDa09eGUJRe4y8IOvf0gujP1HnDwORk+Bo+5iX0PL3XSg/l/irlmeUbJaf+21lealhI=" + "reservesOutput": { + "amount": { + "lo": "339022777773699228" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } } } }, { - "communityPoolOutput": { + "communityPoolSpend": { "value": { "amount": { - "lo": "815719689217486520" + "lo": "351595669417895916" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } - }, - "address": { - "inner": "TmiBtczbGcuN9ga/lX+XQ6XS/ka89UyP5hGbJnrQvFjMSHkNn1Hwvp7TbcXTk4rXYnKsoy1d1oSncj99ROAdkFEah+Fjq9JTDgDSY5DKnWw=" } } }, { - "communityPoolDeposit": { - "value": { - "amount": { - "lo": "450308455168230732" + "actionDutchAuctionSchedule": { + "description": { + "input": { + "amount": { + "lo": "309828377653594891" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "assetId": { + "outputId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + }, + "maxOutput": { + "lo": "390228703465621780" + }, + "minOutput": { + "lo": "651365431407079447" + }, + "startHeight": "662339689", + "endHeight": "662339690", + "stepCount": "315826129", + "nonce": "S79WY6Fj4JaqBfyDOnOwSEAeFJZBTMDRv2AeG86pxTI=" } } }, { - "ics20Withdrawal": { - "amount": { - "lo": "67217833691084182" - }, - "denom": { - "denom": "mkahEaFCV6N915yYmMII69yMhup5m3V" - }, - "destinationChainAddress": "penumbra1w0mcvqrwgr7n0ges8lkqvglhrxfyjjl7hkwxcgu7qdrr6x22ksgs0pkpfh40uj2zfptukl6guz433ka7u8l95a698ugek9mz7mntyghrea3lvmnxdztg30qd73urm3587ma7dn", - "returnAddress": { - "inner": "MocqKdHFP1ovgFMcZorPXHI9WxAISNFgHw7AednENrqvhCgvsjXFbj3xIhPYAV6kH9mL1sqISk/unIoY9s8ofjIdvdmPpYrz0Asiob2Qono=" - }, - "timeoutHeight": { - "revisionNumber": "516040925", - "revisionHeight": "213825661" - }, - "sourceChannel": "channel-0" + "actionDutchAuctionSchedule": { + "description": { + "input": { + "amount": { + "lo": "452785782329070595" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "outputId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "maxOutput": { + "lo": "163964745988808515" + }, + "minOutput": { + "lo": "623129795657028252" + }, + "startHeight": "972938697", + "endHeight": "972938698", + "stepCount": "176531286", + "nonce": "MpebDH9w/+eoE6w3DudL6pJ/DRq5+wfIrf+JAx02F8k=" + } } } ], "transactionParameters": { - "expiryHeight": "100242853", - "chainId": "f-8421725122763533900111664888", + "expiryHeight": "757613912", + "chainId": "rfrzthlsymgvdwzljifqrzdmqdwswuav-5547860931280149093682979663518", "fee": { "amount": { - "lo": "155809695238159532" + "lo": "787800690573283741" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_35.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_35.proto index 60430dbe35..95f6c11d13 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_35.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_35.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_36.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_36.json index 42e2bd4bf3..07d00d05f5 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_36.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_36.json @@ -1,59 +1,72 @@ { "actions": [ { - "ibcRelayAction": { - "rawAction": { - "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", - "value": "CrMBCPuB56AGEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgsI8MeX4QIQv57bVkCon5ONpLXqgRgSAgoAGgsI8MeX4QIQv57bViKPAXBlbnVtYnJhMWt0bXM5bmxzMG4yY3J6dHUzMDVqNThyODNnem5lNHp3NHpqdTRndzU5em45bjc5OTBocG10aGRmdjRqaGM2NXRoNWQ4dTNjMDV6Z3J5N3Izbjd0OG4yZDU0c3lqMzdwMjZ5amtsNWV6eTl6bXRtdGRjejNsbTBnbGpmajVnZjJnbDNzN252" + "communityPoolDeposit": { + "value": { + "amount": { + "lo": "393187019935644771" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } } } }, { "proposalDepositClaim": { - "proposal": "234237802", + "proposal": "290306543", "depositAmount": { - "lo": "170491002808594623" + "lo": "48616193818956834" }, "outcome": { - "slashed": {} + "failed": {} } } }, { - "delegatorVote": { - "proposal": "605555901", - "vote": { - "vote": "VOTE_YES" - }, - "stakedNote": { + "spend": { + "note": { "value": { "amount": { - "lo": "254645828586757487" + "lo": "661372411567408266" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "rseed": "RG/zFAZpBIYPm6MyzUhYyfkt62xYaTBOtxQiR9LJwPM=", + "rseed": "GGHY9JdRl6Kfu1bHvqPHc+HySshyjcdWOBCpzvYBoyw=", "address": { - "inner": "7WSXX9rjVOh95KTrcckft7xKfeq8uPJHn4TqDNyy8I9kI8bFPkHbHtq9Dhd405JuYkwabZZvxeteiuzwVVhxDP+ijwAi0kDcuUtK2dKFj4E=" + "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" } }, + "position": "164205196104512", + "randomizer": "QHWSN2dehfJ6dm2Fmhm7qQkUEbs1qAWAQ8suxxnZiAI=", + "valueBlinding": "1YXi1xeOjTJjQHAsC4whVtf+gHTW++lnAiBtgWCOnAM=", + "proofBlindingR": "wUuYk61y3mp+oyLEfTTxrvFiodtHsK+qTOvyQz4dcws=", + "proofBlindingS": "Gx+STxwSuZuhkkuIPiMgenWPrFIjWh34o+T6QguNLgg=" + } + }, + { + "delegate": { + "validatorIdentity": { + "ik": "5nqr9SpojbPZBs1X+1Nb2Yu3do4KFbodPnCvp4bHS7w=" + }, + "epochIndex": "4403", "unbondedAmount": { - "lo": "950376150540826541" + "lo": "844495116047271892" }, - "randomizer": "vcZy5DFcj0jiDEGb4AOyRNGrJ9jocbMKU8yi1JIDdAE=", - "proofBlindingR": "q8BQWrzYeZ3hVTb0vskjc4db+IRXVLDrOOEe72OEIgA=", - "proofBlindingS": "46IkwPN5DDcOjE+byqGNJFqSy8/gmWMl/05befMe3Qk=" + "delegationAmount": { + "lo": "306847996896290479" + } } } ], "transactionParameters": { - "expiryHeight": "1571335864", - "chainId": "atbhvfprzxpmlpyfbguplqwpeoph-210960299201973636300923628", + "expiryHeight": "4815576432", + "chainId": "vwr-19027228743", "fee": { "amount": { - "lo": "880979735914912086" + "lo": "109368809027710146" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_36.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_36.proto index a836bed905..606e91177e 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_36.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_36.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_37.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_37.json index d8bc7f0494..ad541a7ca0 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_37.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_37.json @@ -1,32 +1,104 @@ { "actions": [ { - "communityPoolDeposit": { + "swapClaim": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "delta1I": { + "lo": "483348454564315174" + }, + "delta2I": { + "lo": "24981429482936026" + }, + "claimFee": { + "amount": {} + }, + "claimAddress": { + "inner": "QB5mPsV5DPjNF8f3jtnLafaPTQOZtmTsrLhZFiLODgT9xi++YRJgW/9nSpOF68m8wTRrPcflSSUxuyzlF3c7aIS0qihZZrLyHTz+CjLRSWg=" + }, + "rseed": "t6ldqiA0xarBX+jD/V39hPJRjMsNTpsN2wJgGET0yjU=" + }, + "outputData": { + "delta1": { + "lo": "702953653" + }, + "delta2": { + "lo": "1105375958" + }, + "lambda1": { + "lo": "314" + }, + "lambda2": { + "lo": "970" + }, + "unfilled1": { + "lo": "518" + }, + "unfilled2": { + "lo": "1757" + }, + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } + }, + "epochDuration": "1000", + "proofBlindingR": "qjfQ6Mk1DkCzURRZXDcwQ0KmnDR/wUboT5QW5adIYQA=", + "proofBlindingS": "XF2ybTLSH3UinVI3iH1lXtIjtiuhCqH/lA3fUNALugE=" + } + }, + { + "ics20Withdrawal": { + "amount": { + "lo": "176400219834859729" + }, + "denom": { + "denom": "3uP" + }, + "destinationChainAddress": "penumbra1wyfvr9kww4qsmz24j8a6x0sjzv6zmhtgtya5t42t5dzdzs3sfw9l4grszzhmmt925d7n9psamt7d86mcd006900qkfsgtuajycln9egs0jdg53pdrnuv8hntng630jrdl4x32r", + "returnAddress": { + "inner": "K9cP6FyydE7UepFnY2P78hNe3NgeioarTMSSYYRIOW+nAs6UnLifc7xuOnOEMjrwAKf498SEIuLsW3/AXqvYX5JASEn3CdR3NQx4XfBs/DI=" + }, + "timeoutHeight": { + "revisionNumber": "856650701", + "revisionHeight": "674892652" + }, + "sourceChannel": "channel-0" + } + }, + { + "communityPoolOutput": { "value": { "amount": { - "lo": "769772834950605681" + "lo": "278998628685915596" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } - } - } - }, - { - "ibcRelayAction": { - "rawAction": { - "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", - "value": "CrMBCOG4keUGEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgsIrLe+IRCD99jMA0DYrKC9pLXqgRgSAgoAGgsIrLe+IRCD99jMAyKPAXBlbnVtYnJhMTBwNTV1YzV3OWczdzQ5bnZ5djdsdDU3cnR4bjQzNTA0cmx6OXE2Y3cwMGQ4ZWR0ejB2d3c1d3htbDRodWVqOWYzNDZyNDhjNXpteWs5dnF2bXNxaHBtc2ZqZ2ZsM25zMHFweHN3ajBrYXd1NHMyZDVjdGN3MGh1cGdqenV3OHA5N2UwZG1o" + }, + "address": { + "inner": "C6+cg5wG8tHbA2+M8sBAV+186hwLGwxoVJidnYl5lRivIUsbgezAS0wFHDxPlLIgh+XYt9SiSt+UlF1FKF/J3ze7e5wTjTpFjgUAM07DxIY=" } } } ], "transactionParameters": { - "expiryHeight": "8915831258", - "chainId": "yfzxcvbplxalvxnbncgrzvhji-9609919821469306239566712638", + "expiryHeight": "1133831552", + "chainId": "icrdgahzmdqgoczisu-10179236882093924987", "fee": { "amount": { - "lo": "90256352478796140" + "lo": "72717640288502713" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_37.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_37.proto index b2e4f38848..91b51c624d 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_37.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_37.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_38.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_38.json index 7249c13f16..c3f734fdc1 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_38.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_38.json @@ -1,139 +1,59 @@ { "actions": [ - { - "positionWithdraw": { - "reserves": { - "r1": { - "lo": "465127837135700820" - }, - "r2": { - "lo": "160069219706089534" - } - }, - "positionId": { - "inner": "bRA2HhI+pfDGdr5Lz6IITVHPS5itkchITo08z3Xk3yo=" - }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "sequence": "1" - } - }, { "spend": { "note": { "value": { "amount": { - "lo": "531388044542160579" + "lo": "470247145843383108" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "rseed": "dF+zGHcJfK4LNl1ecB72F//P3OcBRlkff1Q5+ybylU0=", + "rseed": "GcTT1/rxAoJdLA0/JamS8WCGc1UCdZ5gr7O+mCQU6KE=", "address": { "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" } }, - "position": "127162509479557", - "randomizer": "/bl7NKpqefEh1HDGCPqwzqsW4R3DbI4DhSyFG6tlHgE=", - "valueBlinding": "VW6RZZvuUc0oYTuW5XlVjXwoSv5OYgiZSRLWUNHk/wA=", - "proofBlindingR": "NDznlryPqQ9dYzgLYM89ey/u9Wv0XMe4N4LFRvonygs=", - "proofBlindingS": "IFOQYYyoxRBOVHha0xzLSVn26hUB7VQVNhlIqZlMmww=" + "position": "84210121314347", + "randomizer": "Me2jFts+75K8YN4dpX1eAIMAPQ4ZXNXSB/Mm8ENCxAA=", + "valueBlinding": "1zP4A93dCLQjM2iZEak3Fm9UL2Q0NCj0QgJWLuXkWAA=", + "proofBlindingR": "CI0MJJo2DgqghvOGLhc+FmrmyiCvXxwxx89zZTPKtgc=", + "proofBlindingS": "wi3FI1VCA1MagEDf3ygM5bL12gp8ZOelj7H5yt7Pqg0=" } }, { - "validatorVote": { - "body": { - "proposal": "882810794", - "vote": { - "vote": "VOTE_NO" - }, - "identityKey": { - "ik": "0p7JiwgN/BOyDr/YMdCM/ZT2O+Jt5rn4YDMsjummTnw=" - }, - "governanceKey": { - "gk": "Vku5VEQ0zbzbAtRKvyrwbtotYHjbiyANJSBQvimkiAE=" + "positionWithdraw": { + "reserves": { + "r1": { + "lo": "114522338840145298" }, - "reason": { - "reason": "VPG536v3rI0v3x7vYReCd2y" + "r2": { + "lo": "994982534980539393" } }, - "authSig": { - "inner": "dAOY2+wI33jNIgsUTfqKSbDKwv+P0Fa/91kAGhKr/Q/bM/csW6x4qmZe+kw+jjkWVFoocBzqhWl/re8ZOYXxAA==" - } - } - }, - { - "swapClaim": { - "swapPlaintext": { - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "delta1I": { - "lo": "956996503132728355" - }, - "delta2I": { - "lo": "144510200169114100" - }, - "claimFee": { - "amount": {} - }, - "claimAddress": { - "inner": "qpi4mBmL97S2kdUbhFGYlFibjichsKVRhLuRMv1/kHZ6NaGfwHhEbc+3ZTF7+us/3E3ZRgJyqZqPm242zqG/4QUfQQGclPJiJN7pdYXVAWw=" - }, - "rseed": "1IbSMJo11mPVZSz0ODdqsvBQRnpnMbCH89noQhweSdk=" + "positionId": { + "inner": "HCEW4bYIDHg3ApKtrogQn/t7yZP+3zsSSAJkFsa1xQU=" }, - "outputData": { - "delta1": { - "lo": "1131051379" - }, - "delta2": { - "lo": "1117311984" - }, - "lambda1": { - "lo": "7" - }, - "lambda2": { - "lo": "222" - }, - "unfilled1": { - "lo": "1476" - }, - "unfilled2": { - "lo": "666" + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" }, - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "epochDuration": "1000", - "proofBlindingR": "P6JPAW4Bnd0aZ1STGo6/ho6RjPP0u5UAsRqt5Q6IowU=", - "proofBlindingS": "lv1XDf0ipIKGTWVMLUlUj4l6lAus33k3mLLYoNs1bQI=" + "sequence": "1" } } ], "transactionParameters": { - "expiryHeight": "2397374994", - "chainId": "pbooqfrbyxjcrkuerynachjpsnddb-8189547", + "expiryHeight": "8936079907", + "chainId": "jjtemvflhbxquubruapeddy-785", "fee": { "amount": { - "lo": "35179472883806480" + "lo": "732078482192978091" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_38.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_38.proto index ccb73d044b..d50a32961d 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_38.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_38.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_39.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_39.json index dcaec99a50..b76dbf69c9 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_39.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_39.json @@ -3,29 +3,32 @@ { "actionDutchAuctionEnd": { "auctionId": { - "inner": "XTDpe9No0XGJuhIof9R/H0nzlbndN47FcWp19oan5DA=" + "inner": "c0FVvT19ufQMNoZkw4KE4iOWdnMwkedavwgeysjoPWo=" } } }, { - "proposalSubmit": { - "proposal": { - "title": "ynnajcmmygjtvzebgdinw-5281", - "description": "yakipgupcjcwbzbhcjfh-6887007188777625904", - "signaling": {} + "communityPoolOutput": { + "value": { + "amount": { + "lo": "846711980480633701" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "depositAmount": { - "lo": "765831618350417324" + "address": { + "inner": "/5VVlhnPz2rN3eOjE8R+aD17ie1u7hqm75JOeHIhEGSFcSTAGnQLPS2eGZEa3Bn9flIgapaiKThFkSEeYMEaccv9m4rgaqaV5sKkiyAz1Mg=" } } } ], "transactionParameters": { - "expiryHeight": "30254982", - "chainId": "lmmpzfvkmrjymqhr-821068746509121003911302", + "expiryHeight": "3827603787", + "chainId": "htxqbyniabeljdzvkagj-12379991737703822", "fee": { "amount": { - "lo": "887886743953552340" + "lo": "253952826649855945" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_39.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_39.proto index aaba3b0762..49ca245683 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_39.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_39.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_4.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_4.json index ba3be6e50d..abdab8003c 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_4.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_4.json @@ -1,64 +1,60 @@ { "actions": [ { - "communityPoolOutput": { - "value": { + "actionDutchAuctionWithdraw": { + "auctionId": { + "inner": "tYen9vdCq6ujbL216qi7ocFMD0wE07BgmY1WKDxSsZ0=" + }, + "seq": "618503155", + "reservesInput": { "amount": { - "lo": "240451278658506679" + "lo": "84852211894696562" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "address": { - "inner": "XYzPD9JIGirLSm2WQkkkdfT04NeIVklkHIfheRkeQnjnoERF/iR2XCHD0axHQFQAfH/x3YWubcaG2jN2BQTvNm5DIOoQm6g1REsWYpx3Ikc=" - } - } - }, - { - "positionClose": { - "positionId": { - "inner": "z4A/5pWH7fMa+aNUram3n4gPDAavJ+7rrTfOLqrGVd0=" + "reservesOutput": { + "amount": { + "lo": "949839836777165243" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } } } }, { - "validatorDefinition": { - "validator": { - "identityKey": { - "ik": "eHURaNCDZQ0nIq+Z2ICt4goHmJz+pqGwzh1Z6Vk3Xgo=" - }, - "consensusKey": "NUz+oFzWNut9RkQSONI5G250S8JkZlkbyvjfQW1NhJM=", - "name": "test validator", - "enabled": true, - "governanceKey": { - "gk": "eHURaNCDZQ0nIq+Z2ICt4goHmJz+pqGwzh1Z6Vk3Xgo=" - } + "proposalSubmit": { + "proposal": { + "title": "seefqmo-750448", + "description": "iuf-844", + "signaling": {} }, - "authSig": "GuAHDPSWydG/kdgjsCcw5hJo+9Mf0mARFwPTxw/dzAkoWqP/o31usbbR0E4kH4t7amc5BapBqTEL/AWpn9SmAw==" + "depositAmount": { + "lo": "774139197522646266" + } } }, { - "delegate": { - "validatorIdentity": { - "ik": "3HO/680oYPfR/oxFu9c85ASbXfU/IbuVbtiBpVwc2DA=" - }, - "epochIndex": "5314", - "unbondedAmount": { - "lo": "140229987020723004" + "proposalSubmit": { + "proposal": { + "title": "sefijeqm-92688048104843706673977014363430", + "description": "cbpkaruv-593976592810878117828", + "signaling": {} }, - "delegationAmount": { - "lo": "545618568346872141" + "depositAmount": { + "lo": "978143614202696154" } } } ], "transactionParameters": { - "expiryHeight": "1669319987", - "chainId": "pyvtwysgympchvcsuoqryjtjj-60635851526", + "expiryHeight": "7229120705", + "chainId": "etu-2", "fee": { "amount": { - "lo": "19543685207478289" + "lo": "859783043176233021" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_4.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_4.proto index 3a39b784a2..ae02136e2d 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_4.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_4.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_40.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_40.json index c9196c6b17..2f87b9b142 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_40.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_40.json @@ -1,90 +1,69 @@ { "actions": [ { - "positionClose": { - "positionId": { - "inner": "UUiFkNnXg9ZViKn7X7QKrWPQdWfrRXVTyRjeaXd6WrA=" + "delegate": { + "validatorIdentity": { + "ik": "IkqqqUgNxxBAKcAKZKkJ1a8WnCz6RkNXZw06yxpc7p4=" + }, + "epochIndex": "5292", + "unbondedAmount": { + "lo": "54612088889618543" + }, + "delegationAmount": { + "lo": "784594515381677882" } } }, { - "undelegateClaim": { - "validatorIdentity": { - "ik": "nv15tZzZCNev7B12gqjCQhLfl3A4qf94RYWW+RKv8tY=" + "ics20Withdrawal": { + "amount": { + "lo": "825252195049932857" }, - "penalty": { - "inner": "AAAAAAAAAAAAAAAAAAAAAP7sv7FbVz6rNnoPkJa7mMg=" + "denom": { + "denom": "z9EQNwCn9PzfJ5GcM6" }, - "unbondingAmount": { - "lo": "57013976586590532" + "destinationChainAddress": "penumbra1y0gt6qs54vm0295nt607kmhe05qqvxqh344d9pgqmgwz4kfnstt55n8f7atg6w00lfy720yz8p4ngkpthkjks0wfpu0atv6mdhgsxf5m5lm065unjzehnq7d3nz7utku8ctt7e", + "returnAddress": { + "inner": "aaTKAMy1NrgcddhoCWWL+S3DAMc66oglDD/H5Js98TuF/oIlkl9H+60Os3zEsVn6Jy/t3idxK+gHsMVmlm7PTYZxmwLoUV6rSJV/O+csuaw=" }, - "balanceBlinding": "eYkXLPTtM3AWuTorhqkcqUyi5FmXqPUH4EcrWsZnBQE=", - "proofBlindingR": "IPwPNCs6/4XHV3RWhjxmW3STwbOcZOt9ul02Vz3P4wc=", - "proofBlindingS": "PrNn3bfMuMYt6ktSEAVUrWs3c3DravO9KAtZ1ROx+hA=", - "unbondingStartHeight": "25329" - } - }, - { - "positionOpen": { - "position": { - "phi": { - "component": { - "p": { - "lo": "207020069686096076" - }, - "q": { - "lo": "943108923990145890" - } - }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - } - }, - "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "state": { - "state": "POSITION_STATE_ENUM_CLOSED" - }, - "reserves": { - "r1": { - "lo": "733713745519230870" - }, - "r2": { - "lo": "736311152870444201" - } - }, - "closeOnFill": true - } + "timeoutHeight": { + "revisionNumber": "937198458", + "revisionHeight": "861854162" + }, + "sourceChannel": "channel-0" } }, { - "undelegateClaim": { + "undelegate": { "validatorIdentity": { - "ik": "ORPc0RXNnz2GpuKZAEbmfI1/XzuNgxcHJM8NcAPaGXI=" + "ik": "AkI9fJeSSG0RWwME2e7doy2IdSkX7nU6u8yjWUYhq8g=" }, - "penalty": { - "inner": "AAAAAAAAAAAAAAAAAAAAAP/SH/Lkjopx3mmtQsPJ7sw=" + "unbondedAmount": { + "lo": "317255723438048902" }, - "unbondingAmount": { - "lo": "680601754163920101" + "delegationAmount": { + "lo": "27369677438691387" }, - "balanceBlinding": "j4+GNJ4vr6wT0G1EyZI60xx/fM6vvxpp/YQvZikLGAM=", - "proofBlindingR": "Oe9cvlsQ8DwLaQRFzfoxZ/yh/ZiziudsC3kopwOcswI=", - "proofBlindingS": "ZeQgxOXdIE70ubWWJWX1cIfWYmZB4oIvamhMZutCpQQ=", - "unbondingStartHeight": "67728" + "fromEpoch": { + "index": "6375", + "startHeight": "6375" + } + } + }, + { + "positionClose": { + "positionId": { + "inner": "cLJngD2gAJzhO9PtMCx/NE6BYNHBcZY6gQj0LNuFth0=" + } } } ], "transactionParameters": { - "expiryHeight": "3209846638", - "chainId": "qxtbeccvuhqdjdzrtiasujatkyhf-3286372", + "expiryHeight": "750220182", + "chainId": "eaiwhppxaxjz-9829371", "fee": { "amount": { - "lo": "522357752499407073" + "lo": "89398385200099902" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_40.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_40.proto index 482dc1d805..b9fb7049ad 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_40.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_40.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_41.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_41.json index 3939fa4e68..c6ff94a480 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_41.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_41.json @@ -1,59 +1,83 @@ { "actions": [ { - "actionDutchAuctionEnd": { - "auctionId": { - "inner": "FMaVHvfFRXg+NqgBk1nnvBEluCfJMoK3INBZtXBjeYY=" - } + "output": { + "value": { + "amount": { + "lo": "679189361135083381" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "destAddress": { + "inner": "DWTbSZUsW6oEokJ1qoMMtQoldD3fRPeZOe3GX5kTgZyKR+DCNCjSdzgtBsv4J/oiPLPrM5Xt9lEVAyTjiOE/DhkAmyOfwuLdyDNtWZjQ3dk=" + }, + "rseed": "I2d9d89SDeTTXYZGzo01IJoJD9HpehCnaQljyxKHwBU=", + "valueBlinding": "NDurM1Tooq11nDtNhLYuiaGWLnwbZIHl3t+lCRbuawM=", + "proofBlindingR": "iLr6XrgQdHndYgL2uFhis/XhlFWQLH1nWuQYuRVIbwk=", + "proofBlindingS": "6Bh/qx5XOdtBJvy89M1F501yxcTzAz9JeQdBK25zKQ0=" } }, { - "validatorDefinition": { - "validator": { - "identityKey": { - "ik": "ojXO4Lkqz9V9pZBvCHC1ADpo3rsgsenDzKjyjmxlago=" + "swap": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "consensusKey": "KptjwOVdUw9hBC67ZouxIX833jynv/6XFiDwD615CLo=", - "name": "test validator", - "enabled": true, - "governanceKey": { - "gk": "ojXO4Lkqz9V9pZBvCHC1ADpo3rsgsenDzKjyjmxlago=" - } + "delta1I": { + "lo": "679362630365607269" + }, + "delta2I": { + "lo": "282858944999713516" + }, + "claimFee": { + "amount": {} + }, + "claimAddress": { + "inner": "NXCqPbIJ4f8mhZPKSSoINjAHswai9THUcJ1k4FuXO8t3nesinSYpBj4rVN/vTReoWqwQNWScMp8gI1rUh9qVJOJym34xcKjyonM5AQ6CbYk=" + }, + "rseed": "mfsgXiJLfOs7I3VRyaJBp1+K2qroEJh8ijvzqLPhW0w=" }, - "authSig": "FNmLrD6LVakfBPWeEtab+7M/2qwruaKqNRAqdTQAzASY0BRV/ZKDUPzX6JNPA/dgzS9uAY5yEE8b0Gk7hQx0AA==" + "feeBlinding": "m1KPyQPhl1BnDlNlK94NX4gesbWtBK/pOGrSMbzB8QM=", + "proofBlindingR": "sFXbVCY9A2IdYaIlJcDRL108RCr/QIcW+mcJZXi9Jwg=", + "proofBlindingS": "jje7gxeOOfDj4JzQ4pW4YBTklMvyGiL9g4SfH94emhE=" } }, { - "actionDutchAuctionWithdraw": { - "auctionId": { - "inner": "brqmC676g0WEx0EQzKDKvTJROgh3ZvMb/l4//hvI5PM=" - }, - "seq": "515691415", - "reservesInput": { - "amount": { - "lo": "602315755144163636" + "validatorVote": { + "body": { + "proposal": "223263340", + "vote": { + "vote": "VOTE_YES" }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "reservesOutput": { - "amount": { - "lo": "805532623255840375" + "identityKey": { + "ik": "puggZFMk05lx/nedIwm8XboHzxE3a/ajvltsI7x4uMw=" }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "governanceKey": { + "gk": "lAcboYty5jZKJ8or0n7GDpNC2Np5Qoi/XBr3HbdrARA=" + }, + "reason": { + "reason": "UbScZiD8r5xvJoW7ifHiG7c2C01tST" } + }, + "authSig": { + "inner": "lgOfl0oEXTYSJ3nnMY+VGHnbaL081bNwSEuPd2ywSAA5xryPU5goiOhTwSulbssIx7k6zYNC7LlumwEllQgcAQ==" } } } ], "transactionParameters": { - "expiryHeight": "4395811248", - "chainId": "bjujnpzoilblaevejciymtommdvik-2684", + "expiryHeight": "1466370514", + "chainId": "rjnrfxsvoqewymyy-680935684045949", "fee": { "amount": { - "lo": "141980490610222978" + "lo": "357482991574979395" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_41.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_41.proto index d9b585fd1f..c8604680ae 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_41.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_41.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_42.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_42.json index 12926bcd50..0de5de38b2 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_42.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_42.json @@ -1,68 +1,99 @@ { "actions": [ { - "undelegate": { - "validatorIdentity": { - "ik": "3CMSBNay466PPsbAMMwVcs8dYlUu7wYFnhQBzytszb8=" - }, - "unbondedAmount": { - "lo": "445210398279593827" - }, - "delegationAmount": { - "lo": "912468609333936955" - }, - "fromEpoch": { - "index": "6657", - "startHeight": "6657" + "positionOpen": { + "position": { + "phi": { + "component": { + "p": { + "lo": "831481293624391719" + }, + "q": { + "lo": "497613288717095785" + } + }, + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } + }, + "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "state": { + "state": "POSITION_STATE_ENUM_OPENED" + }, + "reserves": { + "r1": { + "lo": "55053215004382995" + }, + "r2": { + "lo": "704585790519560694" + } + }, + "closeOnFill": true } } }, { - "communityPoolOutput": { - "value": { - "amount": { - "lo": "404834025931030255" + "delegatorVote": { + "proposal": "166458126", + "vote": { + "vote": "VOTE_ABSTAIN" + }, + "stakedNote": { + "value": { + "amount": { + "lo": "60362707822475621" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "rseed": "Gk4J0Jtgi2KFqODwkzGXWgrGsZXAmr2DftoEJlaTvYo=", + "address": { + "inner": "qDw9kEJdMuxmbovfNCuYB2B7ZZAKtajjtG0bqzc/rO5PBCEXH0A55S7PWIEU5adJFd0+tNXsd+L0kmZIHG+CwXH+A7/dJP00jZs7w3RuQ7c=" } }, - "address": { - "inner": "nEyqrZ+MzR5PKHA/316PjZMrNSg8dziZBs/YH9gwefGoVEJ9UnfVLPJKiYFCb7t6XNkRKVgTQE49sMVLGSmzjGJiYxd7Fc6oL8l3IdUw3rM=" - } + "unbondedAmount": { + "lo": "236917491659762722" + }, + "randomizer": "whps6RtTFQNAmf2j6C+xC7XstMHqobg1IevJPe+BugE=", + "proofBlindingR": "buzAORo6tjnuprptyCJ+RbXKj6Cm7+dhnUbV2FkXGAo=", + "proofBlindingS": "1q+mHygvvlOisl78KeAeAgJoKGLr2ZxLZ+DnsT4P5Q0=" } }, { - "positionWithdraw": { - "reserves": { - "r1": { - "lo": "138343348497016726" + "validatorVote": { + "body": { + "proposal": "86308775", + "vote": { + "vote": "VOTE_ABSTAIN" }, - "r2": { - "lo": "56932107223773616" - } - }, - "positionId": { - "inner": "n+5vEEEwJ4Vw6haSoNGSpLWRlemu0wDspESQ0mOZcV0=" - }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "identityKey": { + "ik": "2ywt/sfb3YSDpWR3eFC90+BIinPq7J2ejQLiUkHAY00=" }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "governanceKey": { + "gk": "pKqqX6jdlyeV5m69IahBD5ZCFnkIPSpaTrhIOA/fOQg=" + }, + "reason": { + "reason": "RdA6m6L11BkQj7Ren91" } }, - "sequence": "1" + "authSig": { + "inner": "Xn7T4j+Z0vOmL2w1Mmy7muOF6XjIMbGOVTCa2qtgHwi0jOCvk9SO2c3+TUErDaxIjfLBBkWyoshqn3NvZsaDAg==" + } } } ], "transactionParameters": { - "expiryHeight": "8365802583", - "chainId": "ofufkknwjpgaqnltcztwnx-645471874540833443741784294", + "expiryHeight": "9698697243", + "chainId": "hvjwdhgeljwajgudx-4120", "fee": { "amount": { - "lo": "37048063536637300" + "lo": "615310894601069498" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_42.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_42.proto index c07c3201e9..6a026e5054 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_42.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_42.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_43.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_43.json index 2341e76036..d18005b76b 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_43.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_43.json @@ -1,45 +1,78 @@ { "actions": [ { - "validatorDefinition": { - "validator": { - "identityKey": { - "ik": "yiuUZVLr9cfb87F2ZU4xrYHTKGSXE5PKQh+LdsqLjQ8=" + "undelegateClaim": { + "validatorIdentity": { + "ik": "Wtuj3DC95PNJgWiQ8HJ7GJTRPRAN9yJB403h8sNPlQU=" + }, + "penalty": { + "inner": "AAAAAAAAAAAAAAAAAAAAAP6rNnoPkJa7mMfigkC3gDU=" + }, + "unbondingAmount": { + "lo": "230488741514442039" + }, + "balanceBlinding": "3ZUIePkVqUZd7dzw1gdDSKN8VCNGl1kX35e4/LpjagM=", + "proofBlindingR": "B9RTUukVsngrQQk39gmzqZMzcE8bOqPX86rAGj8hYQI=", + "proofBlindingS": "LuvZLo3lZKdoO44Lav+34PXPsR41B8s+Jm2IoG7Zmwc=", + "unbondingStartHeight": "84133" + } + }, + { + "positionWithdraw": { + "reserves": { + "r1": { + "lo": "406480297377137296" }, - "consensusKey": "VdzKD+11KBFZfd5IL60NIaiSBli5u3vm30o56RWCis0=", - "name": "test validator", - "enabled": true, - "governanceKey": { - "gk": "yiuUZVLr9cfb87F2ZU4xrYHTKGSXE5PKQh+LdsqLjQ8=" + "r2": { + "lo": "465636221977847191" } }, - "authSig": "Uv0dQtEL2asaOcQu5KKu/FxSohORpFWlDh/OqY2/OAWy8zn5GrK+VzM8BRPF1OQf+WxTD1XWUOMv/+TiAcdeAA==" + "positionId": { + "inner": "kZ91xcjgTyISmjs0DuF8hrSaR+7kKtM7kBx5FDVKUjg=" + }, + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "sequence": "1" + } + }, + { + "proposalDepositClaim": { + "proposal": "851548391", + "depositAmount": { + "lo": "646040670043995736" + }, + "outcome": { + "failed": {} + } } }, { - "undelegate": { + "delegate": { "validatorIdentity": { - "ik": "pvhhZ9ltQSb+l28gZqBZ0YFy8qq9VD2uoofnxwIRdNY=" + "ik": "kk7LLOPxmIZKhr0Ukh2XLvUP399L721UhCLhHdbEnPg=" }, + "epochIndex": "2595", "unbondedAmount": { - "lo": "633987113281668403" + "lo": "433731196846298771" }, "delegationAmount": { - "lo": "514614043497885855" - }, - "fromEpoch": { - "index": "1382", - "startHeight": "1382" + "lo": "695702755478573145" } } } ], "transactionParameters": { - "expiryHeight": "6914108482", - "chainId": "fzqytrdlmgqmenndrwblmec-05346451865", + "expiryHeight": "695634365", + "chainId": "kgdomzsttqpjnqd-1381763077", "fee": { "amount": { - "lo": "580640120266145402" + "lo": "319987078549063183" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_43.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_43.proto index a3383fac1c..f70e6f5643 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_43.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_43.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_44.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_44.json index 88e6943353..82205d62ff 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_44.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_44.json @@ -1,42 +1,156 @@ { "actions": [ { - "delegate": { - "validatorIdentity": { - "ik": "fVsbg3ikBc6GHKgoQF4myxrKM2IcrFSNwVGrvMw7ZWY=" + "swapClaim": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "delta1I": { + "lo": "41919736816535540" + }, + "delta2I": { + "lo": "234205120913901479" + }, + "claimFee": { + "amount": {} + }, + "claimAddress": { + "inner": "bscaV3fy90ayaCbE8sLnRk/SMrwScA/c/HJ37Ha0lNkJdCD/OaRiRGYvDQxydn1CZamZIdH+LAf9uk/Qvs+1tV3v8uHdpLgIh9YnGhEUeZ8=" + }, + "rseed": "argPQUzP7hSrU9S2Ya2CfnUxXgSc5ZRACoWhx7nwICY=" }, - "epochIndex": "650", - "unbondedAmount": { - "lo": "837413547143383955" + "outputData": { + "delta1": { + "lo": "1345380509" + }, + "delta2": { + "lo": "1855590535" + }, + "lambda1": { + "lo": "1367" + }, + "lambda2": { + "lo": "1124" + }, + "unfilled1": { + "lo": "671" + }, + "unfilled2": { + "lo": "1841" + }, + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } }, - "delegationAmount": { - "lo": "238000266113679949" - } + "epochDuration": "1000", + "proofBlindingR": "ZHlcMn9i++DqoEuVK2TWtoHuBWv3z7b0yReqVI3iagY=", + "proofBlindingS": "eVud6WmGOnWB8V76OHXZmOJdRTT0nlh4/iDEx4hXIw4=" } }, { "validatorDefinition": { "validator": { "identityKey": { - "ik": "kMD1bKdBDVHp2sf4pztY1bMdubGciAR/82Z7Y5+5RAo=" + "ik": "Xh5QZ8np90ag2aa1UGrc7wOR6U0bwjwofD8MI67pVgc=" }, - "consensusKey": "13BDdkNR8uNDELk/djU6SjG474j3ZUELsOGeC9xiLGY=", + "consensusKey": "zeib8s2FSAOUJcGksDAo+/8aFXFFTHk8xPvFr1ZVyF4=", "name": "test validator", "enabled": true, "governanceKey": { - "gk": "kMD1bKdBDVHp2sf4pztY1bMdubGciAR/82Z7Y5+5RAo=" + "gk": "Xh5QZ8np90ag2aa1UGrc7wOR6U0bwjwofD8MI67pVgc=" + } + }, + "authSig": "LLXblGywq2RZXygc+Ogq/YYmjVetz+p32wckBYzFWgQE19eVBZ2AdyMLforepAYL+lppGYnCjueTAbbnYgMSAg==" + } + }, + { + "swapClaim": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "delta1I": { + "lo": "504058815357787740" + }, + "delta2I": { + "lo": "563305105296329368" + }, + "claimFee": { + "amount": {} + }, + "claimAddress": { + "inner": "m1LzAzBGVxmCYPymLVhWKYTVNl3pxvCSEhlR7zSj6XLXKR7rTYj7wectdXzX6RHMiE9SDAseedJvncY+Q13+aH9nBPNz896hEf/0XUYzuu8=" + }, + "rseed": "1/VlgAevb6sYHFj3fHUWpmbV9YH/QHSEOgaTwy6RtQE=" + }, + "outputData": { + "delta1": { + "lo": "1503441764" + }, + "delta2": { + "lo": "1383878115" + }, + "lambda1": { + "lo": "1575" + }, + "lambda2": { + "lo": "1669" + }, + "unfilled1": { + "lo": "965" + }, + "unfilled2": { + "lo": "1859" + }, + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } } }, - "authSig": "mFTm08JX4xKFE+Pf8XZtV3dpocYcfiJST/0x5b+b4wbi1+e1fCV92+BjwDAkxCjHRh7gDrBsrlqj2NJZctdAAg==" + "epochDuration": "1000", + "proofBlindingR": "nBI12cTiPuv8QSLlkJf718EFWMjICuFRF9SaJsKsBQg=", + "proofBlindingS": "Wl+IED5OMRiZYWenkujlRP37DBiIsTWtspI1S1fM1wo=" + } + }, + { + "communityPoolSpend": { + "value": { + "amount": { + "lo": "346519398546529841" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } } } ], "transactionParameters": { - "expiryHeight": "8764771413", - "chainId": "w-4865271479487611721305091", + "expiryHeight": "177066927", + "chainId": "nobgkgjyspjxhk-964578699294205781088605810", "fee": { "amount": { - "lo": "694627716318700526" + "lo": "154140937369915311" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_44.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_44.proto index d79a9c4b28..a48cbe3611 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_44.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_44.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_45.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_45.json index fd7a407d25..aaf1fa45f7 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_45.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_45.json @@ -1,11 +1,25 @@ { "actions": [ + { + "delegate": { + "validatorIdentity": { + "ik": "5d+n5re432w595HMnHMWNIeiqBG7koxRWz+z/OAcdvo=" + }, + "epochIndex": "7758", + "unbondedAmount": { + "lo": "254573988376150326" + }, + "delegationAmount": { + "lo": "654990827166732001" + } + } + }, { "actionDutchAuctionSchedule": { "description": { "input": { "amount": { - "lo": "822711624718070749" + "lo": "110793240593760250" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" @@ -15,37 +29,25 @@ "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" }, "maxOutput": { - "lo": "430750638761446118" + "lo": "638989916025602774" }, "minOutput": { - "lo": "926253026304277144" - }, - "startHeight": "483746522", - "endHeight": "483746523", - "stepCount": "368806483", - "nonce": "Jz+onRaC+XAwkjAlIGF6CFFWRMrKM2nRN3X3vh4Qub8=" - } - } - }, - { - "communityPoolDeposit": { - "value": { - "amount": { - "lo": "980503223363754344" + "lo": "203912627439460772" }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "startHeight": "747076843", + "endHeight": "747076844", + "stepCount": "269699674", + "nonce": "+axlhX1m8hOAaaXAcxlGp+yTRNHZJtVEvVQF/XzRFKI=" } } } ], "transactionParameters": { - "expiryHeight": "9396435381", - "chainId": "gbyqccglqydcruoszirlvmuqnt-8244639399167547", + "expiryHeight": "9795867227", + "chainId": "jtmkkgfpmpxgdgzkb-56292869373067953542534", "fee": { "amount": { - "lo": "983626274279646423" + "lo": "426559720761419916" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_45.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_45.proto index 81ef26eeb3..93dde0f309 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_45.proto +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_45.proto @@ -1,17 +1,17 @@ +BÂ? +" + åߧ淸ßl9÷‘Ìœs4‡¢¨»’ŒQ[?³üàvúÎ< +¶‚Ü‘™¶›Ä" +ᦃþÕ¿‹ ©ª¥ ¢ 0 -ÝçžÿÑû¶µ " +úÿë¨Ø»çÄ" )êœ/3qö¤‡çé\$pAô£VùƒëN]+;Ï2,©j" )êœ/3qö¤‡çé\$pAô£VùƒëN]+;Ï2,©j -敘ÑÇ­•ý" -˜õüç„Ç­í (ÚÅÕæ0ÛÅÕæ8Ó”î¯B '?¨‚ùp0’0% azQVDÊÊ3iÑ7u÷¾¹¿ -5¢2 -0 - -è²ãÍÉÏÜÍ " - )êœ/3qö¤‡çé\$pAô£VùƒëN]+;Ï2,©jAµóÈ€#+gbyqccglqydcruoszirlvmuqnt-8244639399167547 +Ö…þ–¾‰ï" +¤ÃûÝÄ®œê(ëùä0ìùä8ڔ̀B ù¬e…}fò€i¥ÀsF§ì“DÑÙ&ÕD½Tý|Ñ¢?Û¤„¿$)jtmkkgfpmpxgdgzkb-56292869373067953542534 -×É·ñ¨Ü¢Ó \ No newline at end of file +ŒÑå»å¹Üõ \ No newline at end of file diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_46.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_46.json index 995a72a126..e526da71a7 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_46.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_46.json @@ -1,14 +1,7 @@ { "actions": [ { - "positionClose": { - "positionId": { - "inner": "3bbkEtSgjhFIBKM177cemJLtXPcFjC189hyp82PQme4=" - } - } - }, - { - "swapClaim": { + "swap": { "swapPlaintext": { "tradingPair": { "asset1": { @@ -19,59 +12,43 @@ } }, "delta1I": { - "lo": "396407965900561063" + "lo": "72887687410642095" }, "delta2I": { - "lo": "31512525003725287" + "lo": "547635641772447099" }, "claimFee": { "amount": {} }, "claimAddress": { - "inner": "NNtbsuSI/Znlg0w2zKZo6gqkNX/02iLqEQ0blH/17S0/g9ZYxTM3feLvghIhyqqISmOYghzgIh0wZ3NTHHdKjcgogx5M0DBWTN6Mc7zJipg=" + "inner": "0bniv4eu9150x4dvwnqGvQTwyaAd8h8hBi9jfjPE6vXSklK7Q10uIeaHzf5mMQVIBEPf8hUuDHGBCUdPgcS71KESXOGKpymM4N4tAaW8oYU=" }, - "rseed": "jeYrMjQpR7Ky1p/R/3tIsRqh29ceNbLzEjBP/ctjCck=" + "rseed": "KeOJXP1AP7JzZYpFhct3JdrVkiHPs9qiCU/+FRJ5g1Q=" }, - "outputData": { - "delta1": { - "lo": "1101423576" - }, - "delta2": { - "lo": "1567061194" - }, - "lambda1": { - "lo": "1799" - }, - "lambda2": { - "lo": "746" - }, - "unfilled1": { - "lo": "1097" - }, - "unfilled2": { - "lo": "1121" - }, - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - } + "feeBlinding": "QosWaO7xqNjGM/8R/D5su71Kzakyyka+0diHIQbVCQQ=", + "proofBlindingR": "aL14qFSs2Ann3ONjBFYy5V5y+hsv1tsXLgHoy9U/VxE=", + "proofBlindingS": "K/EoLZ6PgiJSlfGIcwM8fszcp+yq+qJT4/eZX7hILAk=" + } + }, + { + "proposalSubmit": { + "proposal": { + "title": "rxrthzxztjzqytgjtijrhi-6529552803510343709013", + "description": "snisohocwfgeviddxdvlwbo-33080487998", + "signaling": {} }, - "epochDuration": "1000", - "proofBlindingR": "l8LmlnLtcFqlgianoxogzdvDlkScAgUjxACBkM1S7RA=", - "proofBlindingS": "Qu6BJ9ZKFmHZY2D23mxQj1vwChQiV1RUKAyuE/AfZhI=" + "depositAmount": { + "lo": "61121106144839310" + } } } ], "transactionParameters": { - "expiryHeight": "6509449978", - "chainId": "jwfqgaphakccpctwxwsryqvdzbqz-1046450848", + "expiryHeight": "7163888795", + "chainId": "txeyufhwmxngiob-316114451531670780", "fee": { "amount": { - "lo": "753235038814796507" + "lo": "666412132367616610" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_46.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_46.proto index 678ced5be5..9335456c2e 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_46.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_46.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_47.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_47.json index 224236f12c..35d194832c 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_47.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_47.json @@ -1,58 +1,51 @@ { "actions": [ { - "actionDutchAuctionWithdraw": { - "auctionId": { - "inner": "tp/ZH5p59aFYfrUCr0W9/th/yCQ5JoJ45WRnscvnsH0=" + "delegatorVote": { + "proposal": "600307667", + "vote": { + "vote": "VOTE_ABSTAIN" }, - "seq": "166896910", - "reservesInput": { - "amount": { - "lo": "387576649512742381" + "stakedNote": { + "value": { + "amount": { + "lo": "850848196871490857" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "rseed": "r8TyElHz0H3lGKxIKaD+IynWwTpyNF0A1BGi1+zzJrE=", + "address": { + "inner": "m/4ko6fjOrVs7LwmKzUQgB2p0R7lKwUkJZFppOTBM+p92pnWXN5aZWbKDy9fU7D/fSpQu12giwdjZ6H1UGuWWecj+wumQoknmOWy+P2dETo=" } }, - "reservesOutput": { - "amount": { - "lo": "158751433229900404" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - } - } - }, - { - "undelegate": { - "validatorIdentity": { - "ik": "s2x5E6BoKrLd2FExXtyaRre/CGXdnIf3IgCtFHZ++Ro=" - }, "unbondedAmount": { - "lo": "35105153384464635" - }, - "delegationAmount": { - "lo": "545185666844018131" + "lo": "273459012886727127" }, - "fromEpoch": { - "index": "142", - "startHeight": "142" - } + "randomizer": "Aomx564R104JYbIeop7LsO/M5gV99B2yRTxilsKHBAM=", + "proofBlindingR": "r1yCA/E2sQXFlcb72uSlP7zPdPUNLwiC6JhsARjdxgY=", + "proofBlindingS": "ZSXDlHX1JVYSsKsC6mdFmNk7CWaIwWdGk1dMJaBfYAg=" } }, { - "proposalWithdraw": { - "proposal": "18496651" + "proposalDepositClaim": { + "proposal": "859580653", + "depositAmount": { + "lo": "102575997101149630" + }, + "outcome": { + "slashed": {} + } } } ], "transactionParameters": { - "expiryHeight": "1998613256", - "chainId": "cnmkptqvxazriqivquhaazzayjr-618417965884", + "expiryHeight": "9161049251", + "chainId": "nxhqrylxvbgye-80938980112884", "fee": { "amount": { - "lo": "732461060190540421" + "lo": "811644454110626324" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_47.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_47.proto index 9f5833ee02..09ac316dbe 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_47.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_47.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_48.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_48.json index 62ac959887..a060cf8df9 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_48.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_48.json @@ -1,51 +1,61 @@ { "actions": [ { - "undelegate": { - "validatorIdentity": { - "ik": "yXRVlQf6bO60Q1DWoZrjBhTE4KU2WdcYXbbQZmcf29c=" - }, - "unbondedAmount": { - "lo": "434156311610937917" - }, - "delegationAmount": { - "lo": "906736185101517951" + "proposalWithdraw": { + "proposal": "843893421" + } + }, + { + "communityPoolOutput": { + "value": { + "amount": { + "lo": "810187426565504444" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "fromEpoch": { - "index": "9651", - "startHeight": "9651" + "address": { + "inner": "ss+bcEmKMAcFvr3a8nquQgE3bJJ11mJwu4SenHJp6PvooYNrHiq989dK7HXt0G7SABKfgKOosyUHCMfe/dIq7Q3XtJYopBHd3BEZoCKIMng=" } } }, { - "validatorVote": { - "body": { - "proposal": "311833840", - "vote": { - "vote": "VOTE_YES" - }, - "identityKey": { - "ik": "uGUm3LhW3M8jYT62AuhshlUWsY/mLLAXelHtv6bwwsQ=" + "proposalWithdraw": { + "proposal": "758716570" + } + }, + { + "positionWithdraw": { + "reserves": { + "r1": { + "lo": "980119925094349979" }, - "governanceKey": { - "gk": "GBdoWyK4s3wqUTcRYdih09IQNjTvVHCGKcHj/AFaOw4=" + "r2": { + "lo": "400519731478096542" + } + }, + "positionId": { + "inner": "bsWNutFCNQkURuGkyxmNmwwsP3Jd9XUSCtyabolaYCE=" + }, + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" }, - "reason": { - "reason": "2m59060UUbJ686PTRk" + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "authSig": { - "inner": "3OpxO7YAUv3S94K/AwjK4rj4m3dGm3Pkt8CItuaKVgnBkcSLMk3TZQx0vH/oLoGJmp1I7c8BAbe50xFIzN6/AA==" - } + "sequence": "1" } } ], "transactionParameters": { - "expiryHeight": "2073653224", - "chainId": "jwlf-236", + "expiryHeight": "3101462334", + "chainId": "vyklgcjeqbjn-17638596568242081315848442011998", "fee": { "amount": { - "lo": "548940969473133235" + "lo": "642867356857420384" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_48.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_48.proto index cc92372ad8..e6ecdfda1d 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_48.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_48.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_49.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_49.json index cd80b8bb79..9a4dc4ea51 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_49.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_49.json @@ -1,55 +1,39 @@ { "actions": [ { - "positionWithdraw": { - "reserves": { - "r1": { - "lo": "156835881934192213" - }, - "r2": { - "lo": "115627167388872578" - } - }, - "positionId": { - "inner": "engl3YUUdi9iiRLrjh01gUIC49fuDfhSl4hgG0s8Yp8=" - }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "communityPoolDeposit": { + "value": { + "amount": { + "lo": "105487505849066331" }, - "asset2": { + "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } - }, - "sequence": "1" + } } }, { - "output": { + "communityPoolOutput": { "value": { "amount": { - "lo": "553286105063296986" + "lo": "223823246583562188" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "destAddress": { - "inner": "QP0Bom3TH3ENHgZk5FWeoEKfF5KA1OqKM0m2CfKFYqNDM4Vkb4/M4nHz9eexsEJNvPnH+hos9kN0anmLCXRsphl0gbsCsjShwbJkEiyhUDI=" - }, - "rseed": "QuawixFRGn9GZrfF0p/3dYLhLakOdecj0XW12bD6AnI=", - "valueBlinding": "ogNf8Bxh+ZvpwB+oVJvXEgjjdQFXwG9eRdQjY5fplAA=", - "proofBlindingR": "U5Z2xxHUXTwscy0V6TRlI5jWmfwwYtaYhezzbmHDZRA=", - "proofBlindingS": "+TxTE8eMKqNVU7tW4cROU7ZOGQPd3m22H/zTVidekhA=" + "address": { + "inner": "0nu/JCr7CH2ujOOSE5V30n8Np4JgnVXlacjBbPS/1Id1ADNEdqcu+wSnQ3SwIZZieMDVigyw8R25TI6hQ1W6jnJBiCiKtMt23hRO3Vzg/5M=" + } } } ], "transactionParameters": { - "expiryHeight": "1062325585", - "chainId": "qibevlnmicqcvt-49581935210272", + "expiryHeight": "6517265301", + "chainId": "zzkidrpoeyjqa-309", "fee": { "amount": { - "lo": "279865984164232043" + "lo": "370447175926720781" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_49.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_49.proto index a651a82b41..c2e4cbc0d9 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_49.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_49.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_5.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_5.json index c1c8707ed9..5060cf255f 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_5.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_5.json @@ -1,75 +1,61 @@ { "actions": [ { - "communityPoolDeposit": { - "value": { - "amount": { - "lo": "1036664154951369" + "actionDutchAuctionSchedule": { + "description": { + "input": { + "amount": { + "lo": "959267011783665143" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "assetId": { + "outputId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + }, + "maxOutput": { + "lo": "751250687122497302" + }, + "minOutput": { + "lo": "747682953998530574" + }, + "startHeight": "445800614", + "endHeight": "445800615", + "stepCount": "601871057", + "nonce": "xuboyk6/KREc9EAzRC/BGyaPR6qCWyBtoRrasz4r2co=" } } }, { - "output": { + "communityPoolOutput": { "value": { "amount": { - "lo": "638345165489953157" + "lo": "491418530802256378" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "destAddress": { - "inner": "qebt8jtWPj9SnHIJR4NL4vLAi1gKWSyR/JElh1XpvylA7mD0RkbVbcJWBD8psVz+K8lN9c5XX5rIDJTrjghsuKfKSxK+WZ1OdLk2C7S/5Ts=" - }, - "rseed": "2vbbrSt139YZvpgrkYNYUwJTtSu2VZ6ftACy46aqRnY=", - "valueBlinding": "S594QMoEukbNKaSyf5Xe0B9ZszLKDCObk0Uoo45ygwQ=", - "proofBlindingR": "WEez4d/FVTkfJjiWKnrt6LDyfo3xxdu8FMEHn5JNEAU=", - "proofBlindingS": "/TWjna3Uf53MYM1D0+fDYeKyrPep6DubpnHPm8si7gA=" - } - }, - { - "validatorDefinition": { - "validator": { - "identityKey": { - "ik": "fLdasNhrur8qhk0pqQObPgj9q9zgzWq6p4sYoiP1TwA=" - }, - "consensusKey": "QN0BsBuXaJ0QP1JQTZxqxhgehCNR9WmariOOZJTbqp0=", - "name": "test validator", - "enabled": true, - "governanceKey": { - "gk": "fLdasNhrur8qhk0pqQObPgj9q9zgzWq6p4sYoiP1TwA=" - } - }, - "authSig": "Trz+3oLgmDVHoJzW9DNDg8onQjVcVi4NEt5DbfdrsRHT/KRR1/LwQJkrp2POHZqdQV9Cs9zhuKrkT65HKVOuAA==" + "address": { + "inner": "jdfbbRIxJIfnJW9mVORP3gcWOyJILEXkAuTpi4IwR7qt98Hd2GZ4Td+Wi30l/D33mr7OGEwwq/B1LhbpZRLKa4ZHKioajeYaJVESFux/7/g=" + } } }, { - "validatorDefinition": { - "validator": { - "identityKey": { - "ik": "Evn2fHXuJWH6GzQBEVX2Mjskstrj1hScCzEnVzoyawY=" - }, - "consensusKey": "UPLsoOjFgVDESxCpu7NMVmvu23ohO8zvcidh1rVN3s8=", - "name": "test validator", - "enabled": true, - "governanceKey": { - "gk": "Evn2fHXuJWH6GzQBEVX2Mjskstrj1hScCzEnVzoyawY=" - } - }, - "authSig": "Oo/1L+MI5tCGLjQe3OHll8gh7WjSYM7esuNZNfSApAHkhmOG6wPQCoiCPuLRyWFsgmBtVuA1v65PeaI2ClpWAQ==" + "positionClose": { + "positionId": { + "inner": "6ZVTaHiybmvFYuogiLbFGyUmSmuC1VEWNYoQnHuYEN0=" + } } } ], "transactionParameters": { - "expiryHeight": "1063165421", - "chainId": "zaisqdw-2686846248307740", + "expiryHeight": "5353829317", + "chainId": "omyplfrlb-2381799", "fee": { "amount": { - "lo": "322426328779457112" + "lo": "856586381620898873" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_5.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_5.proto index 870ddcc893..052c795fda 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_5.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_5.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_50.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_50.json index c684e10b47..f92d5a861d 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_50.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_50.json @@ -1,86 +1,47 @@ { "actions": [ { - "actionDutchAuctionWithdraw": { - "auctionId": { - "inner": "TpriKDTpcAgYmMOmmv7tbzZZX3EXQX3UiNC+ZnxrcOk=" - }, - "seq": "436040713", - "reservesInput": { - "amount": { - "lo": "387661138015161465" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "reservesOutput": { - "amount": { - "lo": "419810828963875039" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - } - } - }, - { - "communityPoolSpend": { - "value": { - "amount": { - "lo": "377884595747125776" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - } - } - }, - { - "swap": { - "swapPlaintext": { - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "actionDutchAuctionSchedule": { + "description": { + "input": { + "amount": { + "lo": "293740443171447943" }, - "asset2": { + "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "delta1I": { - "lo": "193802762981415312" - }, - "delta2I": { - "lo": "101860170399207144" + "outputId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" }, - "claimFee": { - "amount": {} + "maxOutput": { + "lo": "367390465144112190" }, - "claimAddress": { - "inner": "VnwLDdwir/ubCvYSf6JcVGzVXL7DtQMEKTA1tkwPHCiH5qzVyvpLzx4rtgSPAgBsZDP7patYgBMmFXcMDa2o0UIRiEnFgymh0Z7kD9u6zc8=" + "minOutput": { + "lo": "895001701703425288" }, - "rseed": "3AAzjE03ALLXBUKW7bk+tbN+ll7JaM9u0+3ZSA5vmuo=" - }, - "feeBlinding": "qhUKZj7TFZInDvUxMHGEPZlOgrWjdOVycs38YngJLwI=", - "proofBlindingR": "8XY7e8hdCKdyUh/Cs6jInBPQFTvfdx6s9NqTQYBVxgY=", - "proofBlindingS": "cth/1pVG80xLhN5ave19GBZNneZ8f5UQu746ZXGHUAc=" + "startHeight": "421220788", + "endHeight": "421220789", + "stepCount": "240760373", + "nonce": "YoMhwD4DMN0rlquwsba/FosA36yEJJgDSEAkEU0aVjk=" + } } }, { "ibcRelayAction": { "rawAction": { "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", - "value": "CrQBCOewhdwBEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgwIhOjy7AIQie2R0QFAmJWaiKe16oEYEgIKABoMCITo8uwCEIntkdEBIo8BcGVudW1icmExZXN0Y3owd24wY3p2OGxkYWFqcDhza3F3eHQ1ZnF2bWd0YTM1dGs5YWw5cWU0amVrNjl6c2N6NzMyeXhwbjlqa3M2dXh0bWswNWRobDYwMHFzcWNkN3N0a2s4cXByNzNnNmx2ZXc4c2RkNGtweXQ5NGR2empqa3F1cDA4M2t1eXM3djY3c3M=" + "value": "CrMBCNKNyZcHEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgsI7pyBhgEQ+v6pHUC4zeCtwru2iBgSAgoAGgsI7pyBhgEQ+v6pHSKPAXBlbnVtYnJhMTVjd3o4cnByd3FyNXFkZmd2bHE5djBoaGN2cDg4Z2tldHc3cWdxMno4ZjI5YWRrZGtxM2ZwbW5kaDBsdnVmamx1OGd1ZXZsdGQyMms2bXFqamZremcyNnBldXhocWs0enNxOHo2M2F5cGY1Zm51MnZrcXFwdW1mcXV4aHl3dzZxOHZ6ZGxt" } } } ], "transactionParameters": { - "expiryHeight": "557938254", - "chainId": "wjhrzlljyubzdmxpgmbftrvtztfkkwn-31226743652180448", + "expiryHeight": "4478900183", + "chainId": "vjrjfbkwtyhxhnhuawipa-8364355", "fee": { "amount": { - "lo": "594355047648525707" + "lo": "699606179851092898" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_50.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_50.proto index 6a97f50077..4c546be223 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_50.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_50.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_51.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_51.json index faa02bc441..9f8b4d1f73 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_51.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_51.json @@ -1,82 +1,75 @@ { "actions": [ { - "positionWithdraw": { - "reserves": { - "r1": { - "lo": "288822294649015597" + "validatorVote": { + "body": { + "proposal": "424073693", + "vote": { + "vote": "VOTE_YES" }, - "r2": { - "lo": "459024833642480735" - } - }, - "positionId": { - "inner": "GzOmgxCOOcLgFvHD1lsVkEJwTolZhIM9ZXEadOyVHoI=" - }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "identityKey": { + "ik": "AZo98c88heSoNh2PdZ9kQckOEIX8Gj8iXa16ywUyqBk=" + }, + "governanceKey": { + "gk": "anxLvQrfpZfY/aIeQOviak5+ly1t7ZD6Et4JU1twwhA=" }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "reason": { + "reason": "TsB0FXuAEjSHJLvwBI8576KGlFQ29Iy4" } }, - "sequence": "1" - } - }, - { - "actionDutchAuctionEnd": { - "auctionId": { - "inner": "PwvrR+xrtZB4Xiro6cTqIRmNXJtydVd3KR7leAJe6Ic=" + "authSig": { + "inner": "3OmiNlnOiWHF5V/M8Vp+gekSbqyM5ngqmTrHvml7lxFQzY9rP7tJoYKpK2otPn/cbo3vfIQY4JtrLabDQd4YBA==" } } }, { - "delegatorVote": { - "proposal": "541740445", - "vote": { - "vote": "VOTE_ABSTAIN" + "ics20Withdrawal": { + "amount": { + "lo": "54140647838468836" }, - "stakedNote": { - "value": { - "amount": { - "lo": "572633255744364421" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "rseed": "lL8LHjUh+k7eg2fW5afrKp8NfkQx2Yi5wBZGn5lD1Pw=", - "address": { - "inner": "gsWZa3riNJFwUJvS+GuJSO6upsK0nklORGp5Swl/TNny7VDxlxMT5LApQXx2vdXhLCkhJVPWCiANg6IMtCRCRNuGuSS+qQ1grfgUykQFTe0=" - } + "denom": { + "denom": "qC9P" }, - "unbondedAmount": { - "lo": "428752071407756273" + "destinationChainAddress": "penumbra15gu5f70462e9rvxgw9u8f73uee2n0gk9znhe4qd3tkw5hy0kk46knyhx2avpxgh2h268d4t3at85d4gl24ldk4l6wla86yzzpdq9a5q8ztw2rqjgfs36g84rpnssuk9fk8hndu", + "returnAddress": { + "inner": "mwemSk3QAshRRGsiY37HPwBJKexDX7nJtZk4GLsTER/gByAQIsKgADHYDnNSTCSHt07dVRgCww10Dfj2DSQ2FOSrmP1iTy09Xl1k+oclaRI=" }, - "randomizer": "rP1nJQ2vM+S/JdNAQhOyvbfItixiPxhDcuoMoFOt0wI=", - "proofBlindingR": "UIN6dSK10tWMPGLGFP2EQnH7RIPxQAXCwBKbRueUzhE=", - "proofBlindingS": "BngSyskgmNBrLkcGy/UHYzvPgeIaUwlqXZanHgfd0ws=" + "timeoutHeight": { + "revisionNumber": "706174073", + "revisionHeight": "61357428" + }, + "sourceChannel": "channel-0" } }, { - "proposalDepositClaim": { - "proposal": "693570752", - "depositAmount": { - "lo": "209388441450832082" + "validatorVote": { + "body": { + "proposal": "931666139", + "vote": { + "vote": "VOTE_ABSTAIN" + }, + "identityKey": { + "ik": "WFGXtIuXwW09FdElSfGZpLe591He0lDY6INLP26fTYY=" + }, + "governanceKey": { + "gk": "NpCRC6SKD7qSwKJ7iwmtegUIYg8ZvnxTLcrKEWKz7gQ=" + }, + "reason": { + "reason": "en2FOPKOfWz2pVtfhfuS" + } }, - "outcome": { - "failed": {} + "authSig": { + "inner": "fkgQHALQbL7VPnG8GpJMd8fKykG+l4IXp9QcW0xkVgjE4Nun2n4M/HBvBspQ4P2Qz8Ubd4hOR6ALSNENR1rXAQ==" } } } ], "transactionParameters": { - "expiryHeight": "5085012632", - "chainId": "oryiem-09808985418868", + "expiryHeight": "8661921674", + "chainId": "upyutwzhdrhhfngehapfscnoipj-527282011992925063706295339", "fee": { "amount": { - "lo": "665210448174199572" + "lo": "317449873453524944" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_51.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_51.proto index dca06098f6..0ed1f9d6a9 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_51.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_51.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_52.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_52.json index 3f2b6d6878..1efac46f6b 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_52.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_52.json @@ -1,79 +1,75 @@ { "actions": [ { - "positionClose": { - "positionId": { - "inner": "SMfveMTPvAXF67N8GO5pgSEfQWns64sfkVAn5CFItiQ=" - } - } - }, - { - "undelegate": { + "undelegateClaim": { "validatorIdentity": { - "ik": "iyN87FAMXAftSrtCWE9f3eqPETqBiq/uTvFi7LyCmxI=" + "ik": "cznz23YIn2Hk3aBpRMfqIB4UelYpLIUqYCTmCo31J0E=" }, - "unbondedAmount": { - "lo": "19042216230138264" + "penalty": { + "inner": "AAAAAAAAAAAAAAAAAAAAAP5Pdl/YraufVZs9B8hLXc0=" }, - "delegationAmount": { - "lo": "482839241936869224" + "unbondingAmount": { + "lo": "403952508547945850" }, - "fromEpoch": { - "index": "4676", - "startHeight": "4676" - } + "balanceBlinding": "IXAhKZ9VpP5LoxsD3+aSqfhKmrh/pft78nf2wBJacQE=", + "proofBlindingR": "jofsq0CKWp9GjAWMhIyoiFQEqnwijQRcJTqqmbLMpg0=", + "proofBlindingS": "mGG6SP7D6JVE6iz/ouOppvf1P51poJq+a8j2Ni9pOgs=", + "unbondingStartHeight": "35400" } }, { - "validatorDefinition": { - "validator": { - "identityKey": { - "ik": "UrEAr+MQiJBFO0qFvvJ1CSR5CYvwMdPWVQFEK7IdvgQ=" + "spend": { + "note": { + "value": { + "amount": { + "lo": "405523106391625520" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "consensusKey": "C/nRuRoAy5d9CNLJxn3dsziwwg1AQQQRbey1GkTj9Zg=", - "name": "test validator", - "enabled": true, - "governanceKey": { - "gk": "UrEAr+MQiJBFO0qFvvJ1CSR5CYvwMdPWVQFEK7IdvgQ=" + "rseed": "GGuldCNYx+/YgiZWhopcVfxyzZLnj5aXvY1OI9J6Ys0=", + "address": { + "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" } }, - "authSig": "OGZHsvZky2lg4gp+sG+niTJFG2kw7lzO0PCnrUEllxLbMYSUwVj2tlOs1lMrpT/Ki/hGNPa6wNFylyKdLe1rAQ==" + "position": "29171673165956", + "randomizer": "IRJb4Qw1+CE1lPF0U+zuTBpyV86VTvqslSOveUwAEwQ=", + "valueBlinding": "YfIOuCcwYPEQmFRi5BdZN6LX/EKZa2OVLLqWeQzHkQI=", + "proofBlindingR": "eHhcqkQJzOe+sUVuSzmkDb3OzCtpEKmgP7x/TRjXYgk=", + "proofBlindingS": "QGpJjSDJEobupXnQkQ1enwImDNn+I3VDabmPy/2kyBE=" } }, { - "actionDutchAuctionSchedule": { - "description": { - "input": { + "spend": { + "note": { + "value": { "amount": { - "lo": "613797690949653801" + "lo": "723407473680610268" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "outputId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "maxOutput": { - "lo": "202687475006118761" - }, - "minOutput": { - "lo": "249307451664785847" - }, - "startHeight": "491118876", - "endHeight": "491118877", - "stepCount": "888742486", - "nonce": "RiYbEFApiMNOegR3m6md3NhOdzP8Eerc9jdVdNN8PhY=" - } + "rseed": "mosc7Z0H3J/flXWPlsSXJY3SAeGsVHG7U2Wzv1MXfBU=", + "address": { + "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" + } + }, + "position": "226618279482557", + "randomizer": "2qQfArj1ARkWMjgBwtGzurhuPtFdF8IporG7Su5FvgM=", + "valueBlinding": "nTjC76EESj9sAljstCdAzSpZP4I5QmIABAwfbBjUSQI=", + "proofBlindingR": "xPPBGsdzPEDFjwA99KU1GlzgtW2rdv1e+1NNDRZSyRE=", + "proofBlindingS": "uOTdiyO1r9xf4riPHACpqTRHZ009CSTIRNuBo7ud5Qk=" } } ], "transactionParameters": { - "expiryHeight": "1011380159", - "chainId": "sdlfavqxkfmzsjdgmaeinaezkqm-2702578560544", + "expiryHeight": "7775480369", + "chainId": "zjqydbtrpduqapmudcbrb-8728813122877759430669", "fee": { "amount": { - "lo": "145494383194523523" + "lo": "631078837300928995" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_52.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_52.proto index 9fca24c844..c02f7c71a9 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_52.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_52.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_53.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_53.json index c71dc7e4ae..c0aa06956b 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_53.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_53.json @@ -1,98 +1,67 @@ { "actions": [ { - "swapClaim": { - "swapPlaintext": { - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "delta1I": { - "lo": "958497548301180222" - }, - "delta2I": { - "lo": "762289167720109656" - }, - "claimFee": { - "amount": {} - }, - "claimAddress": { - "inner": "1ULbkzsd9b5KY3FyTdO88HIlZ682nF1mwuSkQ4/A7heFxP4oh5Rb0kEIDfDTI8+3EnLFH4U7zXXRuNuUAFst9ry/bU3HIPgH0s8oL6Hs/14=" - }, - "rseed": "2AmW1IePatTBC1T2mHTfhtOo5UQYhWGgHn6btwRWutQ=" + "actionDutchAuctionWithdraw": { + "auctionId": { + "inner": "AGlBK9qPwRI6CnFVRYyswhjuvy/73YwLRRV0G0ft0iU=" }, - "outputData": { - "delta1": { - "lo": "1405614755" - }, - "delta2": { - "lo": "661376073" - }, - "lambda1": { - "lo": "1258" - }, - "lambda2": { - "lo": "791" - }, - "unfilled1": { - "lo": "840" - }, - "unfilled2": { - "lo": "247" + "seq": "242797281", + "reservesInput": { + "amount": { + "lo": "673293596448810649" }, - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "epochDuration": "1000", - "proofBlindingR": "WQHBry8oVP6WAjz5+c6iSEQL/LNbCmHFoqHJPpa7sg4=", - "proofBlindingS": "oG0qp8wOBzJcSI8Cehv7ba6jsrZWmPqe5dBuNaUyIwc=" + "reservesOutput": { + "amount": { + "lo": "792320776830422645" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } } }, { - "delegatorVote": { - "proposal": "7874140", - "vote": { - "vote": "VOTE_ABSTAIN" - }, - "stakedNote": { - "value": { - "amount": { - "lo": "977817854302871386" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "positionWithdraw": { + "reserves": { + "r1": { + "lo": "690531108414176340" }, - "rseed": "L8kg8Nexj/jKzj+XdvMlm/cslBiraB5VsFNxO7IpCFk=", - "address": { - "inner": "DV44x2Hg8fWCQklYN2scETG+Psm5A/JGsd6fuwJNf8gCfJvZbFTtjwwiAry0wc7HHWsh2FDITF9MNq+/z3KsJqf3qaJy1kkAoMy0fJQmArs=" + "r2": { + "lo": "623174129175679183" } }, - "unbondedAmount": { - "lo": "762957993842331273" + "positionId": { + "inner": "B8avEje9r/JhxKZaDVQucg6uHmjNbN8wyO0xd8KuRGw=" }, - "randomizer": "bBPsXClhVMyyRCeml/RShekIeb4YbJes30F8OqiH8wE=", - "proofBlindingR": "nH/mFAudgSXoNPgqD3ceF6UoedpmRvrEPC9BiluwJw0=", - "proofBlindingS": "/3+71UPitlRw6vw8Yf/L+rA4FoP8gQGRqEZHDx34Dg4=" + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "sequence": "1" + } + }, + { + "positionClose": { + "positionId": { + "inner": "Agc2rvDl7qAnrHbeenzlb+uK2Y7fNOH4Mxtjl4grFRw=" + } } } ], "transactionParameters": { - "expiryHeight": "4419191355", - "chainId": "qfxqscwkbkxnzzupuoraglpkoxqxgxo-01", + "expiryHeight": "4359868", + "chainId": "bzohbssrotvnasx-796803652291134799326310", "fee": { "amount": { - "lo": "441751357449821089" + "lo": "579937922405589716" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_53.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_53.proto index 622da37e43..67be66db02 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_53.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_53.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_54.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_54.json index fadff280e6..ac97d9d9b3 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_54.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_54.json @@ -1,65 +1,62 @@ { "actions": [ { - "validatorDefinition": { - "validator": { - "identityKey": { - "ik": "iLny4M+Mq8sAak5rMdt+lE3oXHGqs33MKXy/jgwg0Ac=" + "spend": { + "note": { + "value": { + "amount": { + "lo": "20141913172230423" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "consensusKey": "NpIKLSY7jK5/iM4NnaIuzfvzBSXJO5t80UmgjobB8ic=", - "name": "test validator", - "enabled": true, - "governanceKey": { - "gk": "iLny4M+Mq8sAak5rMdt+lE3oXHGqs33MKXy/jgwg0Ac=" + "rseed": "pEOXZh76ne+feLiIMugx5PeD1MMDQIxY1wyG8ldgZIE=", + "address": { + "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" } }, - "authSig": "oJBrdJNwasA17QAP6wn//L5VAnXSNC5LVZKLyxtdHQa5m+SJK6r3QVIgB3tbFlp0ti4BWv8vRrnfRFFTAe2+Ag==" + "position": "44539500200028", + "randomizer": "8/qFVGNGIxnB1Lvzpzn9ivsAUJZdVBWtCncuiH0KaAQ=", + "valueBlinding": "eX4BUnEK0vQEdQq74WYQ1vrATJoMuVmDJ6lZ/ZdkKQA=", + "proofBlindingR": "Dhz6tB8g+I5DdnJPYZM2OYbS1Y5XLsdCv0zjYtk7MQI=", + "proofBlindingS": "JVA1mcFNJ/v71hMEbMPY1gW+YvPvINKJv/5TmH0+gAI=" } }, { - "positionOpen": { - "position": { - "phi": { - "component": { - "p": { - "lo": "358931458774794304" - }, - "q": { - "lo": "458103987296919217" - } + "actionDutchAuctionSchedule": { + "description": { + "input": { + "amount": { + "lo": "983823195255907933" }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "state": { - "state": "POSITION_STATE_ENUM_OPENED" + "outputId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" }, - "reserves": { - "r1": { - "lo": "569052995210047825" - }, - "r2": { - "lo": "818343598863903521" - } + "maxOutput": { + "lo": "91704407083692831" + }, + "minOutput": { + "lo": "679530614988797323" }, - "closeOnFill": true + "startHeight": "614121943", + "endHeight": "614121944", + "stepCount": "401943825", + "nonce": "CMPMEUQCAv5g9A6hkXs9Jp3Yk5kLoWfanqLKmjR8Bk4=" } } } ], "transactionParameters": { - "expiryHeight": "2877556417", - "chainId": "dxjzhoot-7635474495673234927", + "expiryHeight": "7944813638", + "chainId": "nznlajsu-65153921", "fee": { "amount": { - "lo": "378296821848840338" + "lo": "702800535852104815" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_54.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_54.proto index c0f1a380ff..6d04c0246b 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_54.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_54.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_55.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_55.json index e57c70002e..7a1620b455 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_55.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_55.json @@ -1,91 +1,50 @@ { "actions": [ { - "output": { - "value": { - "amount": { - "lo": "730795322522198916" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "delegate": { + "validatorIdentity": { + "ik": "cmV/TCl1pfJNLOJ8zFYfiwIpu0LkIi52+r8oRFLyz/I=" }, - "destAddress": { - "inner": "FNfmCqZIghuEhW0oab1ooPTF10ahoCfa8aF19UWlcx0g9qLPkS8M6bHzDEmb4bTcNE0NQ3XgbYbZMt0cmtlZs0J96IBMPRF4RHWlbPtysbI=" + "epochIndex": "5358", + "unbondedAmount": { + "lo": "459111846236517868" }, - "rseed": "qbM6oHNj0vAoT45E9F5wWB2+UJvZSLsDAtt8pBRwVco=", - "valueBlinding": "/IohsH0nkpmqt25AB9PMRy2mntHpK5wLy//wmv+CQwA=", - "proofBlindingR": "/DGdY4nPoSdWlLbb6AdAQELx1fsapYLTxRmq+hmBlhE=", - "proofBlindingS": "+02LS6S+LmBhVUOTX5dc7krNlyJ2k5+l0DrXt6AMQA4=" - } - }, - { - "communityPoolOutput": { - "value": { - "amount": { - "lo": "2803500230602381" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "address": { - "inner": "OEPp7sxzf11Y969ZqAk2satY6uROwgyuKGlWy2nAMpP2n3NuDiMG1GWjEG5Rpe0twXkK8yPY7wTRoroL++UY3yld/54qibvsxp7PU2WXBTg=" + "delegationAmount": { + "lo": "504051032224617802" } } }, { - "swap": { - "swapPlaintext": { - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "delta1I": { - "lo": "280071918739923758" - }, - "delta2I": { - "lo": "82735442475513391" - }, - "claimFee": { - "amount": {} - }, - "claimAddress": { - "inner": "x/ArjPpeSRM+ZsBDicr0HCVZUZqTXK+J70uXsE+T/kheyI6spe8mdKEXEcHH73MJ1jy8X2oE40Bc9Tl7IrhMtowBSiNpL5gPY/MqbF4Lsfw=" - }, - "rseed": "mY1nPgW2cKMakTiZG9kryK+4QlcYwPNe9yRA6HsuJ10=" + "undelegateClaim": { + "validatorIdentity": { + "ik": "c26bl/D2vX2R4k2o88IscUZF2GLTHHGX6NRZ2P8e4eQ=" }, - "feeBlinding": "cwU1mK3ig4wPBuiziWIyFimuTVRPDR9gBEA/ggJknQQ=", - "proofBlindingR": "Hi0z78Eit+7oDUhL0ChlP31eS5MqD7goV25Axi7jqwY=", - "proofBlindingS": "eqDijhVljlBfejqCLm8DLLpKOD22p5EUpQqTwX+XQhA=" + "penalty": { + "inner": "AAAAAAAAAAAAAAAAAAAAAP5jH4oJAt4A0bcXWOIZZSw=" + }, + "unbondingAmount": { + "lo": "917176589983196170" + }, + "balanceBlinding": "U87pkG/+hbjNS9DxQm2j42f+Crz73yTgOMeSzglWHAQ=", + "proofBlindingR": "QIgmQglvMIq5ldH8Mw9AnQKTEd5ZqcxIMdTyle0+xgg=", + "proofBlindingS": "Bxh9Tvc+2Sht5WskW2Hu6dqAtp8lVaCyCMD61WeR0wY=", + "unbondingStartHeight": "44449" } }, { - "communityPoolOutput": { - "value": { - "amount": { - "lo": "751817463129736038" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "address": { - "inner": "maldcboxzz3kHjVGO0A4Lkoi+irE2Cj2/4VpawaXJn9tEOxRgKGhRIYnWuhyq1nnPPceSHc54zmYQSVwE1R6BMouPEbuJLvWKxBThEwZBAE=" + "actionDutchAuctionEnd": { + "auctionId": { + "inner": "9JGjGT2pwN6tEZMehZQ9alwI1WftrFoPyVOQwCpdocM=" } } } ], "transactionParameters": { - "expiryHeight": "7272722499", - "chainId": "sinpanhenfsczdngfwcuflmh-534447788837", + "expiryHeight": "5671128062", + "chainId": "iwqqhafynpaayhkjdhnco-17301706536110934296408", "fee": { "amount": { - "lo": "120841578214817592" + "lo": "481841763530573017" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_55.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_55.proto index ba2b0d9c02..f61d21f926 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_55.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_55.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_56.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_56.json index 028e3c9457..422399a5b6 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_56.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_56.json @@ -1,68 +1,98 @@ { "actions": [ { - "ics20Withdrawal": { - "amount": { - "lo": "121181733842508480" - }, - "denom": { - "denom": "k83T" - }, - "destinationChainAddress": "penumbra1z40a82m0yawny3gv33pdszpvwjkv5d3f9hmvuun88yl89rdkredynypxl9zq04urny48np2f8c2scerdvufel8kn4eph9uvuwuf9td5cx7899ajcus3vzpxk64uhx5etq083xq", - "returnAddress": { - "inner": "8I7Udm4faRbDpDknZOuJ8lHqn6/drSqZXLVr85JJVPgMRlj2lPs+XGb3Z+BD8WrqEzI5E5wOrAx0I7bpMDKZGGJai8VvY7LRl9bifEX1beI=" - }, - "timeoutHeight": { - "revisionNumber": "988635908", - "revisionHeight": "360587687" - }, - "sourceChannel": "channel-0" + "positionOpen": { + "position": { + "phi": { + "component": { + "p": { + "lo": "745694737916985836" + }, + "q": { + "lo": "968867042961476557" + } + }, + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } + }, + "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "state": { + "state": "POSITION_STATE_ENUM_CLOSED" + }, + "reserves": { + "r1": { + "lo": "276516835790042487" + }, + "r2": { + "lo": "245584029657750854" + } + }, + "closeOnFill": true + } } }, { - "communityPoolOutput": { + "output": { "value": { "amount": { - "lo": "618265017482711596" + "lo": "521338691537232665" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "address": { - "inner": "bZ8yazXqJCfvqgJk0l0g+FvRs0G4lbeD1/N3uDeGagexxekHvvb8jW7SvrVdOJT54GmwNPWyo5S8KBunlw4XMyyTnUnBW7gdCeWmQ+UoEC8=" - } + "destAddress": { + "inner": "acY/3afANSc+M/VFhjcTWuLLN5cr2qF1/gGhBOR41zOtRwAKhKwMPhKr2B/z0XVcLdADbKgBgTx7LjF3krX4qdVSEVBqGJ8PSggDsw0cjwA=" + }, + "rseed": "ORZTPbGV8bSky3XcjsISPpSARJq7HnybbKd2GSfOFT0=", + "valueBlinding": "X/r0KsJMk8so8B/neNd8HfjwzYLsYNFlUSJEf3ba5QE=", + "proofBlindingR": "mYqVGGU7U/+Ki1sRK0aVtPhYyAWyU5+huwkViFDW1gs=", + "proofBlindingS": "jICXZYHSrc2dfOwUuAhnmrXLKAlUyRpABpzUA5X+4RA=" } }, { - "validatorVote": { - "body": { - "proposal": "500896994", - "vote": { - "vote": "VOTE_ABSTAIN" + "swap": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "identityKey": { - "ik": "FW/YF8ry8xO4R1fowfPJRpZpiyp8OAJ1q9OhtYDnI4Y=" + "delta1I": { + "lo": "812239839139257288" }, - "governanceKey": { - "gk": "9HysYMEzMkNp2hkmKpJpNHl4DO4JHhR5FS91fuR/hA4=" + "delta2I": { + "lo": "309815352755896717" }, - "reason": { - "reason": "53" - } + "claimFee": { + "amount": {} + }, + "claimAddress": { + "inner": "+4abxQ1pE8twtTmPdt+/h+eALJBKVScEO4KWi+3nOjUCkx1TL4VNCSpFS6ocOot6Qeu37aALFPinNJU6Qmnn8L/kFnt+jUoavBHzhehmOPE=" + }, + "rseed": "jMkdg0vVQjUT+jxA64YtectnpAjJUJeMygEZgz14n5M=" }, - "authSig": { - "inner": "ZlE1U3aFj19nLsI5N0kylo6icTzdRMa43Lq763DvHABjPMZZd37gk+tTf/Kq0ppC4TInW54YjxRZw8yTVoQOAA==" - } + "feeBlinding": "o1nH3tqoW7FG0JN6Bhb6wyDVLC9SUDTDk7+uGD4jqAM=", + "proofBlindingR": "8PTmkfA4V9s0W2zvg+k0yN6WTTed6BT+HcA1mJTwyww=", + "proofBlindingS": "5fVPO0wci8Vku8cdtNW7tyfjSOWKN5zNSm56E55WtgU=" } } ], "transactionParameters": { - "expiryHeight": "3231285081", - "chainId": "ltifokhxkrn-0771099036473421120848003367", + "expiryHeight": "1061434754", + "chainId": "hczqfrcrczfe-4163873794", "fee": { "amount": { - "lo": "813796076035463546" + "lo": "276392301192941259" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_56.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_56.proto index 0d7d7aa4cd..dbecc0dc06 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_56.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_56.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_57.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_57.json index 5b4a8cb58c..9379a79b23 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_57.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_57.json @@ -1,55 +1,76 @@ { "actions": [ { - "output": { - "value": { - "amount": { - "lo": "638605499233781675" + "proposalWithdraw": { + "proposal": "927206879" + } + }, + { + "positionOpen": { + "position": { + "phi": { + "component": { + "p": { + "lo": "38875716911663653" + }, + "q": { + "lo": "916394991916937582" + } + }, + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "destAddress": { - "inner": "1eVfb4503/Pxzpb4qtXP9KPGDq4nAUTVPLvWmXvDHLN9BAn+CuIaZlpnT5RkPD6S5jjSEx9C/+b6iXIP0zAdekuHW/NQYJWhGXyl7Yo0GWU=" - }, - "rseed": "YjwNHhlwNZ9Jf8eLnkaXNlzfipThtMsaRAwajeOAP74=", - "valueBlinding": "zuzjK/ww1oUKjLTkB9UHIPzQHa4pLTyM76UbphPW8gA=", - "proofBlindingR": "2aIsa/xQnVtdmJLCkbnS9hZoUV4lATH0MjmIGS/VkQ0=", - "proofBlindingS": "LqKZgQDZCJ9WiptMy4uqJK6ILbySQu5lqvcPA6AjpBI=" + "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "state": { + "state": "POSITION_STATE_ENUM_OPENED" + }, + "reserves": { + "r1": { + "lo": "229102593719999864" + }, + "r2": { + "lo": "893684954558147537" + } + }, + "closeOnFill": true + } } }, { - "actionDutchAuctionWithdraw": { - "auctionId": { - "inner": "ewYH3EhX0+c66PQghC0IzBAKVS9+s5bSQv8/ZqTYD7A=" - }, - "seq": "768874545", - "reservesInput": { - "amount": { - "lo": "582874434659878222" + "validatorVote": { + "body": { + "proposal": "978329411", + "vote": { + "vote": "VOTE_NO" }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "reservesOutput": { - "amount": { - "lo": "826718086799857812" + "identityKey": { + "ik": "W6Oy39RMoBm/e+LFad0wYK8Q4ONwT+9fDwuAfR7GM5Q=" + }, + "governanceKey": { + "gk": "6LIbx10xSXCGtONJKjMcZb4zKZ5oGAmfX27LMdBabg0=" }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "reason": { + "reason": "w5Cdi5r9JuP36zE2EII" } + }, + "authSig": { + "inner": "AMgTCIc/Jwi3vy2BPnzS1zOYel2a0SQyrU/kR/AbagKLxKFlqiIi0w6sEFvIuj3wkA3sWtgPEjMqC8rqwji+AA==" } } } ], "transactionParameters": { - "expiryHeight": "5804750154", - "chainId": "mdspsngqqszfchxqilztcpjuujgii-8466", + "expiryHeight": "1414913707", + "chainId": "ubtzognig-3124214838668198766698452978937", "fee": { "amount": { - "lo": "533557175117294104" + "lo": "292342699628884630" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_57.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_57.proto index 5788a88603..71dbb08625 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_57.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_57.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_58.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_58.json index c8b8f8a650..bb2846b92d 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_58.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_58.json @@ -1,10 +1,22 @@ { "actions": [ { - "communityPoolSpend": { - "value": { + "actionDutchAuctionWithdraw": { + "auctionId": { + "inner": "BGY2kG+2/x3VAUCYADtWUGrwIXE39Ai5j+45rBga9Mg=" + }, + "seq": "983655910", + "reservesInput": { + "amount": { + "lo": "325215323222150299" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "reservesOutput": { "amount": { - "lo": "566080589551303395" + "lo": "638696139676493847" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" @@ -13,42 +25,52 @@ } }, { - "delegate": { + "undelegate": { "validatorIdentity": { - "ik": "tz3ONAtOKq/YTtqQxvJoOwS2elW+TZ5zohFOpDumoJQ=" + "ik": "Z+4nBW//s2iXqE1G3drN6SC6Zcyc7+hzV8wYES8rVqQ=" }, - "epochIndex": "6379", "unbondedAmount": { - "lo": "421722448920009618" + "lo": "151639903755702094" }, "delegationAmount": { - "lo": "239540607041379310" + "lo": "297568485656866828" + }, + "fromEpoch": { + "index": "9866", + "startHeight": "9866" } } }, { - "validatorDefinition": { - "validator": { - "identityKey": { - "ik": "DrLUAiCrL6+MK2r2UPvIdjNfiKuZv17cgLbYQ5+v7AA=" + "spend": { + "note": { + "value": { + "amount": { + "lo": "409023923114919134" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "consensusKey": "nUm4rftJPMQVsP0+BdE3moUn3CANxAWBXiyBivyS8Pw=", - "name": "test validator", - "enabled": true, - "governanceKey": { - "gk": "DrLUAiCrL6+MK2r2UPvIdjNfiKuZv17cgLbYQ5+v7AA=" + "rseed": "29K+cZP1DycQtWSPdZVm5OSJDJd5/oMbkbFukyY2wm4=", + "address": { + "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" } }, - "authSig": "6OPiP+8SDLVt6H3TPrW2152cxIRH2P+tLt3pGrFyHQlalt4kO1tASKU8E186Hvmb6KBI5agf6rM1xjffMHntAQ==" + "position": "29224606159498", + "randomizer": "TboV/lsombk22hnr8KdfTyfjJUA7lS+u9j1pZvxBWAI=", + "valueBlinding": "y6qZ8kJerfsevFERn6WCIMp+Lbuj/E8fwpFzjVlTpQQ=", + "proofBlindingR": "ka/62rSvm5WLx2uETTdc1uD+LUf1zKnZXXdomaR3cAc=", + "proofBlindingS": "fx4jYBG9YDxRctylpweD2NaqZt3D3+48YnMriowq0wE=" } } ], "transactionParameters": { - "expiryHeight": "5167669332", - "chainId": "ptxgqtqsiqqmmikfuhslwq-08833217433419295846894741553", + "expiryHeight": "7840962923", + "chainId": "jbdcfoznudtbqw-395671294758790869", "fee": { "amount": { - "lo": "102557312519148011" + "lo": "876984997263009570" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_58.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_58.proto index 559e77c492..785a347883 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_58.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_58.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_59.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_59.json index 36d2a2ad2d..488223a434 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_59.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_59.json @@ -1,68 +1,104 @@ { "actions": [ { - "delegatorVote": { - "proposal": "508113385", - "vote": { - "vote": "VOTE_ABSTAIN" + "undelegateClaim": { + "validatorIdentity": { + "ik": "d4IOiG8KGeB7GEXRprU8YnebwPsFUCmDk2iKO285Sk4=" }, - "stakedNote": { - "value": { - "amount": { - "lo": "255829604600641461" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "penalty": { + "inner": "AAAAAAAAAAAAAAAAAAAAAP4UeuFHrhR64UeuFHrhR68=" + }, + "unbondingAmount": { + "lo": "787940004195065135" + }, + "balanceBlinding": "T7T4bF+YE02ESUbdv7AOOgUZmmDk2RTV7pe6+y+F4gI=", + "proofBlindingR": "1nt4UpzAwx51IlpT5Ij4EfuIZIGxgPpsdn8nHfEOJAI=", + "proofBlindingS": "+XzMBPwSgaha0xuXkc6U6pKl92JGhSHD3KQIPNFWBQo=", + "unbondingStartHeight": "7510" + } + }, + { + "positionWithdraw": { + "reserves": { + "r1": { + "lo": "253984256202826004" }, - "rseed": "9PHqXpU5G8Gd8QBm+Hfy9vMulO2xR9/S5yRmHr+uatc=", - "address": { - "inner": "xxwjBvzOC1NjIM7RRApYHi1LPYWc/PzOypFce/Ywn1M3qlsV0Aa6y6WtS6sgts1UpxkYWmFJhRDxcjpjtV0dj4VgSUfvmLBqymfj/9C5VRQ=" + "r2": { + "lo": "269097642978812971" } }, - "unbondedAmount": { - "lo": "175125797432164667" + "positionId": { + "inner": "IVF53uLebTHy3ypG/xjjm9OYZAwg3ZcrU8aFZhgZuDM=" + }, + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "randomizer": "i3hfMX9pure/V7umelje0JV6Q7JpW/DsgPyNqSOmIgA=", - "proofBlindingR": "jq6nBdwT0qovIKZgemzdbAOPaUQ0ZLfS5sezKkRNDQk=", - "proofBlindingS": "P+acuayiqcA4cDLsHCiUFGR6hR5z3ntfln3wq3Hh8Qw=" + "sequence": "1" } }, { - "delegatorVote": { - "proposal": "559121062", - "vote": { - "vote": "VOTE_YES" - }, - "stakedNote": { - "value": { + "actionDutchAuctionSchedule": { + "description": { + "input": { "amount": { - "lo": "36379834493930060" + "lo": "910729265953845683" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "rseed": "LY64ht/6TvGEMglvRzPmpv6TZOe1A2hrMX76Xb0oWyk=", - "address": { - "inner": "zOp7IDj4r96YHFGnPSgZWqoaArrZC30cl61qxr5y4GrlQrRd4lYBcsvyf/8ZL7MJK4euaoWciY2d2SkehbBz6sAIbjAqr5gxVHbG6BWWKgI=" - } + "outputId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "maxOutput": { + "lo": "197008387953445997" + }, + "minOutput": { + "lo": "665118102080631799" + }, + "startHeight": "790925511", + "endHeight": "790925512", + "stepCount": "699554604", + "nonce": "TXX722kc84NWzPwj8H7jgMTLNRVW8jCrQnErhbgULd4=" + } + } + }, + { + "actionDutchAuctionWithdraw": { + "auctionId": { + "inner": "5/y3Qf0zuqb1xT6X/RLmjLcsl6GzYFwMnvDmjR+j8fY=" }, - "unbondedAmount": { - "lo": "482355105312495516" + "seq": "923935010", + "reservesInput": { + "amount": { + "lo": "251164404864768466" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "randomizer": "wragV0zd/1NTLYvYtuPWp5jZJPJjKOTwsJQBXlR3AwM=", - "proofBlindingR": "1sfyjxQ4jbJh0XOWPT6nNWL7DmgWoDBrfnCWIjq8cAs=", - "proofBlindingS": "hlGBoyASkIjeYVzh0Doyxurryw1jk1H5uVicYZYhyAM=" + "reservesOutput": { + "amount": { + "lo": "581063375438161933" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } } } ], "transactionParameters": { - "expiryHeight": "4009473624", - "chainId": "wrjarurvi-16330269366901696947474738", + "expiryHeight": "4525023075", + "chainId": "jqyugyeonnxvhj-05862368", "fee": { "amount": { - "lo": "540792711132723769" + "lo": "791219474669379207" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_59.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_59.proto index 7cd2af4702..df263a7acc 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_59.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_59.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_6.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_6.json index 51306565b6..d2c86715ac 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_6.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_6.json @@ -1,118 +1,89 @@ { "actions": [ { - "positionWithdraw": { - "reserves": { - "r1": { - "lo": "631676801537335739" + "validatorDefinition": { + "validator": { + "identityKey": { + "ik": "vPptZLJqiCoXLFMv5J1SRLDoU2+ECrjCFkE5STHBfhE=" }, - "r2": { - "lo": "688495372942837118" + "consensusKey": "NFRherZeRhe4Zik8OH5sVjwWRj72jN/qwVU33URTKPc=", + "name": "test validator", + "enabled": true, + "governanceKey": { + "gk": "vPptZLJqiCoXLFMv5J1SRLDoU2+ECrjCFkE5STHBfhE=" } }, - "positionId": { - "inner": "OR/soam7HW91eyGZtsx30WM8Y8mZ00jDTpXkJaYl9/8=" - }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "sequence": "1" + "authSig": "5gWHPMw8U18zdOLSK7Ya5nmBtyv/21spbBIJA1ATywoMh9xfHl0NvXlekJ4zXKzZ5BG9rOMUSs78+Z7iWa72AA==" } }, { - "positionWithdraw": { - "reserves": { - "r1": { - "lo": "607781052545284462" + "positionOpen": { + "position": { + "phi": { + "component": { + "p": { + "lo": "1350996659030061" + }, + "q": { + "lo": "379208078271574850" + } + }, + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } }, - "r2": { - "lo": "220370972452678676" - } - }, - "positionId": { - "inner": "I69huFyMLr1rPBLRsUk/Yyl/StFfLu8GFCqF7/Mrw7o=" - }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "state": { + "state": "POSITION_STATE_ENUM_OPENED" + }, + "reserves": { + "r1": { + "lo": "991985858870291127" + }, + "r2": { + "lo": "990555797588997326" + } + }, + "closeOnFill": true + } + } + }, + { + "communityPoolSpend": { + "value": { + "amount": { + "lo": "234935465388814513" }, - "asset2": { + "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } - }, - "sequence": "1" + } } }, { - "swapClaim": { - "swapPlaintext": { - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "delta1I": { - "lo": "182319966174564967" - }, - "delta2I": { - "lo": "421458911749944135" - }, - "claimFee": { - "amount": {} - }, - "claimAddress": { - "inner": "+LGYOs59gYg81n/0Zm6rq0scMmRrrI5cpufVHLRDvLF/65RECAEfKpEZepjIY+wzS/UdOTq9MPtYwOlAK8TXo/TUlNM54umvaOpPOYQUtKg=" - }, - "rseed": "GNRozTOPCSHY701mg5tr7vUdS+K7yznVozHb8X5QeVk=" - }, - "outputData": { - "delta1": { - "lo": "1032363600" + "communityPoolSpend": { + "value": { + "amount": { + "lo": "462684001873467270" }, - "delta2": { - "lo": "609511626" - }, - "lambda1": { - "lo": "1668" - }, - "lambda2": { - "lo": "1923" - }, - "unfilled1": { - "lo": "1623" - }, - "unfilled2": { - "lo": "1004" - }, - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } - }, - "epochDuration": "1000", - "proofBlindingR": "xLW1YhfQygDbUQymTN3EDLmDsuu9vegaNtTTc/7w9A4=", - "proofBlindingS": "gGvA9r048s131YCzZ6TSwlWqmWGK1Z2q+u8k+xuhMQs=" + } } } ], "transactionParameters": { - "expiryHeight": "4827828144", - "chainId": "u-334569537", + "expiryHeight": "7340422367", + "chainId": "olkoknzifxexqwhcrjby-6316", "fee": { "amount": { - "lo": "821551672317379254" + "lo": "945856827285388196" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_6.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_6.proto index 4a05b06728..8e26123ceb 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_6.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_6.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_60.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_60.json index 9e55de714f..90745afb82 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_60.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_60.json @@ -1,99 +1,77 @@ { "actions": [ { - "ibcRelayAction": { - "rawAction": { - "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", - "value": "CrMBCNKf2esDEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgsI35GstgMQ3aawHkD4s66pqrXqgRgSAgoAGgsI35GstgMQ3aawHiKPAXBlbnVtYnJhMTR6cHN5bGZ5MnplenR6cjJ0emozZWpocHN0cjg3Z244a3J4M3R0YWMzN3JmM3c5cnZ6bmp6eHM1MmcwOXoycHlnbHpmNHVuYzU1MGYzdmswbDk5dThzNDYzODZjeDM3d3M1cXJoM3I2NzhnNng4Mm51a2xzbnZuaDVlMjJxbGMyc2Zhbndm" + "positionClose": { + "positionId": { + "inner": "nqvxauROcSbVQnOUvk7b5149ngH4LykooPuqosPTCVY=" } } }, { - "ics20Withdrawal": { - "amount": { - "lo": "308018041765028747" - }, - "denom": { - "denom": "B3YcOmn28Ny6j859Hb" - }, - "destinationChainAddress": "penumbra1nvtkxyqcvvx238aglltx6ma5fe25k80ln3qatxlsg74tpd8w4euvz8vnma6g4tk3e7jg8rydmdr57wn2fpa8w8uw7q294zgyeedfdd6v6gnpar7y73wrpd49verrmtv67wfgnl", - "returnAddress": { - "inner": "xoMECYb0CGHObaOSOpAY5uRELA32LIrdvH/Q9k25oO0Q+xsR6QzdSxfB9nUPQxxJY7OojP08Be0awqA0ENVpFrxWm2x09hkf9/4UwVdKSxU=" - }, - "timeoutHeight": { - "revisionNumber": "653702167", - "revisionHeight": "475333779" + "communityPoolOutput": { + "value": { + "amount": { + "lo": "945406569258576653" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "sourceChannel": "channel-0" + "address": { + "inner": "CgxXuotl8D4fIFx5jSZI8T0LAtO86iYlHhh19NID4xdZ01kyJ+7FQdZPXOaNwQ8ul4IiAs9Bw9MJGmEKaii8YAThO8Pu/RJa6DcU+dDi/ZY=" + } } }, { - "spend": { - "note": { - "value": { - "amount": { - "lo": "718139757343310777" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "positionWithdraw": { + "reserves": { + "r1": { + "lo": "707352881619011109" + }, + "r2": { + "lo": "117023760349645964" + } + }, + "positionId": { + "inner": "jeGxH7HTvK36Z/n6KE11qNoBQUHNl/ar/QyChuevP5o=" + }, + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" }, - "rseed": "RcjPrnIPobed2agSnOqCvDb0g1Opr9+nlkZKrYcMdrs=", - "address": { - "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "position": "70450414053965", - "randomizer": "yBIVdduWQtoNWAPHhCg7sT3M02DDmBiwHiBtMSUHywM=", - "valueBlinding": "QDxTbNlK0BhrXFib6MpeOQtvpv6SsZMFZylGKgcKNQQ=", - "proofBlindingR": "VK2JOgVftyFkOCD/couyQrwIV5TonZD/Vhh2QwRWkgg=", - "proofBlindingS": "UckDAxUGNTIM7eqjoilkKAgr5+FhkPgRPlmXlk3r8hA=" + "sequence": "1" } }, { - "positionOpen": { - "position": { - "phi": { - "component": { - "p": { - "lo": "29998834528177663" - }, - "q": { - "lo": "952907886490048698" - } - }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - } - }, - "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "state": { - "state": "POSITION_STATE_ENUM_OPENED" - }, - "reserves": { - "r1": { - "lo": "192362210918582520" - }, - "r2": { - "lo": "899240725382557177" - } + "output": { + "value": { + "amount": { + "lo": "226381515396186902" }, - "closeOnFill": true - } + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "destAddress": { + "inner": "XwrF5DMRd0uK4hGaRzdgc1c6+qsiroMkPWXBF8WhbJP04BaWWaBE+U6/xFYGhfyG3T1GF3YUpl1odiJFxpXWR9snqwib7fDYwequeDCXkQs=" + }, + "rseed": "lMg7z88/p8wJ5B+x/oRoehdR262nulve/ZRGF/eOkN4=", + "valueBlinding": "1KeVmJL4sK9w0YGxRu11hLcLrGI+Ni/5a8/5G6V9OgA=", + "proofBlindingR": "ovScj8QLTTZvnriN4ufSyWODaLhcVPe9SUDf9tSERgU=", + "proofBlindingS": "mleTW6e2o5ru+E/GXXrJwVWJqTQtJHct4eoLdb0f+Qo=" } } ], "transactionParameters": { - "expiryHeight": "3006640055", - "chainId": "atychdixascsdcztohoimzesr-7812615548453243158989", + "expiryHeight": "5221709871", + "chainId": "wzjcmai-096714", "fee": { "amount": { - "lo": "14716379457485052" + "lo": "601378230710098777" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_60.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_60.proto index 8de2b90d86..6b76d40a69 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_60.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_60.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_61.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_61.json index 9a0db24238..0db1d16b44 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_61.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_61.json @@ -1,79 +1,89 @@ { "actions": [ { - "communityPoolOutput": { - "value": { - "amount": { - "lo": "635313304499185887" + "actionDutchAuctionSchedule": { + "description": { + "input": { + "amount": { + "lo": "300153853829895979" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "assetId": { + "outputId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "address": { - "inner": "dXJVVklsP4mQUdam0n87zLwUraIpl8XbQitsmi0CkoMQTLJVJi5hB7Y+vOJVF5UvzPUvLdPHpj8hJz7laJxFo9uBDjSnfJd1HdWAQu/ySTs=" + }, + "maxOutput": { + "lo": "860913514515460497" + }, + "minOutput": { + "lo": "185870413524230563" + }, + "startHeight": "618624263", + "endHeight": "618624264", + "stepCount": "294135031", + "nonce": "eiTE7CH2wbnYdJuwTWoMwVx6glzmD1/6KK9GgIr6zh8=" } } }, { - "communityPoolOutput": { + "ibcRelayAction": { + "rawAction": { + "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", + "value": "CrMBCNmS7AQSC2RlZmF1bHRQb3J0GgljaGFubmVsLTAiC2RlZmF1bHRQb3J0KgljaGFubmVsLTAyZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA6DAjVs9OLAxDZl5GyAkDwhbyDxbu2iBgSAgoAGgwI1bPTiwMQ2ZeRsgIijwFwZW51bWJyYTE1cGVuenJzNnd5dHNja2pqdmd2YTJyam1rdWFxdjRmbHV0Y2h5Nnk5M3QyMnM5NWNhOTQ3c3J0ZGt3cWNha3B2eGR4ODNtcHEyMmFtbGNrd3N5Nzh5OW5hdTlteWg1Znk1M2dlamdwaHlhd3htbmFmazNlMDdlaHBsdTdyaHp5ZzR0eHQ5Mg==" + } + } + }, + { + "communityPoolSpend": { "value": { "amount": { - "lo": "501946879560447759" + "lo": "323571363887294187" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } - }, - "address": { - "inner": "HJsCEqne46sp++pnSfwSo0bP2kGfmq9GF+SDK91ZX1v/R5F/g1B4FTjbP2JKSjKkqXDNhNpYhls11TCgUWJZIl/kELeYX+mCyEwqKhSP5u4=" } } }, { - "positionOpen": { - "position": { - "phi": { - "component": { - "p": { - "lo": "353425788282793350" - }, - "q": { - "lo": "539403610384082689" - } + "swap": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "state": { - "state": "POSITION_STATE_ENUM_CLOSED" + "delta1I": { + "lo": "394892372392195253" }, - "reserves": { - "r1": { - "lo": "553897337323242306" - }, - "r2": { - "lo": "563503820517080411" - } + "delta2I": { + "lo": "599981972112015708" }, - "closeOnFill": true - } + "claimFee": { + "amount": {} + }, + "claimAddress": { + "inner": "Pz36KO8OHiwRzcT8nt5vivHG8Lfcx/uRK5ZPrJ7PXEB3309hqb7iVKRP8VPLiXNMzRNhMj9SZxTZ/QJzm52tX98gBFkA1xi44Nc8oScl8PA=" + }, + "rseed": "+wsLm9Y4MIq4JtWAg6VLAsdQi8gqc66hVzBhhqf+ghs=" + }, + "feeBlinding": "20zcErCGM2wqpgGnEequ2ucs8pQtcooYw1FsXWohpQE=", + "proofBlindingR": "1gpAZ12J4fF28MQGwkxPFo9tBZLqJNAR8jBZZ0UIqAw=", + "proofBlindingS": "aD2wE3kbEvfWBk3trnOlOvwFuKg9PJ/WTjXZqKFW0wU=" } } ], "transactionParameters": { - "expiryHeight": "2400123472", - "chainId": "akzhyryfl-2132", + "expiryHeight": "9813319055", + "chainId": "lazpo-94358", "fee": { "amount": { - "lo": "961655454472638464" + "lo": "607636800537549935" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_61.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_61.proto index c908bd3a70..81a5dd6f9f 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_61.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_61.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_62.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_62.json index d790cae61a..867e472262 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_62.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_62.json @@ -1,46 +1,140 @@ { "actions": [ { - "positionClose": { - "positionId": { - "inner": "3M43F9k+SwRsWjZIhTdySOp/8R44CEradfEzUYQKrzo=" + "proposalSubmit": { + "proposal": { + "title": "xmsshzsxbaflbgffqrtdjtddbfp-13116371573476362587119590969", + "description": "y-27", + "signaling": {} + }, + "depositAmount": { + "lo": "686818404975552894" } } }, { - "actionDutchAuctionSchedule": { - "description": { - "input": { - "amount": { - "lo": "635431313666200624" + "swapClaim": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" }, - "assetId": { + "asset2": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "outputId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "delta1I": { + "lo": "960053528786690615" }, - "maxOutput": { - "lo": "968182021175373968" + "delta2I": { + "lo": "901004642136973224" }, - "minOutput": { - "lo": "481943553144497287" + "claimFee": { + "amount": {} }, - "startHeight": "141560138", - "endHeight": "141560139", - "stepCount": "385732289", - "nonce": "zA1u4MqCerHjYwcayHAxPAAl0cWCaUZxlle6tBWbW5Y=" - } + "claimAddress": { + "inner": "zls1+ASb+9VnOA4jcn5G+IvvJba5jfoyUwNBfKu9BE/CFL39VAO7XBeimicQlfXhCcKr+hfiFcfwY6qMT4HNvt/dl7cDmZXb7vWBDYOU5Ec=" + }, + "rseed": "RsBM/3cUaCV+sLdOS06VksFumj2SVJiR2q4dUwUFPbE=" + }, + "outputData": { + "delta1": { + "lo": "1800785315" + }, + "delta2": { + "lo": "590384005" + }, + "lambda1": { + "lo": "625" + }, + "lambda2": { + "lo": "315" + }, + "unfilled1": { + "lo": "155" + }, + "unfilled2": { + "lo": "725" + }, + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } + }, + "epochDuration": "1000", + "proofBlindingR": "l93mqq74KD0K8nRauXGYcUlscjZDQGoY0Ff+mjL4wg4=", + "proofBlindingS": "AyYD0JtFVvCe40g0GzjpouWNyDvk9rDakYlH1VH5LAo=" + } + }, + { + "swapClaim": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "delta1I": { + "lo": "980893828380775662" + }, + "delta2I": { + "lo": "86106500627058454" + }, + "claimFee": { + "amount": {} + }, + "claimAddress": { + "inner": "mpbrpp6Hf4fIY8jfTXjlMfq++3C4UCOiQIk8sYgAJ41jOwBX1PtKliDQPmiJgjcySiWWcQP0Aatq/C/f4WafGiOdxaP0harhCNXJuhKT9vY=" + }, + "rseed": "MT8EkUtXpLdXwLh6+S5ZW6ZMXxSR55yCCcLjpzFrlzM=" + }, + "outputData": { + "delta1": { + "lo": "2522729" + }, + "delta2": { + "lo": "1703849832" + }, + "lambda1": { + "lo": "1169" + }, + "lambda2": { + "lo": "362" + }, + "unfilled1": { + "lo": "66" + }, + "unfilled2": { + "lo": "1133" + }, + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } + }, + "epochDuration": "1000", + "proofBlindingR": "+MURdSpc9oK9fzE1SIpoCuhagQ3NGhJLsf8fdoSRCQo=", + "proofBlindingS": "bgwbjPb5zhTkMXxb0ycdla8tODwiN8PYiFj6KG974A0=" } } ], "transactionParameters": { - "expiryHeight": "4202828864", - "chainId": "zwrovhwvux-1555802955862562584415078604787", + "expiryHeight": "4173135303", + "chainId": "svzqyschwbkvhbfnevwoyxnpkxjb-096962762521607", "fee": { "amount": { - "lo": "623834726199234692" + "lo": "408188507360607797" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_62.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_62.proto index 9d6a9fe046..e98985fdc3 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_62.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_62.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_63.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_63.json index 1cafa92ae6..163518a5b1 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_63.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_63.json @@ -1,67 +1,52 @@ { "actions": [ { - "ics20Withdrawal": { - "amount": { - "lo": "211993740729653008" - }, - "denom": { - "denom": "d0AOJmo8qCYKbN67ld" - }, - "destinationChainAddress": "penumbra1jdnuuur64p8jpyw6nrgdljhztjvdnhjtadg3vk33ea83fwms27z6x5qxdt46zqhdec7kcrtg7p0fe2fktmmxpag9cjwlymhjd6gr2n60fjkfwgw7an87uu6fdmdhdu4aglecrv", - "returnAddress": { - "inner": "TjYNT3W0gckNyVauwhF0/DASjvNKYQAs8Ds0JiP/cpwiGiHEpS+bVqooBLgY09pMff7gJyrUn7vNtu3qzixpyNI8XqgdgH4lcDx0wGsYUFA=" - }, - "timeoutHeight": { - "revisionNumber": "198597464", - "revisionHeight": "500107277" - }, - "sourceChannel": "channel-0" + "validatorDefinition": { + "validator": { + "identityKey": { + "ik": "Pn2+WdRhy7/26RR1ZS9OCRT5O7c8WnLOd7tMGB/pSgM=" + }, + "consensusKey": "0nq54naGESkDBAYOJKBEsfYgwyIzJjNqTpwdAp0LThE=", + "name": "test validator", + "enabled": true, + "governanceKey": { + "gk": "Pn2+WdRhy7/26RR1ZS9OCRT5O7c8WnLOd7tMGB/pSgM=" + } + }, + "authSig": "2FG/4KxGPpQfdkl7pHBz5aAfOXQbPom76vQUNJVfDgFmIh9FI01PNwu6iIQW7Hc9s259HYPEGdsPFREbBOnlAQ==" } }, { - "ics20Withdrawal": { - "amount": { - "lo": "82921519133510096" - }, - "denom": { - "denom": "Lvj" - }, - "destinationChainAddress": "penumbra1a23ee3ze9xry6u9rv6fj038gp7ngxpcl9fqjuhaevk9yhuz35ks2mrcce3k8fkx07vpr0p8jw7s3vzvyymlskmgsgzw4alcdl65k2wsrlc4z70wqh3tn5u4xq5yzlpjtde6s2h", - "returnAddress": { - "inner": "QG4xhw/gxs2DQabX/zqox0/48664BCdm7s3mGIE55/mXaqIHOvqUpr5mjSWTYYOOU2WLglfGLHEyjHoC68cjbVaQvvBC6UENgxqQw65U0wE=" - }, - "timeoutHeight": { - "revisionNumber": "615968064", - "revisionHeight": "718374374" - }, - "sourceChannel": "channel-0" + "proposalSubmit": { + "proposal": { + "title": "ucmvcamks-140575015038568184878994589", + "description": "jqemouwcj-48421118", + "signaling": {} + }, + "depositAmount": { + "lo": "155626920557030080" + } } }, { - "undelegate": { - "validatorIdentity": { - "ik": "H14HN5B45fRuWpGqlAfNRVZy7dTaXwy2zYavf1wF8F4=" - }, - "unbondedAmount": { - "lo": "395714588864276120" - }, - "delegationAmount": { - "lo": "824342307556259828" - }, - "fromEpoch": { - "index": "6760", - "startHeight": "6760" + "communityPoolSpend": { + "value": { + "amount": { + "lo": "888407929484696457" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } } } } ], "transactionParameters": { - "expiryHeight": "5073583233", - "chainId": "pcgvajsphcstatukhr-18112323998005591527395481", + "expiryHeight": "6984876858", + "chainId": "dadqbuydlzbxtetdbkcgfm-74914942237570976", "fee": { "amount": { - "lo": "104931946530159598" + "lo": "621955823525683618" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_63.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_63.proto index dd41d5eaca..49ced62dea 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_63.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_63.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_64.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_64.json index 5a0ef36aca..71e010c236 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_64.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_64.json @@ -1,53 +1,66 @@ { "actions": [ { - "proposalSubmit": { - "proposal": { - "title": "cixdkboole-89495", - "description": "fmczeqtezeshlypcuhni-736861826156013714474096666082", - "signaling": {} - }, + "proposalDepositClaim": { + "proposal": "255573202", "depositAmount": { - "lo": "319418957113244997" + "lo": "146493481916344182" + }, + "outcome": { + "passed": {} } } }, { - "proposalSubmit": { - "proposal": { - "title": "zzxxfquzjilsstcp-0", - "description": "ejnxxjosxyrnnoiwafsnhdtuaov-5573296535092824525992", - "signaling": {} + "validatorVote": { + "body": { + "proposal": "597976720", + "vote": { + "vote": "VOTE_ABSTAIN" + }, + "identityKey": { + "ik": "4co8U3KHHWu8nF47s6ULHOyhHyDY/UFc1ftFDIPaj7M=" + }, + "governanceKey": { + "gk": "fkOxdpp7W1VAccRU7Wi6KkSPfMqNTw8pq3yDKhEOYgw=" + }, + "reason": { + "reason": "s7w1GFO7N9AFd2EQ31R1r7qm667Ro" + } }, - "depositAmount": { - "lo": "897611576165551177" + "authSig": { + "inner": "LGIrMt3exDny5gWJDdICkFyBuhrI+WpkJfGDopY4SQZEAl7nCQkEMsxqFWWkLYKn3YsByaEpj6g/DhPz34m3AA==" } } }, { - "undelegateClaim": { - "validatorIdentity": { - "ik": "XLFLzl54otXVenQipwvNfSORN7xD3ZZU/lPcHMsV140=" - }, - "penalty": { - "inner": "AAAAAAAAAAAAAAAAAAAAAP8an752yLQ5WBBiTdLxqfw=" + "validatorDefinition": { + "validator": { + "identityKey": { + "ik": "mpr8yTo8APCCVbRO3cZYwemUGkzVa1/C8/E/f77Orwc=" + }, + "consensusKey": "zHph7gJB75LJWQmDc94Np6Z+ZDt9fkk1Q4EYKHlzAyc=", + "name": "test validator", + "enabled": true, + "governanceKey": { + "gk": "mpr8yTo8APCCVbRO3cZYwemUGkzVa1/C8/E/f77Orwc=" + } }, - "unbondingAmount": { - "lo": "884245862204773054" - }, - "balanceBlinding": "lELf0MSAsV/qudGqi31yK3dHodA9GXTXNgndejNKRQA=", - "proofBlindingR": "/Y8CQqNGHGsJaqfLx3kFeJAX0+G574nFepTNiJBmlwA=", - "proofBlindingS": "yL4veJFPCLVoPg9XJffl71w+O5WnGjFzWuI0xadFiQg=", - "unbondingStartHeight": "50026" + "authSig": "dr2WncS2gVakc1rM+tmk9GhUShwZHH7SMmL7IuFWnwWoZFcWP45W9oZh5nU+hhxDi8CT3Z13HtP3Tn1xPkReBA==" + } + }, + { + "proposalWithdraw": { + "proposal": "653515287" } } ], "transactionParameters": { - "expiryHeight": "8399461328", - "chainId": "dhonjkixmpwe-9674727512824055616", + "expiryHeight": "120375860", + "chainId": "sgzdfwqljpwxclsgdp-7", "fee": { "amount": { - "lo": "91677694919425334" + "lo": "716224304064910123" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_64.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_64.proto index 50dd6515a6..fbcad6feec 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_64.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_64.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_65.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_65.json index 1ae5561796..3230efc9c8 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_65.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_65.json @@ -1,51 +1,59 @@ { "actions": [ { - "proposalDepositClaim": { - "proposal": "290435110", - "depositAmount": { - "lo": "397061836821711838" + "swap": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "delta1I": { + "lo": "859324251814478644" + }, + "delta2I": { + "lo": "901695431274064419" + }, + "claimFee": { + "amount": {} + }, + "claimAddress": { + "inner": "18qvM89j9zTrUEeG013xYfWE6vZNrj6UQUDbkkKFKfUf8oQ3eedBdnyeaLSrRSrMB5PyNI5rov0qB3gjba8KAeh21MUXzBiggkIyM4BrjGI=" + }, + "rseed": "RJQU8db1qR/SbuzdQmwQKrwfLqqWp87N8fQO43ctJj8=" }, - "outcome": { - "slashed": {} - } - } - }, - { - "proposalDepositClaim": { - "proposal": "925454871", - "depositAmount": { - "lo": "996803853926948758" - }, - "outcome": { - "passed": {} - } + "feeBlinding": "tQMT+J2T0jAhPwcUM1LW/UhDpzByu3RsJMlzjbqy6AI=", + "proofBlindingR": "MgHNwa4ZfXbtkR95imQJkvDr2blnLmv7vwCZ3eUIzhA=", + "proofBlindingS": "+Lz4LK5tqO6su4IntCDPDjfhTBkbjAPGhiCZezROwwE=" } }, { "undelegate": { "validatorIdentity": { - "ik": "/avzFpkBoNh4BBdAXNWyYJkGJ7oP9fv8yCRM7zbEXOk=" + "ik": "kbptXf02GZuE7BCv2dVislWHdltLTfVdnIVNEvkQ6GI=" }, "unbondedAmount": { - "lo": "530511781458972404" + "lo": "728020950189583856" }, "delegationAmount": { - "lo": "150481363579985174" + "lo": "75847630668554661" }, "fromEpoch": { - "index": "8627", - "startHeight": "8627" + "index": "8393", + "startHeight": "8393" } } } ], "transactionParameters": { - "expiryHeight": "5830716849", - "chainId": "togtwejgefspbzqxkjzx-53973943018851518386", + "expiryHeight": "6136234607", + "chainId": "ovlgrpgazomnivwxm-0129181629217031183777320", "fee": { "amount": { - "lo": "694466351950944283" + "lo": "593416948151669404" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_65.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_65.proto index cbd2796ffb..ba3028d8ee 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_65.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_65.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_66.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_66.json index 527c967bd3..6bd4edced3 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_66.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_66.json @@ -1,68 +1,49 @@ { "actions": [ { - "communityPoolDeposit": { - "value": { - "amount": { - "lo": "28635501634571198" + "swap": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - } - } - }, - { - "ibcRelayAction": { - "rawAction": { - "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", - "value": "CrMBCID39MoCEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgsI/tb7GRDV5/H3AkCwnLKZrLXqgRgSAgoAGgsI/tb7GRDV5/H3AiKPAXBlbnVtYnJhMWR6eWRqZzgzZGduejkyeDg4NGczdXp2N3RxdTc0Znc3NDBuc2tlcnN0bHo1bTY0anhhcGMyN3Y0OG53dHB1OG0yNHB3bDh6YWxxdXh2eWZ3OWVnMjgyczMyY2djNGQyc3RmcThqdXFwemQzd3RuZ2p5cGc1eGhxcmh3dGpmMGoyZ2Z5MDRr" - } - } - }, - { - "delegate": { - "validatorIdentity": { - "ik": "Mq1BbqAsuclq8wX/tgZ8KOkKUBfSieyZK9hT/05osLI=" - }, - "epochIndex": "7621", - "unbondedAmount": { - "lo": "93204302922706091" - }, - "delegationAmount": { - "lo": "334214563604282888" - } - } - }, - { - "validatorVote": { - "body": { - "proposal": "989783490", - "vote": { - "vote": "VOTE_ABSTAIN" + "delta1I": { + "lo": "674535027910489261" }, - "identityKey": { - "ik": "jLSXfuASgQfzc+Xh3COwKeu9XPlEf/VU1KmT6XygE0w=" + "delta2I": { + "lo": "941145116189604343" }, - "governanceKey": { - "gk": "wkFvsBuzJzqKY2V9+TwYguz41SM5GbepTliGXMeLDAI=" + "claimFee": { + "amount": {} }, - "reason": { - "reason": "9FqCDw5QO" - } + "claimAddress": { + "inner": "UPDGwS0qaAfxlMcM107B1sskbcZkYyxf2Ixb2ahb0f7g8X+o7+c18f1vpcJIT80vohwsc24+vo6HmSwoc5WcNfsXBJ3D3jZv67wWPV4ys7M=" + }, + "rseed": "/ddywbYPiEyKyDf8zOHzEEoGzZqJhtUiWRttImEWDWo=" }, - "authSig": { - "inner": "csTZeHncYx8gAv+o2eeFwOSwo31ABQSZB9k2+Dfm6wovRIlkYXCr2kZ+gf/7VY4E0kcvQpF6YcgIi8cytWxQAg==" + "feeBlinding": "XCEnr64ooFWSP3Obt5vDKIOqiFXpV+P+e4cnpHvbmgA=", + "proofBlindingR": "wtNYlVuHr8MVQGDL3FdNlmSu+BfnZ/wKWNsSqV5RQAA=", + "proofBlindingS": "TSPfqLBV7MTvZPASeJwW09pCBVFvaQuThZT221OhrQI=" + } + }, + { + "positionClose": { + "positionId": { + "inner": "3amiiAtHxnxs3WQJoYIX4ISoki3lYph9YnNOw+V2tYg=" } } } ], "transactionParameters": { - "expiryHeight": "2367335228", - "chainId": "rkekltqaje-675472879407024500076877292436", + "expiryHeight": "4824550852", + "chainId": "ycotzogqtlumfmxxxxuv-658337503005564986402745039744", "fee": { "amount": { - "lo": "696357928072868664" + "lo": "364595764382967855" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_66.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_66.proto index a66f6076d0..78ac0bb874 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_66.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_66.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_67.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_67.json index 5454d2a9a0..3c579b9667 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_67.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_67.json @@ -1,82 +1,51 @@ { "actions": [ { - "spend": { - "note": { - "value": { - "amount": { - "lo": "63303688488887395" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "rseed": "SaEmYPqrn/gmZyi9I+xi2XnqghXfc2O12Ck9LJFiK2I=", - "address": { - "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" - } - }, - "position": "140597868931655", - "randomizer": "hVAVXzIohd1MNQYQ1wFaTBXNRuuVnWFW1I++my6oYwM=", - "valueBlinding": "6cs777i0vJh4CCkkeCiQKfcKQM0pXV/82OY5fJyWiAE=", - "proofBlindingR": "9u9U1B/jCRLJy7A1m39eSBcG9V0MVnqz8q7boyHXgA4=", - "proofBlindingS": "4bE2ytP4ZqWrjv0uYZal2Ll7u2jAYfa6z/xDLZIwSAI=" + "proposalWithdraw": { + "proposal": "933540420" } }, { - "validatorDefinition": { - "validator": { + "validatorVote": { + "body": { + "proposal": "54562684", + "vote": { + "vote": "VOTE_YES" + }, "identityKey": { - "ik": "3OECXP2+o8IymB+YoZx2CodrZpOMWWj7/Dd6XrahRg8=" + "ik": "FO3qktgYS1wU5qseYka39flojumLee3k/7vllohJXec=" }, - "consensusKey": "J1FqtVVLGg9zix3qxjb+v4JwPIK+en/Z2Eg5R+Np5cE=", - "name": "test validator", - "enabled": true, "governanceKey": { - "gk": "3OECXP2+o8IymB+YoZx2CodrZpOMWWj7/Dd6XrahRg8=" + "gk": "bE1Q5EDGAULWk36SgVuRjDD0w0C9tc0PI/KDxjoFWA8=" + }, + "reason": { + "reason": "3m3X577ES6bOEQ4xFJfRMptvy8cDiHLI" } }, - "authSig": "bP1eWXb2nL8ibXgYnio2iwTnUxOCZjTdunW45G8o3A/87pRuhnJer5cwngEHx0EL4tUCTDJHHL5Hh7IWayoyBA==" + "authSig": { + "inner": "Hlg3rn4RKALZxnMPBo0WWOeoDzaHc3yAoHF5TXLWBw9Iz6h6ADuMb/QMOrarhICmNwdbAB61fqUqfBRadYhBAw==" + } } }, { "communityPoolSpend": { "value": { "amount": { - "lo": "462750989683900453" + "lo": "757912587794033221" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } } } - }, - { - "ics20Withdrawal": { - "amount": { - "lo": "10237256736832118" - }, - "denom": { - "denom": "n4vk4wai14QvR73oo891GbzZ" - }, - "destinationChainAddress": "penumbra16w4laj3t0l39r5pvdafaxe8p8n88lx0hmyahpk6n3e2d4eehjrrafrev4mrac39uad8qn90799mqd8gvt0y29hlw99l348ue0k9deflzu3yffqcad0y9xc7evuh67uuv6th8m9", - "returnAddress": { - "inner": "A9DBXlM4R5jzxEDbqHYcPtoviLl3UdFqp5Go7clAy4gx8i/6Lgrqk5SaI0yJYdyJVKuvBObmhp/Ltb8WLu2q6vbzpSNJ6icGFFjqdln8k0M=" - }, - "timeoutHeight": { - "revisionNumber": "231456423", - "revisionHeight": "204697896" - }, - "sourceChannel": "channel-0" - } } ], "transactionParameters": { - "expiryHeight": "9102417723", - "chainId": "midhmecjjrsikeanqbgvp-945282334194719569042051", + "expiryHeight": "6184744402", + "chainId": "wpvgwcarqvx-6202981829494123", "fee": { "amount": { - "lo": "700770715777692843" + "lo": "320048751103429665" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_67.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_67.proto index 0d011ffb4f..415e8aa425 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_67.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_67.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_68.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_68.json index 4ea42c43ea..9ea2f38f36 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_68.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_68.json @@ -1,56 +1,88 @@ { "actions": [ { - "ibcRelayAction": { - "rawAction": { - "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", - "value": "CrQBCLmq95QFEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgwIuuz5kwMQ+KrC1gJAqPaF7ay16oEYEgIKABoMCLrs+ZMDEPiqwtYCIo8BcGVudW1icmExN3JsYzBtOHVtaGY5bnR6Z3ZwbjNmbHFnOXd6cmZ1a3F3ZjBkZjZucXp4cGs2eGY0ODR5amQ2cmR2YzZhMm5sZGg2bGswNHlkeWhoMnhmbm1zNjU5cHRwaHV3cG5qamZyaDZlbDM0eWQ4bmtuMmR4cmd5ZXZxNjhlc3czdjJhdGUzZHF3OXY=" - } - } - }, - { - "ibcRelayAction": { - "rawAction": { - "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", - "value": "CrMBCMH82+IGEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgsI94zxBBCO47KNAUCI/578rLXqgRgSAgoAGgsI94zxBBCO47KNASKPAXBlbnVtYnJhMWc3NzM3NmdzMHV4bnQ0ZzIwbnl5bGQwYzl0OXEwM2QyaDlmMGQ0OGpsOHo3N3F2bmhwZXh6dGQ0Y3g0cTc3Nzlydnl3azV5OTNqNm10MHc1YWR5ems4MnZham1hc3FsNXZ0NXluMGh2MDVwbXRmZ3lja2Rxc3UwbTc1bXVhdmZqYWQwZnZt" - } + "positionWithdraw": { + "reserves": { + "r1": { + "lo": "201443633617440129" + }, + "r2": { + "lo": "617392343763087923" + } + }, + "positionId": { + "inner": "X+WR9ktERUS4w2LkgLDEHEVZs2MEtTB5lOH4gmNbP8c=" + }, + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "sequence": "1" } }, { - "delegatorVote": { - "proposal": "441483725", - "vote": { - "vote": "VOTE_ABSTAIN" - }, - "stakedNote": { + "spend": { + "note": { "value": { "amount": { - "lo": "211183892868237346" + "lo": "902684893903255648" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "rseed": "pwH8yBv8Ej/k/UtxjxN9ZLhTWXKJo4sDv4qOyQVKOC8=", + "rseed": "1VeNb0KR0w1uBg8UWniP7BzRDNdG71h7VAo9YhQ0dmo=", "address": { - "inner": "czr2tS1RGvozaTYfB+m3NvnENNjGIOEUe4nFDg1m/Otw03/kkZt1zEexVklChQ2hTt2SNoDebzs+VROWu9nGpSq+Qj7GKu4l3KTelS4Eyi8=" + "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" } }, + "position": "59296039256241", + "randomizer": "1SoYgexQCRka4bUm33V2m/TCTX/sB1sNHxdR0KhWtQA=", + "valueBlinding": "GAu0X26lL+R898yc972quKAzswvUNlP54JUMCQZdZAQ=", + "proofBlindingR": "NrQe1ZvB5B5dNYgVLA2o7UdamB5rDcHisF0PlUi1ShE=", + "proofBlindingS": "VD3u2xPrTvmCQzSLTSVCsoRuvo1pvstLE4ydXREnVQA=" + } + }, + { + "communityPoolDeposit": { + "value": { + "amount": { + "lo": "516233400468744618" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } + } + }, + { + "undelegate": { + "validatorIdentity": { + "ik": "LKckY3QlmyaFfp0fOoPsqLK8a0hC6A6hVFlQBw5G4ok=" + }, "unbondedAmount": { - "lo": "476307544147812192" + "lo": "331733130205834259" + }, + "delegationAmount": { + "lo": "12804681958798873" }, - "randomizer": "J0n7fjYHS+hf42tACWeBU7pi3dMrbk/1Zcqm7eZFLAI=", - "proofBlindingR": "Eodqjm5KgfdXfI4O7Rr8se9gWP8bQOf7uNcmIcdbcwI=", - "proofBlindingS": "oQtyr8ahQODnC11y4ZL5Myp4SpDA8KbL+H2TpF7MUAg=" + "fromEpoch": { + "index": "8673", + "startHeight": "8673" + } } } ], "transactionParameters": { - "expiryHeight": "6781311514", - "chainId": "bwvedx-738111593850323834795", + "expiryHeight": "3463037096", + "chainId": "mrununqsiunfkjzgegcnsr-496741038808052588830534002144", "fee": { "amount": { - "lo": "214648601475148779" + "lo": "317441656977586368" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_68.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_68.proto index 8b6dd3f9db..d529d1b280 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_68.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_68.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_69.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_69.json index 69ca691edb..8b4b514262 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_69.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_69.json @@ -1,106 +1,88 @@ { "actions": [ { - "proposalSubmit": { - "proposal": { - "title": "pygrfcgdmdvbkinbpkujrsvoceczijcl-32092748615507664261973", - "description": "nlwbrohubgnnr-053670327219833388602857", - "signaling": {} + "delegatorVote": { + "proposal": "647286663", + "vote": { + "vote": "VOTE_NO" }, - "depositAmount": { - "lo": "937490413554625775" - } + "stakedNote": { + "value": { + "amount": { + "lo": "747309454106584177" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "rseed": "vFrmrgWBi5oCGP1e7WJ7qKUk2Y4wKFq3qIcag3JgIwM=", + "address": { + "inner": "viBlCBOsIYVXTYor4XrErovkbSdZTdXL7qGRdAMwc32wWb3DYnPhmE96UIreUk/wDWu6tcCMj4+72UkhQ3Ogn1K5PTs//kc3ymFZ1TmqVG4=" + } + }, + "unbondedAmount": { + "lo": "439798439469163733" + }, + "randomizer": "NfdqMxHVgXMaHyQu3REnv4MorNkwneNzbJ/Wcfx0HwI=", + "proofBlindingR": "OOov646LT/DvRD++suYkiJfRMIwCIfMd/sLorKVdpAU=", + "proofBlindingS": "VVWFsQA+ICiXRvjnUSE3aMzha/PF8b6wFHlmpnazuAE=" } }, { - "actionDutchAuctionWithdraw": { - "auctionId": { - "inner": "3S0RsRjc+hZOFSEU6rSJ+5J9ffvhKvjOPSrVam29Jxs=" - }, - "seq": "448503248", - "reservesInput": { + "output": { + "value": { "amount": { - "lo": "841680905976992458" + "lo": "58341553315828660" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "reservesOutput": { - "amount": { - "lo": "613944882381138194" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - } + "destAddress": { + "inner": "jqEzfWxPBlAnwYSJHeARyH5taEgzmnkNNT6ahgAeZM64kcL8TP8w6UTYqAfrIxtO1OA2LXkHsj1G83KiHerU22Nv98bz45sFtuoVrv5KQng=" + }, + "rseed": "keerivescwx9StOzxMvgLuVNy7sLwo56M64DMm+4WuI=", + "valueBlinding": "buawFoaoMAuJOhgGj2GO/mzQBfAAEcMFyFpCsjgXKAE=", + "proofBlindingR": "2u8mnMLSvhByoUT+dRPqjazvnBfxiPyvDTiLccgjuAw=", + "proofBlindingS": "B29Ti8+Cc9veQ6gJNoSXQ0t1owyeuQZP34dQUyIKEAY=" } }, { - "swap": { - "swapPlaintext": { - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "delta1I": { - "lo": "832451596655743836" - }, - "delta2I": { - "lo": "871476921981967273" - }, - "claimFee": { - "amount": {} - }, - "claimAddress": { - "inner": "CAGcVfG0PjeGEeYX2TgP3EYLyMcN2tq6kv1+gzItUCsjIUsUsPSUdDk8mvwn+qyhWJfmeFYZuqhC1/jg+z+pdWIlxraQRF7KuNzjqojDM6A=" - }, - "rseed": "9NOQeIewKvr0Q0hDtIe8kniUPN+xNUG7F3lasOIHEWA=" + "delegate": { + "validatorIdentity": { + "ik": "kxP2l1rvVTHHSiA6XQ1fzh7zN0FkvvGAbHbv/xGr47A=" + }, + "epochIndex": "7748", + "unbondedAmount": { + "lo": "971244988940526888" }, - "feeBlinding": "a9LbPAX1GQaKr4LGHqEqo+8EtuZtpKTto5VeXgDAlgA=", - "proofBlindingR": "oEELeKn6B1967V8Eihg/3N2Nzx9s6J0HQqqcYwk8hQg=", - "proofBlindingS": "fuHA9wG9h81GHljE0kXsmxFNsPpzhLSG9Ws3YTm4egs=" + "delegationAmount": { + "lo": "74740601770930067" + } } }, { - "delegatorVote": { - "proposal": "571589292", - "vote": { - "vote": "VOTE_NO" - }, - "stakedNote": { - "value": { - "amount": { - "lo": "510221460595527054" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "communityPoolOutput": { + "value": { + "amount": { + "lo": "675769259619918164" }, - "rseed": "HmDR1ENSwbhfvkKli+AGuSiiAW9EnmGArhQ80wbUCTs=", - "address": { - "inner": "okZHsXOvwQLKUAS8UefDlkPjxXR+ZjXvz8KOSG+8qSmD8d629Dvq2nCwiV5b1fmv0XlB6AM+N2ord4Gfo5d2zHXMLUHt26tRGy/oBVFXaPg=" + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "unbondedAmount": { - "lo": "631198246979121845" - }, - "randomizer": "TvPbZm5oWeuFi5W5Bpd8yywrgsxSfLzVrtKVM+G0kgM=", - "proofBlindingR": "DhLoQ3+6DBJ7EKMAmyDoyuKRrpM0VL1/AxIL8v57DAc=", - "proofBlindingS": "4LlDlY/yf+gvBmEB1J0/Na6vJAntFBsnwjnrl6/KLwY=" + "address": { + "inner": "Cfsryc8xzoLWxnQUW88wgIl0b09VHO1hPjd/drTwdJZfHTgK65PJQCUbKsTC4eXWrUXW5HgU1nVHCQ95AOwUkW1HX2dsFbeqkxLL2FDTKxM=" + } } } ], "transactionParameters": { - "expiryHeight": "2307045737", - "chainId": "htnfwhlbnkebjhwjjctmdrvranmt-239605595115", + "expiryHeight": "7846038948", + "chainId": "unwnyzbvcrmkn-961523796265493082050", "fee": { "amount": { - "lo": "824727385379590102" + "lo": "909062766742954169" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_69.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_69.proto index 3e16346356..3935aaed62 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_69.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_69.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_7.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_7.json index 371ba4a400..0fa3134b31 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_7.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_7.json @@ -1,108 +1,79 @@ { "actions": [ { - "validatorVote": { - "body": { - "proposal": "800743260", - "vote": { - "vote": "VOTE_ABSTAIN" - }, - "identityKey": { - "ik": "YZVvz6TXfTDte8y2+XtH1Z0mDB2bO8QJ3rPxGeWvQl4=" - }, - "governanceKey": { - "gk": "8lNWp41Hj/9mHWu/ohYSLF2ErRuLgUEmVEP62JSS6xA=" - }, - "reason": { - "reason": "Kx" - } + "proposalDepositClaim": { + "proposal": "414267719", + "depositAmount": { + "lo": "799855507655296861" }, - "authSig": { - "inner": "umenwbPge+eVGTNsykTe5XrIiFM5qyrlgR8Q2LRbCgXQcnNvcPPYsQZWX7lf4MeTZkMVxLbsb4kp3AYpUUmaAg==" + "outcome": { + "failed": {} } } }, { - "validatorDefinition": { - "validator": { - "identityKey": { - "ik": "ivaRM2LSVZOYWPM5/Bc5KQA2NzQL29V2/jy1oYAnpRE=" - }, - "consensusKey": "QV87anjaXIh9bFnGg6HR/qfARoKHdTwxq29nZ58F7DA=", - "name": "test validator", - "enabled": true, - "governanceKey": { - "gk": "ivaRM2LSVZOYWPM5/Bc5KQA2NzQL29V2/jy1oYAnpRE=" - } - }, - "authSig": "xJLWUPz7D0G5BVsIierr7lDroAoikbEEFVU62TPHQgjCFfo/aklmaDgOBKuPp44VW+/KQZOQ5DG1kEULa75aAw==" - } - }, - { - "swapClaim": { - "swapPlaintext": { - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "positionOpen": { + "position": { + "phi": { + "component": { + "p": { + "lo": "616134581316380473" + }, + "q": { + "lo": "918024852624877366" + } }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } } }, - "delta1I": { - "lo": "7237362738526161" - }, - "delta2I": { - "lo": "408539591171559679" - }, - "claimFee": { - "amount": {} - }, - "claimAddress": { - "inner": "XfeKqfP04yF3KU8ZxW08U4YmSEX9vsdSVgGYjYcqv4MK1aTso9R7KBqmlJn0BYFLMWSl5MoWgTNLbR1ontkwBVeP/HTzGqVQA4YX1zwVo6c=" - }, - "rseed": "qzaL0HVk/2WSlspHKXmyp6Jdo8MSslqcSsixThqbnAs=" - }, - "outputData": { - "delta1": { - "lo": "396731055" - }, - "delta2": { - "lo": "1374229702" - }, - "lambda1": { - "lo": "831" - }, - "lambda2": { - "lo": "1161" - }, - "unfilled1": { - "lo": "1604" + "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "state": { + "state": "POSITION_STATE_ENUM_CLOSED" }, - "unfilled2": { - "lo": "1883" - }, - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "reserves": { + "r1": { + "lo": "745860647007517824" }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "r2": { + "lo": "156282182435216568" } - } + }, + "closeOnFill": true + } + } + }, + { + "ics20Withdrawal": { + "amount": { + "lo": "152229665045581333" + }, + "denom": { + "denom": "DgKM53" + }, + "destinationChainAddress": "penumbra10c0jlkkwucgcsedq7v3uhh6pgrk6h3429mx0gkltugg3maxt3egyemdfx0neg9x55wjzgjerexjxc2mjl8l7hyququ00p69gs6vxr4ga66f4l9yjfdhzdtzjgfczxvyegm9k9s", + "returnAddress": { + "inner": "HsvuGv09+sAwmKC3LG7F94ac/mToGgFgRfNWnBA9tg/lqg32n9SUmnIm8CLfKJvi9MGSmoKkLs6z0cM65FIl20Rgx+e7CM4B65SvBHjtweU=" + }, + "timeoutHeight": { + "revisionNumber": "635443618", + "revisionHeight": "21032834" }, - "epochDuration": "1000", - "proofBlindingR": "9YCqVLRd3WNd13fkPPIiOz8flCiVtYhgzuTRClwxPQg=", - "proofBlindingS": "dPJ1KdTFZqjI9L5dNukqbCSeDezUN51H47QJSKCzaQE=" + "sourceChannel": "channel-0" } } ], "transactionParameters": { - "expiryHeight": "7278472334", - "chainId": "npyps-20528", + "expiryHeight": "8785158461", + "chainId": "ekeysoehpmdegwrzwcecspmsjm-49221425172907582434487920", "fee": { "amount": { - "lo": "603315510540889561" + "lo": "663279731578099519" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_7.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_7.proto index 9d0edcd9d8..9a1dccd6ab 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_7.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_7.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_70.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_70.json index 60d12a282c..f69b0326e3 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_70.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_70.json @@ -1,41 +1,70 @@ { "actions": [ { - "communityPoolSpend": { - "value": { - "amount": { - "lo": "182169567793400948" + "positionClose": { + "positionId": { + "inner": "ZaXVx44Ksl8LB84e1YlEoRyeoW7LAn3xPE5B8ECxz0c=" + } + } + }, + { + "positionOpen": { + "position": { + "phi": { + "component": { + "p": { + "lo": "633458098361194110" + }, + "q": { + "lo": "283318158393225329" + } + }, + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "state": { + "state": "POSITION_STATE_ENUM_OPENED" + }, + "reserves": { + "r1": { + "lo": "227531294295513491" + }, + "r2": { + "lo": "133548629561605043" + } + }, + "closeOnFill": true } } }, { - "undelegateClaim": { + "delegate": { "validatorIdentity": { - "ik": "5RMUaG3KAiiOS8umSYfdl03Pdfeqq9UGDmOix94j4bc=" + "ik": "1n1wKRwyp0hKMNlHCydIBixHxan2/NIHSfDLMSeNevo=" }, - "penalty": { - "inner": "AAAAAAAAAAAAAAAAAAAAAP24uscQyylenhsImgJ1JUc=" + "epochIndex": "1552", + "unbondedAmount": { + "lo": "988630199176420697" }, - "unbondingAmount": { - "lo": "635862938662374571" - }, - "balanceBlinding": "UKNVDQMH0kkDI8ADq4HxRj7MipTc6mVADYa9tIyGEQA=", - "proofBlindingR": "gfHEG5ME6RgHbMBc1XD5XHiJMymqVYN7otT/O9qXyxE=", - "proofBlindingS": "qgFAbfZgcOoPfMvg+cn7jis9u3pkzq3zJfZBvWTWGgk=", - "unbondingStartHeight": "96365" + "delegationAmount": { + "lo": "153702134284315649" + } } } ], "transactionParameters": { - "expiryHeight": "167592944", - "chainId": "bnuiqvevjitdaamyzn-2043254365281265516411890", + "expiryHeight": "208365756", + "chainId": "utekqgwijzn-597", "fee": { "amount": { - "lo": "599063820810496597" + "lo": "389032767397373614" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_70.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_70.proto index 251f1c9cb1..9ff5a43330 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_70.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_70.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_71.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_71.json index 9aa6d7491e..22d5c81127 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_71.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_71.json @@ -1,38 +1,73 @@ { "actions": [ { - "delegate": { - "validatorIdentity": { - "ik": "sKRqjDWadGFO/TIEMtwOmedJkuOxlMQXnoaVtoP+WOM=" + "actionDutchAuctionEnd": { + "auctionId": { + "inner": "0FgxRpdtBST/xaFc7d2/WeBbi7h/nunklWE2Qes8cwE=" + } + } + }, + { + "ics20Withdrawal": { + "amount": { + "lo": "705353425731686480" }, - "epochIndex": "3572", - "unbondedAmount": { - "lo": "884813692927508554" + "denom": { + "denom": "Lp4zTsx8v1xYLCOa52Iw3z3O4oG05q9n" }, - "delegationAmount": { - "lo": "973795711680164591" - } + "destinationChainAddress": "penumbra1lw8c9w9u5dhdjtu3f42fdxqfhesevfzlwpuc4ltq0fqk7ys7qylq79ta9vh9093wcvnxrxkxa3d8xkddwnk4lnmp2vgh8lp4wymej487844flfraq9fyzza879gtjh07937q7r", + "returnAddress": { + "inner": "PI/hOUYA0xGa/ajpqjt4ITxFp0LBQNTrKdULHAQLR5ZwBGhR44t4tnaVd0eGdNfxhFgI87mk6Zf8A4zoIm934U2Ad6BURuHWjaMUnf7H5uA=" + }, + "timeoutHeight": { + "revisionNumber": "647526331", + "revisionHeight": "312877693" + }, + "sourceChannel": "channel-0" } }, { - "communityPoolSpend": { - "value": { - "amount": { - "lo": "35770030447883941" + "spend": { + "note": { + "value": { + "amount": { + "lo": "531364989861787630" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "rseed": "sauMKtnJzAUidTWzgsu5NS1qzX0N4gW9PPRoucfcyDY=", + "address": { + "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" } + }, + "position": "230356823049356", + "randomizer": "HdJleAo5G3LDyT+fKTbriMWZUBb10b/DWlQMie76LQM=", + "valueBlinding": "olzHpXfxJ70iE9+g05Jms50y01oW60+W1PvALBoSlQE=", + "proofBlindingR": "7rFbkn55uLc1OcsqOi7Y6GYm+aawLMx66xMabMI05As=", + "proofBlindingS": "p/UcxJx3aac9vc5KUGQxAJZuueiMz8IoZxcnsZJqwAY=" + } + }, + { + "proposalSubmit": { + "proposal": { + "title": "ncfafkufjpabbdqfghdrjrgvtfcufw-259", + "description": "mwnc-19533998708946666367821339", + "signaling": {} + }, + "depositAmount": { + "lo": "3313028713214231" } } } ], "transactionParameters": { - "expiryHeight": "9838345454", - "chainId": "tiiwrvprdahlmbunkqbywgr-0318729731669205428119", + "expiryHeight": "420803536", + "chainId": "esfob-0647962984199999", "fee": { "amount": { - "lo": "516900881830842854" + "lo": "145474113215460667" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_71.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_71.proto index ba4a865d6e..22da56c322 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_71.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_71.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_72.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_72.json index 490f24d3ad..1282b47640 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_72.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_72.json @@ -1,57 +1,73 @@ { "actions": [ { - "undelegate": { - "validatorIdentity": { - "ik": "qV4z6oixLlYZIyyyLXdk2vzARpQC54YrPgYRqtfUZ9E=" + "ics20Withdrawal": { + "amount": { + "lo": "148464805081319371" }, - "unbondedAmount": { - "lo": "329370722563604454" + "denom": { + "denom": "bd5qheu71hKD" }, - "delegationAmount": { - "lo": "541484332641379" + "destinationChainAddress": "penumbra1x33gx5cjgnzhcks74kcg0kqj86nk4xyzvkrr9asyj4lvlz7fvkjy748p2e99efaffasqevavcvequz8yaz25nsv0kcsk2dtx2cnt5g0jz2n9mrdvxfy9pmcv6fku0pkj0kzdld", + "returnAddress": { + "inner": "e6CUfxfmjBwrcxtqLdK5UJys/yMDh1SEJKotc1l+x6U6HLqRMaGTiC9KTJYAtPsmJZzau7Sxmy+WlUPAyLY+OBxLiIoXyqSt/SjV4dQ/b50=" }, - "fromEpoch": { - "index": "9051", - "startHeight": "9051" - } - } - }, - { - "proposalWithdraw": { - "proposal": "220341220" + "timeoutHeight": { + "revisionNumber": "815086055", + "revisionHeight": "551500235" + }, + "sourceChannel": "channel-0" } }, { - "spend": { - "note": { + "delegatorVote": { + "proposal": "305707539", + "vote": { + "vote": "VOTE_ABSTAIN" + }, + "stakedNote": { "value": { "amount": { - "lo": "291645124801248238" + "lo": "749468195273056247" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "rseed": "Y1CmSJbTesNObuW4v3C+XwDogc0adTAen04t1D/Etl4=", + "rseed": "+GrgPmVbeFxXOT0//n49/KYSUAFpw1ONxfd/+qlFuF4=", "address": { - "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" + "inner": "/cewbdCIQQBl4WHbaOVJpxwu6AFzpbUlfw9W6EAevt6rwKf0plntAejsMFhovDEp1pKnIydVR74/TXaFf0LnWIpBsg1QwAn+eDY0D7DIwCM=" } }, - "position": "201128423224323", - "randomizer": "njfbha0J0jPGpVmbITr/CG7GoTZrufqgZeGP1LNqYAE=", - "valueBlinding": "H0f+j8EM8jNkoj9kI8iycWlH3fe+H7rMTi7DItekQwA=", - "proofBlindingR": "rSGzyd1qDBxkuHahLmYA3KaOI8+BQyJcGKJpn5ZA8w4=", - "proofBlindingS": "8mFlucjgCWT/h2paUlAmvptcFh/vBGsfOCoh2xzr/g4=" + "unbondedAmount": { + "lo": "237063238663394541" + }, + "randomizer": "axvBFedahTZYrF8q/VoQVgK1wejiQUwZLSJa8s0LSQM=", + "proofBlindingR": "nEc4ZDmaYMhLvWQCJ9X6OSfiPBrHqccKOvvSHIQrVgk=", + "proofBlindingS": "4USO3GqV5QY0+s17+hfeiegH8F1UoH3to82wbR/tcAI=" + } + }, + { + "delegate": { + "validatorIdentity": { + "ik": "svnftDHSG9jHi9Jm1gFlgkWypMNADuEVP3iIUgdjBGs=" + }, + "epochIndex": "9713", + "unbondedAmount": { + "lo": "215516364688759872" + }, + "delegationAmount": { + "lo": "876331638260641481" + } } } ], "transactionParameters": { - "expiryHeight": "9886863589", - "chainId": "hcgvtrwavaqngtdiczkoyjrmlaldw-400676818846886299100933956", + "expiryHeight": "2544146112", + "chainId": "mmunlixqdpbuwk-134325978195", "fee": { "amount": { - "lo": "561189096306277775" + "lo": "924244145843591790" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_72.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_72.proto index d3ffc88a42..69905389c8 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_72.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_72.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_73.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_73.json index acb29c3519..eb6e853203 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_73.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_73.json @@ -1,77 +1,60 @@ { "actions": [ { - "actionDutchAuctionEnd": { - "auctionId": { - "inner": "PlFFGg79LE+XRXqsQuJzFbdboGgc7DXJaO1jpO3FNEY=" + "undelegate": { + "validatorIdentity": { + "ik": "7CaaPPRctLemdELS5ODMtwuTL3gROmR5jHZ5OPLbkao=" + }, + "unbondedAmount": { + "lo": "345308470694977905" + }, + "delegationAmount": { + "lo": "245954095699004737" + }, + "fromEpoch": { + "index": "1330", + "startHeight": "1330" } } }, { - "swapClaim": { - "swapPlaintext": { - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "delta1I": { - "lo": "73625975926872997" - }, - "delta2I": { - "lo": "759210985137596090" - }, - "claimFee": { - "amount": {} - }, - "claimAddress": { - "inner": "RTyoacrh7Bp5aARWqJ2efkDhyRgBuiYlditC1SGR7G1bRTwwqIgNsd4P/BRPDs5IjYlfmUXEVhU/OAD3UXepoak+PEvYK44B1FiMjBXcO80=" - }, - "rseed": "owhHAdxie4VP8M/1pPwe1KBoaw0gNnbhxtVQRuf/ARg=" + "undelegate": { + "validatorIdentity": { + "ik": "1DpgYqmHzYNnvHG4JJn9wsOFxFM8ZhpDYKo5YjikfHM=" }, - "outputData": { - "delta1": { - "lo": "257481810" - }, - "delta2": { - "lo": "1341365859" - }, - "lambda1": { - "lo": "1936" - }, - "lambda2": { - "lo": "547" - }, - "unfilled1": { - "lo": "44" - }, - "unfilled2": { - "lo": "1832" - }, - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - } + "unbondedAmount": { + "lo": "36106434607680705" }, - "epochDuration": "1000", - "proofBlindingR": "ANEQyCIG4QedFgBIxmTW65wQgcNtmEesejeqdSSfOQ4=", - "proofBlindingS": "WdT+jFIwNxBujDpZXLkR72RswB5Qo6H7Lr2DPBE+JAI=" + "delegationAmount": { + "lo": "261931724086607083" + }, + "fromEpoch": { + "index": "9386", + "startHeight": "9386" + } + } + }, + { + "delegate": { + "validatorIdentity": { + "ik": "nZGt2iT0BHgS2H5dAAEwfBXC+CongF6+j0UdU1WxTh0=" + }, + "epochIndex": "4284", + "unbondedAmount": { + "lo": "393065063982521479" + }, + "delegationAmount": { + "lo": "518097777490461295" + } } } ], "transactionParameters": { - "expiryHeight": "8455143262", - "chainId": "gbsujyvxwq-16419002146961281753456", + "expiryHeight": "3525353636", + "chainId": "henosxdhdlqtfcikkdg-2893172678357769844448905", "fee": { "amount": { - "lo": "189595041592541069" + "lo": "733669609673625852" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_73.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_73.proto index 26259dd7b6..85be80d440 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_73.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_73.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_74.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_74.json index d3091f2e1b..ac6c3df561 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_74.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_74.json @@ -1,77 +1,66 @@ { "actions": [ { - "spend": { - "note": { - "value": { - "amount": { - "lo": "27663927245931193" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "rseed": "8kKetjhZdxM8OEBAOqIWgi9DNWlVItxL+qsSf/lfgfM=", - "address": { - "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" - } - }, - "position": "252938257034257", - "randomizer": "/DbinvkjsusuI4ky7NSOsMLb/Nu3KcHLRgkjA89blwI=", - "valueBlinding": "0uuFmCSEeS8PXyl+PwpHSsd+x0y42BMYGpQimjYSAAQ=", - "proofBlindingR": "2jmrDWtzXOkZybGhu4Vm4SCHsgvvc9noYovqJMgUVwU=", - "proofBlindingS": "vtxfyAF/LFsHz0GX9njFG9dnjAnYoPFqlj3wGbB2YAQ=" - } - }, - { - "communityPoolDeposit": { + "output": { "value": { "amount": { - "lo": "689532434862634413" + "lo": "340451464773121449" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } - } + }, + "destAddress": { + "inner": "lZNZUBD0MipStnXuM3cPr22YLwgojKy3JyRlnozn1Vw2hWY1JamId5I9tS8KyQKmnBaZNu59j8IYYJlDdXabCKRK1oqcwa/DCyysxL0Dq8Y=" + }, + "rseed": "0/6eGeTmVJ2d7COm+skjceusQMRpISIDt9orcpJRCHE=", + "valueBlinding": "kC9OD+rv13/FvJ6cTk2VCz8W8Iioc9B30eZr6h73EgE=", + "proofBlindingR": "ZsBBPX1iV2IYPsALhBNk/GNdkqpGqtdNUhlvLhFhwgs=", + "proofBlindingS": "gtyxM4NRllH1yM6eg58vlie9KGi7ixmcuhKvuQl6yws=" } }, { - "communityPoolOutput": { - "value": { - "amount": { - "lo": "942142257580664653" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "address": { - "inner": "sRlXkBLJzGKEEFlNWJ6W0h8boGy8a8oasfjtveD1du9xYeJvrlpfqVJB7lKJJ51V5u2wNlX1RCibfAAdLo5oZ41Ts2Cevd0Tx13rDlFdP+w=" + "positionClose": { + "positionId": { + "inner": "gtPL48051rOkQp+2gn9BrLCj509nYG9oOYKXkhwniP0=" } } }, { - "communityPoolOutput": { - "value": { - "amount": { - "lo": "263021446818198553" + "delegatorVote": { + "proposal": "712555247", + "vote": { + "vote": "VOTE_NO" + }, + "stakedNote": { + "value": { + "amount": { + "lo": "544802747201443663" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "rseed": "tNwEFKY/HXH4Yy2O1nkj7uMzjFPWWgM0RIuLTiCQlGE=", + "address": { + "inner": "r5mziC+H/DhYViULTsGWLZPHP23RaFodCaq5nkbP/ozoE5+BeOwiHtz9fQ6oYqaxUpdSiLEPaN7lxzZLPpO7WmAcFhTLiKamhrai9SiKyGg=" } }, - "address": { - "inner": "6IbjT4Cz0UEaFc9aeP7Jchra/yNqx2MB44Vin0cIE3a9PtFQlCvUJQ1pt12SvU7kIit/ObI2Wh9U9zLerZZlIjuFaIigUTaYeH3aoJtM65k=" - } + "unbondedAmount": { + "lo": "717142667821755777" + }, + "randomizer": "HTUNWh9GEIWD6NWa7faTnQvORMkg2NwaEkRehdg1FAA=", + "proofBlindingR": "fy864FBG0NtSQU1TjJlJeonN9YpdR/8Qx8G9sNIjuQo=", + "proofBlindingS": "YteMXag2Qd02/JE9tblmA16xKkpsYn9aMlHGSdEhtQ0=" } } ], "transactionParameters": { - "expiryHeight": "2903176362", - "chainId": "j-20449781250163944545100015", + "expiryHeight": "1077693046", + "chainId": "kdduyqffphbnqajbpuljdmmoifcplxtz-00476524308212980", "fee": { "amount": { - "lo": "101299758122898677" + "lo": "642501004680437559" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_74.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_74.proto index 23381423eb..81729477aa 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_74.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_74.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_75.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_75.json index 11d6ce6a41..793f5d03b6 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_75.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_75.json @@ -1,48 +1,67 @@ { "actions": [ { - "communityPoolOutput": { - "value": { - "amount": { - "lo": "367726786513069539" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "undelegate": { + "validatorIdentity": { + "ik": "wuwgWygLl4axtVEDtwuTWj2v+1giGPJuH98L42iE9Rg=" + }, + "unbondedAmount": { + "lo": "534934644143406260" }, - "address": { - "inner": "S2JUJ7umc/exySvbLgqYSe640AIb2tKgWtEF0+TmbM+pVlmVaDqnLDg6n20j9LrNtq11Q3M1ESnUD8ZYnzsF4j2L2AxZj+MS40DWges+D34=" + "delegationAmount": { + "lo": "692960866983432388" + }, + "fromEpoch": { + "index": "7015", + "startHeight": "7015" } } }, { - "positionClose": { - "positionId": { - "inner": "eBDch1m2dXDvaiXws0690m/ZbCXAq8mNZAAv3frkim8=" - } + "validatorDefinition": { + "validator": { + "identityKey": { + "ik": "WiWhWYLuX9T/RBMkes/V8ynqqR7R3Q4/PUhEQkFPpQU=" + }, + "consensusKey": "YhNRal7+EhH1OVroPFV5KdAoaL05nlcNFWyHdv3cEWA=", + "name": "test validator", + "enabled": true, + "governanceKey": { + "gk": "WiWhWYLuX9T/RBMkes/V8ynqqR7R3Q4/PUhEQkFPpQU=" + } + }, + "authSig": "KkZff9vJ7Ln+HgmkQY6wvKImvxspEg7bsV/dzB9DSAJgQqc/FUytawVA9cT65Vig8npDuwq47rOQRKA5JHCEAw==" } }, { - "delegate": { - "validatorIdentity": { - "ik": "oVRgKknU8Dw5ZA7Qdlz5vr62EuqCTeLs29g3vMQUMCY=" - }, - "epochIndex": "1052", - "unbondedAmount": { - "lo": "985389063481683216" + "validatorVote": { + "body": { + "proposal": "586452870", + "vote": { + "vote": "VOTE_NO" + }, + "identityKey": { + "ik": "ZoGPqyX2doMZwcuCWdwGz+EPijjKMqRUdWsr8UqM+qA=" + }, + "governanceKey": { + "gk": "3rvvwzQY3gGcMycFRk4QPv+T+mGvEFgTmSpoGEpJVhI=" + }, + "reason": { + "reason": "h4IssRgUR9uQfd" + } }, - "delegationAmount": { - "lo": "641165127029311412" + "authSig": { + "inner": "DI+xBuD+9cLcJE59Y0uFczvyC1VckxH83SqsSFndaQEJm/zlqNJB7CnJecyrWQJAuJ0uks5v3TWrYWArjsk1BA==" } } } ], "transactionParameters": { - "expiryHeight": "4059339943", - "chainId": "vgsknzsarnlevcgxtex-64999524802311011331218483730", + "expiryHeight": "4104268457", + "chainId": "u-498220601506581193183974361326", "fee": { "amount": { - "lo": "300595445484946658" + "lo": "150551619517905195" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_75.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_75.proto index 0a095117d8..2824520e05 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_75.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_75.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_76.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_76.json index c52399dd6f..08debaf421 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_76.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_76.json @@ -1,77 +1,78 @@ { "actions": [ { - "validatorVote": { - "body": { - "proposal": "499559962", - "vote": { - "vote": "VOTE_NO" - }, - "identityKey": { - "ik": "nFiW6rkeMgQiKHqZ0AfEZK/AzsKDb1NoXTdSgMO58uo=" - }, - "governanceKey": { - "gk": "1u9xVoClu+OLEgGCyd+TzqJCUTs+u70A9RROo/kj4AE=" - }, - "reason": { - "reason": "0Wivwap5nmQTkgMm9eMYv" - } + "undelegateClaim": { + "validatorIdentity": { + "ik": "L0Y7D5yA65pvty/fncAMn+wa3RnXPw+Bnhi1//8Fzt4=" }, - "authSig": { - "inner": "LtvVp7EJF+htX+W64LV0Y1LubN5yWanY3b0KesF3gwmfFnNs4/b+NWMxIko4rzPHVXkEf5D/mBmk4RjTgzuGAA==" - } + "penalty": { + "inner": "AAAAAAAAAAAAAAAAAAAAAP+XJHRTjvNNahYeT3Zf2K4=" + }, + "unbondingAmount": { + "lo": "368735418534892302" + }, + "balanceBlinding": "1fmKTx3U8+q/8qGz/LEf1g+aBHcGuO4mopFBWZlfjgI=", + "proofBlindingR": "G5gmLQa/kugffbA63b6tSohvX8GVyZC9uCdvJpPrpQg=", + "proofBlindingS": "2OQqq9BOsyDTL2Ry+7qChKgJcr2Dc7I1gAqtafMAAQ4=", + "unbondingStartHeight": "13162" } }, { - "actionDutchAuctionWithdraw": { - "auctionId": { - "inner": "m/zdbJC1ASwwv1z/yz+fyr9lUtaXXwfptWjub9I+dN4=" - }, - "seq": "642126660", - "reservesInput": { - "amount": { - "lo": "790696754725628587" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "proposalSubmit": { + "proposal": { + "title": "hrqkmbfggbgrl-7614", + "description": "oyb-7108209791", + "signaling": {} }, - "reservesOutput": { - "amount": { - "lo": "22174763363613413" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "depositAmount": { + "lo": "96792643880719544" } } }, { - "ics20Withdrawal": { - "amount": { - "lo": "355752587401124815" - }, - "denom": { - "denom": "0oVyqrc9d057e2" - }, - "destinationChainAddress": "penumbra1vvyfptyh4s4w4caja607g5wwpk737lwr0arglnpnzzg400neezmvpluqgc9nceh29d6pwwqftldqd6mhwhdzexkhex92v75wwqnk455lhhyf80mf9tw8cunvxxver8p9gq3tad", - "returnAddress": { - "inner": "9zBzyC8N5prqd79bkfr3LQjyNCBJhouqfqOhJoQy9Hy9bZOcLiftvrwk1Z5JbjwxE+pmjNG0VDeGv5Bl2vdD1SaqVlvX0F7LT281AeuCLxs=" - }, - "timeoutHeight": { - "revisionNumber": "951475047", - "revisionHeight": "597738032" - }, - "sourceChannel": "channel-0" + "positionOpen": { + "position": { + "phi": { + "component": { + "p": { + "lo": "752490546840670506" + }, + "q": { + "lo": "685652472648998305" + } + }, + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } + }, + "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "state": { + "state": "POSITION_STATE_ENUM_OPENED" + }, + "reserves": { + "r1": { + "lo": "576677425087379471" + }, + "r2": { + "lo": "821935855867602153" + } + }, + "closeOnFill": true + } } } ], "transactionParameters": { - "expiryHeight": "7365106243", - "chainId": "mvjaulrrlqlpgxusmiymlourvvc-8306", + "expiryHeight": "16490740", + "chainId": "zhaqbslvzfqvhzrhvnyoih-843575411607877852659022682", "fee": { "amount": { - "lo": "414174351199549054" + "lo": "3498326502753566" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_76.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_76.proto index 914f52f181..7429e60513 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_76.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_76.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_77.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_77.json index 6816be7a41..e492104e5a 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_77.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_77.json @@ -1,55 +1,51 @@ { "actions": [ { - "positionClose": { - "positionId": { - "inner": "0TnfxI7CGKn5gfgQ0JXS3JZpFlV5bzgl7/x3UFCsSJs=" + "ibcRelayAction": { + "rawAction": { + "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", + "value": "CrIBCIbCtEsSC2RlZmF1bHRQb3J0GgljaGFubmVsLTAiC2RlZmF1bHRQb3J0KgljaGFubmVsLTAyZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA6CwjK/r9iEJi06r4CQOiJsrvJu7aIGBICCgAaCwjK/r9iEJi06r4CIo8BcGVudW1icmExcGhuZDR0cW10dDZqYXZ4MzVqd3ZleHlwdWh1cHUzcHdycGp4NGV1OHFsZ2Q3Z3hlM3EwYTl5dDg1NTNqMnBldmo2ZTJyeWVjbTJqcXlmMm04NHc4NGxoc2ozcTZhOGgwazVla2xoNXZkcHQ0Zm5zZnZ4MHdmcjRqd2N1N2cyMmV6dHY3eWU=" } } }, { - "delegatorVote": { - "proposal": "219774875", - "vote": { - "vote": "VOTE_ABSTAIN" - }, - "stakedNote": { - "value": { - "amount": { - "lo": "48413405796385235" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "actionDutchAuctionEnd": { + "auctionId": { + "inner": "sRxMsUvvHGiShxUteMJF1TEEbpucHAK5NRgnXmCLndI=" + } + } + }, + { + "positionWithdraw": { + "reserves": { + "r1": { + "lo": "966399753330479476" }, - "rseed": "4o634/VgVEcnBb8npFHlZ4xxjn3s0K9kVyIANOukvN0=", - "address": { - "inner": "BImkeWiAY2DTqTGtuzT/wgxukmKACkIJr5Zb06tPcP2ATTU5KKIV2LO3zDOEhbnzEbKz79x574YVDtF/St00msjaO9F++Tvy4DcyVj2U8sk=" + "r2": { + "lo": "763606050867868230" } }, - "unbondedAmount": { - "lo": "144640427210658826" + "positionId": { + "inner": "X5hUCkVTYN9tyKDkj3uAz4SE+AtNg8nY43p6W6BFAkA=" + }, + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "randomizer": "FpZS2fYJpfAHHJGpOODkDBgoDs6g8rpZSl3oV0cgbQA=", - "proofBlindingR": "zYlMbjO2q1Mr7rDoMvwqdXk3xWvwsOsrA/P2M1Sg1Qs=", - "proofBlindingS": "jL/R9f247Ou26VsDj2uVIbJp/MavTSNr8ujVtXluDA4=" - } - }, - { - "ibcRelayAction": { - "rawAction": { - "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", - "value": "CrMBCJPpp84CEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgsI1s35nwMQ0ubaDUCI0qjLr7XqgRgSAgoAGgsI1s35nwMQ0ubaDSKPAXBlbnVtYnJhMXhndGhoZDd3bHVsZWhldThsY2p4cDNteHl3NTJtY3RmaDB6c3JjbmY5djg4YXpneXc2MGh0OGcyOXY3NTg2ZGNxcmQ4bWpyOWVuOWtxNXY0eWdrMmpsaGpzZm01ZTk2eXVwYWg0eXkyenkzOW43aG5maGRrcWR0MjBlbWVocjJ4OGE0Y3Rt" - } + "sequence": "1" } } ], "transactionParameters": { - "expiryHeight": "56065610", - "chainId": "hsqij-607766745030415793088514", + "expiryHeight": "6703689706", + "chainId": "qsxey-672714308923798838238291", "fee": { "amount": { - "lo": "106546346302802358" + "lo": "24921229179695470" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_77.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_77.proto index 4406308476..ac4e357afb 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_77.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_77.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_78.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_78.json index 5cabaf168b..2e0320c7d7 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_78.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_78.json @@ -1,58 +1,50 @@ { "actions": [ { - "positionWithdraw": { - "reserves": { - "r1": { - "lo": "2998218174805594" - }, - "r2": { - "lo": "845753515854215497" - } - }, - "positionId": { - "inner": "8SwMXaaQfgZY1TqjWVvmoyiTBf1feslEQnON5w0MXU0=" - }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "proposalDepositClaim": { + "proposal": "473766891", + "depositAmount": { + "lo": "297957986956764967" }, - "sequence": "1" + "outcome": { + "passed": {} + } } }, { - "undelegateClaim": { - "validatorIdentity": { - "ik": "Jju1bsKrn1c3KZ5zTDkwVUV3Kv17d38XILrahr96DBE=" - }, - "penalty": { - "inner": "AAAAAAAAAAAAAAAAAAAAAP8uSOinHeaa1Cw8nuy/sVw=" - }, - "unbondingAmount": { - "lo": "759098308161705917" + "communityPoolOutput": { + "value": { + "amount": { + "lo": "424215752283475438" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "balanceBlinding": "QiSS6nxQhaoO/ftU9SGxw8+ayxH4oVmPAXm7Hrm2kgA=", - "proofBlindingR": "hqzYh0tnWa2FeKak2C2wLuoLbHpZnAhjSQ8rWeSeSQ4=", - "proofBlindingS": "C+Ja+Ck10/HhIonYhk9fQeMp3Fi8XS812VqXMHyDeAI=", - "unbondingStartHeight": "96027" + "address": { + "inner": "aSij68KSXafDXmgTHZGpIX/zs44rB56aBAnoaynqSijGgSABDcZP25+TwHNp8wKBv3a6CddpWe1l2m6+PreYbYlO2nglVP4kx2S7F5L8vZc=" + } } }, { - "proposalWithdraw": { - "proposal": "987713522" + "communityPoolSpend": { + "value": { + "amount": { + "lo": "243485784561771789" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } } } ], "transactionParameters": { - "expiryHeight": "1539522175", - "chainId": "xrzalo-7580521163329717690", + "expiryHeight": "2886812000", + "chainId": "oeipxhgcudkphtmxjwacqy-8106", "fee": { "amount": { - "lo": "4513131285468227" + "lo": "254426681358060609" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_78.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_78.proto index 344b8db0d0..cabd04fc8a 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_78.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_78.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_79.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_79.json index 472d2a88c7..e4fcb060f5 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_79.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_79.json @@ -1,51 +1,34 @@ { "actions": [ { - "spend": { - "note": { - "value": { - "amount": { - "lo": "741942250909992008" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "rseed": "MKC79HQuMnIG69WPEVcxsc2SNdhJCxpSfwaPe8XmDtg=", - "address": { - "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" - } - }, - "position": "3153097213350", - "randomizer": "TluySK6eCnjgXHZcQqXwAhHa8ThZlhUKvlt3iq5vCgQ=", - "valueBlinding": "ydxiq5VRBvEsAtv4ZF6qolgd16z799IB5QgUHQ0wJwE=", - "proofBlindingR": "MFrM2W9DP5ale25K9Pshq9Wg3wsP1/u2zDjs4dtXLhA=", - "proofBlindingS": "OkfgIGXDx18gPSwX8+HE2bYrJFyLOyDZWf1eKb03Rws=" + "proposalWithdraw": { + "proposal": "143473475" } }, { - "validatorDefinition": { - "validator": { - "identityKey": { - "ik": "0Lltz3Ro1wrqNPAk+yNfRZrnm7Nopf9qtH/DEvN5jgk=" - }, - "consensusKey": "bbJnyuqiepIKj5/QX7K38q7+A4Pe4sSIdCkNTcMm6kE=", - "name": "test validator", - "enabled": true, - "governanceKey": { - "gk": "0Lltz3Ro1wrqNPAk+yNfRZrnm7Nopf9qtH/DEvN5jgk=" - } + "undelegateClaim": { + "validatorIdentity": { + "ik": "BrvfJm59aRbU93ppCpq78eJbMH6KGpCsF93ymLInL2w=" + }, + "penalty": { + "inner": "AAAAAAAAAAAAAAAAAAAAAP5CWu5jH4oJAt4A0bcXWOM=" + }, + "unbondingAmount": { + "lo": "770780859579777782" }, - "authSig": "cAniQrp2/FNRKNJ6FyoStqePVpCW1OdZ1vMd/ZVW8gI+pp2Evp0i2bHvnnbmMVZHskBc3gyE5abVgPrWJiJfAw==" + "balanceBlinding": "tj5u+kokyvdJ+voQ9vlE7xynkDeEYFMwbV+dqAh8JAA=", + "proofBlindingR": "azSoQt/V7lYceQL3tkmJBCk/779lSgvPL1VCGG9tsAY=", + "proofBlindingS": "97EkAyM9e4/TP3TlpwW60fA5GfAmQPdXU/5L4L5ykBI=", + "unbondingStartHeight": "70975" } } ], "transactionParameters": { - "expiryHeight": "5317316281", - "chainId": "nxrebnjwsecknwqbgo-5583319941", + "expiryHeight": "2841314202", + "chainId": "joswvrkohbpzjiukfzfikhelu-89430285379435867711", "fee": { "amount": { - "lo": "860494276525678602" + "lo": "779937915757833540" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_79.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_79.proto index 139ca0bbb7..4670939b2e 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_79.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_79.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_8.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_8.json index 966f7f1a81..9cf4786df1 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_8.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_8.json @@ -1,9 +1,19 @@ { "actions": [ { - "actionDutchAuctionEnd": { - "auctionId": { - "inner": "EWcp65XW4Rx93StfpdSB4LBn45TBKYB/8pbxpfQQ3h4=" + "undelegate": { + "validatorIdentity": { + "ik": "a66Rta4duI2zLsqp6xipERevyQQm9xz/duAiFHzeDDE=" + }, + "unbondedAmount": { + "lo": "617773964426648791" + }, + "delegationAmount": { + "lo": "357587342217272798" + }, + "fromEpoch": { + "index": "830", + "startHeight": "830" } } }, @@ -11,14 +21,14 @@ "positionWithdraw": { "reserves": { "r1": { - "lo": "500503486971932926" + "lo": "411703905898199942" }, "r2": { - "lo": "634710064120439757" + "lo": "757485616068801469" } }, "positionId": { - "inner": "Nvg1f57cke3RYmhfZbmYz7COIwnTDwIhUsMoJB587DE=" + "inner": "VSeZkEtY4G2V9ttFQKqr7Gu8TaoQ1uiyTvhQfsHWgnI=" }, "pair": { "asset1": { @@ -32,44 +42,35 @@ } }, { - "positionWithdraw": { - "reserves": { - "r1": { - "lo": "246263227545466034" - }, - "r2": { - "lo": "197420115383946765" - } - }, - "positionId": { - "inner": "IISM6OQjcVlC4Keeai9XFdsittJyKxOZnao/9Ne7di4=" - }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "spend": { + "note": { + "value": { + "amount": { + "lo": "988025050438626391" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "rseed": "HF4VIMA3FtDeK+0anp9dr91tgLdFV55tNAVls3DKuLg=", + "address": { + "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" } }, - "sequence": "1" - } - }, - { - "ibcRelayAction": { - "rawAction": { - "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", - "value": "CrQBCM2Br/wDEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgwI6ZGrnAEQt6uFyQJA4IrVhpy16oEYEgIKABoMCOmRq5wBELerhckCIo8BcGVudW1icmExd3E2eGY1d3ZhdmZtM2drOHN6a2Rwamc5cGF4bmRkNW55Y2VsazlyM25wZmt6NjVkYWNydDJ3czh5N3R0N2NrZHlobXBxODd4czYzdzJrZTA2dXVjNGR6emZ5dGFsOWw1d3d4OHVrOG10cXh5a3A5NGE0dm56a2prNTJ5a256OTdqdG12ZXE=" - } + "position": "169529846311664", + "randomizer": "SuDXOrYJoUL4g9qD53mVNhKAtMsVPEWZ9n4q1JWmhAM=", + "valueBlinding": "7YRiiCHRmhi02WACEsZLrmWaSCJIwQSJ37M8s4BLrAE=", + "proofBlindingR": "jjLR6ipE6uq2KIFqGKI0+p7azJS5l5egmazL8+46pwQ=", + "proofBlindingS": "mnMwrttnsISBK3FiMNTgQZJD+/MWElQtYL18TZIIqQw=" } } ], "transactionParameters": { - "expiryHeight": "9745145300", - "chainId": "k-37091", + "expiryHeight": "9722306607", + "chainId": "ufzazjwe-7742215457239730516980438391261", "fee": { "amount": { - "lo": "607990375585879648" + "lo": "726413324203039240" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_8.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_8.proto index 38f38be41e..bd6cb9dca4 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_8.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_8.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_80.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_80.json index 204b22706f..8287147ebb 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_80.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_80.json @@ -1,80 +1,83 @@ { "actions": [ { - "output": { - "value": { - "amount": { - "lo": "872353388605936813" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "actionDutchAuctionEnd": { + "auctionId": { + "inner": "pCgKnOZbMORged5W70auyE17JH7DA5gbmORha8muKoc=" + } + } + }, + { + "undelegate": { + "validatorIdentity": { + "ik": "7OHCsFEeEmP8iKu/3DDla3ROTLs714PnPI7e0kVkom4=" + }, + "unbondedAmount": { + "lo": "447142506212449079" }, - "destAddress": { - "inner": "N7GNC86a6prrIXkn5AlbDKF9zujjlk/tLZRMSwM/KeVOpukSgvZOD4cTsCzDuyqWNyr6DtsjYmOEhfxvQEyaPTQhuohDn0oaVpo2SKCF2R0=" + "delegationAmount": { + "lo": "77350670252463581" }, - "rseed": "9lsCRdtWMmN+SqxBSsnCeFWZ3l+uUv6MxI2uhLxDx60=", - "valueBlinding": "qvTC66uqZnmGi/BdUK7UIVU3Og2Avoz3DX9xpAj/LAA=", - "proofBlindingR": "sq5+HW+orNM6UpfYl1dLgSVN4CEyZcLYVQ/j5b2nKgc=", - "proofBlindingS": "5BKKn/W42UqnFE6ocG7t16C2qxG+iIek3dl9CaygvAM=" + "fromEpoch": { + "index": "9386", + "startHeight": "9386" + } } }, { - "communityPoolOutput": { - "value": { - "amount": { - "lo": "9042568700646019" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "undelegateClaim": { + "validatorIdentity": { + "ik": "HF895md5tVV1ZxKva+s/AQKVCF0PaHTcUnywylHU1rs=" }, - "address": { - "inner": "50rlXWNqMjjdb5B8YJgEiasgRlQMVVK9JLQNLR1F0ZnC5RUp44LFVIi1lHP5I6keBup/n+KhPuC4xzo+Gu/faF4yJG1DJ/3eMCUd3E3bZe8=" - } + "penalty": { + "inner": "AAAAAAAAAAAAAAAAAAAAAP7FbVz6rNnoPkJa7mMfigo=" + }, + "unbondingAmount": { + "lo": "813031490948101521" + }, + "balanceBlinding": "mniP++R9tytyudOh5+dPvDuyUt90SX/butNhCX1ryQM=", + "proofBlindingR": "K/3vpEdSQ1F6Chf7dP6vYox6uMy+GSECanBhrdBSjgc=", + "proofBlindingS": "dKGrB6juQAbxGBmzwJ1Hz7iPFXCYSkmB9vTlgVVsAg8=", + "unbondingStartHeight": "98966" } }, { - "spend": { - "note": { - "value": { - "amount": { - "lo": "467729617406261529" + "swap": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" }, - "assetId": { + "asset2": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "rseed": "lNj3yZ16Z21Abf2jaLwTBUqfTVc1gxtICYewyUi3CFA=", - "address": { - "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" - } - }, - "position": "149646304680516", - "randomizer": "eLB08pfPU9pekgtj83Jhb5EcoqmDMxWCladOH82fCgE=", - "valueBlinding": "j6SWICpcJg9WyODRnVF3kSPhClcWMzafe9jl0HMB8AE=", - "proofBlindingR": "RqFNwTNoxM9tZm55DIDYLozBU9djKexySVcKy6cAAQI=", - "proofBlindingS": "JhzzraSCeOGfcI/K6wM9Co0SGT+9EbcD6qtWHdRGcQM=" - } - }, - { - "proposalDepositClaim": { - "proposal": "135253180", - "depositAmount": { - "lo": "906710236242005452" + "delta1I": { + "lo": "234348767237035264" + }, + "delta2I": { + "lo": "407405854945919965" + }, + "claimFee": { + "amount": {} + }, + "claimAddress": { + "inner": "I4rSSghbaTxx/moafji7HUfgwEj9Y9b5e210/k6ervBcezAWMByaeQQ50bx9EY4lMaHnQw+tFjDHFnJEm6ZhO8CYl+v8l1qAwwGRSUK5CeQ=" + }, + "rseed": "RL1vn7/pJ2DA0oTA5/JSb2t3Gu3SyTN5uj+yW2J47X0=" }, - "outcome": { - "slashed": {} - } + "feeBlinding": "LT0Jx8X/3qlL5YF8xiCNP8y80zvaAlwGlk1xj8kfdgM=", + "proofBlindingR": "6BReJHtJbNyedguIVDt5o6m+Qm4ncAD2Xmkza09knw0=", + "proofBlindingS": "CEXS0uqJ4+9oSueAfCyDlvpjaA61bSgdQny0QvHGZA8=" } } ], "transactionParameters": { - "expiryHeight": "2630276573", - "chainId": "mfhcbnrradbbkmfnvntozpuxjvqyenb-0", + "expiryHeight": "5741302660", + "chainId": "k-679633", "fee": { "amount": { - "lo": "301746821577816735" + "lo": "488890524685258398" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_80.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_80.proto index 4949e8229d..4d1bd51f30 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_80.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_80.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_81.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_81.json index 5f38e0182d..7cc6b4ba8b 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_81.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_81.json @@ -1,84 +1,75 @@ { "actions": [ { - "actionDutchAuctionSchedule": { - "description": { - "input": { - "amount": { - "lo": "866057145206772136" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "outputId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "maxOutput": { - "lo": "728264069192255875" - }, - "minOutput": { - "lo": "352889948047822001" - }, - "startHeight": "207150342", - "endHeight": "207150343", - "stepCount": "233025820", - "nonce": "dloXm1hu1p/ExePex2v+Knavrbm60wEEk8MLc9rk0LU=" - } - } - }, - { - "proposalSubmit": { - "proposal": { - "title": "theut-162893241955770259991974836794", - "description": "nvxo-57672545158305695", - "signaling": {} + "delegate": { + "validatorIdentity": { + "ik": "NcpmU7NIys/8kSmkqy4MgaHGvfx5z6CDzsvKqx8TmJc=" }, - "depositAmount": { - "lo": "761417310908880861" + "epochIndex": "9048", + "unbondedAmount": { + "lo": "54833717284945011" + }, + "delegationAmount": { + "lo": "303586493067683645" } } }, { - "delegatorVote": { - "proposal": "490562726", - "vote": { - "vote": "VOTE_NO" - }, - "stakedNote": { - "value": { - "amount": { - "lo": "446527137531743521" + "positionOpen": { + "position": { + "phi": { + "component": { + "p": { + "lo": "675170173331687906" + }, + "q": { + "lo": "939236481142618207" + } }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } } }, - "rseed": "IeVKOa1EJcUIRXkQxylHKKOkPS5mcIacrz6uP1GSv7Y=", - "address": { - "inner": "UPHTLAIgBgEez2HJMN0XIEvdCyUp/BtfwCfvAnQ8c3v4OZcL7rLVvZTwe/klOp9dvFKz/mczUMizgZ2fGZnYd2AdY11us+xtA1YeHVS0Fi0=" - } - }, - "unbondedAmount": { - "lo": "611088850376005686" - }, - "randomizer": "VRiJtS60c0/hKtKkGQA2B+Aroq6nkr08oiOK+16/lAM=", - "proofBlindingR": "pR94MukURg6EGO1wNDFfiBVvGkliCZB+oCdq4gDKZAU=", - "proofBlindingS": "WVNuh1Q90f2PO6yEVahvvYGaqnOcfwOKsVYKx2uUSgg=" + "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "state": { + "state": "POSITION_STATE_ENUM_OPENED" + }, + "reserves": { + "r1": { + "lo": "502668342247473787" + }, + "r2": { + "lo": "463873293727350536" + } + }, + "closeOnFill": true + } } }, { - "proposalWithdraw": { - "proposal": "983657671" + "communityPoolSpend": { + "value": { + "amount": { + "lo": "602694808633890263" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } } } ], "transactionParameters": { - "expiryHeight": "5106375199", - "chainId": "rizs-1480153245754187", + "expiryHeight": "6562791567", + "chainId": "fyndyxgzguqudqlexrdjbikfoom-001716125115916962125282722", "fee": { "amount": { - "lo": "765467974827571069" + "lo": "343345086133969757" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_81.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_81.proto index 3072db705a..207e439f43 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_81.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_81.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_82.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_82.json index 18a980a110..40e985c9e3 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_82.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_82.json @@ -1,148 +1,43 @@ { "actions": [ { - "positionWithdraw": { - "reserves": { - "r1": { - "lo": "762907374183046680" - }, - "r2": { - "lo": "857702320436833752" - } - }, - "positionId": { - "inner": "JmXQVbLL5/rIZdmuTL2Sm35ZE9cka2/6IEVEi4YuyDM=" - }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "sequence": "1" - } - }, - { - "positionOpen": { - "position": { - "phi": { - "component": { - "p": { - "lo": "27814592735501" - }, - "q": { - "lo": "115285439836814651" - } - }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - } - }, - "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "state": { - "state": "POSITION_STATE_ENUM_CLOSED" - }, - "reserves": { - "r1": { - "lo": "159083462327874188" - }, - "r2": { - "lo": "53019172107422243" - } - }, - "closeOnFill": true + "actionDutchAuctionEnd": { + "auctionId": { + "inner": "vSkhhYwBqwjhtXiyKySb7J+rLbJqVPkrcI5iboH4UHs=" } } }, { - "undelegateClaim": { - "validatorIdentity": { - "ik": "8tbQoH3gl1pvrbNvjT+7bgRaGLCjChVUKCUW1JHn/ZY=" - }, - "penalty": { - "inner": "AAAAAAAAAAAAAAAAAAAAAP8G9pRGc4HX2/SH/Lkjop0=" - }, - "unbondingAmount": { - "lo": "740941795037630000" + "actionDutchAuctionWithdraw": { + "auctionId": { + "inner": "2JI926sniRZCNQYePICqxtSrJ0yCH/3r/x2dmrgVEoI=" }, - "balanceBlinding": "R/VRsWoWaOxx36QenThCEdoXTB78df8+v5T2ns+4egQ=", - "proofBlindingR": "6KCDruH51rwOAJ4Fj2QU9zKtiwjWGAH3th8VOWpuxA4=", - "proofBlindingS": "VIUVn7jQ2DD0ukAVj5meBiW8dDnmhCF/h57DbfATyQU=", - "unbondingStartHeight": "74025" - } - }, - { - "swapClaim": { - "swapPlaintext": { - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "delta1I": { - "lo": "605370148360838263" - }, - "delta2I": { - "lo": "416969962695394141" + "seq": "798238410", + "reservesInput": { + "amount": { + "lo": "219804310184902937" }, - "claimFee": { - "amount": {} - }, - "claimAddress": { - "inner": "mZ8ppy3taHr3RWwBa4plBcyD44mQ/adDvZZ3Y8btD96Iq1Um21e1K+O/jTN+kvJaDOQ1lmbFqhvIN3kFd1o9JmKfU7AL7ma9A2i3NQ5QmSU=" - }, - "rseed": "Gq6qXposAl+ylFP0pSTqOtCwesgolFKtvZpAAio5zvo=" + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "outputData": { - "delta1": { - "lo": "1142280962" + "reservesOutput": { + "amount": { + "lo": "767034455027239074" }, - "delta2": { - "lo": "913363600" - }, - "lambda1": { - "lo": "758" - }, - "lambda2": { - "lo": "299" - }, - "unfilled1": { - "lo": "621" - }, - "unfilled2": { - "lo": "1106" - }, - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } - }, - "epochDuration": "1000", - "proofBlindingR": "Mt/Ul9RXZ55rgMA2L2zhZA6M2Iu/6Xytos68b5cokgo=", - "proofBlindingS": "WzFw5Lz0GE9am22Xwx7z5Qnmc7YJzc6+VmgkHBz5jhE=" + } } } ], "transactionParameters": { - "expiryHeight": "6512043763", - "chainId": "zxpknzcbhubhgkrkxlgggkl-34956985878210629", + "expiryHeight": "4440323029", + "chainId": "b-915831354005118702135340", "fee": { "amount": { - "lo": "676378964118199950" + "lo": "72430506364727270" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_82.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_82.proto index f84e16bd8d..7a707ace95 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_82.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_82.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_83.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_83.json index f4bddd1e89..b16d994d7a 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_83.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_83.json @@ -4,63 +4,36 @@ "communityPoolOutput": { "value": { "amount": { - "lo": "583421664133655087" + "lo": "233239121287366481" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, "address": { - "inner": "xvDem21q64twopAVCkLaAi/5Pw72xNKfFo93dpOcADJ5RUJeirWLYVX8dmd8JE0iHK1mynLhYxOqp7WZ/0jJXG8osYrLoVULg8VwhJfNNH8=" + "inner": "5pyKiG9GOmdj1R+7uUK0xogu32WZehdZSdH3oPvU7BRJSl8cxW92N1iIXWULncdtsyBmzZjps07S4CDe2r8Wl9kc9uL7Ao+0NlkzcVH/FfU=" } } }, { - "undelegate": { - "validatorIdentity": { - "ik": "rTwIr57Z+TzTvbDVJ24HUFcJ7WutMUIp4EUDhwxQt2I=" + "proposalSubmit": { + "proposal": { + "title": "slmoicbwarrjduvwlszcecqv-873603", + "description": "kcy-85204757736789404739", + "signaling": {} }, - "unbondedAmount": { - "lo": "882852371013310612" - }, - "delegationAmount": { - "lo": "80180876037711740" - }, - "fromEpoch": { - "index": "3632", - "startHeight": "3632" - } - } - }, - { - "validatorVote": { - "body": { - "proposal": "737482718", - "vote": { - "vote": "VOTE_YES" - }, - "identityKey": { - "ik": "U/Pc1t1cOFmWbMi9X2cUNbY9u7VMwz1ZMiBBG5498aU=" - }, - "governanceKey": { - "gk": "truCGSfNBu6Yq9pojTHH/PlRb4uML1hF5ejpUZ/fqAc=" - }, - "reason": { - "reason": "3kiGnfqhr9xVO" - } - }, - "authSig": { - "inner": "ApVDYCRHX0+YQjA/82y2kzLNdCEgyxsoyoMy3xnHZQhuvmEa01BZwhZbncFYgqCZP0m5yn6jEYQoJqBM3mHtAg==" + "depositAmount": { + "lo": "226793985111579160" } } } ], "transactionParameters": { - "expiryHeight": "475967717", - "chainId": "huuxdjbhq-3", + "expiryHeight": "6962057625", + "chainId": "ocegnwkkpqwehfpmirirsxkrnpc-0181549246346809501680805277930", "fee": { "amount": { - "lo": "449393802929298074" + "lo": "737214071928375968" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_83.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_83.proto index ffd15bb15e..d9f1f7c0c6 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_83.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_83.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_84.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_84.json index 7889b21114..884843fd03 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_84.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_84.json @@ -1,82 +1,77 @@ { "actions": [ { - "communityPoolDeposit": { - "value": { - "amount": { - "lo": "788915016365458466" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "proposalDepositClaim": { + "proposal": "211446868", + "depositAmount": { + "lo": "661711057615935837" + }, + "outcome": { + "failed": {} } } }, { - "swapClaim": { - "swapPlaintext": { - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "delta1I": { - "lo": "689316832891768509" - }, - "delta2I": { - "lo": "298290353693146612" - }, - "claimFee": { - "amount": {} - }, - "claimAddress": { - "inner": "rvp6vEDH/UdoVo3Ggppav8bRiaAIX8jbHtu2/85xCJR2xb/7dCgVo2jd6p5C71Nj/KENTHvHAr5VqUoImwys4lpSBIpprqvS9ZlRVnAHkq8=" - }, - "rseed": "ixyxNXNxCxp2n0QZDjqx4F0vhwOC0n9h3PwWKPftvKQ=" + "delegate": { + "validatorIdentity": { + "ik": "LOLyMI+061Hd74nzN0Z2H3vFPWr7CdgMGX0mcxPlEN0=" }, - "outputData": { - "delta1": { - "lo": "240267237" - }, - "delta2": { - "lo": "15036557" - }, - "lambda1": { - "lo": "444" - }, - "lambda2": { - "lo": "1312" - }, - "unfilled1": { - "lo": "1382" - }, - "unfilled2": { - "lo": "975" - }, - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "epochIndex": "8724", + "unbondedAmount": { + "lo": "635611658641592035" + }, + "delegationAmount": { + "lo": "670354822852413266" + } + } + }, + { + "undelegate": { + "validatorIdentity": { + "ik": "eZCniYezt5Hj7WJFF6DNOeGKT4MYgY0uOFDcE4q19MM=" + }, + "unbondedAmount": { + "lo": "85578332276764605" + }, + "delegationAmount": { + "lo": "535755154316490623" + }, + "fromEpoch": { + "index": "4584", + "startHeight": "4584" + } + } + }, + { + "spend": { + "note": { + "value": { + "amount": { + "lo": "623168921947465084" }, - "asset2": { + "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } + }, + "rseed": "fJwV9QcXO8RNyXDidi2J0AgyCz3NZDeRlJgZtlN6dxk=", + "address": { + "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" } }, - "epochDuration": "1000", - "proofBlindingR": "/rflD6uOcxc9/ptEHtLPWiN4P61ELQARV707y8eYgwA=", - "proofBlindingS": "mn+/taE6nJvfklyymyW314OtVBsGpuEl/neNrAe3VBI=" + "position": "133231934592423", + "randomizer": "43IcxprOMEPEGW0yvN9pasr2CFluuf9A2XAZZTrDogA=", + "valueBlinding": "88GocpJzWT2rWTCudnUCp8LBrR18f8fFENylBk7zdQA=", + "proofBlindingR": "O6F3x8ZWwLG+W303WueNRKvlfyajn91FFZEsAvvLZQs=", + "proofBlindingS": "R57DOjXeUhOm3fXrYs1S6fTqK3jcILHzggbCW4zi8wU=" } } ], "transactionParameters": { - "expiryHeight": "6199555422", - "chainId": "gsyrhjkttqxltkdtvvin-99841392087313049", + "expiryHeight": "9280925809", + "chainId": "cxcmjkzuvdfcmyokmakobndbmrvfd-85201315754", "fee": { "amount": { - "lo": "639378339909059718" + "lo": "401933287855968626" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_84.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_84.proto index b78209f7af..7b55ad6594 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_84.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_84.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_85.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_85.json index 35989b3fd4..96e7d90c03 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_85.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_85.json @@ -1,91 +1,46 @@ { "actions": [ { - "spend": { - "note": { - "value": { - "amount": { - "lo": "203301810526886454" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "rseed": "3BWggX7qSmlBVBYK8+nlsRKU7G2tE0aPkhGelDMM9Sk=", - "address": { - "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" - } - }, - "position": "72255383410988", - "randomizer": "bUZ9uB6tW1z08EFheIHB0PSNPydWR8VopA/K/j3ILgA=", - "valueBlinding": "ZzBa2nPi1fiPoJ37X4QR3eieFVJ0sZm/ki8zIEZ6qwE=", - "proofBlindingR": "pyr+IoLU7zT6QN3lMsi58xncRIgEviLCpcM0UAdfggE=", - "proofBlindingS": "eQcuOPjAzk1dkHIfTDdRDbl1n26S/sJoMfQYZ0dTuwo=" - } - }, - { - "proposalSubmit": { - "proposal": { - "title": "hjbjqygjl-98", - "description": "juz-348394101143295059179118292876", - "signaling": {} - }, - "depositAmount": { - "lo": "152837047373892485" + "ibcRelayAction": { + "rawAction": { + "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", + "value": "CrMBCMLhwcICEgtkZWZhdWx0UG9ydBoJY2hhbm5lbC0wIgtkZWZhdWx0UG9ydCoJY2hhbm5lbC0wMmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgsIivjdMBCjuKysAUCwrdWHy7u2iBgSAgoAGgsIivjdMBCjuKysASKPAXBlbnVtYnJhMTVkM2Nxc2toenFobHN2c2wyNHhjdGQwZm5yZzhud2NqY3k3dmt4N2plcXM0MGx0bXYzNzhoN2xudDR5d2U5cG5xbXp6aHZxdDh5MDN0ajN5djh3N213MGFmN244Y3Y1Mjd1NHAycnJrdXc0NWcwbmU4bjBoZ2E5OHA1M2x0ZTVrdWF0ZjJh" } } }, { - "undelegate": { - "validatorIdentity": { - "ik": "EX8kLxnOoTFua2tHaqS6uRhQJrTAmdNHsmzXmSpNDU4=" - }, - "unbondedAmount": { - "lo": "113615227989028917" - }, - "delegationAmount": { - "lo": "250470485827666799" - }, - "fromEpoch": { - "index": "5805", - "startHeight": "5805" + "actionDutchAuctionEnd": { + "auctionId": { + "inner": "OpAFH87m9VIRibODOoCnWC6KbofaAYUHTmMq6VuGFUo=" } } }, { - "actionDutchAuctionSchedule": { - "description": { - "input": { - "amount": { - "lo": "997497672153199471" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "output": { + "value": { + "amount": { + "lo": "969023059420658370" }, - "outputId": { + "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "maxOutput": { - "lo": "320075980528598439" - }, - "minOutput": { - "lo": "98952377966514135" - }, - "startHeight": "211106421", - "endHeight": "211106422", - "stepCount": "68937565", - "nonce": "GurFWrwGlCy9F7h82bg7ruRNjtkopbAeL4d8AqVDW4M=" - } + } + }, + "destAddress": { + "inner": "sFqHrX+p3N1Qwuwx9Gq1RZCTRNvzOFWkV7FZqUTJBPFnhc11WosUpgbSDflNDID9HbJ3OayE/4Z52TolHjQMUA6yZPdxRCyV0NYDEjH/mhc=" + }, + "rseed": "s46YSg3lc3tNbuafFtHcoJgXW6Uq2sGbWichcckAOtY=", + "valueBlinding": "v1bIvkRVTvJ5FaH9awKp7qdxlcUTFGmcOI8eYchZygA=", + "proofBlindingR": "aC66pyLilol0rHc0utaE0C8nfoVYRngysVoGTVgWQQg=", + "proofBlindingS": "ZWjC/hKxCIQ76q0QRo9OG6BRHK9jJNB4IBXjZDTP6Ac=" } } ], "transactionParameters": { - "expiryHeight": "1301656374", - "chainId": "eliijarvcfsfndzu-642649239388125561860212450", + "expiryHeight": "3199813193", + "chainId": "ypuzsskkznnqurexllxyjidx-90788967119211388776565688439415", "fee": { "amount": { - "lo": "387335725222733790" + "lo": "702179720312966580" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_85.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_85.proto index dbd3f55e55..393e3103e6 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_85.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_85.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_86.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_86.json index 039929e31c..ec9fd73b25 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_86.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_86.json @@ -1,56 +1,41 @@ { "actions": [ { - "output": { + "undelegateClaim": { + "validatorIdentity": { + "ik": "WlyEhKtayiJPKHliCRysy3IdKzD2tFVJfdXPuOZLJpI=" + }, + "penalty": { + "inner": "AAAAAAAAAAAAAAAAAAAAAP2ETQE6kqMFUyYXwb2lEZ0=" + }, + "unbondingAmount": { + "lo": "349371217470542075" + }, + "balanceBlinding": "1ePMWRVymmlwv65LxSCP/BL3fzAMqJ7n3AlXS47IpgI=", + "proofBlindingR": "Xa7B0ntn0cFql/9FOcZka1eeb2aREx/IQRpUHDPIVQk=", + "proofBlindingS": "E188/sUUNu6307+SxE3dVwYqn979RZraeeyN4Zvazwg=", + "unbondingStartHeight": "26321" + } + }, + { + "communityPoolSpend": { "value": { "amount": { - "lo": "63503066873854544" + "lo": "617081558765956174" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } - }, - "destAddress": { - "inner": "RT4kvZVyCaPnsRerKuGXe5RWBcgu4zddHZa8FplFtDtSX1g2+yFzaufFvyTeExsYPcvas9RpitQngnkXV8dlWG1Yh5xAFpQ1APCMZfML8uo=" - }, - "rseed": "vGTJDoZw5ndm2vverVBiGuJHgf3XH0PlFztnDXMM3uI=", - "valueBlinding": "jXqK7/vyz/KnzqnDhCUXg6sl1d0IncgYF+ti9CdUggE=", - "proofBlindingR": "oNp/pOh5I6Wb/oFZlQbxfrFf0wePNDA6DeRybB/WkgE=", - "proofBlindingS": "Yn+mu46Gp5g7eteKeKyV0qq7K3PuYNYU0ic8oFPLWhI=" - } - }, - { - "ibcRelayAction": { - "rawAction": { - "typeUrl": "/ibc.core.channel.v1.MsgRecvPacket", - "value": "CrIBCMHQ5QsSC2RlZmF1bHRQb3J0GgljaGFubmVsLTAiC2RlZmF1bHRQb3J0KgljaGFubmVsLTAyZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA6CwitiY0SENGCkZcBQLCh+P2xteqBGBICCgAaCwitiY0SENGCkZcBIo8BcGVudW1icmExczd2NXpnbTJ3ZjU0czQ0NnAwZTIyNDJqNDJkdzV1bGo3ZGFkZHZtdXI3Mzc3OHlkajVjeTJmdjM3dWUycTB0OXJ2bm1nMDZtcnc4bnZlbW11aGt0dXA4ODh2cXNsbjJ0NHFtdWZ5OHI5ejByM2h5eDc2NGw1Z3hhMGs0N3BlNjI2djAwcXY=" - } - } - }, - { - "undelegate": { - "validatorIdentity": { - "ik": "9ZfCSfiVa793nkn/qbsEKgszQhz0Kadk64VNw1GC8Kk=" - }, - "unbondedAmount": { - "lo": "307994269903977320" - }, - "delegationAmount": { - "lo": "812254243148083553" - }, - "fromEpoch": { - "index": "1385", - "startHeight": "1385" } } } ], "transactionParameters": { - "expiryHeight": "7604691665", - "chainId": "ntykn-5846", + "expiryHeight": "7726265066", + "chainId": "lvujvpq-79979032831188958792722174741", "fee": { "amount": { - "lo": "370810228947071123" + "lo": "448810136792935877" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_86.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_86.proto index 8aa839b023..4467d628cc 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_86.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_86.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_87.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_87.json index 3c37ebb389..c013c1c9d9 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_87.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_87.json @@ -3,44 +3,34 @@ { "undelegateClaim": { "validatorIdentity": { - "ik": "1UJ3TgWR5T5WU1jgVGIuRE/Ty1tVk6B5tOw57flwNAE=" + "ik": "+U0BQB7ygOIsm6bPIWOlWqcpjUyAI9L6zBIjHtqyYn0=" }, "penalty": { - "inner": "AAAAAAAAAAAAAAAAAAAAAP++dsi0OVgQYk3S8an7520=" + "inner": "AAAAAAAAAAAAAAAAAAAAAP6+36Q/5ckdFOO801qFh5Q=" }, "unbondingAmount": { - "lo": "144276307645094418" + "lo": "457177636327621561" }, - "balanceBlinding": "hIt/TXK7zRXfZiRmQHqXdg3z8QrxXnSjUjEIOBkH3gM=", - "proofBlindingR": "Q8zxdl/kEzGuTFRaAPl/YA8hso0KyLCRXLZDmVvy+ww=", - "proofBlindingS": "yzUpC25/HduKA53wuw7wr5ZgEtKgZ9J9oq/WHU6mjA4=", - "unbondingStartHeight": "57780" + "balanceBlinding": "wHi1l1xFM/UxOEFdTLmNZrrZ5vc9gVB7gZaT1sKhVAE=", + "proofBlindingR": "LLv2dAUH9/hY9GFXPxXGf2fb9FLmEub2orZNKct7aAc=", + "proofBlindingS": "hnm2l27206bHDLjmUrJDIpvglUp1RGXQCtyVs4XDHAw=", + "unbondingStartHeight": "57939" } }, { - "undelegate": { - "validatorIdentity": { - "ik": "0Pkx+hCmrFGrRwlhu/QbHGET++7RbntMUikRwV8lREg=" - }, - "unbondedAmount": { - "lo": "504227133003625658" - }, - "delegationAmount": { - "lo": "799827424697324738" - }, - "fromEpoch": { - "index": "1063", - "startHeight": "1063" + "actionDutchAuctionEnd": { + "auctionId": { + "inner": "FpJ1PJuirpl9LHqb4HHxAbMVBrgGRL1k8KDYMbA8j64=" } } } ], "transactionParameters": { - "expiryHeight": "722172597", - "chainId": "jdjlnrleefdynmficfnewgzhgwfdulu-75667952557935080", + "expiryHeight": "6772438102", + "chainId": "j-4978032212083156123", "fee": { "amount": { - "lo": "921060973447831954" + "lo": "238398828707212304" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_87.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_87.proto index eba0da1154..538c7643bd 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_87.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_87.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_88.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_88.json index 09ef4bed3a..5548ff4f49 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_88.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_88.json @@ -1,41 +1,40 @@ { "actions": [ { - "undelegate": { - "validatorIdentity": { - "ik": "WcacEUYpT62Ori8ZXsoTfzt1bjpezIPTKjqxq9lrJXU=" + "proposalSubmit": { + "proposal": { + "title": "zrfrwigpehbjckzw-0613652929229646", + "description": "mxovalcqch-50367770", + "signaling": {} }, - "unbondedAmount": { - "lo": "752512952870004296" - }, - "delegationAmount": { - "lo": "180482167411233740" - }, - "fromEpoch": { - "index": "9834", - "startHeight": "9834" + "depositAmount": { + "lo": "766889808489133079" } } }, { - "communityPoolSpend": { - "value": { - "amount": { - "lo": "666998942173848532" + "validatorDefinition": { + "validator": { + "identityKey": { + "ik": "LgkDJ3KQE5WaYZj231yZiGwJACXWjbcifxuu5h+/fwQ=" }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "consensusKey": "u1DbmaIk2J6fAr493M/Yckk1vLw8SurbmoHbqdwVvXg=", + "name": "test validator", + "enabled": true, + "governanceKey": { + "gk": "LgkDJ3KQE5WaYZj231yZiGwJACXWjbcifxuu5h+/fwQ=" } - } + }, + "authSig": "/OdeoxySg7t7Excqef5Vx7NE4SeSA5rWoUfsrlbnFgK78BkUWZKPmvPvIXGkihUqHl2TBAY3XsmajBAhKxjaAQ==" } } ], "transactionParameters": { - "expiryHeight": "7185052916", - "chainId": "vhxkadteun-01798796925197635", + "expiryHeight": "6627548769", + "chainId": "ukeftelbjnntmusj-343757451", "fee": { "amount": { - "lo": "275343058795158683" + "lo": "20865560422820502" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_88.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_88.proto index ae93f52a90..28742ae7af 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_88.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_88.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_89.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_89.json index 0d6f0e637f..f08065abe5 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_89.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_89.json @@ -1,34 +1,66 @@ { "actions": [ { - "communityPoolOutput": { - "value": { - "amount": { - "lo": "17038923852064189" + "actionDutchAuctionSchedule": { + "description": { + "input": { + "amount": { + "lo": "181451187935194818" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "assetId": { + "outputId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "address": { - "inner": "RrYHHRhmkL6YB4s+DSyENibtC1VW/EA1N5RoDM0c7wjiozkzDA5cfRaPYuqJhfehwEJ8ZzpN/5QccSTcYzZ35pJy6/AuGL/aWops6nKbKGo=" + }, + "maxOutput": { + "lo": "981467343483746236" + }, + "minOutput": { + "lo": "816154240701797997" + }, + "startHeight": "838332756", + "endHeight": "838332757", + "stepCount": "79700368", + "nonce": "LxX4R1QJUcAL64eNQVtNu2mmCnm2bnzuBdVPV6UieBY=" } } }, { - "actionDutchAuctionEnd": { - "auctionId": { - "inner": "pJIFlMRi6JtlE5D1sIy287juwgB1fjq4CtLj46lgkDM=" + "actionDutchAuctionSchedule": { + "description": { + "input": { + "amount": { + "lo": "17016452041769541" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "outputId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "maxOutput": { + "lo": "364101025380650949" + }, + "minOutput": { + "lo": "926771860551171596" + }, + "startHeight": "27854867", + "endHeight": "27854868", + "stepCount": "516191274", + "nonce": "UZpstblKi4261jzwv7WKD6GJk6W3ee92X24S2iqSEyE=" } } } ], "transactionParameters": { - "expiryHeight": "3735574029", - "chainId": "tasxpmloagnmbfxkeehe-77091684871730211047", + "expiryHeight": "6710415564", + "chainId": "ebrul-565648844622071770384975869", "fee": { "amount": { - "lo": "16809050601060191" + "lo": "896098301936349283" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_89.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_89.proto index 3cb98be1f6..932e828405 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_89.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_89.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_9.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_9.json index 1f07458579..c21f169500 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_9.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_9.json @@ -1,55 +1,49 @@ { "actions": [ { - "ics20Withdrawal": { - "amount": { - "lo": "542159346182080193" + "communityPoolOutput": { + "value": { + "amount": { + "lo": "857233367113877618" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "denom": { - "denom": "02N19VxMIfLZRfJWoQl1252z2jezO1" - }, - "destinationChainAddress": "penumbra1qxajmpvxs9g4vq2xt23l4zlh37z7crladd8ww8tpj6dpvzjmfgrfz3l3mmdwcqjwp3am0d4ychxvgz89eh6tvzfg55gnqrupjv7rmtd57tthngzyj45gxw8hz0y2jga7p220gt", - "returnAddress": { - "inner": "x9LRu5LIGSPgYSfH1ihWXsOMK/h+jjlOb1mFKxA7YarpSecSlL/9lnqXoTKDeyc76W7nucRFGXcHZFX0+mpU7KTnKnkizP80O6dsz0h+MvM=" - }, - "timeoutHeight": { - "revisionNumber": "859569515", - "revisionHeight": "526166451" - }, - "sourceChannel": "channel-0" - } - }, - { - "positionClose": { - "positionId": { - "inner": "JWQ/XFbuHTvpxHmQDRH81rhvAHvNTYhifkzSaNWEFZY=" + "address": { + "inner": "5CS/jDGX5WiwHQXOVXLSy+l4WbvMTMdKyB27bLQinuGwgMVreKo5GDW+rHYg93PeqVBzC5Sh/Rym3JSqHsRMAalg7x703Lt/XrDsD0edGxc=" } } }, { "undelegateClaim": { "validatorIdentity": { - "ik": "MZHrX0eGX6OhrFe+K5oB23cxSszfTkgnRj1V67zqC7A=" + "ik": "E8r643GiUDmhgjxZoVJ8RrFhRebJC/QssQuDojpGvE8=" }, "penalty": { - "inner": "AAAAAAAAAAAAAAAAAAAAAP6kqMFUyYXwb2lEZzgdfcA=" + "inner": "AAAAAAAAAAAAAAAAAAAAAP8AaNuLrHEMspXp4bCJoCg=" }, "unbondingAmount": { - "lo": "555698703002225246" + "lo": "775828966889612352" }, - "balanceBlinding": "jeg7um8Bt4u0VB4uqTVFjIUDaXxyR0Le2rU+CZ2+awM=", - "proofBlindingR": "tdb8ijwM20IhE2yehs+22zYwmtDiO/JMuLNOIwybiQM=", - "proofBlindingS": "gS+7XgX24ObsqLE4QKGAfzaC/pEbPFKraFAGgi4u0gY=", - "unbondingStartHeight": "95235" + "balanceBlinding": "C0x/6wVXhGhkrK2b54UvGzp9fYfZtNg5yVAXA/t2dgA=", + "proofBlindingR": "Pz2wiVwZb47yjacmlRM5dp6cK4DsvLJpqZ7PxWi7Mgw=", + "proofBlindingS": "GyKsNT+L5zy4C0fRBrMOKL7mVsAbEDa43yBTet5CVwE=", + "unbondingStartHeight": "83616" + } + }, + { + "proposalWithdraw": { + "proposal": "743914309" } } ], "transactionParameters": { - "expiryHeight": "2908284293", - "chainId": "avpj-0209643", + "expiryHeight": "7239103807", + "chainId": "enjyyeitvwmiuvtpazieqrmqucueofje-244819555081339748962007977", "fee": { "amount": { - "lo": "1410913023824353" + "lo": "174740931029389935" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_9.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_9.proto index ae21a9750d..f33046201d 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_9.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_9.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_90.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_90.json index 03ec1433bf..bd54030a7a 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_90.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_90.json @@ -1,75 +1,55 @@ { "actions": [ { - "undelegateClaim": { - "validatorIdentity": { - "ik": "1SxwXceuOifRE5KAsd6OgLJpHfKQ/3TnzWhsHG9EaNc=" - }, - "penalty": { - "inner": "AAAAAAAAAAAAAAAAAAAAAP+xW1c+qzZ6D5CWu5jH4oM=" - }, - "unbondingAmount": { - "lo": "70364462190344251" - }, - "balanceBlinding": "GnWs/cVK2n9m3ugLv9xkQlqijcegJqOfcutOkSJZ1AE=", - "proofBlindingR": "+Wo8H7Pu57YZum8gZsJfavgpqbss1bghUzj1/w2efxA=", - "proofBlindingS": "ZWykfuI2cwg4FMTiy7QpHYQJV0Zd1ClrjIeYmmyLtgM=", - "unbondingStartHeight": "89848" + "communityPoolDeposit": { + "value": { + "amount": { + "lo": "580433248217557752" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } } }, { "validatorDefinition": { "validator": { "identityKey": { - "ik": "CvQ03fHCGa0dJze8GFOSyJyTj21XeYVe3VSGSbIi5wk=" + "ik": "drk6GBXxw0KK3gUd9YerKCWvfIDShHlWJYgvyqcRYxE=" }, - "consensusKey": "38NcxKogRnpzzkwzVBiwJNjEegA9gXPBjSHJkiHDiMI=", + "consensusKey": "L1b+vbeLToFuNQ0S83RQ1x46M3lHjIJv33P+p5NI9yY=", "name": "test validator", "enabled": true, "governanceKey": { - "gk": "CvQ03fHCGa0dJze8GFOSyJyTj21XeYVe3VSGSbIi5wk=" + "gk": "drk6GBXxw0KK3gUd9YerKCWvfIDShHlWJYgvyqcRYxE=" } }, - "authSig": "Rgr+XDoJAlXgHHmQpCacaOON4yGDRAfwr6nAYV8C+wj4ctI02M9z+eKmCLTSoE2nZDlxH9mhBo9Q9XWamyNTAw==" + "authSig": "5imuUiqee0BI+r7e0Te55UpLjKs+GyhPNpPuNB3OKQVOEN+K2kj1RrZc2MA1OmLMkPXS7h3I1UchwjQU3hVjAw==" } }, { - "swap": { - "swapPlaintext": { - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "communityPoolOutput": { + "value": { + "amount": { + "lo": "603275095482739504" }, - "delta1I": { - "lo": "60364190216338014" - }, - "delta2I": { - "lo": "386173577488735542" - }, - "claimFee": { - "amount": {} - }, - "claimAddress": { - "inner": "ufQay7dE0tBy74gCi8N3VGqinPAImg0nzJQJKycqdHGzyDxx8gqSgzVjdIrBQPvsHvqpvH7RxPygdoGPcbnlEP6bxCLTXEDG0JfGq5Y5maA=" - }, - "rseed": "CIyqxG2CT24+7KyfyVa61vqA/YtVerCi8u0iIp8y1x0=" + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "feeBlinding": "OyGAX0juQcBNUZOqDYNQCDn0FBqTpFmBGLD5foAPfAM=", - "proofBlindingR": "IbkpPNoh6oQBwq8CpMEydyYQ0zvpy+IJES1xENH0bg0=", - "proofBlindingS": "jcOumkI608u4oNIn5I0YDd8CFKDbOBSOkb+A05s+sws=" + "address": { + "inner": "LMc7iyEA/ZOUQAQKsqZab+eNxVK5gjPCW6FLQa9v7YHUaeMId98KpsU3MCL4LjTUMEaVZ1etW6GlbZryg3n5+Md0Nbwp/OxOt/yIcawviHE=" + } } } ], "transactionParameters": { - "expiryHeight": "1474226410", - "chainId": "vnpvkgcisbiyvsntpx-0281959327941632", + "expiryHeight": "8826348862", + "chainId": "rlrgvbbxzyksy-60", "fee": { "amount": { - "lo": "920089507490309354" + "lo": "704036978167257025" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_90.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_90.proto index 5a5c246827..54218e0129 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_90.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_90.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_91.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_91.json index aeb8853f78..82b43a8e23 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_91.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_91.json @@ -1,39 +1,51 @@ { "actions": [ { - "communityPoolOutput": { - "value": { - "amount": { - "lo": "344149540286551252" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "undelegateClaim": { + "validatorIdentity": { + "ik": "uk1EubuiVO8HErcV9Cwx1NIJoNDKykDcDp1h9rKTvyQ=" }, - "address": { - "inner": "yiuRnUOYo12VWa07n9TUTadalVq9iksf1+ZRAdl1CwcNxz6L8XBLYEDDrpajNT6soeDvBPdKuBu5k6OHmC/N4bDu5+XGU3fcjnuclKUgh6w=" - } + "penalty": { + "inner": "AAAAAAAAAAAAAAAAAAAAAP3tKIznA6+36Q/5ckdFOPA=" + }, + "unbondingAmount": { + "lo": "566130237451411183" + }, + "balanceBlinding": "7EjDdDuVksC36yOn496WhkKU6uUphW0uWovhQxU60wE=", + "proofBlindingR": "Sn7xoQ/S6r5w+OgT9cCUp9yA8uixuArfqwIfwoIrzwM=", + "proofBlindingS": "UrSt+S/GDqLLi+x3EYCGUZlR6OdfelfDmV7LvZ8EFw8=", + "unbondingStartHeight": "44906" } }, { - "communityPoolSpend": { - "value": { - "amount": { - "lo": "573188836335646955" + "validatorVote": { + "body": { + "proposal": "932822108", + "vote": { + "vote": "VOTE_NO" + }, + "identityKey": { + "ik": "hbRZ7/dh2ysPtVWgJAKjBE6t2GkYYkup7nq2w6o2pxk=" }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "governanceKey": { + "gk": "3oAg9HlS9OVBjhalc7sW3ConWcGOUNSnjpBY4jth2xA=" + }, + "reason": { + "reason": "n1mwbHttLwjh7" } + }, + "authSig": { + "inner": "1qcWLaa5EgGKAbozXsbhpnxGNAwdvQ7JtoF/dtiOdQz2U6DhAGX9AIKep6G8I8h9joA+e7p54Vy5eQTs2Yk7AQ==" } } } ], "transactionParameters": { - "expiryHeight": "3510866232", - "chainId": "fqzcqyjouribnsokfj-56868", + "expiryHeight": "9667223034", + "chainId": "zmhaofblvkwdszzeuxinx-3315295692925964928907401", "fee": { "amount": { - "lo": "372654856776073496" + "lo": "177412773365136471" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_91.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_91.proto index 55fa6bc80b..d054f9f23f 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_91.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_91.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_92.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_92.json index f05a2e3ec4..8bbd5a142b 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_92.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_92.json @@ -1,92 +1,36 @@ { "actions": [ { - "delegate": { - "validatorIdentity": { - "ik": "zeN4fnAZUwDcmSH5MEDUEodTdox6ImsTv4Kncu1HIaM=" - }, - "epochIndex": "4025", - "unbondedAmount": { - "lo": "259983052045005131" - }, - "delegationAmount": { - "lo": "506316354659774132" + "positionClose": { + "positionId": { + "inner": "dIkWbPwTffJ+aQ1gfF+10NCIYwzy0/0hDY2Tc5TEsic=" } } }, { - "swap": { - "swapPlaintext": { - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "delta1I": { - "lo": "233241339257563753" - }, - "delta2I": { - "lo": "921872352026946725" - }, - "claimFee": { - "amount": {} - }, - "claimAddress": { - "inner": "01rGo4wIA7Yzu/dt0g3x6lbTIXSZIAz86yAeTnxpMNjKLkpL2Q9H8RGIGYNulemhEFzSw2yNqBoMmGMbuGqdU0yFrtVqdnyIz/w50X0VOnI=" - }, - "rseed": "XxtTceCUNYjRgWK9lG+ak4iGGD8oBzYWKjzBK5rWvZ8=" - }, - "feeBlinding": "ID8U5Nji/K32hDzxMU7GoBQDJ8hjLEqLROonPkkXVwA=", - "proofBlindingR": "x6c2onQ898zSMnlJGXFTsAm9fgg4asOqtCRhPO2gywo=", - "proofBlindingS": "duzgMHfFjSw762soJ2aRhOzEgyOk/GX2PLUgZLLs+go=" - } - }, - { - "positionWithdraw": { - "reserves": { - "r1": { - "lo": "548038638173775620" - }, - "r2": { - "lo": "815921088375465963" - } + "undelegate": { + "validatorIdentity": { + "ik": "tIFWGcVz07Xmvw+gCGXFoWWu8y45GBX4RWvmqUmK9FQ=" }, - "positionId": { - "inner": "BFaW3Y58DiMiU1aG6usjsvT/stdewfJXyJuWeRoztJA=" + "unbondedAmount": { + "lo": "675995424489524486" }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "delegationAmount": { + "lo": "882404331737823102" }, - "sequence": "1" - } - }, - { - "communityPoolSpend": { - "value": { - "amount": { - "lo": "387074746918755207" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "fromEpoch": { + "index": "3181", + "startHeight": "3181" } } } ], "transactionParameters": { - "expiryHeight": "7695331102", - "chainId": "khuntstwspfnarorzefpx-8494903827030500391", + "expiryHeight": "8782804295", + "chainId": "n-037710", "fee": { "amount": { - "lo": "77078032554932289" + "lo": "220097666912544663" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_92.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_92.proto index 08ea84d28b..1648010906 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_92.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_92.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_93.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_93.json index 61367e153d..09b2b2a108 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_93.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_93.json @@ -1,49 +1,85 @@ { "actions": [ { - "proposalSubmit": { - "proposal": { - "title": "rhygnyiczdqcbnda-5050340999020270975392418403", - "description": "gklivzakngkcklcppk-310781295561841255380289", - "signaling": {} + "validatorVote": { + "body": { + "proposal": "765858924", + "vote": { + "vote": "VOTE_YES" + }, + "identityKey": { + "ik": "rFNpwSJHt05brcFqvAZlZ+OvUm8xRZX5Q0RzzqYzT/s=" + }, + "governanceKey": { + "gk": "Bo4OIu4ZvG+HZ6UDIFi9dO5f0ZYZ9/VWRCFTJKHgmgw=" + }, + "reason": { + "reason": "l4U2jztj6ZGnUgIMLfm742mzuwK3AN" + } }, - "depositAmount": { - "lo": "663865989312057847" + "authSig": { + "inner": "ZkefLCT58us4l7cpe937ll8bCLRdlUI/6EnuMr6wbgCsusB3FrTYMJav30IvasOucDDpKmAoBsPc4KklkNM9BA==" } } }, { - "delegate": { - "validatorIdentity": { - "ik": "+jV4F2dh+4xOGQJMVvPTP1Ae8TLT9ulG2GVp/eJn6iI=" + "spend": { + "note": { + "value": { + "amount": { + "lo": "960533809739726251" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "rseed": "ddFlnaCdzWP4e7SKD/D/27l8mR68VOwipQoEYYX6vnw=", + "address": { + "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" + } }, - "epochIndex": "2291", - "unbondedAmount": { - "lo": "512115687902232302" - }, - "delegationAmount": { - "lo": "121829272433526855" - } + "position": "132705081840158", + "randomizer": "/fyWQgs59oNRZkpf26tIiMV2MnsS1o/KhKsNx0IiMwA=", + "valueBlinding": "nA2Z5Cm6aV7fhs0a1NEIqAsbQe/YDCPh8O4DAR4qsgE=", + "proofBlindingR": "vggZ/oMd6r9ey8k5d2az017vh7aHrX8UmmlJAezSbgI=", + "proofBlindingS": "38ER74SA3MeHySSbT1+nQ3o1hheM57Rsx671GHgbRQI=" } }, { - "proposalDepositClaim": { - "proposal": "101301980", - "depositAmount": { - "lo": "290471330133274347" + "validatorDefinition": { + "validator": { + "identityKey": { + "ik": "xAnJopmqZ0T9MNKnUTUHuE53aa9c81yDmSZLm4vGARA=" + }, + "consensusKey": "rXz7sRXoWz+I6JwQ6khDo9V9K4bKvu4y9+zY8SAI3as=", + "name": "test validator", + "enabled": true, + "governanceKey": { + "gk": "xAnJopmqZ0T9MNKnUTUHuE53aa9c81yDmSZLm4vGARA=" + } }, - "outcome": { - "passed": {} + "authSig": "auIWXRYfwgx0PFYfIP9MWzU8Syf8LXxWV3ccBiqOHRK1MdHEWrAx+ULnq3UAwZNSA+HDz8Q9v9jjfKERQN4VBA==" + } + }, + { + "communityPoolSpend": { + "value": { + "amount": { + "lo": "129688593083476566" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } } } } ], "transactionParameters": { - "expiryHeight": "5120304822", - "chainId": "hfjzzucwtsprnz-16320333674509", + "expiryHeight": "3725707715", + "chainId": "kxgsxqtb-81164169820318145405320067", "fee": { "amount": { - "lo": "298679504801144213" + "lo": "749655901267719827" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_93.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_93.proto index e4724fa3f4..d50bd94b2e 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_93.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_93.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_94.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_94.json index e7a1ae0f3d..ce5988593a 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_94.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_94.json @@ -1,24 +1,5 @@ { "actions": [ - { - "output": { - "value": { - "amount": { - "lo": "524867285676355149" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "destAddress": { - "inner": "imaTysUEFd78u5mGKM2Ef1iK6BHB2jbI0mgszax0k1ljGBxwOVgZjJgKJq8ZeI2Q/Nn3lp1mL+OLVush20KqZh+Jjb0hRINnLWD+CVYjClY=" - }, - "rseed": "H45Z5SiZ6ZALdKk+7ybC2wKfILPGJyapW3Qa0ff94mQ=", - "valueBlinding": "YK6u4+7QJqCVK+jzvARru9+3JXNadujiDNLIrm/mVwE=", - "proofBlindingR": "TwKNhVywM3UVAcyNOGeIHK4NDbx0h0Ohu2y6A3jqCQw=", - "proofBlindingS": "qgnNd99jbePTfPJczKSbagY7YQF6IbJIE56deIdOZxA=" - } - }, { "swapClaim": { "swapPlaintext": { @@ -31,37 +12,37 @@ } }, "delta1I": { - "lo": "958552950487647919" + "lo": "855867826428136" }, "delta2I": { - "lo": "969311499991512708" + "lo": "310556793627790602" }, "claimFee": { "amount": {} }, "claimAddress": { - "inner": "ssiK1PCqTd5FXd4hVUDJDDCYcB1Y7ecVSJOdKNLNVe90zYjPVAd9tWE/4QvmxTpImaxdsPh9NWVYlI6W1Ib2Z2tqWUCJbOqK8wGIU89JGUs=" + "inner": "JN9XPKLOe6N0PlTLRertySDR/Sr79+AGJY2i7Dn+Uk1y8yOdbnmtJAPzShqCLUwVa3CUiHOEkDNpRT0FvrS9g05X22AsuOG71ReVLBiBx6M=" }, - "rseed": "f1czIiWAOhueD6RRL6IK/1ni6My2Kv/GAnWaiJxVegg=" + "rseed": "tY9zbg/fYf7XsKFs5y02Q3b8WGWObRN6CbMni8q72+8=" }, "outputData": { "delta1": { - "lo": "1964862511" + "lo": "142205294" }, "delta2": { - "lo": "1588150153" + "lo": "428290914" }, "lambda1": { - "lo": "102" + "lo": "1939" }, "lambda2": { - "lo": "419" + "lo": "122" }, "unfilled1": { - "lo": "1721" + "lo": "1523" }, "unfilled2": { - "lo": "468" + "lo": "1088" }, "tradingPair": { "asset1": { @@ -73,57 +54,51 @@ } }, "epochDuration": "1000", - "proofBlindingR": "B+dTl6PghXB3VVbf5Zo7QCo0Vn/n7NdB70BemgIJchA=", - "proofBlindingS": "xNs383ivEdhh9I6N7I8tRWtU6gNdBbmhrItCUvTjrgk=" + "proofBlindingR": "P/FmqG7VyVMP54wyTJOPXn4qLK9sdOcROtTi9OvfDws=", + "proofBlindingS": "dVN4tz+V16VTWxl/hIYlwW8ZzRgYjTY40D2RXYUMeRA=" } }, { - "proposalSubmit": { - "proposal": { - "title": "hgxwoxpvfn-560600997686678484853", - "description": "onmxqdavcipimzahappdu-077755106278094080104597", - "signaling": {} + "communityPoolOutput": { + "value": { + "amount": { + "lo": "166034013638109429" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "depositAmount": { - "lo": "991853645356219717" + "address": { + "inner": "/aUnh+yMJE80vP9Jg4LHs6PnvH2YgX1+lpvP0SbPsqK0HJNBacES2aEbTzp6nXLX5p/j1yDXbqjPQMbd4eekQ2NsmIWPYpkT2yd04ayflgA=" } } }, { - "delegatorVote": { - "proposal": "213852063", - "vote": { - "vote": "VOTE_ABSTAIN" + "ics20Withdrawal": { + "amount": { + "lo": "486240232689123711" }, - "stakedNote": { - "value": { - "amount": { - "lo": "545426696443487056" - }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "rseed": "KzZYYj4sYWEGY43S9H8eD90R4rTtgBX1QaGfpjuaJj8=", - "address": { - "inner": "bJPm9SeWO5PwZnKjqnbRGzQ8VKCLXTFQShuwyFLPPm8OQfF8oK0nRJTcWT+8rsPd02m/GZhKk728BtGybHlinoWRrSeFYCWQOOKJjOJnqpo=" - } + "denom": { + "denom": "ZKzdgUEJe3goYlsY74IS0aWQfz17M" + }, + "destinationChainAddress": "penumbra1jwma2k5qaj3cxfa2e83745p42vpef020pyaux5nq8tchztv08z27trh8m9tmz8sslgs9hfjutskufp6fsq82z69uttrqctzesxtc3pr9g2f64yeenpusa4lhf72e42a4egucgg", + "returnAddress": { + "inner": "6dhuuEJfOfSpeIaxhgZT5O47uQ36vyd2ou8ErsFx3urhrAiPvvzS+lID52vJTLO0sp9N8eI4IzqajXMkZt39Sb2O67e1hGy+niI7eM8ITgM=" }, - "unbondedAmount": { - "lo": "660670965498899916" + "timeoutHeight": { + "revisionNumber": "103690440", + "revisionHeight": "762749102" }, - "randomizer": "tdq0aiLvzXp8bUdYTW87OvGuqoju+p1f334nluTXwAE=", - "proofBlindingR": "TbhJQx9VZ1d4Kf/64gXvsjNS6uQq/WeU34+Ez8D8pAw=", - "proofBlindingS": "1uw6AEsJQSsSpkJg90u70FDo+Q69OsXOChrbG65pvAM=" + "sourceChannel": "channel-0" } } ], "transactionParameters": { - "expiryHeight": "4838361632", - "chainId": "nxaettwgygsjyuvtfdj-8807", + "expiryHeight": "9649409419", + "chainId": "p-75423641493308", "fee": { "amount": { - "lo": "691077168287185524" + "lo": "957082626161338180" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_94.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_94.proto index 3121451ff4..3a7886eb8c 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_94.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_94.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_95.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_95.json index 94dc95f743..90a4f41887 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_95.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_95.json @@ -1,116 +1,130 @@ { "actions": [ { - "swapClaim": { - "swapPlaintext": { - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "delegatorVote": { + "proposal": "982270011", + "vote": { + "vote": "VOTE_ABSTAIN" + }, + "stakedNote": { + "value": { + "amount": { + "lo": "775238475765703580" }, - "asset2": { + "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "delta1I": { - "lo": "583087297263301329" - }, - "delta2I": { - "lo": "344333575992976471" - }, - "claimFee": { - "amount": {} - }, - "claimAddress": { - "inner": "IT0dU9tgFUldZxllW6dEdQK6LmEb4osHQxoTDJXz+dGfoJUYh71xcdS9PT5fKvnd1BHjJi41mLYQIS2Lytp2xf+TuumKccqv3Oj0gaHj7Xg=" - }, - "rseed": "12OPhFPzM3sgok6gQ36fsa4152Yy+FGdPgHczHcGNaM=" + "rseed": "Og7ZaBhnWE57M3JZBORmsZdZ5gUinojfrXDeLpIqCLY=", + "address": { + "inner": "AKMST66gPLEQdOzou6Jms85JRafGepHnahr2V2UDVTR3Ck5PP6n5ByUgJhOkqt4CnWmIMOG6xZjn3oVpgl0plT9RNTFvevjigTKlVT4cIg4=" + } }, - "outputData": { - "delta1": { - "lo": "615720446" - }, - "delta2": { - "lo": "1061965199" - }, - "lambda1": { - "lo": "1208" - }, - "lambda2": { - "lo": "1253" - }, - "unfilled1": { - "lo": "1604" - }, - "unfilled2": { - "lo": "1156" - }, - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "unbondedAmount": { + "lo": "841089640262820196" + }, + "randomizer": "fbP9gCcKUYpcDNJf17TxjeV8vD/CuG2kNujIhrFoxQI=", + "proofBlindingR": "uoxT2uryvMRQflNc6ReZeVBNDfLZpqQ2TjdGduLwvgE=", + "proofBlindingS": "tOC9LyI7e//op8h1MrpUX/L2E3NU/SHpiTML3fM/Lgg=" + } + }, + { + "spend": { + "note": { + "value": { + "amount": { + "lo": "872843738430699619" }, - "asset2": { + "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } + }, + "rseed": "OeYpCdoRBHvDjpep2smuZCGaXBD72+BRsvFDeD290zo=", + "address": { + "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" } }, - "epochDuration": "1000", - "proofBlindingR": "9AHgrn/3yIcEaBkcbbmgA9s5XW+WFBahQ+KPZbF8HxA=", - "proofBlindingS": "VSYpP0B9ayZQ9RBXgub4ycIPfTlPi6J5z6M2ltsHFQQ=" + "position": "2439834704384", + "randomizer": "hgw3weZz2HixGj3rj6VkMn2Byi7ELR+1Ikri7msWkAI=", + "valueBlinding": "7g6TyCoGDpKtQ/tEV9sRuGWGyW3wUD21UJndHANzUgE=", + "proofBlindingR": "2XemHBm8eRNssBlUDT/eDH7BeWK3ht+WBrf7c2DvHws=", + "proofBlindingS": "IFZFKQ/cb8+cCMm6/e7CvX6joM61dJ2/Ty0rVjaRsQY=" } }, { - "actionDutchAuctionEnd": { - "auctionId": { - "inner": "hEySjXLNRrC+b2tN2LItQgwKrq9tdGsCOoKFZzLmb1Q=" - } - } - }, - { - "communityPoolOutput": { - "value": { - "amount": { - "lo": "920717698647612376" + "positionOpen": { + "position": { + "phi": { + "component": { + "p": { + "lo": "447389116967240343" + }, + "q": { + "lo": "535098399727853740" + } + }, + "pair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "address": { - "inner": "IeBUlB+OpDEIdZdhXxmJqmnss9+Cq5q3QIwkUFmS1dufpHKSDRIdMy1QMplsboBauk2wxjqzTE96SBpyaSrJZPSoc9veHwTJPV3lMKElDdc=" + "nonce": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", + "state": { + "state": "POSITION_STATE_ENUM_CLOSED" + }, + "reserves": { + "r1": { + "lo": "373702011456517642" + }, + "r2": { + "lo": "642405974606938556" + } + }, + "closeOnFill": true } } }, { - "positionWithdraw": { - "reserves": { - "r1": { - "lo": "292070973662128832" + "swap": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } }, - "r2": { - "lo": "872656353469832026" - } - }, - "positionId": { - "inner": "2JI9tNmymj0Eb8MVpSDv5yXo1hPiUkR1+p3w27uaQ6s=" - }, - "pair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "delta1I": { + "lo": "998479466135870922" }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } + "delta2I": { + "lo": "89997596605802681" + }, + "claimFee": { + "amount": {} + }, + "claimAddress": { + "inner": "yWxU7O9PM1LwU8rOb2WJ0lHnnScbbBavN5JmRvAt/2opOryeJXzJOeGrnxF+cchNHIvxSfxH/Kov7sGyVxTm76DFns6hGCO9NkM4H7OeWV4=" + }, + "rseed": "8IYhMsSLUxqKfia2WfUmx/pqOAlwaJnExONU9rxcayg=" }, - "sequence": "1" + "feeBlinding": "Np/L/3y7ie16fvI+wowS/1yql0GDxVEZSas83l9BjwI=", + "proofBlindingR": "7mKtcuLNMX4/ZqY1MZa/y1TxLKrdgLJ+hr9da+oS1Q8=", + "proofBlindingS": "gHWwHQa4x+T5AjxCUPr/39SADyEqL5YUnsqpJYj+FQI=" } } ], "transactionParameters": { - "expiryHeight": "4349949593", - "chainId": "lkofeysrqxlfikbktzattsks-81757910112574841881894134591", + "expiryHeight": "2023010641", + "chainId": "cxkpbwvgoelmwlag-004786990795080739468", "fee": { "amount": { - "lo": "856380813541842015" + "lo": "329373028077334716" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_95.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_95.proto index bf6caf80e8..4ba834c58f 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_95.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_95.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_96.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_96.json index f44fd22378..5b73e3f9a4 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_96.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_96.json @@ -1,73 +1,139 @@ { "actions": [ { - "delegate": { - "validatorIdentity": { - "ik": "jzrCl0UMjbiFaQ2rv0A7kGIM/I3eGn8TLz+3YuL1BLs=" - }, - "epochIndex": "8151", - "unbondedAmount": { - "lo": "864682147450177591" + "swap": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "delta1I": { + "lo": "455467980574546047" + }, + "delta2I": { + "lo": "298052434489923302" + }, + "claimFee": { + "amount": {} + }, + "claimAddress": { + "inner": "QYOSHoGdoRG+h7w1U4XRhHdetggsWVLaHXwd2+isWGl2CTr1L1/U+qVvMsS3VTMYTlijn3bA/6esTwJ1E/ay32igra20cimH9r6UYlgxePM=" + }, + "rseed": "NveNd7HYfKvN0/bLuRSCdpxzGQUWlXCq1Ti4/8cdKk8=" }, - "delegationAmount": { - "lo": "326833752259186567" - } + "feeBlinding": "fUml5lAo484c/yG0oAbk8/ThH6NIDrNIMK42XLw0+gA=", + "proofBlindingR": "XDX4sWb85HUDr44FBS0vH8zPh3/H62e5iCciKitl4gM=", + "proofBlindingS": "VTrHsoS+cdjQnWTANQ7yJtNnueT1nKhySiZ4NI9WSw4=" } }, { - "delegatorVote": { - "proposal": "313081682", - "vote": { - "vote": "VOTE_ABSTAIN" - }, - "stakedNote": { - "value": { - "amount": { - "lo": "814032502443382975" + "swapClaim": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" }, - "assetId": { + "asset2": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "rseed": "agwVxvFbxa/kYfn1cZzrkO+BK+XsBYj6R2Mf3P5iiZE=", - "address": { - "inner": "9dFPlUBFnXw9PRN9CUmvfw/OTgRdhwrnz84uSW88mI8C0963CVa1VC5yqnDHAcSaLJADHP7W8Z1SmLCDyozyhyEuGfNxbV2/gkjp/CyuNt8=" - } + "delta1I": { + "lo": "973625171337344855" + }, + "delta2I": { + "lo": "712991887835954768" + }, + "claimFee": { + "amount": {} + }, + "claimAddress": { + "inner": "fXRfqgfZkGW7ZIw0CXe9oior2VvwSjvdIAJX8DAhM7oGZQ+rH1+sqiNxVrJCyUbUNcHqKRmHiSPkkaJ7VkRmqbUmMkF+0kP1qp53tTX2r+g=" + }, + "rseed": "OvSKLoKaPnPm0sVTlYxzfQs432Bp000o5tZWT9D/Vng=" }, - "unbondedAmount": { - "lo": "65012729502538182" + "outputData": { + "delta1": { + "lo": "93897255" + }, + "delta2": { + "lo": "560216406" + }, + "lambda1": { + "lo": "898" + }, + "lambda2": { + "lo": "1905" + }, + "unfilled1": { + "lo": "1675" + }, + "unfilled2": { + "lo": "1103" + }, + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } }, - "randomizer": "JEhULXyp9tPUW5vc5vegEjm6IdlzzUJFMQbkDQuOCwA=", - "proofBlindingR": "mO02PPy4B/nqOpLk0NvxAWw/0yVU1GJtZPt03p/mGwU=", - "proofBlindingS": "HLptWJR/YXKiNUUDWwivDAAZGyOsvr0Y5A+joPnkdRI=" + "epochDuration": "1000", + "proofBlindingR": "0QjA4NqVeJahfiR2KsbD+HU92Q1Xf+eqs96Tn+4g/ww=", + "proofBlindingS": "1/pUKXhaSmTxCk+9/spsIhxqHJIhKhQpiZMEwzKpiQc=" } }, { - "output": { + "communityPoolSpend": { "value": { "amount": { - "lo": "506559940712297023" + "lo": "32229005768571624" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } - }, - "destAddress": { - "inner": "GdmgwXY7KcDvkjZoJEpOk48bTP3J+WMhpTg6ElgEoJ+IvGsEydySYzqrC60ZHUehY/vhPRCWH9TiLHxWpP5Jk0JoVs0p/Y1A6S7gvAtH1QY=" - }, - "rseed": "czQrZfDtFVI9tJKJ9ccSkPbdaK14LYEoOcppmd5R6Bo=", - "valueBlinding": "oN1Hj+6i2PccWKvkuGv4YImW5WUFSlSCUijdYAsg8QM=", - "proofBlindingR": "xDwAFQhuqYIoVYS2pemWfVIO8QBtee0sahvSoEObrQ0=", - "proofBlindingS": "6YUpkqBO0obU7xn9XC0ktUXm5P3izVzzb7BtwQLZkAg=" + } + } + }, + { + "actionDutchAuctionSchedule": { + "description": { + "input": { + "amount": { + "lo": "103503964230418719" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "outputId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "maxOutput": { + "lo": "939055371762680766" + }, + "minOutput": { + "lo": "118975699124532138" + }, + "startHeight": "16956915", + "endHeight": "16956916", + "stepCount": "523613978", + "nonce": "eHTOEhcxJEZ0YHAa5XK+oF+rS1wfW1+YnpA29BvWXwM=" + } } } ], "transactionParameters": { - "expiryHeight": "6858984278", - "chainId": "lquzghuvfjy-185036916095830232703681131466", + "expiryHeight": "7483626574", + "chainId": "rpzmsxitizfwpviqhkujkzyfvgrvzok-115393425831867", "fee": { "amount": { - "lo": "348178734158911993" + "lo": "569290083750729549" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_96.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_96.proto index f0628c001b..c7e302cdf2 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_96.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_96.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_97.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_97.json index 7b4d373216..e949dd6ddb 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_97.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_97.json @@ -1,82 +1,51 @@ { "actions": [ { - "validatorDefinition": { - "validator": { - "identityKey": { - "ik": "RmmybFLdLNQCnJUTRgy9oHZD6CSabjmoBtJbd8kP3wA=" + "communityPoolOutput": { + "value": { + "amount": { + "lo": "931106998994222370" }, - "consensusKey": "MBS+YPip3cdoAlPFRoV0RihlOQ2K5i3Z5WgfB2FBotY=", - "name": "test validator", - "enabled": true, - "governanceKey": { - "gk": "RmmybFLdLNQCnJUTRgy9oHZD6CSabjmoBtJbd8kP3wA=" + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "authSig": "CjrgA05hYJdcLyD/Bge0661XSXE1qL+HxsSxPIbQqwEcdqvNpkTiJ2qGRAhkzw5xMZiHghIMaV+PGEelC60tAA==" - } - }, - { - "swap": { - "swapPlaintext": { - "tradingPair": { - "asset1": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - }, - "asset2": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" - } - }, - "delta1I": { - "lo": "284351826197257452" - }, - "delta2I": { - "lo": "368111555320746855" - }, - "claimFee": { - "amount": {} - }, - "claimAddress": { - "inner": "UCNpJ/w1lD1z6krx2M1No2s624VCf7gXwR13/0pNkWW3EG7vxq66aZefPkIcrAkFAyIbZUn/LHG5BRRGB9nnt7l55fOr7tvijlly89E41FU=" - }, - "rseed": "8IdMqC0tTqP6TZk9wFRatMLcTRi5UYmunnMun3XG0z4=" - }, - "feeBlinding": "F7NAzXpWSVvq5pzlD78kMD0pUv5eL7KgSQ6y6wRjXwI=", - "proofBlindingR": "VSijZl61tBgEzdbchFTwvMymfswiDTDYDKe5W590PQI=", - "proofBlindingS": "KmsEyaFjGJKrW0/Vu3xQyT8PA1rnrjxem1iq0xJpyAQ=" - } - }, - { - "undelegate": { - "validatorIdentity": { - "ik": "sSCNA97acoh2uRIeD8MVVP2xR+5BSxTXjumBG7v97uU=" - }, - "unbondedAmount": { - "lo": "956991271899446516" - }, - "delegationAmount": { - "lo": "866562405522086936" - }, - "fromEpoch": { - "index": "9935", - "startHeight": "9935" + "address": { + "inner": "9b+HAFafPR09cK7ZFcEq5N9s84GLlN9nWXUQs7fDEH8GZbqs0XlQMW6Bz8mJ4pUCyRexHQFfwUG+DSn3t9GlxoB0Oo+rm8R1s8aI8XdNCnY=" } } }, { - "actionDutchAuctionEnd": { + "actionDutchAuctionWithdraw": { "auctionId": { - "inner": "4jEaYNRtiehc4JI4WfEjZWC8DM6OPJoHp7h4m7UG3K8=" + "inner": "OZa1TjBenh1Af9KL4Uvs/BABtda8yiAMqYgePYjsOlI=" + }, + "seq": "369521495", + "reservesInput": { + "amount": { + "lo": "18275459060285815" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "reservesOutput": { + "amount": { + "lo": "800874051388190217" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } } } } ], "transactionParameters": { - "expiryHeight": "7406937209", - "chainId": "eaylmasdfs-4617005741657671618481017496603", + "expiryHeight": "4580144751", + "chainId": "ghvwygiemgzlecm-5778450914", "fee": { "amount": { - "lo": "640042224640080417" + "lo": "267843306180849481" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_97.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_97.proto index 9b63bd8464..173bd9a3b7 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_97.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_97.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_98.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_98.json index de712f88df..c5c3e3c5f9 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_98.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_98.json @@ -1,65 +1,114 @@ { "actions": [ + { + "undelegateClaim": { + "validatorIdentity": { + "ik": "fz9B7xgj5Z3X5mdQJjJRgoMaGZfU8wr6Te2rlFBZxyU=" + }, + "penalty": { + "inner": "AAAAAAAAAAAAAAAAAAAAAP3gDRtxdY4hllK9PDYRNAU=" + }, + "unbondingAmount": { + "lo": "179846695860816524" + }, + "balanceBlinding": "EFPv1IdsURMuP/I3bWRp0nBGizpRiP4Go7QLRKgekwI=", + "proofBlindingR": "cag6jlwShj0TAiTnRtDmeHkrXMNwpJ4giTSCI07xPgQ=", + "proofBlindingS": "C6VhBayojlaEq06DAPpmNXSb14MTNWjXrCLY+v9U5wU=", + "unbondingStartHeight": "88894" + } + }, { "validatorDefinition": { "validator": { "identityKey": { - "ik": "+olAHcynlkX3v3Q6yhGtDNBs/UOl4pQYXpxe2uVqVAQ=" + "ik": "MBswZYBSVBoh45Pliyh8midVJVLZF4D39fjOtgJ72Qs=" }, - "consensusKey": "u0iQiSGIiN2imbqiW4ryRNuUS73TnsYBlLF9b4e6bbw=", + "consensusKey": "krKm4kke00qErgZvexoFpAgzYWIX8EAfUWZXT5lc6eY=", "name": "test validator", "enabled": true, "governanceKey": { - "gk": "+olAHcynlkX3v3Q6yhGtDNBs/UOl4pQYXpxe2uVqVAQ=" + "gk": "MBswZYBSVBoh45Pliyh8midVJVLZF4D39fjOtgJ72Qs=" } }, - "authSig": "CDhiaPSIK2MDWOE246Ls1dQgRy69fv60r/x6dPi8sAHupT9aIdVTlHQMUF7OPdGbY39MdDNr38KbZN0B5o5fAA==" + "authSig": "gH464cwZKxrboM0sKC+V0jMXwWXp5A8vTAE4eK/T6Qb9gQF98c+z9U/7aXehcPrQGjH35F4hEkydgKxb5yJeAA==" } }, { - "proposalWithdraw": { - "proposal": "407059286" - } - }, - { - "communityPoolOutput": { - "value": { - "amount": { - "lo": "183483303148941898" + "swapClaim": { + "swapPlaintext": { + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + }, + "delta1I": { + "lo": "597052914115991959" + }, + "delta2I": { + "lo": "666730935724412379" + }, + "claimFee": { + "amount": {} }, - "assetId": { - "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + "claimAddress": { + "inner": "J7elw6hPwJLfNhHZkBU9DEsWQv1HsAGaR4KYdpFpSddKUo4BA2OER95h4AnYHGKe7itiD+CrJ/dDnu3WNtmC0x9gLcqskLcPd3sUeq0xH+o=" + }, + "rseed": "IzOCeHnev8yiLqEyb/r3nQm2U98F8WcL1Xu3FCwZAFo=" + }, + "outputData": { + "delta1": { + "lo": "1550828251" + }, + "delta2": { + "lo": "204199578" + }, + "lambda1": { + "lo": "843" + }, + "lambda2": { + "lo": "976" + }, + "unfilled1": { + "lo": "972" + }, + "unfilled2": { + "lo": "605" + }, + "tradingPair": { + "asset1": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + }, + "asset2": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } } }, - "address": { - "inner": "SXvdibMLjqxm9tri5M0RPNXmse1RviBZW8C+UZDz5K/BKGSireSlAh+7fmI58/RyBgwPTw05Ad/J8wwCFMCfADFKm+9H1aKRR+yBvJe8vuw=" - } + "epochDuration": "1000", + "proofBlindingR": "3SNLBnwuqUwqjhLWVBWtAPuJg4akiyZQ0jfcPuo0qAk=", + "proofBlindingS": "+rs+MhFF121k42UW9S26GSG6x+2vvP9wWGLIEVBvdAc=" } }, { - "undelegate": { - "validatorIdentity": { - "ik": "dTLKcnzzkVKr4tPYJAKycUWh1/8r9KhJZWLQCpLUCQ8=" - }, - "unbondedAmount": { - "lo": "285060289107982186" - }, - "delegationAmount": { - "lo": "893818470956678012" + "proposalDepositClaim": { + "proposal": "393907336", + "depositAmount": { + "lo": "638775907206762079" }, - "fromEpoch": { - "index": "8283", - "startHeight": "8283" + "outcome": { + "slashed": {} } } } ], "transactionParameters": { - "expiryHeight": "1566745428", - "chainId": "cgzaiweksieyipsk-83599040002049045597151361", + "expiryHeight": "380997429", + "chainId": "hstzhgxbschdejbzwnz-2251077073402109858850303184663", "fee": { "amount": { - "lo": "920577261845310446" + "lo": "71381066279392515" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_98.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_98.proto index 3dab9f4de2..d46d4f0e4d 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_98.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_98.proto differ diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_99.json b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_99.json index c19b7085fa..bf95c8ccfe 100644 --- a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_99.json +++ b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_99.json @@ -5,36 +5,43 @@ "note": { "value": { "amount": { - "lo": "963234966043949978" + "lo": "751448120343933306" }, "assetId": { "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" } }, - "rseed": "WdG3+QcwN4CXUod79zKlOfnwz9bJa8CoSSk8o9lYMJM=", + "rseed": "7L/FyeshJmJK7r6Nxuu8hQjRGKrFB0a4dsBwwysOTeI=", "address": { "inner": "r7ae/+8Q9d3QdaAs66/GAAbYBo/Am59nYWeIBU7REchE3LYtFPa1EHW2Lo1KZcRWuXzO/cM54CLSFnv2iArQnxjrlJnTB4nGnuLdFtCY9vc=" } }, - "position": "265376821061201", - "randomizer": "vIqQubQc9c1AUM2/7/7ZI039AjxHQkHQMCLjcA8F5QE=", - "valueBlinding": "qszei8uPOwRMd6TO95MqXH93jBnvxZG9s04KVeTAqwE=", - "proofBlindingR": "+Tpv9t8ojCim0+3cyzqfAdKOpIoH2qlBF76U/eO8ngI=", - "proofBlindingS": "yb6FHS5QZsrakAlRoE1FYIeNDM6q4j1apl6QIZoiOQA=" + "position": "243045536227121", + "randomizer": "zBErvtCVnUMTlWlfgfVv0wcUt8IbjLUosnDcKscsxQM=", + "valueBlinding": "5cq4dH+VPe22+wTob7j4vhzM0j5wdKsoAhCaf6csswA=", + "proofBlindingR": "epyCi5mlPW0FAK3FJCclkXvOjrKr7KCFZyPkJS9oKgk=", + "proofBlindingS": "vuABakiNPN9iJmam3YkX2FsIJik6dFfPX281mEoQFwg=" } }, { - "proposalWithdraw": { - "proposal": "859066776" + "communityPoolDeposit": { + "value": { + "amount": { + "lo": "201164826129915642" + }, + "assetId": { + "inner": "KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=" + } + } } } ], "transactionParameters": { - "expiryHeight": "7029487225", - "chainId": "tizxgst-83617395365617999388632418", + "expiryHeight": "4505369932", + "chainId": "kvbufljmwrscjssoeyosjigztwnrmgnv-40636733089263", "fee": { "amount": { - "lo": "954799719241866939" + "lo": "605464275970447147" } } } diff --git a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_99.proto b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_99.proto index 6eccd4e166..0ec876c1cb 100644 Binary files a/crates/core/transaction/tests/signing_test_vectors/transaction_plan_99.proto and b/crates/core/transaction/tests/signing_test_vectors/transaction_plan_99.proto differ diff --git a/crates/proto/src/gen/penumbra.core.component.ibc.v1.rs b/crates/proto/src/gen/penumbra.core.component.ibc.v1.rs index 320e259a47..995f53eef1 100644 --- a/crates/proto/src/gen/penumbra.core.component.ibc.v1.rs +++ b/crates/proto/src/gen/penumbra.core.component.ibc.v1.rs @@ -71,8 +71,17 @@ pub struct Ics20Withdrawal { pub source_channel: ::prost::alloc::string::String, /// Whether to use a "compat" (bech32, non-m) address for the return address in the withdrawal, /// for compatability with chains that expect to be able to parse the return address as bech32. + #[deprecated] #[prost(bool, tag = "8")] pub use_compat_address: bool, + /// Arbitrary string data to be included in the `memo` field + /// of the ICS-20 FungibleTokenPacketData for this withdrawal. + /// Commonly used for packet forwarding support, or other protocols that may support usage of the memo field. + #[prost(string, tag = "9")] + pub ics20_memo: ::prost::alloc::string::String, + /// Whether to use a transparent address (bech32, 32-byte) for the return address in the withdrawal. + #[prost(bool, tag = "10")] + pub use_transparent_address: bool, } impl ::prost::Name for Ics20Withdrawal { const NAME: &'static str = "Ics20Withdrawal"; diff --git a/crates/proto/src/gen/penumbra.core.component.ibc.v1.serde.rs b/crates/proto/src/gen/penumbra.core.component.ibc.v1.serde.rs index b4bcbf3624..846d45e6c9 100644 --- a/crates/proto/src/gen/penumbra.core.component.ibc.v1.serde.rs +++ b/crates/proto/src/gen/penumbra.core.component.ibc.v1.serde.rs @@ -1057,6 +1057,12 @@ impl serde::Serialize for Ics20Withdrawal { if self.use_compat_address { len += 1; } + if !self.ics20_memo.is_empty() { + len += 1; + } + if self.use_transparent_address { + len += 1; + } let mut struct_ser = serializer.serialize_struct("penumbra.core.component.ibc.v1.Ics20Withdrawal", len)?; if let Some(v) = self.amount.as_ref() { struct_ser.serialize_field("amount", v)?; @@ -1083,6 +1089,12 @@ impl serde::Serialize for Ics20Withdrawal { if self.use_compat_address { struct_ser.serialize_field("useCompatAddress", &self.use_compat_address)?; } + if !self.ics20_memo.is_empty() { + struct_ser.serialize_field("ics20Memo", &self.ics20_memo)?; + } + if self.use_transparent_address { + struct_ser.serialize_field("useTransparentAddress", &self.use_transparent_address)?; + } struct_ser.end() } } @@ -1107,6 +1119,10 @@ impl<'de> serde::Deserialize<'de> for Ics20Withdrawal { "sourceChannel", "use_compat_address", "useCompatAddress", + "ics20_memo", + "ics20Memo", + "use_transparent_address", + "useTransparentAddress", ]; #[allow(clippy::enum_variant_names)] @@ -1119,6 +1135,8 @@ impl<'de> serde::Deserialize<'de> for Ics20Withdrawal { TimeoutTime, SourceChannel, UseCompatAddress, + Ics20Memo, + UseTransparentAddress, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -1149,6 +1167,8 @@ impl<'de> serde::Deserialize<'de> for Ics20Withdrawal { "timeoutTime" | "timeout_time" => Ok(GeneratedField::TimeoutTime), "sourceChannel" | "source_channel" => Ok(GeneratedField::SourceChannel), "useCompatAddress" | "use_compat_address" => Ok(GeneratedField::UseCompatAddress), + "ics20Memo" | "ics20_memo" => Ok(GeneratedField::Ics20Memo), + "useTransparentAddress" | "use_transparent_address" => Ok(GeneratedField::UseTransparentAddress), _ => Ok(GeneratedField::__SkipField__), } } @@ -1176,6 +1196,8 @@ impl<'de> serde::Deserialize<'de> for Ics20Withdrawal { let mut timeout_time__ = None; let mut source_channel__ = None; let mut use_compat_address__ = None; + let mut ics20_memo__ = None; + let mut use_transparent_address__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::Amount => { @@ -1228,6 +1250,18 @@ impl<'de> serde::Deserialize<'de> for Ics20Withdrawal { } use_compat_address__ = Some(map_.next_value()?); } + GeneratedField::Ics20Memo => { + if ics20_memo__.is_some() { + return Err(serde::de::Error::duplicate_field("ics20Memo")); + } + ics20_memo__ = Some(map_.next_value()?); + } + GeneratedField::UseTransparentAddress => { + if use_transparent_address__.is_some() { + return Err(serde::de::Error::duplicate_field("useTransparentAddress")); + } + use_transparent_address__ = Some(map_.next_value()?); + } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } @@ -1242,6 +1276,8 @@ impl<'de> serde::Deserialize<'de> for Ics20Withdrawal { timeout_time: timeout_time__.unwrap_or_default(), source_channel: source_channel__.unwrap_or_default(), use_compat_address: use_compat_address__.unwrap_or_default(), + ics20_memo: ics20_memo__.unwrap_or_default(), + use_transparent_address: use_transparent_address__.unwrap_or_default(), }) } } diff --git a/crates/proto/src/gen/penumbra.core.component.shielded_pool.v1.rs b/crates/proto/src/gen/penumbra.core.component.shielded_pool.v1.rs index 1362033de8..e287e3e5e6 100644 --- a/crates/proto/src/gen/penumbra.core.component.shielded_pool.v1.rs +++ b/crates/proto/src/gen/penumbra.core.component.shielded_pool.v1.rs @@ -420,6 +420,9 @@ pub struct SpendBody { pub rk: ::core::option::Option< super::super::super::super::crypto::decaf377_rdsa::v1::SpendVerificationKey, >, + /// An encryption of the commitment of the input note to the sender's OVK. + #[prost(bytes = "vec", tag = "7")] + pub encrypted_backref: ::prost::alloc::vec::Vec, } impl ::prost::Name for SpendBody { const NAME: &'static str = "SpendBody"; diff --git a/crates/proto/src/gen/penumbra.core.component.shielded_pool.v1.serde.rs b/crates/proto/src/gen/penumbra.core.component.shielded_pool.v1.serde.rs index 85e3edf22e..c77243e1d0 100644 --- a/crates/proto/src/gen/penumbra.core.component.shielded_pool.v1.serde.rs +++ b/crates/proto/src/gen/penumbra.core.component.shielded_pool.v1.serde.rs @@ -3789,6 +3789,9 @@ impl serde::Serialize for SpendBody { if self.rk.is_some() { len += 1; } + if !self.encrypted_backref.is_empty() { + len += 1; + } let mut struct_ser = serializer.serialize_struct("penumbra.core.component.shielded_pool.v1.SpendBody", len)?; if let Some(v) = self.balance_commitment.as_ref() { struct_ser.serialize_field("balanceCommitment", v)?; @@ -3799,6 +3802,10 @@ impl serde::Serialize for SpendBody { if let Some(v) = self.rk.as_ref() { struct_ser.serialize_field("rk", v)?; } + if !self.encrypted_backref.is_empty() { + #[allow(clippy::needless_borrow)] + struct_ser.serialize_field("encryptedBackref", pbjson::private::base64::encode(&self.encrypted_backref).as_str())?; + } struct_ser.end() } } @@ -3813,6 +3820,8 @@ impl<'de> serde::Deserialize<'de> for SpendBody { "balanceCommitment", "nullifier", "rk", + "encrypted_backref", + "encryptedBackref", ]; #[allow(clippy::enum_variant_names)] @@ -3820,6 +3829,7 @@ impl<'de> serde::Deserialize<'de> for SpendBody { BalanceCommitment, Nullifier, Rk, + EncryptedBackref, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -3845,6 +3855,7 @@ impl<'de> serde::Deserialize<'de> for SpendBody { "balanceCommitment" | "balance_commitment" => Ok(GeneratedField::BalanceCommitment), "nullifier" => Ok(GeneratedField::Nullifier), "rk" => Ok(GeneratedField::Rk), + "encryptedBackref" | "encrypted_backref" => Ok(GeneratedField::EncryptedBackref), _ => Ok(GeneratedField::__SkipField__), } } @@ -3867,6 +3878,7 @@ impl<'de> serde::Deserialize<'de> for SpendBody { let mut balance_commitment__ = None; let mut nullifier__ = None; let mut rk__ = None; + let mut encrypted_backref__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::BalanceCommitment => { @@ -3887,6 +3899,14 @@ impl<'de> serde::Deserialize<'de> for SpendBody { } rk__ = map_.next_value()?; } + GeneratedField::EncryptedBackref => { + if encrypted_backref__.is_some() { + return Err(serde::de::Error::duplicate_field("encryptedBackref")); + } + encrypted_backref__ = + Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + ; + } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } @@ -3896,6 +3916,7 @@ impl<'de> serde::Deserialize<'de> for SpendBody { balance_commitment: balance_commitment__, nullifier: nullifier__, rk: rk__, + encrypted_backref: encrypted_backref__.unwrap_or_default(), }) } } diff --git a/crates/proto/src/gen/penumbra.view.v1.rs b/crates/proto/src/gen/penumbra.view.v1.rs index 9509181335..5ec54bf491 100644 --- a/crates/proto/src/gen/penumbra.view.v1.rs +++ b/crates/proto/src/gen/penumbra.view.v1.rs @@ -1,3 +1,32 @@ +/// There's only one transparent address per wallet, so this request has no parameters; +/// the message exists to satisfy forward-compatibility properties. +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct TransparentAddressRequest {} +impl ::prost::Name for TransparentAddressRequest { + const NAME: &'static str = "TransparentAddressRequest"; + const PACKAGE: &'static str = "penumbra.view.v1"; + fn full_name() -> ::prost::alloc::string::String { + ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME) + } +} +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct TransparentAddressResponse { + /// The raw (binary) transparent address + #[prost(message, optional, tag = "1")] + pub address: ::core::option::Option, + /// The t-address encoding of the transparent address + #[prost(string, tag = "2")] + pub encoding: ::prost::alloc::string::String, +} +impl ::prost::Name for TransparentAddressResponse { + const NAME: &'static str = "TransparentAddressResponse"; + const PACKAGE: &'static str = "penumbra.view.v1"; + fn full_name() -> ::prost::alloc::string::String { + ::prost::alloc::format!("penumbra.view.v1.{}", Self::NAME) + } +} /// Filters in an `AuctionsRequest` will be combined using `AND` logic -- that /// is, the more filters you add, the fewer responses you're likely to get. #[allow(clippy::derive_partial_eq_without_eq)] @@ -2117,6 +2146,34 @@ pub mod view_service_client { ); self.inner.unary(req, path, codec).await } + /// Returns the transparent address for the user's wallet. + pub async fn transparent_address( + &mut self, + request: impl tonic::IntoRequest, + ) -> std::result::Result< + tonic::Response, + tonic::Status, + > { + self.inner + .ready() + .await + .map_err(|e| { + tonic::Status::new( + tonic::Code::Unknown, + format!("Service was not ready: {}", e.into()), + ) + })?; + let codec = tonic::codec::ProstCodec::default(); + let path = http::uri::PathAndQuery::from_static( + "/penumbra.view.v1.ViewService/TransparentAddress", + ); + let mut req = request.into_request(); + req.extensions_mut() + .insert( + GrpcMethod::new("penumbra.view.v1.ViewService", "TransparentAddress"), + ); + self.inner.unary(req, path, codec).await + } /// Query for wallet id pub async fn wallet_id( &mut self, @@ -2800,6 +2857,14 @@ pub mod view_service_server { tonic::Response, tonic::Status, >; + /// Returns the transparent address for the user's wallet. + async fn transparent_address( + &self, + request: tonic::Request, + ) -> std::result::Result< + tonic::Response, + tonic::Status, + >; /// Query for wallet id async fn wallet_id( &self, @@ -3596,6 +3661,53 @@ pub mod view_service_server { }; Box::pin(fut) } + "/penumbra.view.v1.ViewService/TransparentAddress" => { + #[allow(non_camel_case_types)] + struct TransparentAddressSvc(pub Arc); + impl< + T: ViewService, + > tonic::server::UnaryService + for TransparentAddressSvc { + type Response = super::TransparentAddressResponse; + type Future = BoxFuture< + tonic::Response, + tonic::Status, + >; + fn call( + &mut self, + request: tonic::Request, + ) -> Self::Future { + let inner = Arc::clone(&self.0); + let fut = async move { + ::transparent_address(&inner, request) + .await + }; + Box::pin(fut) + } + } + let accept_compression_encodings = self.accept_compression_encodings; + let send_compression_encodings = self.send_compression_encodings; + let max_decoding_message_size = self.max_decoding_message_size; + let max_encoding_message_size = self.max_encoding_message_size; + let inner = self.inner.clone(); + let fut = async move { + let inner = inner.0; + let method = TransparentAddressSvc(inner); + let codec = tonic::codec::ProstCodec::default(); + let mut grpc = tonic::server::Grpc::new(codec) + .apply_compression_config( + accept_compression_encodings, + send_compression_encodings, + ) + .apply_max_message_size_config( + max_decoding_message_size, + max_encoding_message_size, + ); + let res = grpc.unary(method, req).await; + Ok(res) + }; + Box::pin(fut) + } "/penumbra.view.v1.ViewService/WalletId" => { #[allow(non_camel_case_types)] struct WalletIdSvc(pub Arc); diff --git a/crates/proto/src/gen/penumbra.view.v1.serde.rs b/crates/proto/src/gen/penumbra.view.v1.serde.rs index 140a24f431..d5b11ff8db 100644 --- a/crates/proto/src/gen/penumbra.view.v1.serde.rs +++ b/crates/proto/src/gen/penumbra.view.v1.serde.rs @@ -8305,6 +8305,190 @@ impl<'de> serde::Deserialize<'de> for TransactionPlannerResponse { deserializer.deserialize_struct("penumbra.view.v1.TransactionPlannerResponse", FIELDS, GeneratedVisitor) } } +impl serde::Serialize for TransparentAddressRequest { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let len = 0; + let struct_ser = serializer.serialize_struct("penumbra.view.v1.TransparentAddressRequest", len)?; + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for TransparentAddressRequest { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + __SkipField__, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + Ok(GeneratedField::__SkipField__) + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = TransparentAddressRequest; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter.write_str("struct penumbra.view.v1.TransparentAddressRequest") + } + + fn visit_map(self, mut map_: V) -> std::result::Result + where + V: serde::de::MapAccess<'de>, + { + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; + } + Ok(TransparentAddressRequest { + }) + } + } + deserializer.deserialize_struct("penumbra.view.v1.TransparentAddressRequest", FIELDS, GeneratedVisitor) + } +} +impl serde::Serialize for TransparentAddressResponse { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut len = 0; + if self.address.is_some() { + len += 1; + } + if !self.encoding.is_empty() { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("penumbra.view.v1.TransparentAddressResponse", len)?; + if let Some(v) = self.address.as_ref() { + struct_ser.serialize_field("address", v)?; + } + if !self.encoding.is_empty() { + struct_ser.serialize_field("encoding", &self.encoding)?; + } + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for TransparentAddressResponse { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "address", + "encoding", + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + Address, + Encoding, + __SkipField__, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "address" => Ok(GeneratedField::Address), + "encoding" => Ok(GeneratedField::Encoding), + _ => Ok(GeneratedField::__SkipField__), + } + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = TransparentAddressResponse; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter.write_str("struct penumbra.view.v1.TransparentAddressResponse") + } + + fn visit_map(self, mut map_: V) -> std::result::Result + where + V: serde::de::MapAccess<'de>, + { + let mut address__ = None; + let mut encoding__ = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::Address => { + if address__.is_some() { + return Err(serde::de::Error::duplicate_field("address")); + } + address__ = map_.next_value()?; + } + GeneratedField::Encoding => { + if encoding__.is_some() { + return Err(serde::de::Error::duplicate_field("encoding")); + } + encoding__ = Some(map_.next_value()?); + } + GeneratedField::__SkipField__ => { + let _ = map_.next_value::()?; + } + } + } + Ok(TransparentAddressResponse { + address: address__, + encoding: encoding__.unwrap_or_default(), + }) + } + } + deserializer.deserialize_struct("penumbra.view.v1.TransparentAddressResponse", FIELDS, GeneratedVisitor) + } +} impl serde::Serialize for UnbondingTokensByAddressIndexRequest { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result diff --git a/crates/proto/src/gen/proto_descriptor.bin.no_lfs b/crates/proto/src/gen/proto_descriptor.bin.no_lfs index 07410da27b..895f0f7259 100644 Binary files a/crates/proto/src/gen/proto_descriptor.bin.no_lfs and b/crates/proto/src/gen/proto_descriptor.bin.no_lfs differ diff --git a/crates/view/src/service.rs b/crates/view/src/service.rs index 7971258eac..8e3c8ce26c 100644 --- a/crates/view/src/service.rs +++ b/crates/view/src/service.rs @@ -815,6 +815,25 @@ impl ViewService for ViewServer { address_index: fvk.address_index(&address).map(Into::into), })) } + async fn transparent_address( + &self, + _request: tonic::Request, + ) -> Result, tonic::Status> { + let fvk = + self.storage.full_viewing_key().await.map_err(|_| { + tonic::Status::failed_precondition("Error retrieving full viewing key") + })?; + + let encoding = fvk.incoming().transparent_address(); + let address: Address = encoding + .parse() + .map_err(|_| tonic::Status::internal("could not parse newly generated address"))?; + + Ok(tonic::Response::new(pb::TransparentAddressResponse { + address: Some(address.into()), + encoding, + })) + } #[instrument(skip_all, level = "trace")] async fn ephemeral_address( diff --git a/proto/penumbra/penumbra/core/component/ibc/v1/ibc.proto b/proto/penumbra/penumbra/core/component/ibc/v1/ibc.proto index 733ca5a3af..17f92c443e 100644 --- a/proto/penumbra/penumbra/core/component/ibc/v1/ibc.proto +++ b/proto/penumbra/penumbra/core/component/ibc/v1/ibc.proto @@ -53,7 +53,15 @@ message Ics20Withdrawal { // Whether to use a "compat" (bech32, non-m) address for the return address in the withdrawal, // for compatability with chains that expect to be able to parse the return address as bech32. - bool use_compat_address = 8; + bool use_compat_address = 8 [deprecated = true]; + + // Arbitrary string data to be included in the `memo` field + // of the ICS-20 FungibleTokenPacketData for this withdrawal. + // Commonly used for packet forwarding support, or other protocols that may support usage of the memo field. + string ics20_memo = 9; + + // Whether to use a transparent address (bech32, 32-byte) for the return address in the withdrawal. + bool use_transparent_address = 10; } message ClientData { diff --git a/proto/penumbra/penumbra/core/component/shielded_pool/v1/shielded_pool.proto b/proto/penumbra/penumbra/core/component/shielded_pool/v1/shielded_pool.proto index f93427e8e8..d2c9cb55f7 100644 --- a/proto/penumbra/penumbra/core/component/shielded_pool/v1/shielded_pool.proto +++ b/proto/penumbra/penumbra/core/component/shielded_pool/v1/shielded_pool.proto @@ -42,7 +42,7 @@ message FmdMetaParameters { } // How much time users have to transition to new parameters. - uint64 fmd_grace_period_blocks = 1; + uint64 fmd_grace_period_blocks = 1; // The algorithm governing how the parameters change. oneof algorithm { uint32 fixed_precision_bits = 2; @@ -154,6 +154,8 @@ message SpendBody { sct.v1.Nullifier nullifier = 6; // The randomized validating key for the spend authorization signature. crypto.decaf377_rdsa.v1.SpendVerificationKey rk = 4; + // An encryption of the commitment of the input note to the sender's OVK. + bytes encrypted_backref = 7; } message SpendView { message Visible { diff --git a/proto/penumbra/penumbra/view/v1/view.proto b/proto/penumbra/penumbra/view/v1/view.proto index 3a11c35f03..5f1ffb41b5 100644 --- a/proto/penumbra/penumbra/view/v1/view.proto +++ b/proto/penumbra/penumbra/view/v1/view.proto @@ -61,6 +61,9 @@ service ViewService { // Query for an address given an address index rpc AddressByIndex(AddressByIndexRequest) returns (AddressByIndexResponse); + // Returns the transparent address for the user's wallet. + rpc TransparentAddress(TransparentAddressRequest) returns (TransparentAddressResponse); + // Query for wallet id rpc WalletId(WalletIdRequest) returns (WalletIdResponse); @@ -148,6 +151,18 @@ service ViewService { rpc Auctions(AuctionsRequest) returns (stream AuctionsResponse); } +// There's only one transparent address per wallet, so this request has no parameters; +// the message exists to satisfy forward-compatibility properties. +message TransparentAddressRequest { +} + +message TransparentAddressResponse { + // The raw (binary) transparent address + core.keys.v1.Address address = 1; + // The t-address encoding of the transparent address + string encoding = 2; +} + // Filters in an `AuctionsRequest` will be combined using `AND` logic -- that // is, the more filters you add, the fewer responses you're likely to get. message AuctionsRequest {