Compare commits
77 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 55f40238c6 | |||
| 0e97d6c040 | |||
| 854dccd79c | |||
| a792313b68 | |||
| 7778adb493 | |||
| 33988b5164 | |||
| 284c25ff5a | |||
| 9d72229fa6 | |||
| da8d14ae84 | |||
| 2e4f7bbc70 | |||
| cbafe4adcf | |||
| 967b6c8e34 | |||
| c3dad4231d | |||
| ba8ed878c9 | |||
| 744860d4f9 | |||
| 0013e7ac40 | |||
| 0fcc42e02d | |||
| 4f0974fcf1 | |||
| bd2174641e | |||
| 59b62fabc9 | |||
| e6f4bae895 | |||
| d71742af32 | |||
| 3b7c07e249 | |||
| 3b429dde69 | |||
| 3a29c296da | |||
| 8544c54f8f | |||
| 9f9639950b | |||
| 111a0b20b6 | |||
| 67b300d0b8 | |||
| 88c4e0ce6c | |||
| f6800aff0a | |||
| 0c7c927ca2 | |||
| a69c8b1660 | |||
| f3ea310a46 | |||
| 92f9ff035d | |||
| 5a817e1df1 | |||
| a07a24db00 | |||
| a0cb812eff | |||
| 923c1fa184 | |||
| 35ea7e4926 | |||
| d1cb9afaf0 | |||
| 79d4b4b2e3 | |||
| 8460b33946 | |||
| ae6539e07c | |||
| 18cebdfedc | |||
| c448ec823a | |||
| a266137278 | |||
| 6f4dfd1dab | |||
| 57719787db | |||
| 29a57bf172 | |||
| db813b6e3e | |||
| 1be5ba310a | |||
| 41ff3f7824 | |||
| c9d4d62446 | |||
| e839a0d80e | |||
| cd61f930bf | |||
| 0674f31227 | |||
| 3e4f563dce | |||
| edcf2b1204 | |||
| b07fb18113 | |||
| 017dea4afd | |||
| 5a9ce13beb | |||
| 514cf25c68 | |||
| 49ee0636e4 | |||
| bb971ce99c | |||
| 54de369c1e | |||
| 6d6ce284df | |||
| 56ad1c6c8e | |||
| 10b4a288c8 | |||
| bbbb9486ce | |||
| 16e86e1a07 | |||
| ca0c9898f0 | |||
| 8b73d4e615 | |||
| 6a9a767ab4 | |||
| e03a9fa16f | |||
| a0fbd57d5b | |||
| cfa7635ae1 |
@@ -54,7 +54,7 @@ jobs:
|
||||
uses: actions-rs/cargo@v1
|
||||
with:
|
||||
command: test
|
||||
args: --lib --manifest-path contracts/Cargo.toml
|
||||
args: --lib --manifest-path contracts/Cargo.toml --all-features
|
||||
|
||||
- name: Check formatting
|
||||
uses: actions-rs/cargo@v1
|
||||
|
||||
@@ -4,7 +4,7 @@ on:
|
||||
|
||||
jobs:
|
||||
publish:
|
||||
runs-on: arc-ubuntu-22.04
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
@@ -17,10 +17,13 @@ jobs:
|
||||
- name: Setup yarn
|
||||
run: npm install -g yarn
|
||||
|
||||
- name: Install Rust stable
|
||||
- name: Install rust toolchain
|
||||
uses: actions-rs/toolchain@v1
|
||||
with:
|
||||
profile: minimal
|
||||
toolchain: stable
|
||||
override: true
|
||||
components: rustfmt, clippy
|
||||
|
||||
- name: Install wasm-pack
|
||||
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
|
||||
@@ -29,9 +32,9 @@ jobs:
|
||||
run: cargo install wasm-opt
|
||||
|
||||
- name: Set up Go
|
||||
uses: actions/setup-go@v5
|
||||
uses: actions/setup-go@v6
|
||||
with:
|
||||
go-version: "1.23.7"
|
||||
go-version: "1.24.6"
|
||||
|
||||
- name: Install dependencies
|
||||
run: yarn
|
||||
|
||||
@@ -4,6 +4,50 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## [2025.18-jarlsberg] (2025-10-14)
|
||||
|
||||
- ns-api: add descriptions to dVPN gateway responses ([#6102])
|
||||
- NS API: use new probe download filesize and milliseconds field ([#6097])
|
||||
- ns-api: use download files size from probes instead of parsing filenames ([#6095])
|
||||
- ns-api: add new fields for probe output for query_metadata and download file size and duration in ms ([#6091])
|
||||
- Bugfix/bloomfilters purge ([#6089])
|
||||
- Hotfix: Update API source in node ping tester script ([#6082])
|
||||
- Get wireguard keypair as arg instead of reading it from disk ([#6078])
|
||||
- Feature: Ping probe all nodes /described nodes from a server ([#6074])
|
||||
- Node Status API: add bridge information to dVPN endpoint ([#6069])
|
||||
- frontdoor typo fix ([#6067])
|
||||
- Feature: Node rewards tracker ([#6064])
|
||||
- [chore] Clippy fix ([#6060])
|
||||
- Registration Client ([#6059])
|
||||
- Bugfix: Nym node CLI download nym-node exception ([#6058])
|
||||
- Feature: Nym node html landing page ([#6053])
|
||||
- feat: DKG contract method for updating announce address ([#6050])
|
||||
- feat: NS ticket faucet ([#6047])
|
||||
- Bridge proto client params in Self-Described ([#6035])
|
||||
- Node Status API: remove sqlite support ([#6004])
|
||||
- Benny/ci contract fix ([#5962])
|
||||
|
||||
[#6102]: https://github.com/nymtech/nym/pull/6102
|
||||
[#6097]: https://github.com/nymtech/nym/pull/6097
|
||||
[#6095]: https://github.com/nymtech/nym/pull/6095
|
||||
[#6091]: https://github.com/nymtech/nym/pull/6091
|
||||
[#6089]: https://github.com/nymtech/nym/pull/6089
|
||||
[#6082]: https://github.com/nymtech/nym/pull/6082
|
||||
[#6078]: https://github.com/nymtech/nym/pull/6078
|
||||
[#6074]: https://github.com/nymtech/nym/pull/6074
|
||||
[#6069]: https://github.com/nymtech/nym/pull/6069
|
||||
[#6067]: https://github.com/nymtech/nym/pull/6067
|
||||
[#6064]: https://github.com/nymtech/nym/pull/6064
|
||||
[#6060]: https://github.com/nymtech/nym/pull/6060
|
||||
[#6059]: https://github.com/nymtech/nym/pull/6059
|
||||
[#6058]: https://github.com/nymtech/nym/pull/6058
|
||||
[#6053]: https://github.com/nymtech/nym/pull/6053
|
||||
[#6050]: https://github.com/nymtech/nym/pull/6050
|
||||
[#6047]: https://github.com/nymtech/nym/pull/6047
|
||||
[#6035]: https://github.com/nymtech/nym/pull/6035
|
||||
[#6004]: https://github.com/nymtech/nym/pull/6004
|
||||
[#5962]: https://github.com/nymtech/nym/pull/5962
|
||||
|
||||
## [2025.17-isabirra] (2025-09-29)
|
||||
|
||||
- Bugfix | Fix the registration handshake ([#6062])
|
||||
|
||||
Generated
+687
-817
File diff suppressed because it is too large
Load Diff
+2
-2
@@ -150,7 +150,7 @@ members = [
|
||||
"tools/internal/contract-state-importer/importer-cli",
|
||||
"tools/internal/contract-state-importer/importer-contract",
|
||||
"tools/internal/mixnet-connectivity-check",
|
||||
# "tools/internal/sdk-version-bump",
|
||||
# "tools/internal/sdk-version-bump",
|
||||
"tools/internal/ssl-inject",
|
||||
"tools/internal/testnet-manager",
|
||||
"tools/internal/testnet-manager/dkg-bypass-contract",
|
||||
@@ -248,7 +248,7 @@ dashmap = "5.5.3"
|
||||
# We want https://github.com/DefGuard/wireguard-rs/pull/64 , but there's no crates.io release being pushed out anymore
|
||||
defguard_wireguard_rs = { git = "https://github.com/DefGuard/wireguard-rs.git", rev = "v0.4.7" }
|
||||
digest = "0.10.7"
|
||||
dirs = "5.0"
|
||||
dirs = "6.0"
|
||||
doc-comment = "0.3"
|
||||
dotenvy = "0.15.6"
|
||||
dyn-clone = "1.0.19"
|
||||
|
||||
@@ -107,16 +107,16 @@ sdk-wasm-build:
|
||||
$(MAKE) -C nym-browser-extension/storage wasm-pack
|
||||
$(MAKE) -C wasm/client
|
||||
$(MAKE) -C wasm/node-tester
|
||||
# $(MAKE) -C wasm/mix-fetch
|
||||
$(MAKE) -C wasm/mix-fetch
|
||||
$(MAKE) -C wasm/zknym-lib
|
||||
# $(MAKE) -C wasm/full-nym-wasm
|
||||
|
||||
# run this from npm/yarn to ensure tools are in the path, e.g. yarn build:sdk from root of repo
|
||||
sdk-typescript-build:
|
||||
npx lerna run --scope @nymproject/sdk build --stream
|
||||
# npx lerna run --scope @nymproject/mix-fetch build --stream
|
||||
# npx lerna run --scope @nymproject/node-tester build --stream
|
||||
# yarn --cwd sdk/typescript/codegen/contract-clients build
|
||||
npx lerna run --scope @nymproject/mix-fetch build --stream
|
||||
npx lerna run --scope @nymproject/node-tester build --stream
|
||||
yarn --cwd sdk/typescript/codegen/contract-clients build
|
||||
|
||||
# NOTE: These targets are part of the main workspace (but not as wasm32-unknown-unknown)
|
||||
WASM_CRATES = extension-storage nym-client-wasm nym-node-tester-wasm zknym-lib
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "nym-client"
|
||||
version = "1.1.63"
|
||||
version = "1.1.64"
|
||||
authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
|
||||
description = "Implementation of the Nym Client"
|
||||
edition = "2021"
|
||||
|
||||
@@ -60,6 +60,7 @@ impl SocketClient {
|
||||
let ClientInput {
|
||||
connection_command_sender,
|
||||
input_sender,
|
||||
..
|
||||
} = client_input;
|
||||
|
||||
let ClientOutput {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "nym-socks5-client"
|
||||
version = "1.1.63"
|
||||
version = "1.1.64"
|
||||
authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
|
||||
description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
|
||||
edition = "2021"
|
||||
|
||||
@@ -36,7 +36,7 @@ nym-bandwidth-controller = { path = "../bandwidth-controller" }
|
||||
nym-crypto = { path = "../crypto" }
|
||||
nym-gateway-client = { path = "../client-libs/gateway-client" }
|
||||
nym-gateway-requests = { path = "../gateway-requests" }
|
||||
nym-http-api-client = { path = "../http-api-client" }
|
||||
nym-http-api-client = { path = "../http-api-client", features = ["network-defaults"] }
|
||||
nym-nonexhaustive-delayqueue = { path = "../nonexhaustive-delayqueue" }
|
||||
nym-sphinx = { path = "../nymsphinx" }
|
||||
nym-statistics-common = { path = "../statistics" }
|
||||
|
||||
@@ -114,13 +114,12 @@ where
|
||||
})?;
|
||||
hardcoded_topology.entry_capable_nodes().cloned().collect()
|
||||
} else {
|
||||
let mut rng = rand::thread_rng();
|
||||
crate::init::helpers::gateways_for_init(
|
||||
&mut rng,
|
||||
&core.client.nym_api_urls,
|
||||
user_agent,
|
||||
core.debug.topology.minimum_gateway_performance,
|
||||
core.debug.topology.ignore_ingress_epoch_role,
|
||||
None,
|
||||
)
|
||||
.await?
|
||||
};
|
||||
|
||||
@@ -173,13 +173,12 @@ where
|
||||
})?;
|
||||
hardcoded_topology.entry_capable_nodes().cloned().collect()
|
||||
} else {
|
||||
let mut rng = rand::thread_rng();
|
||||
crate::init::helpers::gateways_for_init(
|
||||
&mut rng,
|
||||
&core.client.nym_api_urls,
|
||||
user_agent,
|
||||
core.debug.topology.minimum_gateway_performance,
|
||||
core.debug.topology.ignore_ingress_epoch_role,
|
||||
None,
|
||||
)
|
||||
.await?
|
||||
};
|
||||
|
||||
@@ -7,11 +7,12 @@ use super::statistics_control::StatisticsControl;
|
||||
use crate::client::base_client::storage::helpers::store_client_keys;
|
||||
use crate::client::base_client::storage::MixnetClientStorage;
|
||||
use crate::client::cover_traffic_stream::LoopCoverTrafficStream;
|
||||
use crate::client::event_control::EventControl;
|
||||
use crate::client::inbound_messages::{InputMessage, InputMessageReceiver, InputMessageSender};
|
||||
use crate::client::key_manager::persistence::KeyStore;
|
||||
use crate::client::key_manager::ClientKeys;
|
||||
use crate::client::mix_traffic::transceiver::{GatewayReceiver, GatewayTransceiver, RemoteGateway};
|
||||
use crate::client::mix_traffic::{BatchMixMessageSender, MixTrafficController};
|
||||
use crate::client::mix_traffic::{BatchMixMessageSender, MixTrafficController, MixTrafficEvent};
|
||||
use crate::client::real_messages_control;
|
||||
use crate::client::real_messages_control::RealMessagesController;
|
||||
use crate::client::received_buffer::{
|
||||
@@ -66,13 +67,16 @@ use std::path::Path;
|
||||
use std::sync::Arc;
|
||||
use time::OffsetDateTime;
|
||||
use tokio::sync::mpsc::Sender;
|
||||
use tracing::*;
|
||||
use url::Url;
|
||||
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
#[cfg(debug_assertions)]
|
||||
use wasm_utils::console_log;
|
||||
|
||||
/// Default number of retries for Nym API requests when using network details with domain fronting.
|
||||
/// This allows the client to try alternative URLs if the primary endpoint is unavailable.
|
||||
const DEFAULT_NYM_API_RETRIES: usize = 3;
|
||||
|
||||
#[cfg(all(
|
||||
not(target_arch = "wasm32"),
|
||||
feature = "fs-surb-storage",
|
||||
@@ -83,10 +87,28 @@ pub mod non_wasm_helpers;
|
||||
pub mod helpers;
|
||||
pub mod storage;
|
||||
|
||||
#[derive(Clone, Copy, Debug)]
|
||||
pub enum MixnetClientEvent {
|
||||
Traffic(MixTrafficEvent),
|
||||
}
|
||||
|
||||
pub type EventReceiver = mpsc::UnboundedReceiver<MixnetClientEvent>;
|
||||
#[derive(Clone)]
|
||||
pub struct EventSender(pub mpsc::UnboundedSender<MixnetClientEvent>);
|
||||
|
||||
impl EventSender {
|
||||
pub fn send(&self, event: MixnetClientEvent) {
|
||||
if let Err(err) = self.0.unbounded_send(event) {
|
||||
tracing::warn!("Failed to send error event. The caller event reader was closed: {err}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct ClientInput {
|
||||
pub connection_command_sender: ConnectionCommandSender,
|
||||
pub input_sender: InputMessageSender,
|
||||
pub client_request_sender: ClientRequestSender,
|
||||
}
|
||||
|
||||
impl ClientInput {
|
||||
@@ -194,10 +216,14 @@ pub struct BaseClientBuilder<C, S: MixnetClientStorage> {
|
||||
client_store: S,
|
||||
dkg_query_client: Option<C>,
|
||||
|
||||
// Optional API URLs for domain fronting support
|
||||
nym_api_urls: Option<Vec<nym_network_defaults::ApiUrl>>,
|
||||
|
||||
wait_for_gateway: bool,
|
||||
custom_topology_provider: Option<Box<dyn TopologyProvider + Send + Sync>>,
|
||||
custom_gateway_transceiver: Option<Box<dyn GatewayTransceiver + Send>>,
|
||||
shutdown: Option<ShutdownTracker>,
|
||||
event_tx: Option<EventSender>,
|
||||
user_agent: Option<UserAgent>,
|
||||
|
||||
setup_method: GatewaySetup,
|
||||
@@ -222,10 +248,12 @@ where
|
||||
config: base_config,
|
||||
client_store,
|
||||
dkg_query_client,
|
||||
nym_api_urls: None,
|
||||
wait_for_gateway: false,
|
||||
custom_topology_provider: None,
|
||||
custom_gateway_transceiver: None,
|
||||
shutdown: None,
|
||||
event_tx: None,
|
||||
user_agent: None,
|
||||
setup_method: GatewaySetup::MustLoad { gateway_id: None },
|
||||
#[cfg(unix)]
|
||||
@@ -243,6 +271,16 @@ where
|
||||
self
|
||||
}
|
||||
|
||||
/// Set Nym API URLs for domain fronting support.
|
||||
///
|
||||
/// When provided, the client will use these API URLs (which include front_hosts)
|
||||
/// to construct HTTP clients with domain fronting enabled.
|
||||
#[must_use]
|
||||
pub fn with_nym_api_urls(mut self, nym_api_urls: Vec<nym_network_defaults::ApiUrl>) -> Self {
|
||||
self.nym_api_urls = Some(nym_api_urls);
|
||||
self
|
||||
}
|
||||
|
||||
#[must_use]
|
||||
pub fn with_forget_me(mut self, forget_me: &ForgetMe) -> Self {
|
||||
self.config.debug.forget_me = *forget_me;
|
||||
@@ -288,6 +326,12 @@ where
|
||||
self
|
||||
}
|
||||
|
||||
#[must_use]
|
||||
pub fn with_event_tx(mut self, event_tx: EventSender) -> Self {
|
||||
self.event_tx = Some(event_tx);
|
||||
self
|
||||
}
|
||||
|
||||
#[must_use]
|
||||
pub fn with_user_agent(mut self, user_agent: UserAgent) -> Self {
|
||||
self.user_agent = Some(user_agent);
|
||||
@@ -318,6 +362,18 @@ where
|
||||
details.client_address()
|
||||
}
|
||||
|
||||
fn start_event_control(
|
||||
parent_event_tx: Option<EventSender>,
|
||||
children_event_rx: EventReceiver,
|
||||
shutdown_tracker: &ShutdownTracker,
|
||||
) {
|
||||
let event_control = EventControl::new(parent_event_tx, children_event_rx);
|
||||
shutdown_tracker.try_spawn_named_with_shutdown(
|
||||
async move { event_control.run().await },
|
||||
"EventControl",
|
||||
);
|
||||
}
|
||||
|
||||
// future constantly pumping loop cover traffic at some specified average rate
|
||||
// the pumped traffic goes to the MixTrafficController
|
||||
fn start_cover_traffic_stream(
|
||||
@@ -329,7 +385,7 @@ where
|
||||
stats_tx: ClientStatsSender,
|
||||
shutdown_tracker: &ShutdownTracker,
|
||||
) {
|
||||
info!("Starting loop cover traffic stream...");
|
||||
tracing::info!("Starting loop cover traffic stream...");
|
||||
|
||||
let mut stream = LoopCoverTrafficStream::new(
|
||||
ack_key,
|
||||
@@ -361,7 +417,7 @@ where
|
||||
stats_tx: ClientStatsSender,
|
||||
shutdown_tracker: &ShutdownTracker,
|
||||
) {
|
||||
info!("Starting real traffic stream...");
|
||||
tracing::info!("Starting real traffic stream...");
|
||||
|
||||
let real_messages_controller = RealMessagesController::new(
|
||||
controller_config,
|
||||
@@ -446,7 +502,7 @@ where
|
||||
metrics_reporter: ClientStatsSender,
|
||||
shutdown_tracker: &ShutdownTracker,
|
||||
) {
|
||||
info!("Starting received messages buffer controller...");
|
||||
tracing::info!("Starting received messages buffer controller...");
|
||||
let controller = ReceivedMessagesBufferController::<SphinxMessageReceiver>::new(
|
||||
local_encryption_keypair,
|
||||
query_receiver,
|
||||
@@ -557,7 +613,7 @@ where
|
||||
details_store
|
||||
.upgrade_stored_remote_gateway_key(gateway_client.gateway_identity(), &updated_key)
|
||||
.await.map_err(|err| {
|
||||
error!("failed to store upgraded gateway key! this connection might be forever broken now: {err}");
|
||||
tracing::error!("failed to store upgraded gateway key! this connection might be forever broken now: {err}");
|
||||
ClientCoreError::GatewaysDetailsStoreError { source: Box::new(err) }
|
||||
})?
|
||||
}
|
||||
@@ -654,7 +710,7 @@ where
|
||||
|
||||
if topology_config.disable_refreshing {
|
||||
// if we're not spawning the refresher, don't cause shutdown immediately
|
||||
info!("The background topology refresher is not going to be started");
|
||||
tracing::info!("The background topology refresher is not going to be started");
|
||||
}
|
||||
|
||||
let mut topology_refresher = TopologyRefresher::new(
|
||||
@@ -664,7 +720,7 @@ where
|
||||
);
|
||||
// before returning, block entire runtime to refresh the current network view so that any
|
||||
// components depending on topology would see a non-empty view
|
||||
info!("Obtaining initial network topology");
|
||||
tracing::info!("Obtaining initial network topology");
|
||||
topology_refresher.try_refresh().await;
|
||||
|
||||
if let Err(err) = topology_refresher.ensure_topology_is_routable().await {
|
||||
@@ -690,13 +746,13 @@ where
|
||||
.wait_for_gateway(local_gateway, waiting_timeout)
|
||||
.await
|
||||
{
|
||||
error!(
|
||||
tracing::error!(
|
||||
"the gateway did not come back online within the specified timeout: {err}"
|
||||
);
|
||||
return Err(err.into());
|
||||
}
|
||||
} else {
|
||||
error!("the gateway we're supposedly connected to does not exist. We'll not be able to send any packets to ourselves: {err}");
|
||||
tracing::error!("the gateway we're supposedly connected to does not exist. We'll not be able to send any packets to ourselves: {err}");
|
||||
return Err(err.into());
|
||||
}
|
||||
}
|
||||
@@ -704,7 +760,7 @@ where
|
||||
if !topology_config.disable_refreshing {
|
||||
// don't spawn the refresher if we don't want to be refreshing the topology.
|
||||
// only use the initial values obtained
|
||||
info!("Starting topology refresher...");
|
||||
tracing::info!("Starting topology refresher...");
|
||||
shutdown_tracker.try_spawn_named_with_shutdown(
|
||||
async move { topology_refresher.run().await },
|
||||
"TopologyRefresher",
|
||||
@@ -721,7 +777,7 @@ where
|
||||
input_sender: Sender<InputMessage>,
|
||||
shutdown_tracker: &ShutdownTracker,
|
||||
) -> ClientStatsSender {
|
||||
info!("Starting statistics control...");
|
||||
tracing::info!("Starting statistics control...");
|
||||
StatisticsControl::create_and_start(
|
||||
config.debug.stats_reporting,
|
||||
user_agent
|
||||
@@ -736,10 +792,17 @@ where
|
||||
fn start_mix_traffic_controller(
|
||||
gateway_transceiver: Box<dyn GatewayTransceiver + Send>,
|
||||
shutdown_tracker: &ShutdownTracker,
|
||||
event_tx: EventSender,
|
||||
) -> (BatchMixMessageSender, ClientRequestSender) {
|
||||
info!("Starting mix traffic controller...");
|
||||
let (mut mix_traffic_controller, mix_tx, client_tx) =
|
||||
MixTrafficController::new(gateway_transceiver, shutdown_tracker.clone_shutdown_token());
|
||||
tracing::info!("Starting mix traffic controller...");
|
||||
let mut mix_traffic_controller = MixTrafficController::new(
|
||||
gateway_transceiver,
|
||||
shutdown_tracker.clone_shutdown_token(),
|
||||
event_tx,
|
||||
);
|
||||
|
||||
let mix_tx = mix_traffic_controller.mix_rx();
|
||||
let client_tx = mix_traffic_controller.client_tx();
|
||||
|
||||
shutdown_tracker.try_spawn_named(
|
||||
async move { mix_traffic_controller.run().await },
|
||||
@@ -803,7 +866,7 @@ where
|
||||
{
|
||||
// if client keys do not exist already, create and persist them
|
||||
if key_store.load_keys().await.is_err() {
|
||||
info!("could not find valid client keys - a new set will be generated");
|
||||
tracing::info!("could not find valid client keys - a new set will be generated");
|
||||
let mut rng = OsRng;
|
||||
let keys = if let Some(derivation_material) = derivation_material {
|
||||
ClientKeys::from_master_key(&mut rng, &derivation_material)
|
||||
@@ -818,21 +881,67 @@ where
|
||||
}
|
||||
|
||||
fn construct_nym_api_client(
|
||||
nym_api_urls: Option<&Vec<nym_network_defaults::ApiUrl>>,
|
||||
config: &Config,
|
||||
user_agent: Option<UserAgent>,
|
||||
) -> Result<nym_http_api_client::Client, ClientCoreError> {
|
||||
tracing::debug!(
|
||||
"construct_nym_api_client called with nym_api_urls: {}",
|
||||
nym_api_urls.is_some()
|
||||
);
|
||||
|
||||
// If API URLs are provided, use new_with_fronted_urls() which handles domain fronting
|
||||
if let Some(nym_api_urls) = nym_api_urls {
|
||||
if nym_api_urls.is_empty() {
|
||||
tracing::warn!("Provided nym_api_urls is empty, falling back to config endpoints");
|
||||
} else {
|
||||
tracing::info!(
|
||||
"Building nym-api client from provided URLs (with domain fronting support): {} URLs",
|
||||
nym_api_urls.len()
|
||||
);
|
||||
|
||||
let mut builder =
|
||||
nym_http_api_client::ClientBuilder::new_with_fronted_urls(nym_api_urls.clone())
|
||||
.map_err(ClientCoreError::from)?
|
||||
.with_retries(DEFAULT_NYM_API_RETRIES);
|
||||
|
||||
if let Some(user_agent) = user_agent {
|
||||
builder = builder.with_user_agent(user_agent);
|
||||
}
|
||||
|
||||
return builder.build().map_err(ClientCoreError::from);
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback to basic client for backwards compatibility
|
||||
tracing::debug!("Building basic nym-api HTTP client from config endpoints");
|
||||
|
||||
let mut nym_api_urls = config.get_nym_api_endpoints();
|
||||
if nym_api_urls.is_empty() {
|
||||
tracing::warn!("No API endpoints configured in config, this may cause issues");
|
||||
}
|
||||
nym_api_urls.shuffle(&mut thread_rng());
|
||||
|
||||
let mut builder = nym_http_api_client::Client::builder(nym_api_urls[0].clone())
|
||||
.map_err(ClientCoreError::from)?;
|
||||
// Convert config URLs to ApiUrl format for consistency
|
||||
let api_urls: Vec<nym_network_defaults::ApiUrl> = nym_api_urls
|
||||
.into_iter()
|
||||
.map(|url| nym_network_defaults::ApiUrl {
|
||||
url: url.to_string(),
|
||||
front_hosts: None,
|
||||
})
|
||||
.collect();
|
||||
|
||||
tracing::debug!("Using {} config API endpoints", api_urls.len());
|
||||
|
||||
let mut builder = nym_http_api_client::ClientBuilder::new_with_fronted_urls(api_urls)
|
||||
.map_err(ClientCoreError::from)?
|
||||
.with_retries(DEFAULT_NYM_API_RETRIES)
|
||||
.with_bincode();
|
||||
|
||||
if let Some(user_agent) = user_agent {
|
||||
builder = builder.with_user_agent(user_agent);
|
||||
}
|
||||
|
||||
builder = builder.with_bincode();
|
||||
|
||||
builder.build().map_err(ClientCoreError::from)
|
||||
}
|
||||
|
||||
@@ -850,7 +959,7 @@ where
|
||||
<S::CredentialStore as CredentialStorage>::StorageError: Send + Sync + 'static,
|
||||
<S::GatewaysDetailsStore as GatewaysDetailsStore>::StorageError: Sync + Send,
|
||||
{
|
||||
info!("Starting nym client");
|
||||
tracing::info!("Starting nym client");
|
||||
#[cfg(debug_assertions)]
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
{
|
||||
@@ -884,6 +993,9 @@ where
|
||||
// channels responsible for controlling real messages
|
||||
let (input_sender, input_receiver) = tokio::sync::mpsc::channel::<InputMessage>(1);
|
||||
|
||||
// channels responsible for event management
|
||||
let (event_sender, event_receiver) = mpsc::unbounded();
|
||||
|
||||
// channels responsible for controlling ack messages
|
||||
let (ack_sender, ack_receiver) = mpsc::unbounded();
|
||||
let shared_topology_accessor =
|
||||
@@ -896,6 +1008,8 @@ where
|
||||
None => nym_task::get_sdk_shutdown_tracker()?,
|
||||
};
|
||||
|
||||
Self::start_event_control(self.event_tx, event_receiver, &shutdown_tracker);
|
||||
|
||||
// channels responsible for dealing with reply-related fun
|
||||
let (reply_controller_sender, reply_controller_receiver) =
|
||||
reply_controller::requests::new_control_channels();
|
||||
@@ -911,7 +1025,11 @@ where
|
||||
.dkg_query_client
|
||||
.map(|client| BandwidthController::new(credential_store, client));
|
||||
|
||||
let nym_api_client = Self::construct_nym_api_client(&self.config, self.user_agent.clone())?;
|
||||
let nym_api_client = Self::construct_nym_api_client(
|
||||
self.nym_api_urls.as_ref(),
|
||||
&self.config,
|
||||
self.user_agent.clone(),
|
||||
)?;
|
||||
let key_rotation_config = Self::determine_key_rotation_state(&nym_api_client).await?;
|
||||
|
||||
let topology_provider = Self::setup_topology_provider(
|
||||
@@ -986,6 +1104,7 @@ where
|
||||
let (message_sender, client_request_sender) = Self::start_mix_traffic_controller(
|
||||
gateway_transceiver,
|
||||
&shutdown_tracker.child_tracker(),
|
||||
EventSender(event_sender),
|
||||
);
|
||||
|
||||
// Channels that the websocket listener can use to signal downstream to the real traffic
|
||||
@@ -1035,8 +1154,8 @@ where
|
||||
);
|
||||
}
|
||||
|
||||
debug!("Core client startup finished!");
|
||||
debug!("The address of this client is: {self_address}");
|
||||
tracing::debug!("Core client startup finished!");
|
||||
tracing::debug!("The address of this client is: {self_address}");
|
||||
|
||||
#[cfg(debug_assertions)]
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
@@ -1052,6 +1171,7 @@ where
|
||||
client_input: ClientInput {
|
||||
connection_command_sender: client_connection_tx,
|
||||
input_sender,
|
||||
client_request_sender,
|
||||
},
|
||||
},
|
||||
client_output: ClientOutputStatus::AwaitingConsumer {
|
||||
@@ -1067,7 +1187,6 @@ where
|
||||
},
|
||||
stats_reporter,
|
||||
shutdown_handle: shutdown_tracker, // The primary tracker for this client
|
||||
client_request_sender,
|
||||
forget_me: self.config.debug.forget_me,
|
||||
remember_me: self.config.debug.remember_me,
|
||||
})
|
||||
@@ -1081,8 +1200,57 @@ pub struct BaseClient {
|
||||
pub client_output: ClientOutputStatus,
|
||||
pub client_state: ClientState,
|
||||
pub stats_reporter: ClientStatsSender,
|
||||
pub client_request_sender: ClientRequestSender,
|
||||
pub shutdown_handle: ShutdownTracker,
|
||||
pub forget_me: ForgetMe,
|
||||
pub remember_me: RememberMe,
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use nym_network_defaults::{ApiUrl, NymNetworkDetails};
|
||||
|
||||
#[test]
|
||||
fn test_network_details_with_multiple_urls() {
|
||||
// Verify that network details can be configured with multiple API URLs
|
||||
let mut network_details = NymNetworkDetails::new_empty();
|
||||
network_details.nym_api_urls = Some(vec![
|
||||
ApiUrl {
|
||||
url: "https://validator.nymtech.net/api/".to_string(),
|
||||
front_hosts: None,
|
||||
},
|
||||
ApiUrl {
|
||||
url: "https://nym-frontdoor.vercel.app/api/".to_string(),
|
||||
front_hosts: Some(vec!["vercel.app".to_string(), "vercel.com".to_string()]),
|
||||
},
|
||||
]);
|
||||
|
||||
assert_eq!(network_details.nym_api_urls.as_ref().unwrap().len(), 2);
|
||||
assert!(network_details.nym_api_urls.as_ref().unwrap()[1]
|
||||
.front_hosts
|
||||
.is_some());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_network_details_with_front_hosts() {
|
||||
// Verify that ApiUrl can store domain fronting configuration
|
||||
let api_url = ApiUrl {
|
||||
url: "https://nym-frontdoor.vercel.app/api/".to_string(),
|
||||
front_hosts: Some(vec!["vercel.app".to_string(), "vercel.com".to_string()]),
|
||||
};
|
||||
|
||||
assert_eq!(api_url.url, "https://nym-frontdoor.vercel.app/api/");
|
||||
assert_eq!(api_url.front_hosts.as_ref().unwrap().len(), 2);
|
||||
assert!(api_url
|
||||
.front_hosts
|
||||
.as_ref()
|
||||
.unwrap()
|
||||
.contains(&"vercel.app".to_string()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_default_nym_api_retries_constant() {
|
||||
// Verify the retry constant is set correctly
|
||||
assert_eq!(DEFAULT_NYM_API_RETRIES, 3);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
use futures::StreamExt;
|
||||
|
||||
use crate::client::base_client::{EventReceiver, EventSender, MixnetClientEvent};
|
||||
|
||||
/// Launches and manages task events, propagating upwards what is not strictly internal.
|
||||
pub(crate) struct EventControl {
|
||||
parent_event_tx: Option<EventSender>,
|
||||
children_event_rx: EventReceiver,
|
||||
}
|
||||
|
||||
impl EventControl {
|
||||
pub(crate) fn new(
|
||||
parent_event_tx: Option<EventSender>,
|
||||
children_event_rx: EventReceiver,
|
||||
) -> Self {
|
||||
EventControl {
|
||||
parent_event_tx,
|
||||
children_event_rx,
|
||||
}
|
||||
}
|
||||
|
||||
fn is_internal(event: MixnetClientEvent) -> bool {
|
||||
match event {
|
||||
MixnetClientEvent::Traffic(_) => false,
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) async fn run(mut self) {
|
||||
while let Some(event) = self.children_event_rx.next().await {
|
||||
if let Some(parent_event_tx) = &self.parent_event_tx {
|
||||
if !Self::is_internal(event) {
|
||||
parent_event_tx.send(event);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,10 @@
|
||||
// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
use crate::client::mix_traffic::transceiver::GatewayTransceiver;
|
||||
use crate::client::{
|
||||
base_client::{EventSender, MixnetClientEvent},
|
||||
mix_traffic::transceiver::GatewayTransceiver,
|
||||
};
|
||||
use nym_gateway_requests::ClientRequest;
|
||||
use nym_sphinx::forwarding::packet::MixPacket;
|
||||
use nym_task::ShutdownToken;
|
||||
@@ -22,28 +25,33 @@ const MAX_FAILURE_COUNT: usize = 100;
|
||||
// that's also disgusting.
|
||||
pub struct Empty;
|
||||
|
||||
#[derive(Clone, Copy, Debug)]
|
||||
pub enum MixTrafficEvent {
|
||||
FailedSendingSphinx,
|
||||
}
|
||||
|
||||
pub struct MixTrafficController {
|
||||
gateway_transceiver: Box<dyn GatewayTransceiver + Send>,
|
||||
|
||||
mix_tx: BatchMixMessageSender,
|
||||
mix_rx: BatchMixMessageReceiver,
|
||||
client_rx: ClientRequestReceiver,
|
||||
client_tx: ClientRequestSender,
|
||||
|
||||
// TODO: this is temporary work-around.
|
||||
// in long run `gateway_client` will be moved away from `MixTrafficController` anyway.
|
||||
consecutive_gateway_failure_count: usize,
|
||||
|
||||
shutdown_token: ShutdownToken,
|
||||
event_tx: EventSender,
|
||||
}
|
||||
|
||||
impl MixTrafficController {
|
||||
pub fn new<T>(
|
||||
gateway_transceiver: T,
|
||||
shutdown_token: ShutdownToken,
|
||||
) -> (
|
||||
MixTrafficController,
|
||||
BatchMixMessageSender,
|
||||
ClientRequestSender,
|
||||
)
|
||||
event_tx: EventSender,
|
||||
) -> MixTrafficController
|
||||
where
|
||||
T: GatewayTransceiver + Send + 'static,
|
||||
{
|
||||
@@ -52,41 +60,32 @@ impl MixTrafficController {
|
||||
|
||||
let (client_sender, client_receiver) = tokio::sync::mpsc::channel(8);
|
||||
|
||||
(
|
||||
MixTrafficController {
|
||||
gateway_transceiver: Box::new(gateway_transceiver),
|
||||
mix_rx: message_receiver,
|
||||
client_rx: client_receiver,
|
||||
consecutive_gateway_failure_count: 0,
|
||||
shutdown_token,
|
||||
},
|
||||
message_sender,
|
||||
client_sender,
|
||||
)
|
||||
MixTrafficController {
|
||||
gateway_transceiver: Box::new(gateway_transceiver),
|
||||
mix_tx: message_sender,
|
||||
mix_rx: message_receiver,
|
||||
client_rx: client_receiver,
|
||||
client_tx: client_sender,
|
||||
consecutive_gateway_failure_count: 0,
|
||||
shutdown_token,
|
||||
event_tx,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new_dynamic(
|
||||
gateway_transceiver: Box<dyn GatewayTransceiver + Send>,
|
||||
shutdown_token: ShutdownToken,
|
||||
) -> (
|
||||
MixTrafficController,
|
||||
BatchMixMessageSender,
|
||||
ClientRequestSender,
|
||||
) {
|
||||
let (message_sender, message_receiver) =
|
||||
tokio::sync::mpsc::channel(MIX_MESSAGE_RECEIVER_BUFFER_SIZE);
|
||||
let (client_sender, client_receiver) = tokio::sync::mpsc::channel(8);
|
||||
(
|
||||
MixTrafficController {
|
||||
gateway_transceiver,
|
||||
mix_rx: message_receiver,
|
||||
client_rx: client_receiver,
|
||||
consecutive_gateway_failure_count: 0,
|
||||
shutdown_token,
|
||||
},
|
||||
message_sender,
|
||||
client_sender,
|
||||
)
|
||||
event_tx: EventSender,
|
||||
) -> MixTrafficController {
|
||||
Self::new(gateway_transceiver, shutdown_token, event_tx)
|
||||
}
|
||||
|
||||
pub fn client_tx(&self) -> ClientRequestSender {
|
||||
self.client_tx.clone()
|
||||
}
|
||||
|
||||
pub fn mix_rx(&self) -> BatchMixMessageSender {
|
||||
self.mix_tx.clone()
|
||||
}
|
||||
|
||||
async fn on_messages(
|
||||
@@ -145,34 +144,26 @@ impl MixTrafficController {
|
||||
trace!("MixTrafficController: Received shutdown");
|
||||
break;
|
||||
}
|
||||
mix_packets = self.mix_rx.recv() => match mix_packets {
|
||||
Some(mix_packets) => {
|
||||
if let Err(err) = self.on_messages(mix_packets).await {
|
||||
error!("Failed to send sphinx packet(s) to the gateway: {err}");
|
||||
if self.consecutive_gateway_failure_count == MAX_FAILURE_COUNT {
|
||||
// Disconnect from the gateway. If we should try to re-connect
|
||||
// is handled at a higher layer.
|
||||
error!("Failed to send sphinx packet to the gateway {MAX_FAILURE_COUNT} times in a row - assuming the gateway is dead");
|
||||
// Do we need to handle the embedded mixnet client case
|
||||
// separately?
|
||||
break;
|
||||
}
|
||||
// mix_rx should never error out as we're holding one instance of the sender
|
||||
|
||||
Some(mix_packets) = self.mix_rx.recv() => {
|
||||
if let Err(err) = self.on_messages(mix_packets).await {
|
||||
error!("Failed to send sphinx packet(s) to the gateway: {err}");
|
||||
if self.consecutive_gateway_failure_count == MAX_FAILURE_COUNT {
|
||||
// Disconnect from the gateway. If we should try to re-connect
|
||||
// is handled at a higher layer.
|
||||
error!("Failed to send sphinx packet to the gateway {MAX_FAILURE_COUNT} times in a row - assuming the gateway is dead");
|
||||
// Do we need to handle the embedded mixnet client case
|
||||
// separately?
|
||||
self.event_tx.send(MixnetClientEvent::Traffic(MixTrafficEvent::FailedSendingSphinx));
|
||||
break;
|
||||
}
|
||||
},
|
||||
None => {
|
||||
trace!("MixTrafficController: Stopping since channel closed");
|
||||
break;
|
||||
}
|
||||
},
|
||||
client_request = self.client_rx.recv() => match client_request {
|
||||
Some(client_request) => {
|
||||
self.on_client_request(client_request).await;
|
||||
},
|
||||
None => {
|
||||
trace!("MixTrafficController, client request channel closed");
|
||||
break
|
||||
}
|
||||
},
|
||||
// client_rx should never error out as we're holding one instance of the sender
|
||||
Some(client_request) = self.client_rx.recv() => {
|
||||
self.on_client_request(client_request).await;
|
||||
}
|
||||
}
|
||||
}
|
||||
debug!("MixTrafficController: Exiting");
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
pub mod base_client;
|
||||
pub mod cover_traffic_stream;
|
||||
pub(crate) mod event_control;
|
||||
pub(crate) mod helpers;
|
||||
pub mod inbound_messages;
|
||||
pub mod key_manager;
|
||||
|
||||
@@ -45,6 +45,7 @@ type WsConn = JSWebsocket;
|
||||
|
||||
const CONCURRENT_GATEWAYS_MEASURED: usize = 20;
|
||||
const MEASUREMENTS: usize = 3;
|
||||
const DEFAULT_NYM_API_RETRIES: usize = 3;
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
const CONN_TIMEOUT: Duration = Duration::from_millis(1500);
|
||||
@@ -132,25 +133,27 @@ impl<'a, G: ConnectableGateway> GatewayWithLatency<'a, G> {
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn gateways_for_init<R: Rng>(
|
||||
rng: &mut R,
|
||||
pub async fn gateways_for_init(
|
||||
nym_apis: &[Url],
|
||||
user_agent: Option<UserAgent>,
|
||||
minimum_performance: u8,
|
||||
ignore_epoch_roles: bool,
|
||||
retry_count: Option<usize>,
|
||||
) -> Result<Vec<RoutingNode>, ClientCoreError> {
|
||||
let nym_api = nym_apis
|
||||
.choose(rng)
|
||||
.ok_or(ClientCoreError::ListOfNymApisIsEmpty)?;
|
||||
// Build client with ALL URLs for fallback support
|
||||
let nym_api_urls: Vec<nym_http_api_client::Url> = nym_apis
|
||||
.iter()
|
||||
.map(|url| nym_http_api_client::Url::from(url.clone()))
|
||||
.collect();
|
||||
|
||||
// Use the unified HTTP client directly with optional user agent
|
||||
let mut builder = nym_http_api_client::Client::builder(nym_api.clone())
|
||||
.map_err(|e| {
|
||||
ClientCoreError::ValidatorClientError(nym_validator_client::ValidatorClientError::from(
|
||||
e,
|
||||
))
|
||||
})?
|
||||
.with_bincode(); // Use bincode for better performance
|
||||
if nym_api_urls.is_empty() {
|
||||
return Err(ClientCoreError::ListOfNymApisIsEmpty);
|
||||
}
|
||||
|
||||
let retry_count = retry_count.unwrap_or(DEFAULT_NYM_API_RETRIES);
|
||||
let mut builder = nym_http_api_client::ClientBuilder::new_with_urls(nym_api_urls.clone())?
|
||||
.with_retries(retry_count)
|
||||
.with_bincode();
|
||||
|
||||
if let Some(user_agent) = user_agent {
|
||||
builder = builder.with_user_agent(user_agent);
|
||||
@@ -160,7 +163,7 @@ pub async fn gateways_for_init<R: Rng>(
|
||||
ClientCoreError::ValidatorClientError(nym_validator_client::ValidatorClientError::from(e))
|
||||
})?;
|
||||
|
||||
tracing::debug!("Fetching list of gateways from: {nym_api}");
|
||||
tracing::debug!("Fetching list of gateways from: {:?}", nym_api_urls);
|
||||
|
||||
// Use our helper to handle pagination
|
||||
let gateways = get_all_basic_entry_nodes_with_metadata(&client, true)
|
||||
@@ -172,17 +175,15 @@ pub async fn gateways_for_init<R: Rng>(
|
||||
|
||||
// filter out gateways below minimum performance and ones that could operate as a mixnode
|
||||
// (we don't want instability)
|
||||
let valid_gateways = gateways
|
||||
let valid_gateways: Vec<RoutingNode> = gateways
|
||||
.iter()
|
||||
.filter(|g| ignore_epoch_roles || !g.supported_roles.mixnode)
|
||||
.filter(|g| g.performance.round_to_integer() >= minimum_performance)
|
||||
.filter_map(|gateway| gateway.try_into().ok())
|
||||
.collect::<Vec<_>>();
|
||||
tracing::debug!("After checking validity: {}", valid_gateways.len());
|
||||
tracing::trace!("Valid gateways: {valid_gateways:#?}");
|
||||
.collect();
|
||||
|
||||
tracing::info!(
|
||||
"and {} after validity and performance filtering",
|
||||
"Found {} valid gateways after filtering",
|
||||
valid_gateways.len()
|
||||
);
|
||||
|
||||
@@ -345,13 +346,20 @@ pub(super) fn get_specified_gateway(
|
||||
must_use_tls: bool,
|
||||
) -> Result<RoutingNode, ClientCoreError> {
|
||||
tracing::debug!("Requesting specified gateway: {gateway_identity}");
|
||||
|
||||
let user_gateway = ed25519::PublicKey::from_base58_string(gateway_identity)
|
||||
.map_err(ClientCoreError::UnableToCreatePublicKeyFromGatewayId)?;
|
||||
|
||||
let gateway = gateways
|
||||
.iter()
|
||||
.find(|gateway| gateway.identity_key == user_gateway)
|
||||
.ok_or_else(|| ClientCoreError::NoGatewayWithId(gateway_identity.to_string()))?;
|
||||
.ok_or_else(|| {
|
||||
tracing::debug!(
|
||||
"Gateway {gateway_identity} not found in {} available gateways",
|
||||
gateways.len()
|
||||
);
|
||||
ClientCoreError::NoGatewayWithId(gateway_identity.to_string())
|
||||
})?;
|
||||
|
||||
let Some(entry_details) = gateway.entry.as_ref() else {
|
||||
return Err(ClientCoreError::UnsupportedEntry {
|
||||
@@ -414,3 +422,52 @@ pub(super) async fn register_with_gateway(
|
||||
authenticated_ephemeral_client: gateway_client,
|
||||
})
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use url::Url;
|
||||
|
||||
#[test]
|
||||
fn test_single_url_builds_without_retries() {
|
||||
let urls = [Url::parse("https://api.nym.com").unwrap()];
|
||||
|
||||
let nym_api_urls: Vec<nym_http_api_client::Url> = urls
|
||||
.iter()
|
||||
.map(|url| nym_http_api_client::Url::from(url.clone()))
|
||||
.collect();
|
||||
|
||||
assert_eq!(nym_api_urls.len(), 1, "Should have exactly one URL");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_multiple_urls_prepared_for_retries() {
|
||||
let urls = vec![
|
||||
Url::parse("https://api1.nym.com").unwrap(),
|
||||
Url::parse("https://api2.nym.com").unwrap(),
|
||||
Url::parse("https://api3.nym.com").unwrap(),
|
||||
];
|
||||
|
||||
let nym_api_urls: Vec<nym_http_api_client::Url> = urls
|
||||
.iter()
|
||||
.map(|url| nym_http_api_client::Url::from(url.clone()))
|
||||
.collect();
|
||||
|
||||
assert_eq!(nym_api_urls.len(), 3, "Should have all three URLs");
|
||||
assert!(
|
||||
nym_api_urls.len() > 1,
|
||||
"Multiple URLs trigger retry behavior"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_empty_url_list_is_detected() {
|
||||
let urls: Vec<Url> = vec![];
|
||||
|
||||
let nym_api_urls: Vec<nym_http_api_client::Url> = urls
|
||||
.iter()
|
||||
.map(|url| nym_http_api_client::Url::from(url.clone()))
|
||||
.collect();
|
||||
|
||||
assert!(nym_api_urls.is_empty(), "Empty list should remain empty");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -296,6 +296,9 @@ impl std::error::Error for ReqwestErrorWrapper {}
|
||||
#[derive(Debug, Error)]
|
||||
#[allow(missing_docs)]
|
||||
pub enum HttpClientError {
|
||||
#[error("did not provide any valid client URLs")]
|
||||
NoUrlsProvided,
|
||||
|
||||
#[error("failed to construct inner reqwest client: {source}")]
|
||||
ReqwestBuildError {
|
||||
#[source]
|
||||
@@ -582,24 +585,29 @@ impl ClientBuilder {
|
||||
Self::new(alt)
|
||||
} else {
|
||||
let url = url.to_url()?;
|
||||
Ok(Self::new_with_urls(vec![url]))
|
||||
Self::new_with_urls(vec![url])
|
||||
}
|
||||
}
|
||||
|
||||
/// Create a client builder from network details with sensible defaults
|
||||
#[cfg(feature = "network-defaults")]
|
||||
// deprecating function since it's not clear from its signature whether the client
|
||||
// would be constructed using `nym_api_urls` or `nym_vpn_api_urls`
|
||||
#[deprecated(note = "use explicit Self::new_with_fronted_urls instead")]
|
||||
pub fn from_network(
|
||||
network: &nym_network_defaults::NymNetworkDetails,
|
||||
) -> Result<Self, HttpClientError> {
|
||||
let urls = network
|
||||
.nym_api_urls
|
||||
.as_ref()
|
||||
.ok_or_else(|| {
|
||||
HttpClientError::GenericRequestFailure(
|
||||
"No API URLs configured in network details".to_string(),
|
||||
)
|
||||
})?
|
||||
.iter()
|
||||
let urls = network.nym_api_urls.as_ref().cloned().unwrap_or_default();
|
||||
Self::new_with_fronted_urls(urls.clone())
|
||||
}
|
||||
|
||||
/// Create a client builder using the provided set of domain-fronted URLs
|
||||
#[cfg(feature = "network-defaults")]
|
||||
pub fn new_with_fronted_urls(
|
||||
urls: Vec<nym_network_defaults::ApiUrl>,
|
||||
) -> Result<Self, HttpClientError> {
|
||||
let urls = urls
|
||||
.into_iter()
|
||||
.map(|api_url| {
|
||||
// Convert ApiUrl to our Url type with fronting support
|
||||
let mut url = Url::parse(&api_url.url)?;
|
||||
@@ -611,15 +619,19 @@ impl ClientBuilder {
|
||||
.iter()
|
||||
.map(|host| format!("https://{}", host))
|
||||
.collect();
|
||||
url = Url::new(api_url.url.clone(), Some(fronts))
|
||||
.map_err(|e| HttpClientError::GenericRequestFailure(e.to_string()))?;
|
||||
url = Url::new(api_url.url.clone(), Some(fronts)).map_err(|source| {
|
||||
HttpClientError::MalformedUrl {
|
||||
raw: api_url.url.clone(),
|
||||
source,
|
||||
}
|
||||
})?;
|
||||
}
|
||||
|
||||
Ok(url)
|
||||
})
|
||||
.collect::<Result<Vec<_>, HttpClientError>>()?;
|
||||
|
||||
let mut builder = Self::new_with_urls(urls);
|
||||
let mut builder = Self::new_with_urls(urls)?;
|
||||
|
||||
// Enable domain fronting by default (on retry)
|
||||
#[cfg(feature = "tunneling")]
|
||||
@@ -631,7 +643,11 @@ impl ClientBuilder {
|
||||
}
|
||||
|
||||
/// Constructs a new http `ClientBuilder` from a valid url.
|
||||
pub fn new_with_urls(urls: Vec<Url>) -> Self {
|
||||
pub fn new_with_urls(urls: Vec<Url>) -> Result<Self, HttpClientError> {
|
||||
if urls.is_empty() {
|
||||
return Err(HttpClientError::NoUrlsProvided);
|
||||
}
|
||||
|
||||
let urls = Self::check_urls(urls);
|
||||
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
@@ -640,7 +656,7 @@ impl ClientBuilder {
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
let reqwest_client_builder = default_builder();
|
||||
|
||||
ClientBuilder {
|
||||
Ok(ClientBuilder {
|
||||
urls,
|
||||
timeout: None,
|
||||
custom_user_agent: false,
|
||||
@@ -651,7 +667,7 @@ impl ClientBuilder {
|
||||
|
||||
retry_limit: 0,
|
||||
serialization: SerializationFormat::Json,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/// Add an additional URL to the set usable by this constructed `Client`
|
||||
@@ -948,13 +964,13 @@ impl Client {
|
||||
|
||||
return (url.as_str(), url.front_str());
|
||||
} else {
|
||||
warn!(
|
||||
"Domain fronting is enabled, but no host_url is defined! Domain fronting WILL NOT WORK"
|
||||
tracing::debug!(
|
||||
"Domain fronting is enabled, but no host_url is defined for current URL"
|
||||
)
|
||||
}
|
||||
} else {
|
||||
warn!(
|
||||
"Domain fronting is enabled, but no front_url is defined! Domain fronting WILL NOT WORK"
|
||||
tracing::debug!(
|
||||
"Domain fronting is enabled, but current URL has no front_hosts configured"
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,6 +21,10 @@ inventory::collect!(ConfigRecord);
|
||||
/// Returns the default builder with all registered configurations applied.
|
||||
pub fn default_builder() -> ReqwestClientBuilder {
|
||||
let mut b = ReqwestClientBuilder::new();
|
||||
|
||||
#[cfg(feature = "debug-inventory")]
|
||||
let mut test_client = ReqwestClientBuilder::new();
|
||||
|
||||
let mut records: Vec<&'static ConfigRecord> =
|
||||
inventory::iter::<ConfigRecord>.into_iter().collect();
|
||||
records.sort_by_key(|r| r.priority); // lower runs first
|
||||
@@ -35,6 +39,10 @@ pub fn default_builder() -> ReqwestClientBuilder {
|
||||
|
||||
for r in records {
|
||||
b = (r.apply)(b);
|
||||
#[cfg(feature = "debug-inventory")]
|
||||
{
|
||||
test_client = (r.apply)(test_client);
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "debug-inventory")]
|
||||
@@ -47,7 +55,7 @@ pub fn default_builder() -> ReqwestClientBuilder {
|
||||
eprintln!("[HTTP-INVENTORY] Building test client to verify configuration...");
|
||||
|
||||
// Try to build a client to see if it works
|
||||
match b.try_clone().unwrap().build() {
|
||||
match test_client.build() {
|
||||
Ok(client) => {
|
||||
eprintln!("[HTTP-INVENTORY] ✓ Client built successfully");
|
||||
eprintln!("[HTTP-INVENTORY] Client debug info: {:#?}", client);
|
||||
|
||||
@@ -2,77 +2,77 @@ use super::*;
|
||||
|
||||
#[test]
|
||||
fn sanitizing_urls() {
|
||||
let base_url: Url = "http://foomp.com".parse().unwrap();
|
||||
let base_url: Url = "http://api.test".parse().unwrap();
|
||||
|
||||
// works with a full string
|
||||
assert_eq!(
|
||||
"http://foomp.com/foo/bar",
|
||||
"http://api.test/foo/bar",
|
||||
sanitize_url(&base_url, "/foo//bar/", NO_PARAMS).as_str()
|
||||
);
|
||||
|
||||
// (and leading slash doesn't matter)
|
||||
assert_eq!(
|
||||
"http://foomp.com/foo/bar",
|
||||
"http://api.test/foo/bar",
|
||||
sanitize_url(&base_url, "foo//bar/", NO_PARAMS).as_str()
|
||||
);
|
||||
|
||||
// works with 1 segment
|
||||
assert_eq!(
|
||||
"http://foomp.com/foo",
|
||||
"http://api.test/foo",
|
||||
sanitize_url(&base_url, &["foo"], NO_PARAMS).as_str()
|
||||
);
|
||||
|
||||
// works with 2 segments
|
||||
assert_eq!(
|
||||
"http://foomp.com/foo/bar",
|
||||
"http://api.test/foo/bar",
|
||||
sanitize_url(&base_url, &["foo", "bar"], NO_PARAMS).as_str()
|
||||
);
|
||||
|
||||
// works with leading slash
|
||||
assert_eq!(
|
||||
"http://foomp.com/foo",
|
||||
"http://api.test/foo",
|
||||
sanitize_url(&base_url, &["/foo"], NO_PARAMS).as_str()
|
||||
);
|
||||
assert_eq!(
|
||||
"http://foomp.com/foo/bar",
|
||||
"http://api.test/foo/bar",
|
||||
sanitize_url(&base_url, &["/foo", "bar"], NO_PARAMS).as_str()
|
||||
);
|
||||
assert_eq!(
|
||||
"http://foomp.com/foo/bar",
|
||||
"http://api.test/foo/bar",
|
||||
sanitize_url(&base_url, &["foo", "/bar"], NO_PARAMS).as_str()
|
||||
);
|
||||
|
||||
// works with trailing slash
|
||||
assert_eq!(
|
||||
"http://foomp.com/foo",
|
||||
"http://api.test/foo",
|
||||
sanitize_url(&base_url, &["foo/"], NO_PARAMS).as_str()
|
||||
);
|
||||
assert_eq!(
|
||||
"http://foomp.com/foo/bar",
|
||||
"http://api.test/foo/bar",
|
||||
sanitize_url(&base_url, &["foo/", "bar"], NO_PARAMS).as_str()
|
||||
);
|
||||
assert_eq!(
|
||||
"http://foomp.com/foo/bar",
|
||||
"http://api.test/foo/bar",
|
||||
sanitize_url(&base_url, &["foo", "bar/"], NO_PARAMS).as_str()
|
||||
);
|
||||
|
||||
// works with both leading and trailing slash
|
||||
assert_eq!(
|
||||
"http://foomp.com/foo",
|
||||
"http://api.test/foo",
|
||||
sanitize_url(&base_url, &["/foo/"], NO_PARAMS).as_str()
|
||||
);
|
||||
assert_eq!(
|
||||
"http://foomp.com/foo/bar",
|
||||
"http://api.test/foo/bar",
|
||||
sanitize_url(&base_url, &["/foo/", "/bar/"], NO_PARAMS).as_str()
|
||||
);
|
||||
|
||||
// adds params
|
||||
assert_eq!(
|
||||
"http://foomp.com/foo/bar?foomp=baz",
|
||||
"http://api.test/foo/bar?foomp=baz",
|
||||
sanitize_url(&base_url, &["foo", "bar"], &[("foomp", "baz")]).as_str()
|
||||
);
|
||||
assert_eq!(
|
||||
"http://foomp.com/foo/bar?arg1=val1&arg2=val2",
|
||||
"http://api.test/foo/bar?arg1=val1&arg2=val2",
|
||||
sanitize_url(
|
||||
&base_url,
|
||||
&["/foo/", "/bar/"],
|
||||
@@ -91,83 +91,87 @@ fn sanitizing_urls() {
|
||||
#[tokio::test]
|
||||
async fn api_client_retry() -> Result<(), Box<dyn std::error::Error>> {
|
||||
let client = ClientBuilder::new_with_urls(vec![
|
||||
"http://broken.nym.badurl".parse()?,
|
||||
"http://example.com/".parse()?,
|
||||
])
|
||||
"http://broken.nym.test".parse()?, // This will fail
|
||||
"https://httpbin.org/status/200".parse()?, // This will succeed
|
||||
])?
|
||||
.with_retries(3)
|
||||
.build()?;
|
||||
|
||||
let req = client.create_get_request(&["/"], NO_PARAMS).unwrap();
|
||||
let req = client.create_get_request(&[], NO_PARAMS).unwrap();
|
||||
let resp = client.send(req).await?;
|
||||
|
||||
assert_eq!(resp.status(), 200);
|
||||
// The main test is that we successfully retried and switched to the working URL
|
||||
// We accept any response from the working endpoint since external services can be unreliable
|
||||
assert_eq!(
|
||||
client.current_url().as_str(),
|
||||
"https://httpbin.org/status/200"
|
||||
);
|
||||
|
||||
// check that the url was updated
|
||||
assert_eq!(client.current_url().as_str(), "http://example.com/");
|
||||
println!("Response status: {}", resp.status());
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn host_updating() {
|
||||
let url = Url::new("http://example.com", None).unwrap();
|
||||
let url = Url::new("http://nym-api1.test", None).unwrap();
|
||||
let mut client = ClientBuilder::new(url).unwrap().build().unwrap();
|
||||
|
||||
// check that the url is set correctly
|
||||
let current_url = client.current_url();
|
||||
assert_eq!(current_url.as_str(), "http://example.com/");
|
||||
assert_eq!(current_url.as_str(), "http://nym-api1.test/");
|
||||
assert_eq!(current_url.front_str(), None);
|
||||
|
||||
// update the url
|
||||
client.update_host();
|
||||
|
||||
// check that the url is still the same since there is one URL
|
||||
assert_eq!(client.current_url().as_str(), "http://example.com/");
|
||||
assert_eq!(client.current_url().as_str(), "http://nym-api1.test/");
|
||||
|
||||
// =======================================
|
||||
// we rotate through urls when available
|
||||
|
||||
let new_urls = vec![
|
||||
Url::new("http://example.com", None).unwrap(),
|
||||
Url::new("http://example.org", None).unwrap(),
|
||||
Url::new("http://nym-api1.test", None).unwrap(),
|
||||
Url::new("http://nym-api2.test", None).unwrap(),
|
||||
];
|
||||
client.change_base_urls(new_urls);
|
||||
assert_eq!(client.current_url().as_str(), "http://example.com/");
|
||||
assert_eq!(client.current_url().as_str(), "http://nym-api1.test/");
|
||||
|
||||
client.update_host();
|
||||
|
||||
// check that the url got updated now that there are multiple URLs
|
||||
assert_eq!(client.current_url().as_str(), "http://example.org/");
|
||||
assert_eq!(client.current_url().as_str(), "http://nym-api2.test/");
|
||||
assert_eq!(client.current_url().front_str(), None);
|
||||
|
||||
client.update_host();
|
||||
assert_eq!(client.current_url().as_str(), "http://example.com/");
|
||||
assert_eq!(client.current_url().as_str(), "http://nym-api1.test/");
|
||||
|
||||
// =======================================
|
||||
// we rotate through urls when available if fronting is disabled
|
||||
|
||||
let new_urls = vec![
|
||||
Url::new(
|
||||
"http://example.com",
|
||||
Some(vec!["http://front1.com", "http://front2.com"]),
|
||||
"http://nym-api1.test",
|
||||
Some(vec!["http://cdn1.test", "http://cdn2.test"]),
|
||||
)
|
||||
.unwrap(),
|
||||
Url::new("http://example.org", None).unwrap(),
|
||||
Url::new("http://nym-api2.test", None).unwrap(),
|
||||
];
|
||||
client.change_base_urls(new_urls);
|
||||
|
||||
assert_eq!(client.current_url().as_str(), "http://example.com/");
|
||||
assert_eq!(client.current_url().as_str(), "http://nym-api1.test/");
|
||||
|
||||
client.update_host();
|
||||
|
||||
// check that the url got updated now that there are multiple URLs
|
||||
assert_eq!(client.current_url().as_str(), "http://example.org/");
|
||||
assert_eq!(client.current_url().as_str(), "http://nym-api2.test/");
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[cfg(feature = "tunneling")]
|
||||
fn fronted_host_updating() {
|
||||
let url = Url::new("http://example.com", Some(vec!["http://front1.com"])).unwrap();
|
||||
let url = Url::new("http://nym-api.test", Some(vec!["http://cdn1.test"])).unwrap();
|
||||
let mut client = ClientBuilder::new(url)
|
||||
.unwrap()
|
||||
.with_fronting(crate::fronted::FrontPolicy::Always)
|
||||
@@ -176,46 +180,103 @@ fn fronted_host_updating() {
|
||||
|
||||
// check that the url is set correctly
|
||||
let current_url = client.current_url();
|
||||
assert_eq!(current_url.as_str(), "http://example.com/");
|
||||
assert_eq!(current_url.front_str(), Some("front1.com"));
|
||||
assert_eq!(current_url.as_str(), "http://nym-api.test/");
|
||||
assert_eq!(current_url.front_str(), Some("cdn1.test"));
|
||||
|
||||
// update the url
|
||||
client.update_host();
|
||||
|
||||
// check that the url is still the same since there is one URL and one front
|
||||
let current_url = client.current_url();
|
||||
assert_eq!(current_url.as_str(), "http://example.com/");
|
||||
assert_eq!(current_url.front_str(), Some("front1.com"));
|
||||
assert_eq!(current_url.as_str(), "http://nym-api.test/");
|
||||
assert_eq!(current_url.front_str(), Some("cdn1.test"));
|
||||
|
||||
// =======================================
|
||||
// we rotate through front urls when available if fronting is enabled
|
||||
|
||||
let new_urls = vec![
|
||||
Url::new(
|
||||
"http://example.com",
|
||||
Some(vec!["http://front1.com", "http://front2.com"]),
|
||||
"http://nym-api.test",
|
||||
Some(vec!["http://cdn1.test", "http://cdn2.test"]),
|
||||
)
|
||||
.unwrap(),
|
||||
Url::new("http://example.org", None).unwrap(),
|
||||
Url::new("http://nym-api2.test", None).unwrap(),
|
||||
];
|
||||
client.change_base_urls(new_urls);
|
||||
|
||||
let current_url = client.current_url();
|
||||
assert_eq!(current_url.as_str(), "http://example.com/");
|
||||
assert_eq!(current_url.front_str(), Some("front1.com"));
|
||||
assert_eq!(current_url.as_str(), "http://nym-api.test/");
|
||||
assert_eq!(current_url.front_str(), Some("cdn1.test"));
|
||||
|
||||
// update the url - this should keep the same host but change the front
|
||||
client.update_host();
|
||||
|
||||
let current_url = client.current_url();
|
||||
// check that the url is still the same since there is one URL
|
||||
assert_eq!(current_url.as_str(), "http://example.com/");
|
||||
assert_eq!(current_url.front_str(), Some("front2.com"));
|
||||
assert_eq!(current_url.as_str(), "http://nym-api.test/");
|
||||
assert_eq!(current_url.front_str(), Some("cdn2.test"));
|
||||
|
||||
// update the url - this should wrap around to the first front as the second url is not fronted
|
||||
client.update_host();
|
||||
|
||||
let current_url = client.current_url();
|
||||
assert_eq!(current_url.as_str(), "http://example.com/");
|
||||
assert_eq!(current_url.front_str(), Some("front1.com"));
|
||||
assert_eq!(current_url.as_str(), "http://nym-api.test/");
|
||||
assert_eq!(current_url.front_str(), Some("cdn1.test"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[cfg(feature = "network-defaults")]
|
||||
fn from_network_configures_multiple_urls_and_retries() {
|
||||
use nym_network_defaults::{ApiUrl, NymNetworkDetails};
|
||||
|
||||
// Create network details with multiple URLs and fronting
|
||||
let mut network_details = NymNetworkDetails::new_empty();
|
||||
network_details.nym_api_urls = Some(vec![
|
||||
ApiUrl {
|
||||
url: "https://validator.nymtech.net/api/".to_string(),
|
||||
front_hosts: None,
|
||||
},
|
||||
ApiUrl {
|
||||
url: "https://nym-frontdoor.vercel.app/api/".to_string(),
|
||||
front_hosts: Some(vec!["vercel.app".to_string(), "vercel.com".to_string()]),
|
||||
},
|
||||
ApiUrl {
|
||||
url: "https://nym-frontdoor.global.ssl.fastly.net/api/".to_string(),
|
||||
front_hosts: Some(vec!["yelp.global.ssl.fastly.net".to_string()]),
|
||||
},
|
||||
]);
|
||||
|
||||
// Build client from network details
|
||||
let client = ClientBuilder::new_with_fronted_urls(
|
||||
network_details.nym_api_urls.clone().unwrap_or_default(),
|
||||
)
|
||||
.expect("Failed to create client from network")
|
||||
.build()
|
||||
.expect("Failed to build client");
|
||||
|
||||
// Verify all URLs were configured
|
||||
assert_eq!(
|
||||
client.base_urls().len(),
|
||||
3,
|
||||
"Expected 3 URLs to be configured from network details"
|
||||
);
|
||||
|
||||
// Verify the URLs have fronting configured where appropriate
|
||||
assert_eq!(
|
||||
client.base_urls()[0].as_str(),
|
||||
"https://validator.nymtech.net/api/"
|
||||
);
|
||||
assert!(client.base_urls()[0].front_str().is_none());
|
||||
|
||||
assert_eq!(
|
||||
client.base_urls()[1].as_str(),
|
||||
"https://nym-frontdoor.vercel.app/api/"
|
||||
);
|
||||
assert!(client.base_urls()[1].front_str().is_some());
|
||||
|
||||
assert_eq!(
|
||||
client.base_urls()[2].as_str(),
|
||||
"https://nym-frontdoor.global.ssl.fastly.net/api/"
|
||||
);
|
||||
assert!(client.base_urls()[2].front_str().is_some());
|
||||
}
|
||||
|
||||
@@ -183,6 +183,11 @@ impl Url {
|
||||
})
|
||||
}
|
||||
|
||||
/// Returns the underlying URL
|
||||
pub fn inner_url(&self) -> &url::Url {
|
||||
&self.url
|
||||
}
|
||||
|
||||
/// Returns true if the URL has a front domain set
|
||||
pub fn has_front(&self) -> bool {
|
||||
if let Some(fronts) = &self.fronts {
|
||||
@@ -201,6 +206,11 @@ impl Url {
|
||||
.and_then(|url| url.host_str())
|
||||
}
|
||||
|
||||
/// Returns the fronts
|
||||
pub fn fronts(&self) -> Option<&[url::Url]> {
|
||||
self.fronts.as_deref()
|
||||
}
|
||||
|
||||
/// Return the string representation of the host (domain or IP address) for this URL, if any.
|
||||
pub fn host_str(&self) -> Option<&str> {
|
||||
self.url.host_str()
|
||||
|
||||
@@ -124,6 +124,8 @@ impl NymNetworkDetails {
|
||||
}
|
||||
}
|
||||
|
||||
let nym_api = var(var_names::NYM_API).expect("nym api not set");
|
||||
|
||||
NymNetworkDetails::new_empty()
|
||||
.with_network_name(var(var_names::NETWORK_NAME).expect("network name not set"))
|
||||
.with_bech32_account_prefix(
|
||||
@@ -149,7 +151,7 @@ impl NymNetworkDetails {
|
||||
})
|
||||
.with_additional_validator_endpoint(ValidatorDetails::new(
|
||||
var(var_names::NYXD).expect("nyxd validator not set"),
|
||||
Some(var(var_names::NYM_API).expect("nym api not set")),
|
||||
Some(nym_api.clone()),
|
||||
get_optional_env(var_names::NYXD_WEBSOCKET),
|
||||
))
|
||||
.with_mixnet_contract(get_optional_env(var_names::MIXNET_CONTRACT_ADDRESS))
|
||||
@@ -159,6 +161,10 @@ impl NymNetworkDetails {
|
||||
.with_multisig_contract(get_optional_env(var_names::MULTISIG_CONTRACT_ADDRESS))
|
||||
.with_coconut_dkg_contract(get_optional_env(var_names::COCONUT_DKG_CONTRACT_ADDRESS))
|
||||
.with_nym_vpn_api_url(get_optional_env(var_names::NYM_VPN_API))
|
||||
.with_nym_api_urls(Some(vec![ApiUrl {
|
||||
url: nym_api,
|
||||
front_hosts: None,
|
||||
}]))
|
||||
}
|
||||
|
||||
pub fn new_mainnet() -> Self {
|
||||
@@ -348,6 +354,12 @@ impl NymNetworkDetails {
|
||||
self
|
||||
}
|
||||
|
||||
#[must_use]
|
||||
pub fn with_nym_api_urls(mut self, urls: Option<Vec<ApiUrl>>) -> Self {
|
||||
self.nym_api_urls = urls;
|
||||
self
|
||||
}
|
||||
|
||||
pub fn nym_vpn_api_url(&self) -> Option<Url> {
|
||||
self.nym_vpn_api_url.as_ref().map(|url| {
|
||||
url.parse()
|
||||
|
||||
@@ -119,6 +119,7 @@ where
|
||||
let ClientInput {
|
||||
connection_command_sender,
|
||||
input_sender,
|
||||
..
|
||||
} = client_input;
|
||||
|
||||
let ClientOutput {
|
||||
|
||||
@@ -160,13 +160,12 @@ pub async fn setup_gateway_from_api(
|
||||
minimum_performance: u8,
|
||||
ignore_epoch_roles: bool,
|
||||
) -> Result<InitialisationResult, WasmCoreError> {
|
||||
let mut rng = thread_rng();
|
||||
let gateways = gateways_for_init(
|
||||
&mut rng,
|
||||
nym_apis,
|
||||
None,
|
||||
minimum_performance,
|
||||
ignore_epoch_roles,
|
||||
None,
|
||||
)
|
||||
.await?;
|
||||
setup_gateway_wasm(client_store, force_tls, chosen_gateway, gateways).await
|
||||
@@ -178,13 +177,12 @@ pub async fn current_gateways_wasm(
|
||||
minimum_performance: u8,
|
||||
ignore_epoch_roles: bool,
|
||||
) -> Result<Vec<RoutingNode>, ClientCoreError> {
|
||||
let mut rng = thread_rng();
|
||||
gateways_for_init(
|
||||
&mut rng,
|
||||
nym_apis,
|
||||
user_agent,
|
||||
minimum_performance,
|
||||
ignore_epoch_roles,
|
||||
None,
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
@@ -255,10 +255,12 @@ pub fn query(deps: Deps<'_>, env: Env, msg: QueryMsg) -> Result<QueryResponse, C
|
||||
}
|
||||
|
||||
#[entry_point]
|
||||
pub fn migrate(deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
|
||||
pub fn migrate(deps: DepsMut<'_>, env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
|
||||
set_build_information!(deps.storage)?;
|
||||
cw2::ensure_from_older_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
|
||||
|
||||
crate::queued_migrations::introduce_historical_epochs(deps, env)?;
|
||||
|
||||
Ok(Response::new())
|
||||
}
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ use crate::epoch_state::storage::{load_current_epoch, save_epoch};
|
||||
use crate::epoch_state::utils::check_epoch_state;
|
||||
use crate::error::ContractError;
|
||||
use crate::state::storage::STATE;
|
||||
use crate::verification_key_shares::storage::vk_shares;
|
||||
use crate::Dealer;
|
||||
use cosmwasm_std::{Deps, DepsMut, Env, Event, MessageInfo, Response};
|
||||
use nym_coconut_dkg_common::dealer::{DealerRegistrationDetails, OwnershipTransfer};
|
||||
@@ -109,7 +110,7 @@ pub fn try_transfer_ownership(
|
||||
DEALERS_INDICES.save(deps.storage, &transfer_to, ¤t_index)?;
|
||||
DEALERS_INDICES.remove(deps.storage, &info.sender);
|
||||
|
||||
// update registration detail for every epoch the current dealer has participated in the protocol
|
||||
// update registration detail and share information for every epoch the current dealer has participated in the protocol
|
||||
// ideally, we'd have only updated the current epoch, but the way the contract is constructed
|
||||
// forbids that otherwise we'd have introduced inconsistency
|
||||
for epoch_id in 0..=epoch.epoch_id {
|
||||
@@ -117,6 +118,11 @@ pub fn try_transfer_ownership(
|
||||
EPOCH_DEALERS_MAP.remove(deps.storage, (epoch_id, &info.sender));
|
||||
EPOCH_DEALERS_MAP.save(deps.storage, (epoch_id, &transfer_to), &details)?;
|
||||
}
|
||||
if let Some(mut vk_share) = vk_shares().may_load(deps.storage, (&info.sender, epoch_id))? {
|
||||
vk_shares().remove(deps.storage, (&info.sender, epoch_id))?;
|
||||
vk_share.owner = transfer_to.clone();
|
||||
vk_shares().save(deps.storage, (&transfer_to, epoch_id), &vk_share)?;
|
||||
}
|
||||
}
|
||||
|
||||
let Some(transaction_info) = env.transaction else {
|
||||
@@ -161,6 +167,14 @@ pub fn try_update_announce_address(
|
||||
details.announce_address = new_address.clone();
|
||||
EPOCH_DEALERS_MAP.save(deps.storage, (epoch.epoch_id, &info.sender), &details)?;
|
||||
|
||||
let mut contract_share = vk_shares().load(deps.storage, (&info.sender, epoch.epoch_id))?;
|
||||
contract_share.announce_address = new_address.clone();
|
||||
vk_shares().save(
|
||||
deps.storage,
|
||||
(&info.sender, epoch.epoch_id),
|
||||
&contract_share,
|
||||
)?;
|
||||
|
||||
Ok(Response::new().add_event(
|
||||
Event::new("dkg-announce-address-update")
|
||||
.add_attribute("dealer", info.sender)
|
||||
@@ -228,9 +242,14 @@ pub(crate) mod tests {
|
||||
#[cfg(feature = "testable-dkg-contract")]
|
||||
mod tests_with_mock {
|
||||
use super::*;
|
||||
use crate::testable_dkg_contract::{init_contract_tester, DkgContractTesterExt};
|
||||
use crate::testable_dkg_contract::{
|
||||
init_contract_tester, init_contract_tester_with_group_members, DkgContractTesterExt,
|
||||
};
|
||||
use anyhow::Context;
|
||||
use cosmwasm_std::testing::message_info;
|
||||
use nym_contracts_common_testing::ContractOpts;
|
||||
use nym_coconut_dkg_common::msg::QueryMsg;
|
||||
use nym_coconut_dkg_common::verification_key::PagedVKSharesResponse;
|
||||
use nym_contracts_common_testing::{ChainOpts, ContractOpts};
|
||||
|
||||
#[test]
|
||||
fn transferring_ownership() -> anyhow::Result<()> {
|
||||
@@ -248,6 +267,7 @@ mod tests_with_mock {
|
||||
contract.run_initial_dummy_dkg();
|
||||
let old_index = DEALERS_INDICES.load(&contract, &group_member)?;
|
||||
let old_details = EPOCH_DEALERS_MAP.load(&contract, (0, &group_member))?;
|
||||
let old_share = vk_shares().load(&contract, (&group_member, 0))?;
|
||||
|
||||
let not_group_member = contract.addr_make("not_group_member");
|
||||
let (deps, env) = contract.deps_mut_env();
|
||||
@@ -277,13 +297,20 @@ mod tests_with_mock {
|
||||
assert!(EPOCH_DEALERS_MAP
|
||||
.may_load(&contract, (0, &group_member))?
|
||||
.is_none());
|
||||
assert!(vk_shares()
|
||||
.may_load(&contract, (&group_member, 0))?
|
||||
.is_none());
|
||||
|
||||
let new_index = DEALERS_INDICES.load(&contract, &new_group_member)?;
|
||||
let new_details = EPOCH_DEALERS_MAP.load(&contract, (0, &new_group_member))?;
|
||||
let new_share = vk_shares().load(&contract, (&new_group_member, 0))?;
|
||||
|
||||
// the underlying info hasn't changed
|
||||
assert_eq!(old_index, new_index);
|
||||
assert_eq!(old_details, new_details);
|
||||
assert_ne!(old_share, new_share);
|
||||
assert_eq!(old_share.owner, group_member);
|
||||
assert_eq!(new_share.owner, new_group_member);
|
||||
|
||||
assert_eq!(
|
||||
OWNERSHIP_TRANSFER_LOG.load(
|
||||
@@ -436,9 +463,91 @@ mod tests_with_mock {
|
||||
assert_eq!(old_details1, new_details1);
|
||||
assert_eq!(old_details2, new_details2);
|
||||
|
||||
// most recent entry is updated
|
||||
// most recent entry is updated
|
||||
assert_eq!(new_details3.announce_address, new_address);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn updating_announce_address_updates_vk_shares() -> anyhow::Result<()> {
|
||||
let mut contract = init_contract_tester_with_group_members(3);
|
||||
let group_member = contract.random_group_member();
|
||||
|
||||
contract.run_initial_dummy_dkg(); // => epoch 0
|
||||
contract.run_reset_dkg(); // => epoch 1
|
||||
|
||||
// LEAVE DKG MEMBERSHIP
|
||||
contract.remove_group_member(group_member.clone());
|
||||
contract.run_reset_dkg(); // => epoch 2
|
||||
|
||||
// COME BACK
|
||||
contract.add_group_member(group_member.clone());
|
||||
contract.run_reset_dkg(); // => epoch 3
|
||||
|
||||
let old_address = EPOCH_DEALERS_MAP
|
||||
.load(&contract, (3, &group_member))?
|
||||
.announce_address;
|
||||
|
||||
let old_share0 = vk_shares().load(&contract, (&group_member, 0))?;
|
||||
let old_share1 = vk_shares().load(&contract, (&group_member, 1))?;
|
||||
let old_share2 = vk_shares().may_load(&contract, (&group_member, 2))?;
|
||||
assert!(old_share2.is_none());
|
||||
let old_share3 = vk_shares().may_load(&contract, (&group_member, 3))?;
|
||||
assert!(old_share3.is_some());
|
||||
|
||||
let new_address = "https://new-address.com".to_string();
|
||||
try_update_announce_address(
|
||||
contract.deps_mut(),
|
||||
message_info(&group_member, &[]),
|
||||
new_address.clone(),
|
||||
)?;
|
||||
|
||||
let new_share0 = vk_shares().load(&contract, (&group_member, 0))?;
|
||||
let new_share1 = vk_shares().load(&contract, (&group_member, 1))?;
|
||||
let new_share2 = vk_shares().may_load(&contract, (&group_member, 2))?;
|
||||
assert!(new_share2.is_none());
|
||||
let new_share3 = vk_shares().load(&contract, (&group_member, 3))?;
|
||||
|
||||
// old epoch data is unchanged
|
||||
assert_eq!(old_share0, new_share0);
|
||||
assert_eq!(old_share1, new_share1);
|
||||
assert_eq!(old_share2, new_share2);
|
||||
|
||||
// most recent entry is updated
|
||||
assert_eq!(new_share3.announce_address, new_address);
|
||||
|
||||
// finally an integration check against query endpoint
|
||||
let epoch0_shares: PagedVKSharesResponse =
|
||||
contract.query(&QueryMsg::GetVerificationKeys {
|
||||
epoch_id: 0,
|
||||
limit: None,
|
||||
start_after: None,
|
||||
})?;
|
||||
assert_eq!(epoch0_shares.shares.len(), 3);
|
||||
|
||||
let member_share = epoch0_shares
|
||||
.shares
|
||||
.iter()
|
||||
.find(|s| s.owner == group_member)
|
||||
.context("failed to find member's share")?;
|
||||
assert_eq!(member_share.announce_address, old_address);
|
||||
|
||||
let epoch0_shares: PagedVKSharesResponse =
|
||||
contract.query(&QueryMsg::GetVerificationKeys {
|
||||
epoch_id: 3,
|
||||
limit: None,
|
||||
start_after: None,
|
||||
})?;
|
||||
assert_eq!(epoch0_shares.shares.len(), 3);
|
||||
|
||||
let member_share = epoch0_shares
|
||||
.shares
|
||||
.iter()
|
||||
.find(|s| s.owner == group_member)
|
||||
.context("failed to find member's share")?;
|
||||
assert_eq!(member_share.announce_address, new_address);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,2 +1,21 @@
|
||||
// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
use crate::epoch_state::storage::HISTORICAL_EPOCH;
|
||||
use crate::error::ContractError;
|
||||
use cosmwasm_std::{DepsMut, Env};
|
||||
|
||||
pub fn introduce_historical_epochs(deps: DepsMut, env: Env) -> Result<(), ContractError> {
|
||||
if HISTORICAL_EPOCH.may_load(deps.storage)?.is_some() {
|
||||
return Err(ContractError::FailedMigration {
|
||||
comment: "this migration has already been run before".to_string(),
|
||||
});
|
||||
}
|
||||
|
||||
#[allow(deprecated)]
|
||||
let current = crate::epoch_state::storage::CURRENT_EPOCH.load(deps.storage)?;
|
||||
// we won't have information on intermediate states prior to now, but that's not the end of the world
|
||||
HISTORICAL_EPOCH.save(deps.storage, ¤t, env.block.height)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -62,12 +62,18 @@ impl TestableNymContract for DkgContract {
|
||||
where
|
||||
Self: Sized,
|
||||
{
|
||||
init_contract_tester_with_group_members(DEFAULT_GROUP_MEMBERS)
|
||||
init_contract_tester()
|
||||
}
|
||||
}
|
||||
|
||||
pub fn init_contract_tester() -> ContractTester<DkgContract> {
|
||||
DkgContract::init().with_common_storage_key(CommonStorageKeys::Admin, "dkg-admin")
|
||||
init_contract_tester_with_group_members(DEFAULT_GROUP_MEMBERS)
|
||||
}
|
||||
|
||||
pub fn init_contract_tester_with_group_members(members: usize) -> ContractTester<DkgContract> {
|
||||
prepare_contract_tester_builder_with_group_members(members)
|
||||
.build()
|
||||
.with_common_storage_key(CommonStorageKeys::Admin, "dkg-admin")
|
||||
}
|
||||
|
||||
pub fn prepare_contract_tester_builder_with_group_members<C>(
|
||||
@@ -137,12 +143,6 @@ where
|
||||
builder
|
||||
}
|
||||
|
||||
pub fn init_contract_tester_with_group_members(members: usize) -> ContractTester<DkgContract> {
|
||||
prepare_contract_tester_builder_with_group_members(members)
|
||||
.build()
|
||||
.with_common_storage_key(CommonStorageKeys::Admin, "dkg-admin")
|
||||
}
|
||||
|
||||
pub trait DkgContractTesterExt:
|
||||
ContractOpts<ExecuteMsg = ExecuteMsg, QueryMsg = QueryMsg, ContractError = ContractError>
|
||||
+ ChainOpts
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn legacy_mixnode_bonding() {
|
||||
todo!()
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,3 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
pub(crate) mod transactions;
|
||||
|
||||
// the purpose of that module is to keep track of tests of legacy features that will eventually be phased out
|
||||
// such as standalone mixnode/gateway bonding
|
||||
pub(crate) mod legacy;
|
||||
|
||||
@@ -1 +1 @@
|
||||
Monday, October 13th 2025, 13:24:56 UTC
|
||||
Tuesday, October 14th 2025, 11:34:14 UTC
|
||||
|
||||
@@ -49,6 +49,319 @@ This page displays a full list of all the changes during our release cycle from
|
||||
|
||||
<VarInfo />
|
||||
|
||||
## `v2025.18-jarlsberg`
|
||||
|
||||
- [Release Binaries](https://github.com/nymtech/nym/releases/tag/nym-binaries-v2025.18-jarlsberg)
|
||||
- [`nym-node`](nodes/nym-node.mdx) version `1.19.0`
|
||||
|
||||
```sh
|
||||
nym-node
|
||||
Binary Name: nym-node
|
||||
Build Timestamp: 2025-10-15T09:04:32.043934599Z
|
||||
Build Version: 1.19.0
|
||||
Commit SHA: 2235a6e1477bea7368ee5443a298f544deb63504
|
||||
Commit Date: 2025-10-15T10:22:16.000000000+02:00
|
||||
Commit Branch: master
|
||||
rustc Version: 1.92.0-nightly
|
||||
rustc Channel: nightly
|
||||
cargo Profile: release
|
||||
```
|
||||
|
||||
### API Changes
|
||||
There have been a few updates to the Node Status API (used by the NymVPN API) to do with Nodes' metadata endpoints, which are used to determine if they are running a QUIC bridge.
|
||||
|
||||
- [Node Status API: add bridge information to dVPN endpoint](https://github.com/nymtech/nym/pull/6069)
|
||||
Scrape the `/api/v1/bridges/client-params` endpoint from nodes to get bridge information and add to the dVPN output:
|
||||
|
||||
```
|
||||
{
|
||||
"identity_key": "3wqfp9ebaajgV8HRKYHeZuZCNXgitnW8BbytxyBH65xZ",
|
||||
"name": "middle winner wing",
|
||||
"authenticator": {
|
||||
"address": "6CQMtm9DqUj7mPVkSD9YarjUuPh7mJaZQnnHWxNpgByh.AGXiTivVieBULeDhL9tuyMKgRydoT67sFCjeoERDN84k@3wqfp9ebaajgV8HRKYHeZuZCNXgitnW8BbytxyBH65xZ"
|
||||
},
|
||||
"ip_packet_router": {
|
||||
"address": "GA47h8294m7f6ciyFuDkjk3mmqrvALqboL2o22jkqFhi.22SdTGBWKFrrBM31hMgzjmgduSH1nosnbE9dgNcY2CXz@3wqfp9ebaajgV8HRKYHeZuZCNXgitnW8BbytxyBH65xZ"
|
||||
},
|
||||
"location": {
|
||||
"two_letter_iso_country_code": "GB",
|
||||
"latitude": 51.5085,
|
||||
"longitude": -0.1257
|
||||
},
|
||||
"last_probe": {
|
||||
"last_updated_utc": "2025-09-02T18:19:10Z",
|
||||
"outcome": {
|
||||
"as_entry": {
|
||||
"can_connect": true,
|
||||
"can_route": true
|
||||
},
|
||||
"as_exit": {
|
||||
"can_connect": true,
|
||||
"can_route_ip_external_v4": true,
|
||||
"can_route_ip_external_v6": true,
|
||||
"can_route_ip_v4": true,
|
||||
"can_route_ip_v6": true
|
||||
},
|
||||
"wg": {
|
||||
"can_handshake_v4": true,
|
||||
"can_handshake_v6": true,
|
||||
"can_register": true,
|
||||
"can_resolve_dns_v4": true,
|
||||
"can_resolve_dns_v6": true,
|
||||
"download_duration_sec_v4": 0,
|
||||
"download_duration_sec_v6": 5,
|
||||
"download_error_v4": "",
|
||||
"download_error_v6": "",
|
||||
"downloaded_file_v4": "https://proof.ovh.net/files/1Mb.dat",
|
||||
"downloaded_file_v6": "https://proof.ovh.net/files/10Mb.dat",
|
||||
"ping_hosts_performance_v4": 1,
|
||||
"ping_hosts_performance_v6": 1,
|
||||
"ping_ips_performance_v4": 1,
|
||||
"ping_ips_performance_v6": 0.6666667,
|
||||
"can_handshake": true,
|
||||
"can_resolve_dns": true,
|
||||
"ping_hosts_performance": 1,
|
||||
"ping_ips_performance": 1
|
||||
}
|
||||
}
|
||||
},
|
||||
"ip_addresses": [
|
||||
"178.79.168.250",
|
||||
"2a01:7e00::f03c:95ff:fef8:77f"
|
||||
],
|
||||
"mix_port": 1789,
|
||||
"role": "EntryGateway",
|
||||
"entry": {
|
||||
"hostname": "nym-circ.anonym.tech",
|
||||
"ws_port": 9000,
|
||||
"wss_port": 9443
|
||||
},
|
||||
+ "bridges":{
|
||||
+ "version": 0,
|
||||
+ "transports": [
|
||||
+ {
|
||||
+ "transport_type": "quic_plain",
|
||||
+ "args": {
|
||||
+ "addresses": ["[2a01:7e00::f03c:95ff:fef8:77f]:4443", "178.79.168.250:4443"],
|
||||
+ "id_pubkey": "gyKl6DN9hgdPGhEzdf9gY4Ha2GzrOwSzLCguxeTVTJU=",
|
||||
+ "host": "netdna.bootstrapcdn.com"
|
||||
+ }
|
||||
+ }
|
||||
+ ]
|
||||
+ }
|
||||
"performance": "1",
|
||||
"build_information": {
|
||||
"build_version": "1.16.0",
|
||||
"commit_branch": "build",
|
||||
"commit_sha": "7f97f13799342f864e1b106e8cafc9f6d6c24c0f"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
- [ns-api: add new fields for probe output for query_metadata and download file size and duration in ms](https://github.com/nymtech/nym/pull/6091)
|
||||
|
||||
This PR adds new fields to the Node Status API:
|
||||
|
||||
```json
|
||||
{
|
||||
"node": "ByxGq9hpDQu6Wc8augEh22w7CRWJHPNfDshB1b8nfWkh",
|
||||
"used_entry": "ByxGq9hpDQu6Wc8augEh22w7CRWJHPNfDshB1b8nfWkh",
|
||||
"outcome": {
|
||||
"as_entry": {
|
||||
"can_connect": true,
|
||||
"can_route": true
|
||||
},
|
||||
"as_exit": {
|
||||
"can_connect": true,
|
||||
"can_route_ip_v4": true,
|
||||
"can_route_ip_external_v4": true,
|
||||
"can_route_ip_v6": true,
|
||||
"can_route_ip_external_v6": true
|
||||
},
|
||||
"wg": {
|
||||
"can_register": true,
|
||||
"can_query_metadata_v4": true, // <--------------------------------
|
||||
"can_handshake_v4": true,
|
||||
"can_resolve_dns_v4": true,
|
||||
"ping_hosts_performance_v4": 1.0,
|
||||
"ping_ips_performance_v4": 1.0,
|
||||
"can_handshake_v6": true,
|
||||
"can_resolve_dns_v6": true,
|
||||
"ping_hosts_performance_v6": 1.0,
|
||||
"ping_ips_performance_v6": 0.93333334,
|
||||
"download_duration_sec_v4": 2,
|
||||
"download_duration_milliseconds_v4": 2034, // <--------------------------------
|
||||
"downloaded_file_size_bytes_v4": 1048576, // <--------------------------------
|
||||
"downloaded_file_v4": "https://nym-bandwidth-monitoring.ops-d86.workers.dev/1mb.dat",
|
||||
"download_error_v4": "",
|
||||
"download_duration_sec_v6": 5,
|
||||
"downloaded_file_size_bytes_v6": 1048576,
|
||||
"download_duration_milliseconds_v6": 5501,
|
||||
"downloaded_file_v6": "https://proof.ovh.net/files/1Mb.dat",
|
||||
"download_error_v6": ""
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
- [ns-api: add descriptions to dVPN gateway responses](https://github.com/nymtech/nym/pull/6102)
|
||||
This PR adds the `description` field to dVPN gateways in `/dvpn/v1/directory/gateways`.
|
||||
|
||||
- [NS API: use new probe download filesize and milliseconds field](https://github.com/nymtech/nym/pull/6097)
|
||||
This PR uses the new fields in mainnet to calculate the probe download score.
|
||||
|
||||
- [ns-api: use download files size from probes instead of parsing filenames](https://github.com/nymtech/nym/pull/6095) This PR uses the new field in the probe results that says how many bytes were downloaded to calculate the speed of download. It only uses downloads on ipv4 and ignores ipv6 for now. This might change in the future.
|
||||
|
||||
- [Node Status API: remove sqlite support](https://github.com/nymtech/nym/pull/6004)
|
||||
This PR removes sqlite support, requiring pgsql to run the NS API.
|
||||
|
||||
It also fixes the following issues:
|
||||
|
||||
- deserialisation of `NodeDescription`
|
||||
- defaults for `WireguardDetails` for deserialisation
|
||||
|
||||
It also bumps the version to v4.0.0.
|
||||
|
||||
### Operators Updates & Tools
|
||||
|
||||
- [Node rewards tracker](https://github.com/nymtech/nym/pull/6064)
|
||||
This PR introduces a script fetching operators rewards based on provided Nyx account addresses provided in `data/wallet-addresses.csv`.
|
||||
|
||||
<AccordionTemplate name="Info">
|
||||
**Output is:**
|
||||
1. Printed table in terminal
|
||||
3. Sheet with complete info stored in `data/node-balances.csv`
|
||||
4. Historical data yaml file stored in `data/data.yaml` - this file should not be changed manually, as
|
||||
all values older than 30 days get auto-removed
|
||||
|
||||
**RUN**
|
||||
|
||||
Before you start fill first column of `data/wallet-addresses.csv` called `addresses` with your Nyx account addresses and (optionally) second column called `tag` with an entity, for example *"mysquad"* and *"personal"* to get sorted output per entity.
|
||||
|
||||
- Csv example with `tag`s:
|
||||
```
|
||||
n1foofoofoo, personal
|
||||
n1barbarbar, personal
|
||||
n1bazbazbaz, mysquad
|
||||
n1lollollol, mysquad
|
||||
```
|
||||
- For operators having all nodes under one entity, the tag field will be left empty. Example:
|
||||
```csv
|
||||
n1foofoofoo
|
||||
n1barbarbar
|
||||
n1bazbazbaz
|
||||
```
|
||||
|
||||
Documentation coming soon.
|
||||
</AccordionTemplate>
|
||||
|
||||
- [Bugfix/bloomfilters purge](https://github.com/nymtech/nym/pull/6089)
|
||||
This PR fixes bug where old replay protection bloomfilters were never getting removed.
|
||||
|
||||
|
||||
### Features
|
||||
- [Get wireguard keypair as arg instead of reading it from disk](https://github.com/nymtech/nym/pull/6078)
|
||||
|
||||
- [Registration Client](https://github.com/nymtech/nym/pull/6059)
|
||||
This PR introduces the `RegistrationClient` whose eventual job will be to handle registration with gateway and bandwidth control. This is step 1, where it only handles registration and then hands back the control channel to the vpn-client.
|
||||
|
||||
<AccordionTemplate name="Info">
|
||||
|
||||
**nym-wg-gateway-client**
|
||||
This crate has been smooshed with the nym-authenticator-client as they were doing the same thing : talking with the Authenticator.
|
||||
|
||||
**nym-authenticator-client**
|
||||
The job of the `AuthenticatorClient` is to talk to the `Authenticator`s via the mixnet. They both make use of a `AuthClientMixnetListener` that handles interaction with the mixnet client. No more `SharedMixnetClient`, only clear owners. That component could be turned into an actual multiplexer, but that's out of scope.
|
||||
|
||||
It is designed to be able to shut down, since it won't be necessary for bandwidth top up in the future.
|
||||
|
||||
Lots of types and traits were copied in both repos, some of them are sadly still there. Further work could be done to improve messaging ( `ClientMessage` and `AuthenticatorRequests` for example)
|
||||
|
||||
**nym-ip-packet-client**
|
||||
This crate has minor changes, focused on getting rid of the `SharedMixnetClient`. It still talks to the `IpPacketRouter` but it owns the `MixnetClient`
|
||||
|
||||
**Nym-registration-client**
|
||||
Brand new crates, whose current job is to run a `MixnetClient` with the given options, register with the component related to the tunnel type, and hand back the necessary component for running the tunnel.
|
||||
|
||||
**authenticator-requests**
|
||||
Mostly refactoring, lots of code was duplicated in the vpn-client repo
|
||||
|
||||
**misc**
|
||||
The rest are qol changes that might not be needed right away but that is preparing the future improvements coming soon™
|
||||
</AccordionTemplate>
|
||||
|
||||
- [Feature: Ping probe all nodes /described nodes from a server](https://github.com/nymtech/nym/pull/6074)
|
||||
This script should be ran from a node hosting server. It pings all IPs listed in /described endpoint and returns a file with unreachable IPs. Such list gives operator an idea on IPs potentially blocking their IP.
|
||||
|
||||
- [Feature: Nym node html landing page](https://github.com/nymtech/nym/pull/6053)
|
||||
This PR introduces a new landing page which contains:
|
||||
- no more deprecated tornul
|
||||
- new nym theme
|
||||
- bold text about DMCA
|
||||
- hook for nym-node-cli to use it and add $EMAIL prompted to the operator
|
||||
|
||||
- [feat: DKG contract method for updating announce address](https://github.com/nymtech/nym/pull/6050)
|
||||
|
||||
- [feat: NS ticket faucet](https://github.com/nymtech/nym/pull/6047)
|
||||
Overview: modifies the Node Status API so that it keeps a buffer of tickets inside its storage that it gives out when new test runs get requested. it also slightly adjusts the ticketbook API in a bit hacky way to allow importing ticketbooks with specific index ranges. However, those changes also involve modifying cli arguments passed to both NS API and gateway probes. The associated vpn-client repo branch is `feature/ticket-faucet-probe` which for the same reason is not yet ready
|
||||
|
||||
<AccordionTemplate name="Info">
|
||||
**Node Status API**
|
||||
**Added**
|
||||
- `--config-env-file` / `-c` (optional) - helper allowing testing locally on non-mainnet networks without passing everything through env variables
|
||||
- `--mnemonic` (env: `NYM_NODE_STATUS_API_MNEMONIC`) - account used for obtaining ticketbooks
|
||||
- `--max-concurrent-deposits` (env: `NYM_NODE_STATUS_API_MAX_CONCURRENT_DEPOSITS`) (optional; default: 5) - Specifies the maximum number of deposits the node status api can make in a single transaction. Note that each deposit batch is followed by the same number of sequential signing requests
|
||||
- `--tickets-buffer-size` (env: `NYM_NODE_STATUS_API_TICKETS_BUFFER`) (optional; default: 50) - Specifies the size of the tickets buffer the node status api should have available at any time for each ticket type.
|
||||
- `--tickets-buffer-check-interval` (env: `NYM_NODE_STATUS_API_TICKETS_CHECK_INTERVAL`) (optional; default: 1min) - Specifies interval at which the node status api should check if it has sufficient number of tickets buffered
|
||||
- `--quorum-check-interval` (env: `NYM_NODE_STATUS_API_QUORUM_CHECK_INTERVAL`) (optional; default: 5min) - Specifies interval at which the node status api should check if signing quorum is available
|
||||
- `--buffered-ticket-types` (env: `NYM_NODE_STATUS_BUFFERED_TICKET_TYPES`) (optional; default: `[V1MixnetEntry, V1WireguardEntry, V1WireguardExit]`) - Specifies types of tickets to buffer
|
||||
- `--ecash-client-identifier-bs58` (env: `NYM_NODE_STATUS_API_ECASH_CLIENT_IDENTIFIER_BS58`) - Identifier used for deriving keys embedded in the issued ticketbooks (i.e. seed for the client identity). It can be a random string, but make sure it has sufficient entropy. it has to be base58 encoded.
|
||||
|
||||
**Node Status Agent**
|
||||
**Removed**
|
||||
- `--mnemonic` - no longer needed as tickets are obtained throught the faucet
|
||||
|
||||
**Gateway Probe (vpn-client repo)**
|
||||
**Added**
|
||||
- `--ticket-materials` - all the encoded generated tickets (and global data) needed by the probe
|
||||
- `--ticket-materials-revision` - revision of the serialisation to help with decoding (not strictly needed, but it was already available)
|
||||
**Removed**
|
||||
- `--mnemonic` - no longer needed as tickets are obtained throught the faucet
|
||||
</AccordionTemplate>
|
||||
|
||||
- [Bridge proto client params in Self-Described](https://github.com/nymtech/nym/pull/6035)
|
||||
This PR gives the nym-node a way to expose information about the bridge protocols that the node supports, and the parameters that are necessary to connect using those protocols.
|
||||
|
||||
<AccordionTemplate name="Info">
|
||||
This is meant to be usable by the node status API to be be included into node descriptors that are compiled for the vpn client.
|
||||
|
||||
- Adds a new field to the nym-node config `gateway_tasks.storage_paths.bridge_client_params`
|
||||
- IF the new config field is present a new self-described endpoint is available at `/v1/bridges/client-params`
|
||||
- IF the new config field is NOT present the endpoint is not exposed.
|
||||
|
||||
I arbitrarily chose config v8 as the oldest nym-node configuration version that supports the option. This can probably be propogated further backwards if necessary.
|
||||
|
||||
NOTE: The new `/bridges/client-params` endpoint does not have swagger / utopia docs associated. This interface will likely change in several upcoming iterations and serving from file (for now) means that the types are not defined internally.
|
||||
|
||||
tested as working on node `3wqfp9eb` both when file is provided in config (sucessful response) and when file is not specified in config (path gives 404).
|
||||
|
||||
</AccordionTemplate>
|
||||
|
||||
### Refactors & Maintenance
|
||||
- [[chore] Clippy fix](https://github.com/nymtech/nym/pull/6060)
|
||||
|
||||
- [Bugfix: Nym node CLI download nym-node exception](https://github.com/nymtech/nym/pull/6058)
|
||||
This PR fixes a case when the "Latest" platform release doesn't include `nym-node` by prompting user to insert binary URL instead of failing. Additionally it fixes fetching new landing page script in the CLI.
|
||||
|
||||
- [Benny/ci contract fix](https://github.com/nymtech/nym/pull/5962)
|
||||
|
||||
- [frontdoor typo fix](https://github.com/nymtech/nym/pull/6067)
|
||||
|
||||
- [Hotfix: Update API source in node ping tester script](https://github.com/nymtech/nym/pull/6082)
|
||||
This PR fixes initial development bug where a wrong API endpoint was used.
|
||||
`https://validator.nymtech.net/api/v1/nym-nodes/described` gets all nym nodes, not just gateways.
|
||||
Code is simplified accordingly.
|
||||
|
||||
## QUIC Transport Bridge Deployment
|
||||
|
||||
<QuicDeploymentSteps />
|
||||
@@ -108,7 +421,7 @@ All of the routes removed had already been deprecated over a year ago. This is m
|
||||
<AccordionTemplate name="Removed API routes">
|
||||
|
||||
### Legacy mixnodes related:
|
||||
|
||||
|
||||
- `/v1/mixnodes`
|
||||
- `/v1/mixnodes/active`
|
||||
- `/v1/mixnodes/active/detailed`
|
||||
@@ -130,9 +443,9 @@ All of the routes removed had already been deprecated over a year ago. This is m
|
||||
- `/v1/status/mixnodes/detailed-unfiltered`
|
||||
- `/v1/status/mixnode/{mix_id}/report`
|
||||
- `/v1/status/mixnode/{mix_id}/avg_uptime`
|
||||
|
||||
|
||||
### Legacy gateways related:
|
||||
|
||||
|
||||
- `/v1/gateways`
|
||||
- `/v1/gateways/described`
|
||||
- `/v1/gateways/blacklisted`
|
||||
@@ -144,21 +457,21 @@ All of the routes removed had already been deprecated over a year ago. This is m
|
||||
</AccordionTemplate>
|
||||
|
||||
#### Structs changes:
|
||||
|
||||
|
||||
- `MixnodeUptimeHistoryResponse` no longer has `owner` field
|
||||
- `GatewayUptimeHistoryResponse` no longer has `owner` field
|
||||
|
||||
|
||||
|
||||
|
||||
#### New Routes Added
|
||||
|
||||
- `/v1/nym-nodes/stake-saturation/{node_id}` - as a better replacement for `/v1/status/mixnode/{mix_id}/stake-saturation` as this information might be potentially useful and can be applied to any nym-node, not just a legacy mixnode.
|
||||
- `/v1/legacy/mixnodes` - returns a list of bonded legacy mixnodes that haven't migrated to nym-nodes
|
||||
- `/v1/legacy/gateways` - returns a list of bonded legacy gateways that haven't migrated to nym-nodes
|
||||
|
||||
|
||||
#### Node Status API
|
||||
|
||||
|
||||
Furthermore the changes remove all scraping of legacy mixnodes from NS and the following routes are removed:
|
||||
|
||||
|
||||
- `/v2/mixnodes/{mix_id}`
|
||||
- `/v2/mixnodes`
|
||||
|
||||
@@ -229,7 +542,7 @@ Furthermore the changes remove all scraping of legacy mixnodes from NS and the f
|
||||
### Operators Updates & Tools
|
||||
|
||||
<Callout type="info" emoji="ℹ️">
|
||||
Nodes receiving stake as a part of [**Nym Delegation Program**](https://nym.com/network/DP) are updated weekly based on the [rules](https://forms.nym.com/form/#/2/form/view/BRh8QroXFinjOF4D3FHgYiX76zbiRvUV2Sy+czaoKFQ) without prior notification given to the operators.
|
||||
Nodes receiving stake as a part of [**Nym Delegation Program**](https://nym.com/network/DP) are updated weekly based on the [rules](https://forms.nym.com/form/#/2/form/view/BRh8QroXFinjOF4D3FHgYiX76zbiRvUV2Sy+czaoKFQ) without prior notification given to the operators.
|
||||
|
||||
[**Nym Delegation account**](https://explorer.nym.spectredao.net/account/n1rnxpdpx3kldygsklfft0gech7fhfcux4zst5lw) `n1rnxpdpx3kldygsklfft0gech7fhfcux4zst5lw` is a single source of truth. If you expect your node to have Nym team stake and it doesn't, please reach out in in the [**Node Operators Matrix channel**](https://matrix.to/#/#operators:nymtech.chat).
|
||||
</Callout>
|
||||
@@ -252,32 +565,32 @@ nym-vpnc connect --enable-two-hop --entry-gateway-id 7CWjY3QFoA9dgE535u9bQiXCfz
|
||||
|
||||
- [Feature/testing utils](https://github.com/nymtech/nym/pull/5963): This PR introduces a couple of general helpers, in particular some mocks for sending across values using Stream/Sink and AsyncRead/AsyncWrite without actual underlying networking. Example implementation are with NymNoise (which was the original inspiration) and gateway handshake.
|
||||
|
||||
- [Backport metadata endpoint](https://github.com/nymtech/nym/pull/6010)
|
||||
- [Backport metadata endpoint](https://github.com/nymtech/nym/pull/6010)
|
||||
|
||||
### Bugfix
|
||||
|
||||
- [Fix rust `1.89` `clippy` issues](https://github.com/nymtech/nym/pull/5944)
|
||||
|
||||
- [`http api` client adjustment](https://github.com/nymtech/nym/pull/5953): It fixes missing `feature-lock` when cloning the client and adds helper macro for user agent creation
|
||||
- [`http api` client adjustment](https://github.com/nymtech/nym/pull/5953): It fixes missing `feature-lock` when cloning the client and adds helper macro for user agent creation
|
||||
|
||||
- [Fix `ci-build` for linux (and use updated runner)](https://github.com/nymtech/nym/pull/5958): This PR fixes our build pipeline by using correct (updated) linux runner and updates all the conditional steps that were behind `ubuntu` runners (which no longer exist)
|
||||
|
||||
- [Fixing the ci for ns agent](https://github.com/nymtech/nym/pull/5965)
|
||||
- [Fixing the ci for ns agent](https://github.com/nymtech/nym/pull/5965)
|
||||
|
||||
- [Manually calculate per node work on rewarded set changes](https://github.com/nymtech/nym/pull/5972): This PR fixes:
|
||||
1. Nym rewarded set was set to X, for argument sake say 200
|
||||
1. Nym rewarded set was set to X, for argument sake say 200
|
||||
2. We sent transaction to update it to Y, say 100
|
||||
3. This internally updated the interval rewarding parameters inside the mixnet contract including the default active and standby node work factors. Note that the rewarded set itself stayed the same, as it only changes after epoch rolls over and new one is assigned (by the `nym-api`)
|
||||
4. Epoch has finished and `nym-api` wanted to do the rewarding. It grabbed the **current** rewarded set (of X, 200) and started calculating the total work in the system. But since the contract already had new parameters (adjusted for size of Y, 100), the result was greater than 1 thus `nym-api` was preventably blowing up.
|
||||
To fix it we introduce additional checks, so that if the current rewarded set does not match the specification defined in the contract rewarding parameters, `nym-api` will attempt to do its best to manually calculate work factors for this epoch.
|
||||
|
||||
- [Fix the ns api ci workflow](https://github.com/nymtech/nym/pull/5981)
|
||||
- [Fix the ns api ci workflow](https://github.com/nymtech/nym/pull/5981)
|
||||
|
||||
- [Make sure tables are removed in correct order to not trigger FK constraint issue](https://github.com/nymtech/nym/pull/5987)
|
||||
- [Make sure tables are removed in correct order to not trigger FK constraint issue](https://github.com/nymtech/nym/pull/5987)
|
||||
|
||||
### Refactors & Maintenance
|
||||
|
||||
- [Move credential verifier in peer controller](https://github.com/nymtech/nym/pull/5938): This PR is to not duplicate the verifier code (minus the actual verification operation, which is harder to unit test because of expiration checks)
|
||||
- [Move credential verifier in peer controller](https://github.com/nymtech/nym/pull/5938): This PR is to not duplicate the verifier code (minus the actual verification operation, which is harder to unit test because of expiration checks)
|
||||
|
||||
- [Remove unused import](https://github.com/nymtech/nym/pull/5942)
|
||||
|
||||
@@ -288,7 +601,7 @@ nym-vpnc connect --enable-two-hop --entry-gateway-id 7CWjY3QFoA9dgE535u9bQiXCfz
|
||||
- [Remove freshness check on testrun submit](https://github.com/nymtech/nym/pull/5977):
|
||||
- Freshness is enforced by a background task that marks test runs as stale after a configured amount of time
|
||||
- Make existing freshness period configurable to avoid code changes in the future
|
||||
- Added `humantime` for parsing
|
||||
- Added `humantime` for parsing
|
||||
|
||||
- [Move authenticator into gateway crate](https://github.com/nymtech/nym/pull/5982)
|
||||
|
||||
@@ -311,7 +624,7 @@ nym-vpnc connect --enable-two-hop --entry-gateway-id 7CWjY3QFoA9dgE535u9bQiXCfz
|
||||
|
||||
- [Ecash liveness check](https://github.com/nymtech/nym/pull/5890)
|
||||
|
||||
- [Basic zulip client for sending messages](https://github.com/nymtech/nym/pull/5913): In order to be able to send zulip notifications about *emergency* upgrade mode being activated, we need some sort of client. Unfortunately there isn't any rust library that's maintained (the only one had last commit 4 years ago). This simple thing now currently only supports message sending
|
||||
- [Basic zulip client for sending messages](https://github.com/nymtech/nym/pull/5913): In order to be able to send zulip notifications about *emergency* upgrade mode being activated, we need some sort of client. Unfortunately there isn't any rust library that's maintained (the only one had last commit 4 years ago). This simple thing now currently only supports message sending
|
||||
|
||||
- [`nym-node` debug command to reset providers db](https://github.com/nymtech/nym/pull/5914)
|
||||
|
||||
@@ -321,7 +634,7 @@ nym-vpnc connect --enable-two-hop --entry-gateway-id 7CWjY3QFoA9dgE535u9bQiXCfz
|
||||
|
||||
### Refactors & Maintenance
|
||||
|
||||
- [Allow compatibility with 'CDLA-Permissive-2.0'](https://github.com/nymtech/nym/pull/5910): This license is present in the included `webpki-roots`
|
||||
- [Allow compatibility with 'CDLA-Permissive-2.0'](https://github.com/nymtech/nym/pull/5910): This license is present in the included `webpki-roots`
|
||||
|
||||
- [Migrate strum to `0.27.2`](https://github.com/nymtech/nym/pull/5960): This PR migrates strum to the latest. Notably all macros' were moved into `strum_macros`. The rest stays the same.
|
||||
|
||||
@@ -346,9 +659,9 @@ cargo Profile: release
|
||||
|
||||
### Operators Updates & Tools
|
||||
|
||||
- Stark Industries is on a sanction list by EU. IP addresses managed by Stark Ind. and their subsidies (ASN 44477 / ASN 33993) had been put on [spamhaus.org](http://spamhaus.org/) [list](https://www.spamhaus.org/drop/asndrop.json). The effect on NymVPN user experience is that Exit Gateways IPs hosted on Stark Ind. are seen as a spam proxies by many online services.
|
||||
- Stark Industries is on a sanction list by EU. IP addresses managed by Stark Ind. and their subsidies (ASN 44477 / ASN 33993) had been put on [spamhaus.org](http://spamhaus.org/) [list](https://www.spamhaus.org/drop/asndrop.json). The effect on NymVPN user experience is that Exit Gateways IPs hosted on Stark Ind. are seen as a spam proxies by many online services.
|
||||
|
||||
- We ask operators - especially Exit Gateways - to consider moving to another ISP. Visit an updated [ISP list](community-counsel/isp-list) and feel free to add more providers, following [these steps](community-counsel/add-content).
|
||||
- We ask operators - especially Exit Gateways - to consider moving to another ISP. Visit an updated [ISP list](community-counsel/isp-list) and feel free to add more providers, following [these steps](community-counsel/add-content).
|
||||
|
||||
### Features
|
||||
|
||||
@@ -362,13 +675,13 @@ cargo Profile: release
|
||||
- [`sqlx-pool-guard`: allocate more memory on windows](https://github.com/nymtech/nym/pull/5896):
|
||||
- Allocate 1.5x more memory than reported by the system to provide a safety margin
|
||||
- Increase number of retry attempts to 5
|
||||
|
||||
|
||||
|
||||
- [dkg epoch dealers query](https://github.com/nymtech/nym/pull/5899)
|
||||
|
||||
- [dkg snapshot epoch](https://github.com/nymtech/nym/pull/5900): In order to determine if signer quorum has been down at particular height, we need to know with certainty the dkg epoch id corresponding to given block height. This PR makes it possible. Every time epoch state is changed (due to DKG progress), snapshot is saved and can be queried. This doesn't work for past data, but given mainnet has only had a single DKG instance, that's not an issue.
|
||||
|
||||
- [`sqlx-pool-guard`: obtain filename from connect options](https://github.com/nymtech/nym/pull/5905):
|
||||
- [`sqlx-pool-guard`: obtain filename from connect options](https://github.com/nymtech/nym/pull/5905):
|
||||
|
||||
### Refactors & Maintenance
|
||||
|
||||
@@ -424,7 +737,7 @@ cargo Profile: release
|
||||
|
||||
- [Remove old explorer references](https://github.com/nymtech/nym/pull/5846)
|
||||
|
||||
- [Listen for shutdown signals during nym-node startup](https://github.com/nymtech/nym/pull/5879): This is to avoid situation where the process can't be killed without 'kill -9' because the logic to listen to shutdown signals hasn't been hit yet
|
||||
- [Listen for shutdown signals during nym-node startup](https://github.com/nymtech/nym/pull/5879): This is to avoid situation where the process can't be killed without 'kill -9' because the logic to listen to shutdown signals hasn't been hit yet
|
||||
|
||||
### Bugfixes
|
||||
|
||||
|
||||
@@ -21,13 +21,13 @@ This documentation page provides a guide on how to set up and run a [NYM NODE](.
|
||||
```sh
|
||||
nym-node
|
||||
Binary Name: nym-node
|
||||
Build Timestamp: 2025-10-01T10:42:58.647419869Z
|
||||
Build Version: 1.18.0
|
||||
Commit SHA: bbea2ff9e913f49cb7bf6c7bafa9d9b158c80de5
|
||||
Commit Date: 2025-10-01T12:06:07.000000000+02:00
|
||||
Commit Branch: HEAD
|
||||
rustc Version: 1.88.0
|
||||
rustc Channel: stable
|
||||
Build Timestamp: 2025-10-15T09:04:32.043934599Z
|
||||
Build Version: 1.19.0
|
||||
Commit SHA: 2235a6e1477bea7368ee5443a298f544deb63504
|
||||
Commit Date: 2025-10-15T10:22:16.000000000+02:00
|
||||
Commit Branch: master
|
||||
rustc Version: 1.92.0-nightly
|
||||
rustc Channel: nightly
|
||||
cargo Profile: release
|
||||
```
|
||||
|
||||
|
||||
+16
-16
@@ -2,23 +2,23 @@
|
||||
|
||||
/** @type {import('next').NextConfig} */
|
||||
const nextConfig = {
|
||||
reactStrictMode: true,
|
||||
reactStrictMode: true,
|
||||
|
||||
basePath: "/explorer",
|
||||
assetPrefix: "/explorer",
|
||||
trailingSlash: false,
|
||||
basePath: "/explorer",
|
||||
assetPrefix: "/explorer",
|
||||
trailingSlash: false,
|
||||
|
||||
async redirects() {
|
||||
return [
|
||||
// Change the basePath to /explorer
|
||||
{
|
||||
source: "/",
|
||||
destination: "/explorer",
|
||||
basePath: false,
|
||||
permanent: true,
|
||||
},
|
||||
];
|
||||
},
|
||||
async redirects() {
|
||||
return [
|
||||
// Change the basePath to /explorer
|
||||
{
|
||||
source: "/",
|
||||
destination: "/explorer",
|
||||
basePath: false,
|
||||
permanent: true,
|
||||
},
|
||||
];
|
||||
},
|
||||
};
|
||||
|
||||
module.exports = nextConfig
|
||||
module.exports = nextConfig;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
"use client";
|
||||
import type { IObservatoryNode } from "@/app/api/types";
|
||||
import { NYM_ACCOUNT_ADDRESS } from "@/app/api/urls";
|
||||
import { Search } from "@mui/icons-material";
|
||||
import {
|
||||
Autocomplete,
|
||||
@@ -13,7 +14,6 @@ import { useQuery } from "@tanstack/react-query";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { useState } from "react";
|
||||
import { fetchObservatoryNodes } from "../../app/api";
|
||||
import { NYM_ACCOUNT_ADDRESS } from "@/app/api/urls";
|
||||
|
||||
const NodeAndAddressSearch = () => {
|
||||
const router = useRouter();
|
||||
@@ -50,7 +50,7 @@ const NodeAndAddressSearch = () => {
|
||||
}
|
||||
} catch {
|
||||
setErrorText(
|
||||
"No node found with the provided Name, Node ID or Identity Key. Please check your input and try again."
|
||||
"No node found with the provided Name, Node ID or Identity Key. Please check your input and try again.",
|
||||
);
|
||||
setIsLoading(false); // Stop loading
|
||||
|
||||
@@ -58,7 +58,7 @@ const NodeAndAddressSearch = () => {
|
||||
}
|
||||
} else {
|
||||
setErrorText(
|
||||
"No node found with the provided Name, Node ID or Identity Key. Please check your input and try again."
|
||||
"No node found with the provided Name, Node ID or Identity Key. Please check your input and try again.",
|
||||
);
|
||||
setIsLoading(false); // Stop loading
|
||||
|
||||
@@ -68,7 +68,7 @@ const NodeAndAddressSearch = () => {
|
||||
// Check if it's a node identity key
|
||||
if (nymNodes) {
|
||||
const matchingNode = nymNodes.find(
|
||||
(node) => node.identity_key === inputValue
|
||||
(node) => node.identity_key === inputValue,
|
||||
);
|
||||
|
||||
if (matchingNode) {
|
||||
@@ -77,13 +77,13 @@ const NodeAndAddressSearch = () => {
|
||||
}
|
||||
}
|
||||
setErrorText(
|
||||
"No node found with the provided Name, Node ID or Identity Key. Please check your input and try again."
|
||||
"No node found with the provided Name, Node ID or Identity Key. Please check your input and try again.",
|
||||
);
|
||||
setIsLoading(false);
|
||||
}
|
||||
} catch (error) {
|
||||
setErrorText(
|
||||
"No node found with the provided Name, Node ID or Identity Key. Please check your input and try again."
|
||||
"No node found with the provided Name, Node ID or Identity Key. Please check your input and try again.",
|
||||
);
|
||||
console.error(error);
|
||||
setIsLoading(false); // Stop loading
|
||||
@@ -92,7 +92,7 @@ const NodeAndAddressSearch = () => {
|
||||
|
||||
// Handle search input change
|
||||
const handleSearchInputChange = (
|
||||
event: React.ChangeEvent<HTMLInputElement>
|
||||
event: React.ChangeEvent<HTMLInputElement>,
|
||||
) => {
|
||||
const value = event.target.value;
|
||||
setInputValue(value);
|
||||
@@ -107,7 +107,7 @@ const NodeAndAddressSearch = () => {
|
||||
const filteredNodes = nymNodes.filter((node) =>
|
||||
node.self_description?.moniker
|
||||
?.toLowerCase()
|
||||
.includes(value.toLowerCase())
|
||||
.includes(value.toLowerCase()),
|
||||
);
|
||||
setSearchOptions(filteredNodes);
|
||||
} else {
|
||||
@@ -118,7 +118,7 @@ const NodeAndAddressSearch = () => {
|
||||
// Handle node selection from dropdown
|
||||
const handleNodeSelect = (
|
||||
event: React.SyntheticEvent,
|
||||
value: string | IObservatoryNode | null
|
||||
value: string | IObservatoryNode | null,
|
||||
) => {
|
||||
if (value && typeof value !== "string") {
|
||||
setIsLoading(true); // Show loading spinner
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
[package]
|
||||
name = "nym-api"
|
||||
license = "GPL-3.0"
|
||||
version = "1.1.66"
|
||||
version = "1.1.67"
|
||||
authors.workspace = true
|
||||
edition = "2021"
|
||||
rust-version.workspace = true
|
||||
|
||||
@@ -124,6 +124,7 @@ pub struct Config {
|
||||
pub node_status_api: NodeStatusAPI,
|
||||
|
||||
#[serde(alias = "topology_cacher")]
|
||||
#[serde(default)]
|
||||
pub describe_cache: DescribeCache,
|
||||
|
||||
#[serde(default)]
|
||||
|
||||
@@ -70,30 +70,6 @@ per_node_test_packets = {{ network_monitor.debug.per_node_test_packets }}
|
||||
# Path to the database file containing uptime statuses for all mixnodes and gateways.
|
||||
database_path = '{{ node_status_api.storage_paths.database_path }}'
|
||||
|
||||
[node_status_api.debug]
|
||||
|
||||
caching_interval = '{{ node_status_api.debug.caching_interval }}'
|
||||
|
||||
|
||||
##### topology cacher config options #####
|
||||
|
||||
[topology_cacher.debug]
|
||||
|
||||
caching_interval = '{{ topology_cacher.debug.caching_interval }}'
|
||||
|
||||
|
||||
##### circulating supply cacher config options #####
|
||||
|
||||
[circulating_supply_cacher]
|
||||
|
||||
# Specifies whether circulating supply caching service is enabled in this process.
|
||||
enabled = {{ circulating_supply_cacher.enabled }}
|
||||
|
||||
[circulating_supply_cacher.debug]
|
||||
|
||||
caching_interval = '{{ circulating_supply_cacher.debug.caching_interval }}'
|
||||
|
||||
|
||||
##### rewarding config options #####
|
||||
|
||||
[rewarding]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "extension-storage"
|
||||
version = "1.4.0-rc.0"
|
||||
version = "1.4.1"
|
||||
edition = "2024"
|
||||
license = "Apache-2.0"
|
||||
repository = "https://github.com/nymtech/nym"
|
||||
|
||||
@@ -16,6 +16,7 @@ schemars = { workspace = true, features = ["preserve_order", "uuid1"] }
|
||||
uuid = { workspace = true, features = ["serde"] }
|
||||
serde = { workspace = true, features = ["derive"] }
|
||||
serde_json.workspace = true
|
||||
serde_with = { workspace = true }
|
||||
time = { workspace = true, features = ["serde", "formatting", "parsing"] }
|
||||
tsify = { workspace = true, optional = true }
|
||||
reqwest = { workspace = true, features = ["json", "rustls-tls"] }
|
||||
|
||||
@@ -9,6 +9,7 @@ use schemars::JsonSchema;
|
||||
use schemars::r#gen::SchemaGenerator;
|
||||
use schemars::schema::Schema;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_with::{DisplayFromStr, serde_as};
|
||||
use std::ops::{Deref, DerefMut};
|
||||
use time::{Date, OffsetDateTime};
|
||||
|
||||
@@ -264,12 +265,14 @@ pub struct WebhookTicketbookWalletSharesRequest {
|
||||
pub secret: String,
|
||||
}
|
||||
|
||||
#[serde_as]
|
||||
#[derive(Default, Debug, Serialize, Deserialize, Clone)]
|
||||
#[cfg_attr(feature = "openapi", derive(utoipa::ToSchema, utoipa::IntoParams))]
|
||||
#[cfg(feature = "query-types")]
|
||||
#[serde(default, rename_all = "kebab-case")]
|
||||
pub struct TicketbookObtainParams {
|
||||
#[serde(default)]
|
||||
#[serde_as(as = "DisplayFromStr")]
|
||||
pub skip_webhook: bool,
|
||||
|
||||
#[serde(default)]
|
||||
@@ -277,15 +280,19 @@ pub struct TicketbookObtainParams {
|
||||
pub global: GlobalDataParams,
|
||||
}
|
||||
|
||||
#[serde_as]
|
||||
#[derive(Default, Debug, Serialize, Deserialize, Clone)]
|
||||
#[cfg_attr(feature = "openapi", derive(utoipa::ToSchema, utoipa::IntoParams))]
|
||||
#[cfg(feature = "query-types")]
|
||||
#[serde(default, rename_all = "kebab-case")]
|
||||
pub struct GlobalDataParams {
|
||||
#[serde_as(as = "DisplayFromStr")]
|
||||
pub include_master_verification_key: bool,
|
||||
|
||||
#[serde_as(as = "DisplayFromStr")]
|
||||
pub include_coin_index_signatures: bool,
|
||||
|
||||
#[serde_as(as = "DisplayFromStr")]
|
||||
pub include_expiration_date_signatures: bool,
|
||||
}
|
||||
|
||||
|
||||
@@ -35,15 +35,13 @@ import (
|
||||
)
|
||||
|
||||
var fileUrls = []string{
|
||||
"https://proof.ovh.net/files/1Mb.dat",
|
||||
"https://nym-bandwidth-monitoring.ops-d86.workers.dev/1mb.dat",
|
||||
"https://proof.ovh.net/files/10Mb.dat",
|
||||
"https://nym-bandwidth-monitoring.ops-d86.workers.dev/10mb.dat",
|
||||
// "https://nym-bandwidth-monitoring.ops-d86.workers.dev/100mb.dat", to be introduced later
|
||||
}
|
||||
|
||||
var fileUrlsV6 = []string{
|
||||
"https://proof.ovh.net/files/1Mb.dat",
|
||||
"https://nym-bandwidth-monitoring.ops-d86.workers.dev/1mb.dat",
|
||||
"https://proof.ovh.net/files/10Mb.dat",
|
||||
"https://nym-bandwidth-monitoring.ops-d86.workers.dev/10mb.dat",
|
||||
// "https://nym-bandwidth-monitoring.ops-d86.workers.dev/100mb.dat", to be introduced later
|
||||
}
|
||||
@@ -194,14 +192,20 @@ func ping(req NetstackRequestGo) (NetstackResponse, error) {
|
||||
|
||||
response.CanHandshake = true
|
||||
|
||||
version, duration, err := queryMetadata(req.MetadataEndpoint, req.MetadataTimeoutSec, tnet)
|
||||
if err != nil {
|
||||
log.Printf("Failed to query metadata URLs: %v\n", err)
|
||||
response.CanQueryMetadata = false
|
||||
// Skip metadata query if endpoint is empty (e.g., for IPv6 where the IPv4 metadata endpoint is not reachable)
|
||||
if req.MetadataEndpoint != "" {
|
||||
version, duration, err := queryMetadata(req.MetadataEndpoint, req.MetadataTimeoutSec, tnet)
|
||||
if err != nil {
|
||||
log.Printf("Failed to query metadata URLs: %v\n", err)
|
||||
response.CanQueryMetadata = false
|
||||
} else {
|
||||
log.Printf("Queried metadata endpoint with version: %v\n", version)
|
||||
log.Printf("Query duration: %v\n", duration)
|
||||
response.CanQueryMetadata = true
|
||||
}
|
||||
} else {
|
||||
log.Printf("Queried metadata endpoint with version: %v\n", version)
|
||||
log.Printf("Query duration: %v\n", duration)
|
||||
response.CanQueryMetadata = true
|
||||
log.Printf("Skipping metadata query (no endpoint provided)")
|
||||
response.CanQueryMetadata = false
|
||||
}
|
||||
|
||||
for _, host := range req.PingHosts {
|
||||
@@ -542,25 +546,25 @@ func queryMetadata(url string, timeoutSecs uint64, tnet *netstack.Net) (int, tim
|
||||
func main() {
|
||||
// uncomment the lines below to run locally and see README.md for how to get the Wireguard config
|
||||
/* var _, err = ping(NetstackRequestGo{
|
||||
WgIp: "10.1.155.153",
|
||||
PrivateKey: "...",
|
||||
PublicKey: "...",
|
||||
Endpoint: "13.245.9.123:51822",
|
||||
MetadataEndpoint: "http://10.1.0.1:51830",
|
||||
Dns: "1.1.1.1",
|
||||
IpVersion: 4,
|
||||
//PingHosts: nil,
|
||||
//PingIps: nil,
|
||||
//NumPing: 0,
|
||||
//SendTimeoutSec: 0,
|
||||
//RecvTimeoutSec: 0,
|
||||
//DownloadTimeoutSec: 0,
|
||||
MetadataTimeoutSec: 5,
|
||||
//AwgArgs: "",
|
||||
})
|
||||
WgIp: "10.1.155.153",
|
||||
PrivateKey: "...",
|
||||
PublicKey: "...",
|
||||
Endpoint: "13.245.9.123:51822",
|
||||
MetadataEndpoint: "http://10.1.0.1:51830",
|
||||
Dns: "1.1.1.1",
|
||||
IpVersion: 4,
|
||||
//PingHosts: nil,
|
||||
//PingIps: nil,
|
||||
//NumPing: 0,
|
||||
//SendTimeoutSec: 0,
|
||||
//RecvTimeoutSec: 0,
|
||||
//DownloadTimeoutSec: 0,
|
||||
MetadataTimeoutSec: 5,
|
||||
//AwgArgs: "",
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
@@ -215,8 +215,8 @@ func TestPingFunction(t *testing.T) {
|
||||
// Create a request with valid IP but will fail due to network setup
|
||||
req := NetstackRequestGo{
|
||||
WgIp: "10.0.0.1",
|
||||
PrivateKey: "test-key",
|
||||
PublicKey: "test-pub-key",
|
||||
PrivateKey: "0000000000000000000000000000000000000000000000000000000000000000",
|
||||
PublicKey: "0000000000000000000000000000000000000000000000000000000000000000",
|
||||
Endpoint: "1.1.1.1:51820",
|
||||
Dns: "1.1.1.1",
|
||||
IpVersion: 4,
|
||||
@@ -275,10 +275,11 @@ func TestResultStructs(t *testing.T) {
|
||||
// TestConsecutiveFailureExit validates that the ping loop exits cleanly after consecutive failures
|
||||
func TestConsecutiveFailureExit(t *testing.T) {
|
||||
// Create a test request that will trigger consecutive failures
|
||||
// Using valid hex-encoded keys (32 bytes = 64 hex chars)
|
||||
req := NetstackRequestGo{
|
||||
WgIp: "10.0.0.1",
|
||||
PrivateKey: "test-key",
|
||||
PublicKey: "test-pub-key",
|
||||
PrivateKey: "0000000000000000000000000000000000000000000000000000000000000000",
|
||||
PublicKey: "0000000000000000000000000000000000000000000000000000000000000000",
|
||||
Endpoint: "1.1.1.1:51820",
|
||||
Dns: "1.1.1.1",
|
||||
IpVersion: 4,
|
||||
|
||||
@@ -145,7 +145,8 @@ impl NetstackRequestGo {
|
||||
private_key: req.private_key.clone(),
|
||||
public_key: req.public_key.clone(),
|
||||
endpoint: req.endpoint.clone(),
|
||||
metadata_endpoint: req.metadata_endpoint.clone(),
|
||||
// Skip metadata endpoint for IPv6 as it's an IPv4-only address (10.1.0.1)
|
||||
metadata_endpoint: String::new(),
|
||||
dns: req.v6_ping_config.dns.clone(),
|
||||
ip_version: 6,
|
||||
ping_hosts: req.v6_ping_config.ping_hosts.clone(),
|
||||
|
||||
-14
@@ -1,14 +0,0 @@
|
||||
{
|
||||
"db_name": "PostgreSQL",
|
||||
"query": "UPDATE ecash_ticketbook SET used_tickets = used_tickets + 1 WHERE id = $1",
|
||||
"describe": {
|
||||
"columns": [],
|
||||
"parameters": {
|
||||
"Left": [
|
||||
"Int4"
|
||||
]
|
||||
},
|
||||
"nullable": []
|
||||
},
|
||||
"hash": "8c92a413a2853a2508c0e8a17ae8723c400930663c4c76e96dfdc7e8c98501ca"
|
||||
}
|
||||
+65
@@ -0,0 +1,65 @@
|
||||
{
|
||||
"db_name": "PostgreSQL",
|
||||
"query": "\n UPDATE ecash_ticketbook\n SET used_tickets = used_tickets + 1\n WHERE id = (\n SELECT id\n FROM ecash_ticketbook\n WHERE used_tickets < total_tickets\n AND expiration_date >= $1\n AND ticketbook_type = $2\n ORDER BY expiration_date ASC\n LIMIT 1\n FOR UPDATE\n )\n RETURNING *\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
"ordinal": 0,
|
||||
"name": "id",
|
||||
"type_info": "Int4"
|
||||
},
|
||||
{
|
||||
"ordinal": 1,
|
||||
"name": "serialization_revision",
|
||||
"type_info": "Int2"
|
||||
},
|
||||
{
|
||||
"ordinal": 2,
|
||||
"name": "ticketbook_type",
|
||||
"type_info": "Text"
|
||||
},
|
||||
{
|
||||
"ordinal": 3,
|
||||
"name": "ticketbook_data",
|
||||
"type_info": "Bytea"
|
||||
},
|
||||
{
|
||||
"ordinal": 4,
|
||||
"name": "expiration_date",
|
||||
"type_info": "Date"
|
||||
},
|
||||
{
|
||||
"ordinal": 5,
|
||||
"name": "epoch_id",
|
||||
"type_info": "Int4"
|
||||
},
|
||||
{
|
||||
"ordinal": 6,
|
||||
"name": "total_tickets",
|
||||
"type_info": "Int4"
|
||||
},
|
||||
{
|
||||
"ordinal": 7,
|
||||
"name": "used_tickets",
|
||||
"type_info": "Int4"
|
||||
}
|
||||
],
|
||||
"parameters": {
|
||||
"Left": [
|
||||
"Date",
|
||||
"Text"
|
||||
]
|
||||
},
|
||||
"nullable": [
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false
|
||||
]
|
||||
},
|
||||
"hash": "af5c78ef980e38d81f58f72f21c9cd410f83b8750196e0cf5fa5af23883e76df"
|
||||
}
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
[package]
|
||||
name = "nym-node-status-api"
|
||||
version = "4.0.9"
|
||||
version = "4.0.10"
|
||||
authors.workspace = true
|
||||
repository.workspace = true
|
||||
homepage.workspace = true
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
use anyhow::{Result, anyhow};
|
||||
use std::ops::{Deref, DerefMut};
|
||||
use std::{str::FromStr, time::Duration};
|
||||
|
||||
pub(crate) mod models;
|
||||
@@ -8,9 +7,7 @@ pub(crate) mod queries;
|
||||
#[cfg(test)]
|
||||
mod tests;
|
||||
|
||||
use sqlx::{
|
||||
ConnectOptions, PgPool, Postgres, Transaction, migrate::Migrator, postgres::PgConnectOptions,
|
||||
};
|
||||
use sqlx::{ConnectOptions, PgPool, Postgres, migrate::Migrator, postgres::PgConnectOptions};
|
||||
|
||||
static MIGRATOR: Migrator = sqlx::migrate!("./migrations_pg");
|
||||
|
||||
@@ -18,35 +15,6 @@ pub(crate) type DbPool = PgPool;
|
||||
|
||||
pub(crate) type DbConnection = sqlx::pool::PoolConnection<Postgres>;
|
||||
|
||||
pub(crate) struct StorageTransaction<'a> {
|
||||
inner: Transaction<'a, Postgres>,
|
||||
}
|
||||
|
||||
impl<'a> StorageTransaction<'a> {
|
||||
pub(crate) async fn commit(self) -> Result<(), sqlx::Error> {
|
||||
self.inner.commit().await
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> From<Transaction<'a, Postgres>> for StorageTransaction<'a> {
|
||||
fn from(inner: Transaction<'a, Postgres>) -> Self {
|
||||
Self { inner }
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> Deref for StorageTransaction<'a> {
|
||||
type Target = Transaction<'a, Postgres>;
|
||||
fn deref(&self) -> &Self::Target {
|
||||
&self.inner
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> DerefMut for StorageTransaction<'a> {
|
||||
fn deref_mut(&mut self) -> &mut Transaction<'a, Postgres> {
|
||||
&mut self.inner
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub(crate) struct Storage {
|
||||
pool: DbPool,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
|
||||
use crate::db::{Storage, StorageTransaction};
|
||||
use crate::db::Storage;
|
||||
use crate::ticketbook_manager::storage::auxiliary_models::StoredIssuedTicketbook;
|
||||
use nym_credential_proxy_lib::storage::models::{
|
||||
RawCoinIndexSignatures, RawExpirationDateSignatures, RawVerificationKey,
|
||||
@@ -10,10 +10,6 @@ use time::Date;
|
||||
use tracing::error;
|
||||
|
||||
impl Storage {
|
||||
pub(crate) async fn begin_storage_tx(&self) -> Result<StorageTransaction<'_>, sqlx::Error> {
|
||||
self.pool.begin().await.map(Into::into)
|
||||
}
|
||||
|
||||
pub(crate) async fn available_tickets_of_type(&self, typ: &str) -> Result<i64, sqlx::Error> {
|
||||
let count = sqlx::query!(
|
||||
r#"
|
||||
@@ -217,46 +213,38 @@ impl Storage {
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> StorageTransaction<'a> {
|
||||
pub(crate) async fn get_next_unspent_ticketbook(
|
||||
&mut self,
|
||||
&self,
|
||||
ticket_type: String,
|
||||
deadline: Date,
|
||||
) -> Result<Option<StoredIssuedTicketbook>, sqlx::Error> {
|
||||
sqlx::query_as(
|
||||
sqlx::query_as!(
|
||||
StoredIssuedTicketbook,
|
||||
r#"
|
||||
SELECT *
|
||||
FROM ecash_ticketbook
|
||||
WHERE used_tickets + 1 <= total_tickets
|
||||
AND expiration_date >= $1
|
||||
AND ticketbook_type = $2
|
||||
ORDER BY expiration_date ASC
|
||||
LIMIT 1
|
||||
UPDATE ecash_ticketbook
|
||||
SET used_tickets = used_tickets + 1
|
||||
WHERE id = (
|
||||
SELECT id
|
||||
FROM ecash_ticketbook
|
||||
WHERE used_tickets < total_tickets
|
||||
AND expiration_date >= $1
|
||||
AND ticketbook_type = $2
|
||||
ORDER BY expiration_date ASC
|
||||
LIMIT 1
|
||||
FOR UPDATE
|
||||
)
|
||||
RETURNING *
|
||||
"#,
|
||||
deadline,
|
||||
ticket_type
|
||||
)
|
||||
.bind(deadline)
|
||||
.bind(ticket_type)
|
||||
.fetch_optional(&mut ***self)
|
||||
.fetch_optional(&self.pool)
|
||||
.await
|
||||
}
|
||||
|
||||
pub(crate) async fn increase_used_ticketbook_tickets(
|
||||
&mut self,
|
||||
ticketbook_id: i32,
|
||||
) -> Result<(), sqlx::Error> {
|
||||
sqlx::query!(
|
||||
"UPDATE ecash_ticketbook SET used_tickets = used_tickets + 1 WHERE id = $1",
|
||||
ticketbook_id
|
||||
)
|
||||
.execute(&mut ***self)
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub(crate) async fn set_distributed_ticketbook(
|
||||
&mut self,
|
||||
&self,
|
||||
testrun_id: i32,
|
||||
ticketbook_id: i32,
|
||||
assigned_index: i32,
|
||||
@@ -271,7 +259,7 @@ impl<'a> StorageTransaction<'a> {
|
||||
ticketbook_id,
|
||||
assigned_index
|
||||
)
|
||||
.execute(&mut ***self)
|
||||
.execute(&self.pool)
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@ async fn run(
|
||||
.clone()
|
||||
.expect("rust sdk mainnet default missing api_url");
|
||||
|
||||
let nym_api = nym_http_api_client::ClientBuilder::new_with_urls(vec![default_api_url.into()])
|
||||
let nym_api = nym_http_api_client::ClientBuilder::new_with_urls(vec![default_api_url.into()])?
|
||||
.no_hickory_dns()
|
||||
.with_timeout(nym_api_client_timeout)
|
||||
.build()?;
|
||||
|
||||
@@ -98,7 +98,7 @@ impl Monitor {
|
||||
.expect("rust sdk mainnet default missing api_url");
|
||||
|
||||
let nym_api =
|
||||
nym_http_api_client::ClientBuilder::new_with_urls(vec![default_api_url.into()])
|
||||
nym_http_api_client::ClientBuilder::new_with_urls(vec![default_api_url.into()])?
|
||||
.no_hickory_dns()
|
||||
.with_timeout(self.nym_api_client_timeout)
|
||||
.build()?;
|
||||
|
||||
@@ -91,15 +91,14 @@ impl TicketbookManagerStorage {
|
||||
testrun_id: i32,
|
||||
) -> anyhow::Result<Option<RetrievedTicketbook>> {
|
||||
let deadline = ecash_today().ecash_date();
|
||||
let mut tx = self.storage.begin_storage_tx().await?;
|
||||
|
||||
// we don't want ticketbooks with expiration in the past
|
||||
let Some(raw) = tx
|
||||
// note: this query updates the spent tickets atomically
|
||||
let Some(raw) = self
|
||||
.storage
|
||||
.get_next_unspent_ticketbook(ticket_type.to_string(), deadline)
|
||||
.await?
|
||||
else {
|
||||
// make sure to finish our tx
|
||||
tx.commit().await?;
|
||||
return Ok(None);
|
||||
};
|
||||
|
||||
@@ -110,10 +109,9 @@ impl TicketbookManagerStorage {
|
||||
)
|
||||
.map_err(|err| anyhow!("failed to deserialise stored ticketbook: {err}"))?;
|
||||
|
||||
tx.set_distributed_ticketbook(testrun_id, raw.id, raw.used_tickets)
|
||||
self.storage
|
||||
.set_distributed_ticketbook(testrun_id, raw.id, raw.used_tickets)
|
||||
.await?;
|
||||
tx.increase_used_ticketbook_tickets(raw.id).await?;
|
||||
tx.commit().await?;
|
||||
|
||||
deserialised.update_spent_tickets(raw.used_tickets as u64);
|
||||
Ok(Some(RetrievedTicketbook {
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
[package]
|
||||
name = "nym-node"
|
||||
version = "1.16.0"
|
||||
version = "1.19.0"
|
||||
authors.workspace = true
|
||||
repository.workspace = true
|
||||
homepage.workspace = true
|
||||
|
||||
@@ -2,9 +2,7 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
|
||||
use crate::config::Config;
|
||||
use crate::config::persistence::{
|
||||
DEFAULT_RD_BLOOMFILTER_FILE_EXT, DEFAULT_RD_BLOOMFILTER_FLUSH_FILE_EXT,
|
||||
};
|
||||
use crate::config::persistence::DEFAULT_RD_BLOOMFILTER_FLUSH_FILE_EXT;
|
||||
use crate::error::NymNodeError;
|
||||
use crate::node::replay_protection::bloomfilter::RotationFilter;
|
||||
use crate::node::replay_protection::helpers::parse_rotation_id_from_filename;
|
||||
@@ -24,7 +22,6 @@ use tracing::{debug, error, info, trace, warn};
|
||||
|
||||
// background task responsible for periodically flushing the bloomfilters to disk
|
||||
pub struct ReplayProtectionDiskFlush {
|
||||
bloomfilters_directory: PathBuf,
|
||||
disk_flushing_rate: Duration,
|
||||
|
||||
filters_manager: ReplayProtectionBloomfiltersManager,
|
||||
@@ -124,8 +121,25 @@ impl ReplayProtectionDiskFlush {
|
||||
None
|
||||
};
|
||||
|
||||
// if we have any other stored bloomfilters that are neither primary nor secondary,
|
||||
// remove them - they are an artifact from an old version that had a bug in purging code
|
||||
for (rotation_id, path) in filter_files {
|
||||
if rotation_id == primary_key_rotation_id {
|
||||
continue;
|
||||
}
|
||||
if let Some(secondary_key_rotation_id) = secondary_key_rotation_id
|
||||
&& secondary_key_rotation_id == rotation_id
|
||||
{
|
||||
continue;
|
||||
}
|
||||
info!(
|
||||
"stale bloomfilter for rotation {rotation_id} found at: {path:?}. it is going to get removed"
|
||||
);
|
||||
fs::remove_file(&path)
|
||||
.map_err(|source| NymNodeError::BloomfilterIoFailure { source, path })?;
|
||||
}
|
||||
|
||||
Ok(ReplayProtectionDiskFlush {
|
||||
bloomfilters_directory,
|
||||
disk_flushing_rate: config
|
||||
.mixnet
|
||||
.replay_protection
|
||||
@@ -142,15 +156,12 @@ impl ReplayProtectionDiskFlush {
|
||||
}
|
||||
|
||||
fn bloomfilter_filepath(&self, rotation_id: u32) -> PathBuf {
|
||||
self.bloomfilters_directory
|
||||
.join(format!("rot-{rotation_id}"))
|
||||
.with_extension(DEFAULT_RD_BLOOMFILTER_FILE_EXT)
|
||||
self.filters_manager.bloomfilter_filepath(rotation_id)
|
||||
}
|
||||
|
||||
fn current_bloomfilter_being_flushed_filepath(&self, rotation_id: u32) -> PathBuf {
|
||||
self.bloomfilters_directory
|
||||
.join(format!("rot-{rotation_id}"))
|
||||
.with_extension(DEFAULT_RD_BLOOMFILTER_FLUSH_FILE_EXT)
|
||||
self.filters_manager
|
||||
.current_bloomfilter_being_flushed_filepath(rotation_id)
|
||||
}
|
||||
|
||||
pub(crate) fn bloomfilters_manager(&self) -> ReplayProtectionBloomfiltersManager {
|
||||
@@ -213,7 +224,7 @@ impl ReplayProtectionDiskFlush {
|
||||
}
|
||||
|
||||
async fn flush_filters_to_disk(&self) -> Result<(), NymNodeError> {
|
||||
if let Some(parent) = self.bloomfilters_directory.parent() {
|
||||
if let Some(parent) = self.filters_manager.bloomfilters_directory().parent() {
|
||||
fs::create_dir_all(parent).map_err(|source| NymNodeError::BloomfilterIoFailure {
|
||||
source,
|
||||
path: parent.to_path_buf(),
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
use crate::error::NymNodeError;
|
||||
use bloomfilter::Bloom;
|
||||
use nym_sphinx_types::REPLAY_TAG_SIZE;
|
||||
use nym_validator_client::models::KeyRotationId;
|
||||
use std::collections::HashMap;
|
||||
use std::fs::File;
|
||||
use std::io::Read;
|
||||
@@ -12,7 +13,6 @@ use std::path::Path;
|
||||
use std::sync::{Arc, Mutex, PoisonError, TryLockError};
|
||||
use time::OffsetDateTime;
|
||||
use tracing::{error, info, warn};
|
||||
|
||||
// auxiliary data associated with the bloomfilter to get some statistics from the time of its creation
|
||||
// this is needed in order to more accurately resize it upon reset
|
||||
|
||||
@@ -180,15 +180,16 @@ impl ReplayProtectionBloomfilters {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub(crate) fn purge_secondary(&self) -> Result<(), NymNodeError> {
|
||||
pub(crate) fn purge_secondary(&self) -> Result<Option<KeyRotationId>, NymNodeError> {
|
||||
let mut guard = self
|
||||
.inner
|
||||
.lock()
|
||||
.map_err(|_| NymNodeError::BloomfilterFailure {
|
||||
message: "mutex got poisoned",
|
||||
})?;
|
||||
guard.overlap = None;
|
||||
Ok(())
|
||||
|
||||
let id = guard.overlap.take().map(|f| f.metadata.rotation_id);
|
||||
Ok(id)
|
||||
}
|
||||
|
||||
pub(crate) fn primary_metadata(
|
||||
|
||||
@@ -2,18 +2,25 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
|
||||
use crate::config::Config;
|
||||
use crate::config::persistence::{
|
||||
DEFAULT_RD_BLOOMFILTER_FILE_EXT, DEFAULT_RD_BLOOMFILTER_FLUSH_FILE_EXT,
|
||||
};
|
||||
use crate::error::NymNodeError;
|
||||
use crate::node::replay_protection::bloomfilter::{ReplayProtectionBloomfilters, RotationFilter};
|
||||
use crate::node::replay_protection::items_in_bloomfilter;
|
||||
use human_repr::HumanCount;
|
||||
use nym_node_metrics::NymNodeMetrics;
|
||||
use std::cmp::max;
|
||||
use std::fs;
|
||||
use std::path::PathBuf;
|
||||
use std::time::Duration;
|
||||
use time::OffsetDateTime;
|
||||
use tracing::info;
|
||||
|
||||
#[derive(Clone)]
|
||||
pub(crate) struct ReplayProtectionBloomfiltersManager {
|
||||
bloomfilters_directory: PathBuf,
|
||||
|
||||
target_fp_p: f64,
|
||||
minimum_bloomfilter_packets_per_second: usize,
|
||||
bloomfilter_size_multiplier: f64,
|
||||
@@ -26,6 +33,7 @@ impl ReplayProtectionBloomfiltersManager {
|
||||
pub(crate) fn new_disabled(metrics: NymNodeMetrics) -> Self {
|
||||
// the exact config values are irrelevant as the filters will never be recreated
|
||||
ReplayProtectionBloomfiltersManager {
|
||||
bloomfilters_directory: Default::default(),
|
||||
target_fp_p: 0.001,
|
||||
minimum_bloomfilter_packets_per_second: 1,
|
||||
bloomfilter_size_multiplier: 1.0,
|
||||
@@ -41,6 +49,12 @@ impl ReplayProtectionBloomfiltersManager {
|
||||
metrics: NymNodeMetrics,
|
||||
) -> Self {
|
||||
ReplayProtectionBloomfiltersManager {
|
||||
bloomfilters_directory: config
|
||||
.mixnet
|
||||
.replay_protection
|
||||
.storage_paths
|
||||
.current_bloomfilters_directory
|
||||
.clone(),
|
||||
target_fp_p: config.mixnet.replay_protection.debug.false_positive_rate,
|
||||
minimum_bloomfilter_packets_per_second: config
|
||||
.mixnet
|
||||
@@ -57,6 +71,22 @@ impl ReplayProtectionBloomfiltersManager {
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn bloomfilters_directory(&self) -> &PathBuf {
|
||||
&self.bloomfilters_directory
|
||||
}
|
||||
|
||||
pub(crate) fn bloomfilter_filepath(&self, rotation_id: u32) -> PathBuf {
|
||||
self.bloomfilters_directory
|
||||
.join(format!("rot-{rotation_id}"))
|
||||
.with_extension(DEFAULT_RD_BLOOMFILTER_FILE_EXT)
|
||||
}
|
||||
|
||||
pub(crate) fn current_bloomfilter_being_flushed_filepath(&self, rotation_id: u32) -> PathBuf {
|
||||
self.bloomfilters_directory
|
||||
.join(format!("rot-{rotation_id}"))
|
||||
.with_extension(DEFAULT_RD_BLOOMFILTER_FLUSH_FILE_EXT)
|
||||
}
|
||||
|
||||
pub(crate) fn bloomfilters(&self) -> ReplayProtectionBloomfilters {
|
||||
self.filters.clone()
|
||||
}
|
||||
@@ -70,7 +100,14 @@ impl ReplayProtectionBloomfiltersManager {
|
||||
}
|
||||
|
||||
pub(crate) fn purge_secondary(&self) -> Result<(), NymNodeError> {
|
||||
self.filters.purge_secondary()
|
||||
// remove data in memory
|
||||
if let Some(secondary_id) = self.filters.purge_secondary()? {
|
||||
// remove data on disk (if applicable)
|
||||
let path = self.bloomfilter_filepath(secondary_id);
|
||||
fs::remove_file(&path)
|
||||
.map_err(|source| NymNodeError::BloomfilterIoFailure { source, path })?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub(crate) fn promote_pre_announced(&self) -> Result<(), NymNodeError> {
|
||||
|
||||
@@ -12,6 +12,7 @@ license.workspace = true
|
||||
workspace = true
|
||||
|
||||
[dependencies]
|
||||
futures.workspace = true
|
||||
thiserror.workspace = true
|
||||
tokio.workspace = true
|
||||
tokio-util.workspace = true
|
||||
|
||||
@@ -56,6 +56,53 @@ pub struct MixnetClientConfig {
|
||||
}
|
||||
|
||||
impl BuilderConfig {
|
||||
/// Creates a new BuilderConfig with all required parameters.
|
||||
///
|
||||
/// However, consider using `BuilderConfig::builder()` instead.
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn new(
|
||||
entry_node: NymNodeWithKeys,
|
||||
exit_node: NymNodeWithKeys,
|
||||
data_path: Option<PathBuf>,
|
||||
mixnet_client_config: MixnetClientConfig,
|
||||
two_hops: bool,
|
||||
user_agent: UserAgent,
|
||||
custom_topology_provider: Box<dyn TopologyProvider + Send + Sync>,
|
||||
network_env: NymNetworkDetails,
|
||||
cancel_token: CancellationToken,
|
||||
#[cfg(unix)] connection_fd_callback: Arc<dyn Fn(RawFd) + Send + Sync>,
|
||||
) -> Self {
|
||||
Self {
|
||||
entry_node,
|
||||
exit_node,
|
||||
data_path,
|
||||
mixnet_client_config,
|
||||
two_hops,
|
||||
user_agent,
|
||||
custom_topology_provider,
|
||||
network_env,
|
||||
cancel_token,
|
||||
#[cfg(unix)]
|
||||
connection_fd_callback,
|
||||
}
|
||||
}
|
||||
|
||||
/// Creates a builder for BuilderConfig
|
||||
///
|
||||
/// This is the preferred way to construct a BuilderConfig.
|
||||
///
|
||||
/// # Example
|
||||
/// ```ignore
|
||||
/// let config = BuilderConfig::builder()
|
||||
/// .entry_node(entry)
|
||||
/// .exit_node(exit)
|
||||
/// .user_agent(agent)
|
||||
/// .build()?;
|
||||
/// ```
|
||||
pub fn builder() -> BuilderConfigBuilder {
|
||||
BuilderConfigBuilder::default()
|
||||
}
|
||||
|
||||
pub fn mixnet_client_debug_config(&self) -> DebugConfig {
|
||||
if self.two_hops {
|
||||
two_hop_debug_config(&self.mixnet_client_config)
|
||||
@@ -206,3 +253,205 @@ fn log_mixnet_client_config(debug_config: &DebugConfig) {
|
||||
fn true_to_disabled(val: bool) -> &'static str {
|
||||
if val { "disabled" } else { "enabled" }
|
||||
}
|
||||
|
||||
/// Error type for BuilderConfig validation
|
||||
#[derive(Debug, Clone, thiserror::Error)]
|
||||
#[allow(clippy::enum_variant_names)]
|
||||
pub enum BuilderConfigError {
|
||||
#[error("entry_node is required")]
|
||||
MissingEntryNode,
|
||||
#[error("exit_node is required")]
|
||||
MissingExitNode,
|
||||
#[error("mixnet_client_config is required")]
|
||||
MissingMixnetClientConfig,
|
||||
#[error("user_agent is required")]
|
||||
MissingUserAgent,
|
||||
#[error("custom_topology_provider is required")]
|
||||
MissingTopologyProvider,
|
||||
#[error("network_env is required")]
|
||||
MissingNetworkEnv,
|
||||
#[error("cancel_token is required")]
|
||||
MissingCancelToken,
|
||||
#[cfg(unix)]
|
||||
#[error("connection_fd_callback is required")]
|
||||
MissingConnectionFdCallback,
|
||||
}
|
||||
|
||||
/// Builder for `BuilderConfig`
|
||||
///
|
||||
/// This provides a more convenient way to construct a `BuilderConfig` compared to the
|
||||
/// `new()` constructor with many arguments.
|
||||
#[derive(Default)]
|
||||
pub struct BuilderConfigBuilder {
|
||||
entry_node: Option<NymNodeWithKeys>,
|
||||
exit_node: Option<NymNodeWithKeys>,
|
||||
data_path: Option<PathBuf>,
|
||||
mixnet_client_config: Option<MixnetClientConfig>,
|
||||
two_hops: bool,
|
||||
user_agent: Option<UserAgent>,
|
||||
custom_topology_provider: Option<Box<dyn TopologyProvider + Send + Sync>>,
|
||||
network_env: Option<NymNetworkDetails>,
|
||||
cancel_token: Option<CancellationToken>,
|
||||
#[cfg(unix)]
|
||||
connection_fd_callback: Option<Arc<dyn Fn(RawFd) + Send + Sync>>,
|
||||
}
|
||||
|
||||
impl BuilderConfigBuilder {
|
||||
pub fn new() -> Self {
|
||||
Self::default()
|
||||
}
|
||||
|
||||
pub fn entry_node(mut self, entry_node: NymNodeWithKeys) -> Self {
|
||||
self.entry_node = Some(entry_node);
|
||||
self
|
||||
}
|
||||
|
||||
pub fn exit_node(mut self, exit_node: NymNodeWithKeys) -> Self {
|
||||
self.exit_node = Some(exit_node);
|
||||
self
|
||||
}
|
||||
|
||||
pub fn data_path(mut self, data_path: Option<PathBuf>) -> Self {
|
||||
self.data_path = data_path;
|
||||
self
|
||||
}
|
||||
|
||||
pub fn mixnet_client_config(mut self, mixnet_client_config: MixnetClientConfig) -> Self {
|
||||
self.mixnet_client_config = Some(mixnet_client_config);
|
||||
self
|
||||
}
|
||||
|
||||
pub fn two_hops(mut self, two_hops: bool) -> Self {
|
||||
self.two_hops = two_hops;
|
||||
self
|
||||
}
|
||||
|
||||
pub fn user_agent(mut self, user_agent: UserAgent) -> Self {
|
||||
self.user_agent = Some(user_agent);
|
||||
self
|
||||
}
|
||||
|
||||
pub fn custom_topology_provider(
|
||||
mut self,
|
||||
custom_topology_provider: Box<dyn TopologyProvider + Send + Sync>,
|
||||
) -> Self {
|
||||
self.custom_topology_provider = Some(custom_topology_provider);
|
||||
self
|
||||
}
|
||||
|
||||
pub fn network_env(mut self, network_env: NymNetworkDetails) -> Self {
|
||||
self.network_env = Some(network_env);
|
||||
self
|
||||
}
|
||||
|
||||
pub fn cancel_token(mut self, cancel_token: CancellationToken) -> Self {
|
||||
self.cancel_token = Some(cancel_token);
|
||||
self
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
pub fn connection_fd_callback(
|
||||
mut self,
|
||||
connection_fd_callback: Arc<dyn Fn(RawFd) + Send + Sync>,
|
||||
) -> Self {
|
||||
self.connection_fd_callback = Some(connection_fd_callback);
|
||||
self
|
||||
}
|
||||
|
||||
/// Builds the `BuilderConfig`.
|
||||
///
|
||||
/// Returns an error if any required field is missing.
|
||||
pub fn build(self) -> Result<BuilderConfig, BuilderConfigError> {
|
||||
Ok(BuilderConfig {
|
||||
entry_node: self
|
||||
.entry_node
|
||||
.ok_or(BuilderConfigError::MissingEntryNode)?,
|
||||
exit_node: self.exit_node.ok_or(BuilderConfigError::MissingExitNode)?,
|
||||
data_path: self.data_path,
|
||||
mixnet_client_config: self
|
||||
.mixnet_client_config
|
||||
.ok_or(BuilderConfigError::MissingMixnetClientConfig)?,
|
||||
two_hops: self.two_hops,
|
||||
user_agent: self
|
||||
.user_agent
|
||||
.ok_or(BuilderConfigError::MissingUserAgent)?,
|
||||
custom_topology_provider: self
|
||||
.custom_topology_provider
|
||||
.ok_or(BuilderConfigError::MissingTopologyProvider)?,
|
||||
network_env: self
|
||||
.network_env
|
||||
.ok_or(BuilderConfigError::MissingNetworkEnv)?,
|
||||
cancel_token: self
|
||||
.cancel_token
|
||||
.ok_or(BuilderConfigError::MissingCancelToken)?,
|
||||
#[cfg(unix)]
|
||||
connection_fd_callback: self
|
||||
.connection_fd_callback
|
||||
.ok_or(BuilderConfigError::MissingConnectionFdCallback)?,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_mixnet_client_config_default_values() {
|
||||
let config = MixnetClientConfig::default();
|
||||
assert!(!config.disable_poisson_rate);
|
||||
assert!(!config.disable_background_cover_traffic);
|
||||
assert_eq!(config.min_mixnode_performance, None);
|
||||
assert_eq!(config.min_gateway_performance, None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_builder_config_builder_fails_without_required_fields() {
|
||||
// Building without any fields should fail with specific error
|
||||
let result = BuilderConfig::builder().build();
|
||||
assert!(result.is_err());
|
||||
match result {
|
||||
Err(BuilderConfigError::MissingEntryNode) => (), // Expected
|
||||
Err(e) => panic!("Expected MissingEntryNode, got: {}", e),
|
||||
Ok(_) => panic!("Expected error, got Ok"),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_builder_config_builder_validates_all_required_fields() {
|
||||
// Test that each required field is validated
|
||||
let result = BuilderConfig::builder().build();
|
||||
assert!(result.is_err());
|
||||
|
||||
// Short-circuits at first missing field, so we just verify it's one of the expected errors
|
||||
#[allow(unreachable_patterns)] // All variants are covered, but keeping catch-all for safety
|
||||
match result {
|
||||
Err(BuilderConfigError::MissingEntryNode)
|
||||
| Err(BuilderConfigError::MissingExitNode)
|
||||
| Err(BuilderConfigError::MissingMixnetClientConfig)
|
||||
| Err(BuilderConfigError::MissingUserAgent)
|
||||
| Err(BuilderConfigError::MissingTopologyProvider)
|
||||
| Err(BuilderConfigError::MissingNetworkEnv)
|
||||
| Err(BuilderConfigError::MissingCancelToken) => (),
|
||||
#[cfg(unix)]
|
||||
Err(BuilderConfigError::MissingConnectionFdCallback) => (),
|
||||
Err(e) => panic!("Unexpected error: {}", e),
|
||||
Ok(_) => panic!("Expected validation error, got Ok"),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_builder_config_builder_method_chaining() {
|
||||
// Test that builder methods chain properly and return Self
|
||||
let builder = BuilderConfig::builder();
|
||||
|
||||
// Verify the builder returns itself for chaining
|
||||
let builder = builder.two_hops(true);
|
||||
let builder = builder.two_hops(false);
|
||||
let builder = builder.data_path(None);
|
||||
|
||||
// Builder should still fail because required fields are missing
|
||||
let result = builder.build();
|
||||
assert!(result.is_err());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
use futures::channel::mpsc;
|
||||
use nym_bandwidth_controller::{BandwidthController, BandwidthTicketProvider};
|
||||
use nym_credential_storage::ephemeral_storage::EphemeralCredentialStorage;
|
||||
use nym_sdk::{
|
||||
NymNetworkDetails,
|
||||
mixnet::{MixnetClient, MixnetClientBuilder},
|
||||
mixnet::{EventSender, MixnetClient, MixnetClientBuilder},
|
||||
};
|
||||
use nym_validator_client::{
|
||||
QueryHttpRpcNyxdClient,
|
||||
@@ -37,6 +38,7 @@ impl RegistrationClientBuilder {
|
||||
two_hops: self.config.two_hops,
|
||||
};
|
||||
let cancel_token = self.config.cancel_token.clone();
|
||||
let (event_tx, event_rx) = mpsc::unbounded();
|
||||
|
||||
let nyxd_client = get_nyxd_client(&self.config.network_env)?;
|
||||
|
||||
@@ -44,7 +46,8 @@ impl RegistrationClientBuilder {
|
||||
MixnetClient,
|
||||
Box<dyn BandwidthTicketProvider>,
|
||||
) = if let Some((mixnet_client_storage, credential_storage)) = storage {
|
||||
let builder = MixnetClientBuilder::new_with_storage(mixnet_client_storage);
|
||||
let builder = MixnetClientBuilder::new_with_storage(mixnet_client_storage)
|
||||
.event_tx(EventSender(event_tx));
|
||||
let mixnet_client = tokio::time::timeout(
|
||||
MIXNET_CLIENT_STARTUP_TIMEOUT,
|
||||
self.config.build_and_connect_mixnet_client(builder),
|
||||
@@ -54,7 +57,7 @@ impl RegistrationClientBuilder {
|
||||
Box::new(BandwidthController::new(credential_storage, nyxd_client));
|
||||
(mixnet_client, bandwidth_controller)
|
||||
} else {
|
||||
let builder = MixnetClientBuilder::new_ephemeral();
|
||||
let builder = MixnetClientBuilder::new_ephemeral().event_tx(EventSender(event_tx));
|
||||
let mixnet_client = tokio::time::timeout(
|
||||
MIXNET_CLIENT_STARTUP_TIMEOUT,
|
||||
self.config.build_and_connect_mixnet_client(builder),
|
||||
@@ -74,6 +77,7 @@ impl RegistrationClientBuilder {
|
||||
cancel_token,
|
||||
mixnet_client_address,
|
||||
bandwidth_controller,
|
||||
event_rx,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ use nym_bandwidth_controller::BandwidthTicketProvider;
|
||||
use nym_credentials_interface::TicketType;
|
||||
use nym_ip_packet_client::IprClientConnect;
|
||||
use nym_registration_common::AssignedAddresses;
|
||||
use nym_sdk::mixnet::{MixnetClient, Recipient};
|
||||
use nym_sdk::mixnet::{EventReceiver, MixnetClient, Recipient};
|
||||
|
||||
use crate::config::RegistrationClientConfig;
|
||||
|
||||
@@ -31,6 +31,7 @@ pub struct RegistrationClient {
|
||||
mixnet_client_address: Recipient,
|
||||
bandwidth_controller: Box<dyn BandwidthTicketProvider>,
|
||||
cancel_token: CancellationToken,
|
||||
event_rx: EventReceiver,
|
||||
}
|
||||
|
||||
impl RegistrationClient {
|
||||
@@ -61,6 +62,7 @@ impl RegistrationClient {
|
||||
entry_mixnet_gateway_ip,
|
||||
exit_mixnet_gateway_ip,
|
||||
},
|
||||
event_rx: self.event_rx,
|
||||
},
|
||||
)))
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
use nym_authenticator_client::{AuthClientMixnetListenerHandle, AuthenticatorClient};
|
||||
use nym_bandwidth_controller::BandwidthTicketProvider;
|
||||
use nym_registration_common::{AssignedAddresses, GatewayData};
|
||||
use nym_sdk::mixnet::MixnetClient;
|
||||
use nym_sdk::mixnet::{EventReceiver, MixnetClient};
|
||||
|
||||
pub enum RegistrationResult {
|
||||
Mixnet(Box<MixnetRegistrationResult>),
|
||||
@@ -14,6 +14,7 @@ pub enum RegistrationResult {
|
||||
pub struct MixnetRegistrationResult {
|
||||
pub assigned_addresses: AssignedAddresses,
|
||||
pub mixnet_client: MixnetClient,
|
||||
pub event_rx: EventReceiver,
|
||||
}
|
||||
|
||||
pub struct WireguardRegistrationResult {
|
||||
|
||||
Generated
+3
-24
@@ -1,6 +1,6 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
version = 4
|
||||
|
||||
[[package]]
|
||||
name = "NymWallet"
|
||||
@@ -773,7 +773,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "bls12_381"
|
||||
version = "0.8.0"
|
||||
source = "git+https://github.com/jstuczyn/bls12_381?branch=temp/experimental-serdect-updated#9bf520059cb28323fc51469cae86868ef4fa6fbd"
|
||||
source = "git+https://github.com/jstuczyn/bls12_381?branch=temp%2Fexperimental-serdect-updated#9bf520059cb28323fc51469cae86868ef4fa6fbd"
|
||||
dependencies = [
|
||||
"digest 0.10.7",
|
||||
"ff",
|
||||
@@ -1723,15 +1723,6 @@ dependencies = [
|
||||
"dirs-sys 0.3.7",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs"
|
||||
version = "5.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
|
||||
dependencies = [
|
||||
"dirs-sys 0.4.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs"
|
||||
version = "6.0.0"
|
||||
@@ -1752,18 +1743,6 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs-sys"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"option-ext",
|
||||
"redox_users 0.4.6",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs-sys"
|
||||
version = "0.5.0"
|
||||
@@ -4100,7 +4079,7 @@ dependencies = [
|
||||
name = "nym-config"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"dirs 5.0.1",
|
||||
"dirs 6.0.0",
|
||||
"handlebars",
|
||||
"log",
|
||||
"nym-network-defaults",
|
||||
|
||||
@@ -80,6 +80,7 @@
|
||||
"@types/big.js": "^6.1.6",
|
||||
"@types/bs58": "^4.0.1",
|
||||
"@types/jest": "^27.0.1",
|
||||
"@types/minimatch": "5.1.2",
|
||||
"@types/node": "^16.7.13",
|
||||
"@types/qrcode.react": "^1.0.2",
|
||||
"@types/react": "^18.0.26",
|
||||
@@ -131,5 +132,8 @@
|
||||
"webpack-favicons": "^1.3.8",
|
||||
"webpack-merge": "^5.8.0"
|
||||
},
|
||||
"resolutions": {
|
||||
"@types/minimatch": "5.1.2"
|
||||
},
|
||||
"private": false
|
||||
}
|
||||
@@ -1,32 +1,32 @@
|
||||
import React from 'react';
|
||||
import { Box, Typography, Grid, Link, Card, CardContent, Stack } from '@mui/material';
|
||||
import { NymCard } from '..';
|
||||
import BitfinexIcon from 'src/svg-icons/bitfinex.svg';
|
||||
import KrakenIcon from 'src/svg-icons/kraken.svg';
|
||||
import BybitIcon from 'src/svg-icons/bybit.svg';
|
||||
import GateIcon from 'src/svg-icons/gate22.svg';
|
||||
import HTXIcon from 'src/svg-icons/htx.svg';
|
||||
import { NymCard } from '..';
|
||||
|
||||
const ExchangeCard = ({
|
||||
name,
|
||||
tokenType,
|
||||
url,
|
||||
IconComponent
|
||||
const ExchangeCard = ({
|
||||
name,
|
||||
tokenType,
|
||||
url,
|
||||
IconComponent,
|
||||
}: {
|
||||
name: string;
|
||||
tokenType: string;
|
||||
url: string;
|
||||
IconComponent: React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
|
||||
}) => (
|
||||
<Card
|
||||
variant="outlined"
|
||||
sx={{
|
||||
<Card
|
||||
variant="outlined"
|
||||
sx={{
|
||||
height: '100%',
|
||||
transition: 'all 0.2s ease-in-out',
|
||||
'&:hover': {
|
||||
transform: 'translateY(-2px)',
|
||||
boxShadow: 2,
|
||||
}
|
||||
},
|
||||
}}
|
||||
>
|
||||
<CardContent sx={{ p: 3 }}>
|
||||
@@ -51,17 +51,17 @@ const ExchangeCard = ({
|
||||
<Typography variant="body2" sx={{ color: 'text.secondary' }}>
|
||||
{tokenType}
|
||||
</Typography>
|
||||
<Link
|
||||
href={url}
|
||||
target="_blank"
|
||||
<Link
|
||||
href={url}
|
||||
target="_blank"
|
||||
variant="body2"
|
||||
data-testid="link-get-nym"
|
||||
sx={{
|
||||
sx={{
|
||||
textDecoration: 'underline',
|
||||
fontWeight: 500,
|
||||
'&:hover': {
|
||||
textDecoration: 'none',
|
||||
}
|
||||
},
|
||||
}}
|
||||
>
|
||||
GET NYM
|
||||
@@ -78,44 +78,40 @@ export const Tutorial = () => {
|
||||
name: 'Bitfinex',
|
||||
tokenType: 'Native NYM, ERC-20',
|
||||
url: 'https://www.bitfinex.com/',
|
||||
IconComponent: BitfinexIcon
|
||||
IconComponent: BitfinexIcon,
|
||||
},
|
||||
{
|
||||
name: 'Kraken',
|
||||
tokenType: 'Native NYM',
|
||||
url: 'https://www.kraken.com/',
|
||||
IconComponent: KrakenIcon
|
||||
IconComponent: KrakenIcon,
|
||||
},
|
||||
{
|
||||
name: 'Bybit',
|
||||
tokenType: 'ERC-20',
|
||||
url: 'https://www.bybit.com/en/',
|
||||
IconComponent: BybitIcon
|
||||
IconComponent: BybitIcon,
|
||||
},
|
||||
{
|
||||
name: 'Gate.io',
|
||||
tokenType: 'ERC-20',
|
||||
url: 'https://www.gate.io/',
|
||||
IconComponent: GateIcon
|
||||
IconComponent: GateIcon,
|
||||
},
|
||||
{
|
||||
name: 'HTX',
|
||||
tokenType: 'ERC-20',
|
||||
url: 'https://www.htx.com/',
|
||||
IconComponent: HTXIcon
|
||||
IconComponent: HTXIcon,
|
||||
},
|
||||
];
|
||||
|
||||
return (
|
||||
<NymCard
|
||||
borderless
|
||||
title="Where you can get NYM tokens"
|
||||
sx={{ mt: 4 }}
|
||||
>
|
||||
<NymCard borderless title="Where you can get NYM tokens" sx={{ mt: 4 }}>
|
||||
<Typography mb={3} fontSize={14} sx={{ color: 'text.secondary' }}>
|
||||
You can get NYM tokens from these exchanges
|
||||
</Typography>
|
||||
|
||||
|
||||
<Grid container spacing={3}>
|
||||
{exchanges.map((exchange) => (
|
||||
<Grid item xs={12} md={6} lg={4} key={exchange.name}>
|
||||
|
||||
+41
-40
@@ -1,49 +1,41 @@
|
||||
{
|
||||
"name": "@nymproject/nymsphere",
|
||||
"version": "1.0.0",
|
||||
"private": true,
|
||||
"version": "1.0.1",
|
||||
"license": "Apache 2.0",
|
||||
"workspaces": [
|
||||
"sdk/typescript/packages/**",
|
||||
"sdk/typescript/examples/**",
|
||||
"ts-packages/*",
|
||||
"nym-wallet",
|
||||
"explorer-nextjs",
|
||||
"explorer-v2",
|
||||
"types",
|
||||
"clients/validator",
|
||||
"sdk/typescript/packages/**",
|
||||
"sdk/typescript/examples/**",
|
||||
"sdk/typescript/codegen/**"
|
||||
],
|
||||
"scripts": {
|
||||
"nuke": "npx rimraf **/node_modules node_modules",
|
||||
"scrub": "npx rimraf **/dist dist",
|
||||
"clean": "lerna run clean",
|
||||
"audit:fix": "npm_config_yes=true npx yarn-audit-fix -- --dry-run",
|
||||
"build": "run-s build:types build:packages",
|
||||
"build:wasm": "make sdk-wasm-build",
|
||||
"build:types": "lerna run --scope @nymproject/types build --stream",
|
||||
"build:packages": "run-s build:packages:theme build:packages:react",
|
||||
"build:packages:theme": "lerna run --scope @nymproject/mui-theme build",
|
||||
"build:packages:react": "lerna run --scope @nymproject/react build",
|
||||
"build:playground": "lerna run --scope @nymproject/react storybook:build --stream",
|
||||
"build:ci": "run-s build:types build:packages build:wasm build:ci:sdk",
|
||||
"build:ci:sdk": "lerna run --scope '{@nymproject/sdk,@nymproject/node-tester,@nymproject/sdk-react,@nymproject/mix-fetch,@nymproject/nodejs-client,@nymproject/mix-fetch-node}' build --stream",
|
||||
"build:ci:storybook": "yarn build && yarn dev:on && run-p build:playground && yarn build:ci:storybook:collect-artifacts ",
|
||||
"build:ci:storybook:collect-artifacts": "mkdir -p ts-packages/dist && mv sdk/typescript/packages/react-components/storybook-static ts-packages/dist/storybook ",
|
||||
"prebuild:ci": "yarn dev:on && yarn",
|
||||
"build:ci": "run-s build:types build:packages build:wasm build:ci:sdk",
|
||||
"postbuild:ci": "yarn dev:off",
|
||||
"build:ci:sdk": "lerna run --scope '{@nymproject/sdk,@nymproject/node-tester,@nymproject/sdk-react,@nymproject/mix-fetch,@nymproject/nodejs-client,@nymproject/mix-fetch-node}' build --stream",
|
||||
"build:packages": "run-s build:packages:theme build:packages:react",
|
||||
"build:packages:react": "lerna run --scope @nymproject/react build",
|
||||
"build:packages:theme": "lerna run --scope @nymproject/mui-theme build",
|
||||
"build:playground": "lerna run --scope @nymproject/react storybook:build --stream",
|
||||
"build:types": "lerna run --scope @nymproject/types build --stream",
|
||||
"build:wasm": "make sdk-wasm-build",
|
||||
"clean": "lerna run clean",
|
||||
"dev:off": "node sdk/typescript/scripts/dev-mode-remove.mjs",
|
||||
"dev:on": "node sdk/typescript/scripts/dev-mode-add.mjs",
|
||||
"docs:prod:build": "run-s docs:prod:build:ws",
|
||||
"docs:prod:build:ws": "lerna run docs:prod:build --stream",
|
||||
"sdk:build": "./sdk/typescript/scripts/build-prod-sdk.sh",
|
||||
"sdk:publish": "./sdk/typescript/scripts/publish.sh",
|
||||
"lint": "lerna run lint --stream",
|
||||
"lint:fix": "lerna run lint:fix --stream",
|
||||
"nuke": "npx rimraf **/node_modules node_modules",
|
||||
"postbuild:ci": "yarn dev:off",
|
||||
"prebuild:ci": "yarn dev:on && yarn",
|
||||
"scrub": "npx rimraf **/dist dist",
|
||||
"sdk:build": "./sdk/typescript/scripts/build-prod-sdk.sh",
|
||||
"sdk:publish": "./sdk/typescript/scripts/publish.sh",
|
||||
"sdk:versions:add-rc": "cargo run -p sdk-version-bump --pre-release",
|
||||
"sdk:versions:bump": "cargo run -p sdk-version-bump bump-version",
|
||||
"sdk:versions:remove-rc": "cargo run -p sdk-version-bump remove-suffix",
|
||||
"tsc": "lerna run tsc --stream",
|
||||
"types:lint:fix": "lerna run lint:fix --scope @nymproject/types --scope @nymproject/nym-wallet-app",
|
||||
"audit:fix": "npm_config_yes=true npx yarn-audit-fix -- --dry-run",
|
||||
"dev:on": "node sdk/typescript/scripts/dev-mode-add.mjs",
|
||||
"dev:off": "node sdk/typescript/scripts/dev-mode-remove.mjs"
|
||||
"types:lint:fix": "lerna run lint:fix --scope @nymproject/types --scope @nymproject/nym-wallet-app"
|
||||
},
|
||||
"dependencies": {
|
||||
"lucide-react": "^0.453.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@npmcli/node-gyp": "^3.0.0",
|
||||
@@ -53,14 +45,23 @@
|
||||
"npm-run-all": "^4.1.5",
|
||||
"tslog": "3.3.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"lucide-react": "^0.453.0"
|
||||
},
|
||||
"private": true,
|
||||
"resolutions": {
|
||||
"@cosmjs/amino": "^0.32.4",
|
||||
"@cosmjs/cosmwasm-stargate": "^0.32.4",
|
||||
"@cosmjs/proto-signing": "^0.32.4",
|
||||
"@cosmjs/stargate": "^0.32.4",
|
||||
"@cosmjs/cosmwasm-stargate": "^0.32.4",
|
||||
"cosmjs-types": "^0.9.0"
|
||||
}
|
||||
}
|
||||
},
|
||||
"workspaces": [
|
||||
"ts-packages/*",
|
||||
"nym-wallet",
|
||||
"explorer-nextjs",
|
||||
"explorer-v2",
|
||||
"types",
|
||||
"clients/validator",
|
||||
"sdk/typescript/packages/mix-fetch/internal-dev",
|
||||
"sdk/typescript/packages/react-components",
|
||||
"sdk/typescript/packages/mui-theme"
|
||||
]
|
||||
}
|
||||
@@ -155,7 +155,7 @@ check_ip_routing() {
|
||||
|
||||
perform_pings() {
|
||||
echo "Performing IPv4 ping to google.com..."
|
||||
ping -c 4 google.com
|
||||
ping -4 -c 4 google.com
|
||||
echo "---------------------------------------"
|
||||
echo "Performing IPv6 ping to google.com..."
|
||||
ping6 -c 4 google.com
|
||||
@@ -189,7 +189,7 @@ test_bridge_connectivity() {
|
||||
echo -e "Testing IPv4 connectivity..."
|
||||
echo
|
||||
|
||||
if ping -c 1 -I "$ipv4_address" google.com >/dev/null 2>&1; then
|
||||
if ping -4 -c 1 -I "$ipv4_address" google.com >/dev/null 2>&1; then
|
||||
echo -e "${green}IPv4 connectivity is working. Fetching test data...${reset}"
|
||||
joke=$(curl -s -H "Accept: application/json" --interface "$ipv4_address" https://icanhazdadjoke.com/ | jq -r .joke)
|
||||
[[ -n "$joke" && "$joke" != "null" ]] && echo -e "${green}IPv4 test joke: $joke${reset}" || echo -e "${red}Failed to fetch test data via IPv4.${reset}"
|
||||
@@ -277,7 +277,7 @@ check_bridge_installation() {
|
||||
# Check keys directory
|
||||
if [[ -d "$BRIDGE_KEYS_DIR" ]]; then
|
||||
echo -e "${green}✓ Keys directory exists: $BRIDGE_KEYS_DIR${reset}"
|
||||
key_count=$(ls -1 "$BRIDGE_KEYS_DIR"/*.pem 2>/dev/null | wc -l)
|
||||
key_count=$(sudo bash -c "ls -1 \"$BRIDGE_KEYS_DIR\"/*.pem" 2>/dev/null | wc -l)
|
||||
echo " Keys found: $key_count"
|
||||
else
|
||||
echo -e "${red}✗ Keys directory not found: $BRIDGE_KEYS_DIR${reset}"
|
||||
@@ -494,7 +494,7 @@ generate_bridge_keys() {
|
||||
# Generate ED25519 private key
|
||||
local key_file="$BRIDGE_KEYS_DIR/ed25519_bridge_identity.pem"
|
||||
|
||||
if [[ -f "$key_file" ]]; then
|
||||
if sudo test -f "$key_file"; then
|
||||
echo -e "${yellow}Warning: Key file already exists at $key_file${reset}"
|
||||
read -p "Overwrite existing key? (yes/no): " confirm
|
||||
if [[ "$confirm" != "yes" ]]; then
|
||||
@@ -532,14 +532,14 @@ create_client_params() {
|
||||
|
||||
# Check if key exists
|
||||
local key_file="$BRIDGE_KEYS_DIR/ed25519_bridge_identity.pem"
|
||||
if [[ ! -f "$key_file" ]]; then
|
||||
if ! sudo test -f "$key_file"; then
|
||||
echo -e "${red}Error: Bridge key not found at $key_file${reset}"
|
||||
echo "Run 'nym-bridge-helper generate_bridge_keys' first"
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Get forward address
|
||||
read -p "Enter forward address (e.g., <IPv4>:51822, can be found by running 'curl -6 https://ifconfig.co/ip'): " forward_addr
|
||||
read -p "Enter forward address (e.g., <IPv4>:51822, can be found by running 'curl -4 https://ifconfig.co/ip'): " forward_addr
|
||||
if [[ -z "$forward_addr" ]]; then
|
||||
echo -e "${red}Error: Forward address is required${reset}"
|
||||
return 1
|
||||
@@ -722,24 +722,28 @@ install_bridge_binary() {
|
||||
local red="\033[0;31m"
|
||||
local yellow="\033[0;33m"
|
||||
|
||||
local deb_arch="amd64"
|
||||
local sys_arch=$(dpkg --print-architecture)
|
||||
|
||||
if [[ "$deb_arch" != "$sys_arch" ]]; then
|
||||
echo -e "${red}Error: aborting .deb package installation as this system's arch is not amd64.${reset}"
|
||||
echo " Refer to https://github.com/nymtech/nym-bridges for build instructions."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo -e "${yellow}=== Installing nym-bridge Binary ===${reset}"
|
||||
echo ""
|
||||
|
||||
read -p "Enter bridge binary URL for your system from here https://builds.ci.nymte.ch/QUIC/: " binary_url
|
||||
if [[ -z "$binary_url" ]]; then
|
||||
echo -e "${red}Error: Binary URL is required${reset}"
|
||||
return 1
|
||||
fi
|
||||
echo "Retrieving URL to latest release..."
|
||||
local binary_url=$(
|
||||
curl -s "https://api.github.com/repos/nymtech/nym-bridges/releases/latest" |
|
||||
grep "browser_download_url.*amd64.deb" |
|
||||
grep -o 'https://[^"]*'
|
||||
)
|
||||
|
||||
echo "Downloading nym-bridge binary..."
|
||||
if sudo curl -L "$binary_url" -o "$BRIDGE_BINARY"; then
|
||||
sudo chmod 755 "$BRIDGE_BINARY"
|
||||
echo -e "${green}✓ Bridge binary installed at $BRIDGE_BINARY${reset}"
|
||||
|
||||
# Show version
|
||||
echo ""
|
||||
echo "Binary version:"
|
||||
$BRIDGE_BINARY --version || echo "Unable to determine version"
|
||||
echo "Downloading $binary_url ..."
|
||||
if curl -L -o "/tmp/$(basename "$binary_url")" "$binary_url"; then
|
||||
sudo dpkg -i "/tmp/$(basename "$binary_url")"
|
||||
else
|
||||
echo -e "${red}✗ Failed to download bridge binary${reset}"
|
||||
return 1
|
||||
|
||||
@@ -45,15 +45,21 @@ pub use native_client::MixnetClient;
|
||||
pub use native_client::MixnetClientSender;
|
||||
#[allow(deprecated)]
|
||||
pub use nym_client_core::client::{
|
||||
base_client::storage::{
|
||||
gateways_storage::{ActiveGateway, BadGateway, GatewayRegistration, GatewaysDetailsStore},
|
||||
Ephemeral, MixnetClientStorage, OnDiskPersistent,
|
||||
base_client::{
|
||||
storage::{
|
||||
gateways_storage::{
|
||||
ActiveGateway, BadGateway, GatewayRegistration, GatewaysDetailsStore,
|
||||
},
|
||||
Ephemeral, MixnetClientStorage, OnDiskPersistent,
|
||||
},
|
||||
EventReceiver, EventSender, MixnetClientEvent,
|
||||
},
|
||||
inbound_messages::InputMessage,
|
||||
key_manager::{
|
||||
persistence::{InMemEphemeralKeys, KeyStore, OnDiskKeys},
|
||||
ClientKeys,
|
||||
},
|
||||
mix_traffic::MixTrafficEvent,
|
||||
replies::reply_storage::{
|
||||
fs_backend::Backend as ReplyStorage, CombinedReplyStorage, Empty as EmptyReplyStorage,
|
||||
ReplyStorageBackend,
|
||||
|
||||
@@ -16,7 +16,7 @@ use nym_client_core::client::base_client::storage::helpers::{
|
||||
use nym_client_core::client::base_client::storage::{
|
||||
Ephemeral, GatewaysDetailsStore, MixnetClientStorage, OnDiskPersistent,
|
||||
};
|
||||
use nym_client_core::client::base_client::BaseClient;
|
||||
use nym_client_core::client::base_client::{BaseClient, EventSender};
|
||||
use nym_client_core::client::key_manager::persistence::KeyStore;
|
||||
use nym_client_core::client::{
|
||||
base_client::BaseClientBuilder, replies::reply_storage::ReplyStorageBackend,
|
||||
@@ -54,6 +54,7 @@ pub struct MixnetClientBuilder<S: MixnetClientStorage = Ephemeral> {
|
||||
custom_topology_provider: Option<Box<dyn TopologyProvider + Send + Sync>>,
|
||||
custom_gateway_transceiver: Option<Box<dyn GatewayTransceiver + Send + Sync>>,
|
||||
custom_shutdown: Option<ShutdownTracker>,
|
||||
event_tx: Option<EventSender>,
|
||||
force_tls: bool,
|
||||
user_agent: Option<UserAgent>,
|
||||
#[cfg(unix)]
|
||||
@@ -97,6 +98,7 @@ impl MixnetClientBuilder<OnDiskPersistent> {
|
||||
.await?,
|
||||
gateway_endpoint_config_path: None,
|
||||
custom_shutdown: None,
|
||||
event_tx: None,
|
||||
custom_gateway_transceiver: None,
|
||||
force_tls: false,
|
||||
user_agent: None,
|
||||
@@ -130,6 +132,7 @@ where
|
||||
custom_topology_provider: None,
|
||||
custom_gateway_transceiver: None,
|
||||
custom_shutdown: None,
|
||||
event_tx: None,
|
||||
force_tls: false,
|
||||
user_agent: None,
|
||||
#[cfg(unix)]
|
||||
@@ -153,6 +156,7 @@ where
|
||||
custom_topology_provider: self.custom_topology_provider,
|
||||
custom_gateway_transceiver: self.custom_gateway_transceiver,
|
||||
custom_shutdown: self.custom_shutdown,
|
||||
event_tx: self.event_tx,
|
||||
force_tls: self.force_tls,
|
||||
user_agent: self.user_agent,
|
||||
#[cfg(unix)]
|
||||
@@ -270,6 +274,13 @@ where
|
||||
self
|
||||
}
|
||||
|
||||
/// Use an externally managed shutdown mechanism.
|
||||
#[must_use]
|
||||
pub fn event_tx(mut self, event_tx: EventSender) -> Self {
|
||||
self.event_tx = Some(event_tx);
|
||||
self
|
||||
}
|
||||
|
||||
/// Attempt to wait for the selected gateway (if applicable) to come online if its currently not bonded.
|
||||
#[must_use]
|
||||
pub fn with_wait_for_gateway(mut self, wait_for_gateway: bool) -> Self {
|
||||
@@ -318,8 +329,12 @@ where
|
||||
|
||||
/// Construct a [`DisconnectedMixnetClient`] from the setup specified.
|
||||
pub fn build(self) -> Result<DisconnectedMixnetClient<S>> {
|
||||
let mut client =
|
||||
DisconnectedMixnetClient::new(self.config, self.socks5_config, self.storage)?;
|
||||
let mut client = DisconnectedMixnetClient::new(
|
||||
self.config,
|
||||
self.socks5_config,
|
||||
self.storage,
|
||||
self.event_tx,
|
||||
)?;
|
||||
|
||||
client.custom_gateway_transceiver = self.custom_gateway_transceiver;
|
||||
client.custom_topology_provider = self.custom_topology_provider;
|
||||
@@ -381,6 +396,9 @@ where
|
||||
/// Allows passing an externally controlled shutdown handle.
|
||||
custom_shutdown: Option<ShutdownTracker>,
|
||||
|
||||
/// Sender of mixnet client events to the SDK caller
|
||||
event_tx: Option<EventSender>,
|
||||
|
||||
user_agent: Option<UserAgent>,
|
||||
|
||||
/// Callback on the websocket fd as soon as the connection has been established
|
||||
@@ -415,6 +433,7 @@ where
|
||||
config: Config,
|
||||
socks5_config: Option<Socks5>,
|
||||
storage: S,
|
||||
event_tx: Option<EventSender>,
|
||||
) -> Result<DisconnectedMixnetClient<S>> {
|
||||
// don't create dkg client for the bandwidth controller if credentials are disabled
|
||||
let dkg_query_client = if config.enabled_credentials_mode {
|
||||
@@ -443,6 +462,7 @@ where
|
||||
wait_for_gateway: false,
|
||||
force_tls: false,
|
||||
custom_shutdown: None,
|
||||
event_tx,
|
||||
user_agent: None,
|
||||
#[cfg(unix)]
|
||||
connection_fd_callback: None,
|
||||
@@ -535,21 +555,22 @@ where
|
||||
async fn available_gateways(&mut self) -> Result<Vec<RoutingNode>, ClientCoreError> {
|
||||
if let Some(ref mut custom_provider) = self.custom_topology_provider {
|
||||
if let Some(topology) = custom_provider.get_new_topology().await {
|
||||
return Ok(topology.entry_gateways().cloned().collect());
|
||||
// Use entry_capable_nodes() instead of entry_gateways() to include
|
||||
// all entry-capable nodes, not just actively assigned ones
|
||||
return Ok(topology.entry_capable_nodes().cloned().collect());
|
||||
}
|
||||
}
|
||||
|
||||
let nym_api_endpoints = self.get_api_endpoints();
|
||||
let topology_cfg = &self.config.debug_config.topology;
|
||||
let user_agent = self.user_agent.clone();
|
||||
let mut rng = OsRng;
|
||||
|
||||
gateways_for_init(
|
||||
&mut rng,
|
||||
&nym_api_endpoints,
|
||||
user_agent,
|
||||
topology_cfg.minimum_gateway_performance,
|
||||
topology_cfg.ignore_ingress_epoch_role,
|
||||
None,
|
||||
)
|
||||
.await
|
||||
}
|
||||
@@ -685,6 +706,16 @@ where
|
||||
.config
|
||||
.as_base_client_config(nyxd_endpoints, nym_api_endpoints.clone());
|
||||
|
||||
tracing::debug!(
|
||||
"SDK: Passing nym_api_urls to BaseClientBuilder (has {} nym_api_urls)",
|
||||
self.config
|
||||
.network_details
|
||||
.nym_api_urls
|
||||
.as_ref()
|
||||
.map(|urls| urls.len())
|
||||
.unwrap_or(0)
|
||||
);
|
||||
|
||||
let mut base_builder: BaseClientBuilder<_, _> =
|
||||
BaseClientBuilder::new(base_config, self.storage, self.dkg_query_client)
|
||||
.with_wait_for_gateway(self.wait_for_gateway)
|
||||
@@ -692,6 +723,11 @@ where
|
||||
.with_remember_me(&self.remember_me)
|
||||
.with_derivation_material(self.derivation_material);
|
||||
|
||||
// Add nym_api_urls if available in network_details
|
||||
if let Some(nym_api_urls) = self.config.network_details.nym_api_urls.clone() {
|
||||
base_builder = base_builder.with_nym_api_urls(nym_api_urls);
|
||||
}
|
||||
|
||||
if let Some(user_agent) = self.user_agent {
|
||||
base_builder = base_builder.with_user_agent(user_agent);
|
||||
}
|
||||
@@ -709,6 +745,9 @@ where
|
||||
}
|
||||
};
|
||||
base_builder = base_builder.with_shutdown(shutdown_tracker);
|
||||
if let Some(event_tx) = self.event_tx {
|
||||
base_builder = base_builder.with_event_tx(event_tx);
|
||||
}
|
||||
|
||||
if let Some(gateway_transceiver) = self.custom_gateway_transceiver {
|
||||
base_builder = base_builder.with_gateway_transceiver(gateway_transceiver);
|
||||
@@ -826,7 +865,6 @@ where
|
||||
stats_events_reporter,
|
||||
started_client.shutdown_handle,
|
||||
None,
|
||||
started_client.client_request_sender,
|
||||
started_client.forget_me,
|
||||
started_client.remember_me,
|
||||
))
|
||||
@@ -858,3 +896,17 @@ impl IncludedSurbs {
|
||||
Self::ExposeSelfAddress
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_mixnet_builder_default_no_custom_client() {
|
||||
let builder = MixnetClientBuilder::new_ephemeral();
|
||||
assert!(
|
||||
builder.build().is_ok(),
|
||||
"Builder should succeed without custom client"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,7 +58,6 @@ pub struct MixnetClient {
|
||||
|
||||
// internal state used for the `Stream` implementation
|
||||
_buffered: Vec<ReconstructedMessage>,
|
||||
pub(crate) client_request_sender: ClientRequestSender,
|
||||
pub(crate) forget_me: ForgetMe,
|
||||
pub(crate) remember_me: RememberMe,
|
||||
}
|
||||
@@ -75,7 +74,6 @@ impl MixnetClient {
|
||||
stats_events_reporter: ClientStatsSender,
|
||||
task_handle: ShutdownTracker,
|
||||
packet_type: Option<PacketType>,
|
||||
client_request_sender: ClientRequestSender,
|
||||
forget_me: ForgetMe,
|
||||
remember_me: RememberMe,
|
||||
) -> Self {
|
||||
@@ -90,7 +88,6 @@ impl MixnetClient {
|
||||
shutdown_handle: task_handle,
|
||||
packet_type,
|
||||
_buffered: Vec::new(),
|
||||
client_request_sender,
|
||||
forget_me,
|
||||
remember_me,
|
||||
}
|
||||
@@ -129,7 +126,7 @@ impl MixnetClient {
|
||||
}
|
||||
|
||||
pub fn client_request_sender(&self) -> ClientRequestSender {
|
||||
self.client_request_sender.clone()
|
||||
self.client_input.client_request_sender.clone()
|
||||
}
|
||||
|
||||
/// Get the client's identity keys.
|
||||
@@ -252,7 +249,12 @@ impl MixnetClient {
|
||||
client: self.forget_me.client(),
|
||||
stats: self.forget_me.stats(),
|
||||
};
|
||||
match self.client_request_sender.send(client_request).await {
|
||||
match self
|
||||
.client_input
|
||||
.client_request_sender
|
||||
.send(client_request)
|
||||
.await
|
||||
{
|
||||
Ok(_) => Ok(()),
|
||||
Err(e) => {
|
||||
error!("Failed to send forget me request: {e}");
|
||||
@@ -265,7 +267,12 @@ impl MixnetClient {
|
||||
let client_request = ClientRequest::RememberMe {
|
||||
session_type: self.remember_me.session_type(),
|
||||
};
|
||||
match self.client_request_sender.send(client_request).await {
|
||||
match self
|
||||
.client_input
|
||||
.client_request_sender
|
||||
.send(client_request)
|
||||
.await
|
||||
{
|
||||
Ok(_) => Ok(()),
|
||||
Err(e) => {
|
||||
error!("Failed to send forget me request: {e}");
|
||||
|
||||
@@ -3,13 +3,11 @@ import codegen from '@cosmwasm/ts-codegen';
|
||||
codegen
|
||||
.default({
|
||||
contracts: [
|
||||
{ name: 'coconut-bandwidth', dir: '../../../../contracts/coconut-bandwidth' },
|
||||
{ name: 'ecash', dir: '../../../../contracts/ecash' },
|
||||
{ name: 'coconut-dkg', dir: '../../../../contracts/coconut-dkg' },
|
||||
{ name: 'mixnet', dir: '../../../../contracts/mixnet' },
|
||||
{ name: 'cw3-flex-multisig', dir: '../../../../contracts/multisig/cw3-flex-multisig' },
|
||||
{ name: 'cw4-group', dir: '../../../../contracts/multisig/cw4-group' },
|
||||
{ name: 'name-service', dir: '../../../../contracts/name-service' },
|
||||
{ name: 'service-provider-directory', dir: '../../../../contracts/service-provider-directory' },
|
||||
{ name: 'vesting', dir: '../../../../contracts/vesting' },
|
||||
],
|
||||
outPath: './src',
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nymproject/contract-clients",
|
||||
"version": "1.3.0-rc.0",
|
||||
"version": "1.3.1-rc0",
|
||||
"description": "A client for all Nym smart contracts",
|
||||
"license": "Apache-2.0",
|
||||
"author": "Nym Technologies SA",
|
||||
@@ -18,7 +18,7 @@
|
||||
"docs:watch": "nodemon --ext ts --watch './src/**/*' --watch './typedoc.json' --exec \"yarn docs:generate\""
|
||||
},
|
||||
"devDependencies": {
|
||||
"@cosmwasm/ts-codegen": "^0.35.3",
|
||||
"@cosmwasm/ts-codegen": "^1.13.3",
|
||||
"nodemon": "3.0.1",
|
||||
"npm-run-all": "^4.1.5",
|
||||
"reload": "^3.2.1",
|
||||
@@ -27,4 +27,4 @@
|
||||
},
|
||||
"private": false,
|
||||
"types": "./dist/index.d.ts"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,23 +1,58 @@
|
||||
/**
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@0.35.3.
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@1.13.3.
|
||||
* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
|
||||
* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
|
||||
*/
|
||||
|
||||
import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
|
||||
import { Coin, StdFee } from "@cosmjs/amino";
|
||||
import { InstantiateMsg, TimeConfiguration, ExecuteMsg, ContractSafeBytes, Addr, QueryMsg, MigrateMsg, PagedDealerResponse, DealerDetails, Timestamp, Uint64, EpochState, Epoch, DealerType, DealerDetailsResponse, PagedDealingsResponse, ContractDealing, NullableInitialReplacementData, InitialReplacementData, PagedVKSharesResponse, ContractVKShare } from "./CoconutDkg.types";
|
||||
|
||||
import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
|
||||
import { Coin, StdFee } from "@interchainjs/types";
|
||||
import { InstantiateMsg, TimeConfiguration, ExecuteMsg, ContractSafeBytes, DealingChunkInfo, PartialContractDealing, QueryMsg, MigrateMsg, EpochState, Timestamp, Uint64, StateAdvanceResponse, StateProgress, ContractVersion, Addr, PagedDealerResponse, DealerDetails, Epoch, DealerDealingsStatusResponse, DealerType, DealerDetailsResponse, PagedDealerIndexResponse, DealingChunkResponse, DealingChunkStatusResponse, ChunkSubmissionStatus, DealingStatusResponse, DealingStatus, DealingMetadataResponse, DealingMetadata, PagedDealerAddressesResponse, NullableEpoch, RegisteredDealerDetails, DealerRegistrationDetails, Cw4Contract, State, VkShareResponse, ContractVKShare, PagedVKSharesResponse } from "./CoconutDkg.types";
|
||||
export interface CoconutDkgReadOnlyInterface {
|
||||
contractAddress: string;
|
||||
getState: () => Promise<State>;
|
||||
getCurrentEpochState: () => Promise<Epoch>;
|
||||
getEpochStateAtHeight: ({
|
||||
height
|
||||
}: {
|
||||
height: number;
|
||||
}) => Promise<NullableEpoch>;
|
||||
getCurrentEpochThreshold: () => Promise<Uint64>;
|
||||
getInitialDealers: () => Promise<NullableInitialReplacementData>;
|
||||
getEpochThreshold: ({
|
||||
epochId
|
||||
}: {
|
||||
epochId: number;
|
||||
}) => Promise<Uint64>;
|
||||
canAdvanceState: () => Promise<StateAdvanceResponse>;
|
||||
getRegisteredDealer: ({
|
||||
dealerAddress,
|
||||
epochId
|
||||
}: {
|
||||
dealerAddress: string;
|
||||
epochId?: number;
|
||||
}) => Promise<RegisteredDealerDetails>;
|
||||
getDealerDetails: ({
|
||||
dealerAddress
|
||||
}: {
|
||||
dealerAddress: string;
|
||||
}) => Promise<DealerDetailsResponse>;
|
||||
getEpochDealersAddresses: ({
|
||||
epochId,
|
||||
limit,
|
||||
startAfter
|
||||
}: {
|
||||
epochId: number;
|
||||
limit?: number;
|
||||
startAfter?: string;
|
||||
}) => Promise<PagedDealerAddressesResponse>;
|
||||
getEpochDealers: ({
|
||||
epochId,
|
||||
limit,
|
||||
startAfter
|
||||
}: {
|
||||
epochId: number;
|
||||
limit?: number;
|
||||
startAfter?: string;
|
||||
}) => Promise<PagedDealerResponse>;
|
||||
getCurrentDealers: ({
|
||||
limit,
|
||||
startAfter
|
||||
@@ -25,22 +60,67 @@ export interface CoconutDkgReadOnlyInterface {
|
||||
limit?: number;
|
||||
startAfter?: string;
|
||||
}) => Promise<PagedDealerResponse>;
|
||||
getPastDealers: ({
|
||||
getDealerIndices: ({
|
||||
limit,
|
||||
startAfter
|
||||
}: {
|
||||
limit?: number;
|
||||
startAfter?: string;
|
||||
}) => Promise<PagedDealerResponse>;
|
||||
getDealing: ({
|
||||
idx,
|
||||
limit,
|
||||
startAfter
|
||||
}) => Promise<PagedDealerIndexResponse>;
|
||||
getDealingsMetadata: ({
|
||||
dealer,
|
||||
dealingIndex,
|
||||
epochId
|
||||
}: {
|
||||
idx: number;
|
||||
limit?: number;
|
||||
startAfter?: string;
|
||||
}) => Promise<PagedDealingsResponse>;
|
||||
dealer: string;
|
||||
dealingIndex: number;
|
||||
epochId: number;
|
||||
}) => Promise<DealingMetadataResponse>;
|
||||
getDealerDealingsStatus: ({
|
||||
dealer,
|
||||
epochId
|
||||
}: {
|
||||
dealer: string;
|
||||
epochId: number;
|
||||
}) => Promise<DealerDealingsStatusResponse>;
|
||||
getDealingStatus: ({
|
||||
dealer,
|
||||
dealingIndex,
|
||||
epochId
|
||||
}: {
|
||||
dealer: string;
|
||||
dealingIndex: number;
|
||||
epochId: number;
|
||||
}) => Promise<DealingStatusResponse>;
|
||||
getDealingChunkStatus: ({
|
||||
chunkIndex,
|
||||
dealer,
|
||||
dealingIndex,
|
||||
epochId
|
||||
}: {
|
||||
chunkIndex: number;
|
||||
dealer: string;
|
||||
dealingIndex: number;
|
||||
epochId: number;
|
||||
}) => Promise<DealingChunkStatusResponse>;
|
||||
getDealingChunk: ({
|
||||
chunkIndex,
|
||||
dealer,
|
||||
dealingIndex,
|
||||
epochId
|
||||
}: {
|
||||
chunkIndex: number;
|
||||
dealer: string;
|
||||
dealingIndex: number;
|
||||
epochId: number;
|
||||
}) => Promise<DealingChunkResponse>;
|
||||
getVerificationKey: ({
|
||||
epochId,
|
||||
owner
|
||||
}: {
|
||||
epochId: number;
|
||||
owner: string;
|
||||
}) => Promise<VkShareResponse>;
|
||||
getVerificationKeys: ({
|
||||
epochId,
|
||||
limit,
|
||||
@@ -50,37 +130,89 @@ export interface CoconutDkgReadOnlyInterface {
|
||||
limit?: number;
|
||||
startAfter?: string;
|
||||
}) => Promise<PagedVKSharesResponse>;
|
||||
getCw2ContractVersion: () => Promise<GetCw2ContractVersionResponse>;
|
||||
}
|
||||
export class CoconutDkgQueryClient implements CoconutDkgReadOnlyInterface {
|
||||
client: CosmWasmClient;
|
||||
client: ICosmWasmClient;
|
||||
contractAddress: string;
|
||||
|
||||
constructor(client: CosmWasmClient, contractAddress: string) {
|
||||
constructor(client: ICosmWasmClient, contractAddress: string) {
|
||||
this.client = client;
|
||||
this.contractAddress = contractAddress;
|
||||
this.getState = this.getState.bind(this);
|
||||
this.getCurrentEpochState = this.getCurrentEpochState.bind(this);
|
||||
this.getEpochStateAtHeight = this.getEpochStateAtHeight.bind(this);
|
||||
this.getCurrentEpochThreshold = this.getCurrentEpochThreshold.bind(this);
|
||||
this.getInitialDealers = this.getInitialDealers.bind(this);
|
||||
this.getEpochThreshold = this.getEpochThreshold.bind(this);
|
||||
this.canAdvanceState = this.canAdvanceState.bind(this);
|
||||
this.getRegisteredDealer = this.getRegisteredDealer.bind(this);
|
||||
this.getDealerDetails = this.getDealerDetails.bind(this);
|
||||
this.getEpochDealersAddresses = this.getEpochDealersAddresses.bind(this);
|
||||
this.getEpochDealers = this.getEpochDealers.bind(this);
|
||||
this.getCurrentDealers = this.getCurrentDealers.bind(this);
|
||||
this.getPastDealers = this.getPastDealers.bind(this);
|
||||
this.getDealing = this.getDealing.bind(this);
|
||||
this.getDealerIndices = this.getDealerIndices.bind(this);
|
||||
this.getDealingsMetadata = this.getDealingsMetadata.bind(this);
|
||||
this.getDealerDealingsStatus = this.getDealerDealingsStatus.bind(this);
|
||||
this.getDealingStatus = this.getDealingStatus.bind(this);
|
||||
this.getDealingChunkStatus = this.getDealingChunkStatus.bind(this);
|
||||
this.getDealingChunk = this.getDealingChunk.bind(this);
|
||||
this.getVerificationKey = this.getVerificationKey.bind(this);
|
||||
this.getVerificationKeys = this.getVerificationKeys.bind(this);
|
||||
this.getCw2ContractVersion = this.getCw2ContractVersion.bind(this);
|
||||
}
|
||||
|
||||
getState = async (): Promise<State> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_state: {}
|
||||
});
|
||||
};
|
||||
getCurrentEpochState = async (): Promise<Epoch> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_current_epoch_state: {}
|
||||
});
|
||||
};
|
||||
getEpochStateAtHeight = async ({
|
||||
height
|
||||
}: {
|
||||
height: number;
|
||||
}): Promise<NullableEpoch> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_epoch_state_at_height: {
|
||||
height
|
||||
}
|
||||
});
|
||||
};
|
||||
getCurrentEpochThreshold = async (): Promise<Uint64> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_current_epoch_threshold: {}
|
||||
});
|
||||
};
|
||||
getInitialDealers = async (): Promise<NullableInitialReplacementData> => {
|
||||
getEpochThreshold = async ({
|
||||
epochId
|
||||
}: {
|
||||
epochId: number;
|
||||
}): Promise<Uint64> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_initial_dealers: {}
|
||||
get_epoch_threshold: {
|
||||
epoch_id: epochId
|
||||
}
|
||||
});
|
||||
};
|
||||
canAdvanceState = async (): Promise<StateAdvanceResponse> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
can_advance_state: {}
|
||||
});
|
||||
};
|
||||
getRegisteredDealer = async ({
|
||||
dealerAddress,
|
||||
epochId
|
||||
}: {
|
||||
dealerAddress: string;
|
||||
epochId?: number;
|
||||
}): Promise<RegisteredDealerDetails> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_registered_dealer: {
|
||||
dealer_address: dealerAddress,
|
||||
epoch_id: epochId
|
||||
}
|
||||
});
|
||||
};
|
||||
getDealerDetails = async ({
|
||||
@@ -94,6 +226,40 @@ export class CoconutDkgQueryClient implements CoconutDkgReadOnlyInterface {
|
||||
}
|
||||
});
|
||||
};
|
||||
getEpochDealersAddresses = async ({
|
||||
epochId,
|
||||
limit,
|
||||
startAfter
|
||||
}: {
|
||||
epochId: number;
|
||||
limit?: number;
|
||||
startAfter?: string;
|
||||
}): Promise<PagedDealerAddressesResponse> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_epoch_dealers_addresses: {
|
||||
epoch_id: epochId,
|
||||
limit,
|
||||
start_after: startAfter
|
||||
}
|
||||
});
|
||||
};
|
||||
getEpochDealers = async ({
|
||||
epochId,
|
||||
limit,
|
||||
startAfter
|
||||
}: {
|
||||
epochId: number;
|
||||
limit?: number;
|
||||
startAfter?: string;
|
||||
}): Promise<PagedDealerResponse> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_epoch_dealers: {
|
||||
epoch_id: epochId,
|
||||
limit,
|
||||
start_after: startAfter
|
||||
}
|
||||
});
|
||||
};
|
||||
getCurrentDealers = async ({
|
||||
limit,
|
||||
startAfter
|
||||
@@ -108,34 +274,119 @@ export class CoconutDkgQueryClient implements CoconutDkgReadOnlyInterface {
|
||||
}
|
||||
});
|
||||
};
|
||||
getPastDealers = async ({
|
||||
getDealerIndices = async ({
|
||||
limit,
|
||||
startAfter
|
||||
}: {
|
||||
limit?: number;
|
||||
startAfter?: string;
|
||||
}): Promise<PagedDealerResponse> => {
|
||||
}): Promise<PagedDealerIndexResponse> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_past_dealers: {
|
||||
get_dealer_indices: {
|
||||
limit,
|
||||
start_after: startAfter
|
||||
}
|
||||
});
|
||||
};
|
||||
getDealing = async ({
|
||||
idx,
|
||||
limit,
|
||||
startAfter
|
||||
getDealingsMetadata = async ({
|
||||
dealer,
|
||||
dealingIndex,
|
||||
epochId
|
||||
}: {
|
||||
idx: number;
|
||||
limit?: number;
|
||||
startAfter?: string;
|
||||
}): Promise<PagedDealingsResponse> => {
|
||||
dealer: string;
|
||||
dealingIndex: number;
|
||||
epochId: number;
|
||||
}): Promise<DealingMetadataResponse> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_dealing: {
|
||||
idx,
|
||||
limit,
|
||||
start_after: startAfter
|
||||
get_dealings_metadata: {
|
||||
dealer,
|
||||
dealing_index: dealingIndex,
|
||||
epoch_id: epochId
|
||||
}
|
||||
});
|
||||
};
|
||||
getDealerDealingsStatus = async ({
|
||||
dealer,
|
||||
epochId
|
||||
}: {
|
||||
dealer: string;
|
||||
epochId: number;
|
||||
}): Promise<DealerDealingsStatusResponse> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_dealer_dealings_status: {
|
||||
dealer,
|
||||
epoch_id: epochId
|
||||
}
|
||||
});
|
||||
};
|
||||
getDealingStatus = async ({
|
||||
dealer,
|
||||
dealingIndex,
|
||||
epochId
|
||||
}: {
|
||||
dealer: string;
|
||||
dealingIndex: number;
|
||||
epochId: number;
|
||||
}): Promise<DealingStatusResponse> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_dealing_status: {
|
||||
dealer,
|
||||
dealing_index: dealingIndex,
|
||||
epoch_id: epochId
|
||||
}
|
||||
});
|
||||
};
|
||||
getDealingChunkStatus = async ({
|
||||
chunkIndex,
|
||||
dealer,
|
||||
dealingIndex,
|
||||
epochId
|
||||
}: {
|
||||
chunkIndex: number;
|
||||
dealer: string;
|
||||
dealingIndex: number;
|
||||
epochId: number;
|
||||
}): Promise<DealingChunkStatusResponse> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_dealing_chunk_status: {
|
||||
chunk_index: chunkIndex,
|
||||
dealer,
|
||||
dealing_index: dealingIndex,
|
||||
epoch_id: epochId
|
||||
}
|
||||
});
|
||||
};
|
||||
getDealingChunk = async ({
|
||||
chunkIndex,
|
||||
dealer,
|
||||
dealingIndex,
|
||||
epochId
|
||||
}: {
|
||||
chunkIndex: number;
|
||||
dealer: string;
|
||||
dealingIndex: number;
|
||||
epochId: number;
|
||||
}): Promise<DealingChunkResponse> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_dealing_chunk: {
|
||||
chunk_index: chunkIndex,
|
||||
dealer,
|
||||
dealing_index: dealingIndex,
|
||||
epoch_id: epochId
|
||||
}
|
||||
});
|
||||
};
|
||||
getVerificationKey = async ({
|
||||
epochId,
|
||||
owner
|
||||
}: {
|
||||
epochId: number;
|
||||
owner: string;
|
||||
}): Promise<VkShareResponse> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_verification_key: {
|
||||
epoch_id: epochId,
|
||||
owner
|
||||
}
|
||||
});
|
||||
};
|
||||
@@ -156,91 +407,142 @@ export class CoconutDkgQueryClient implements CoconutDkgReadOnlyInterface {
|
||||
}
|
||||
});
|
||||
};
|
||||
getCw2ContractVersion = async (): Promise<GetCw2ContractVersionResponse> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_cw2_contract_version: {}
|
||||
});
|
||||
};
|
||||
}
|
||||
export interface CoconutDkgInterface extends CoconutDkgReadOnlyInterface {
|
||||
contractAddress: string;
|
||||
sender: string;
|
||||
initiateDkg: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
registerDealer: ({
|
||||
announceAddress,
|
||||
bteKeyWithProof,
|
||||
identityKey,
|
||||
resharing
|
||||
}: {
|
||||
announceAddress: string;
|
||||
bteKeyWithProof: string;
|
||||
identityKey: string;
|
||||
resharing: boolean;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
commitDealing: ({
|
||||
dealingBytes,
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
commitDealingsMetadata: ({
|
||||
chunks,
|
||||
dealingIndex,
|
||||
resharing
|
||||
}: {
|
||||
dealingBytes: ContractSafeBytes;
|
||||
chunks: DealingChunkInfo[];
|
||||
dealingIndex: number;
|
||||
resharing: boolean;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
commitDealingsChunk: ({
|
||||
chunk
|
||||
}: {
|
||||
chunk: PartialContractDealing;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
commitVerificationKeyShare: ({
|
||||
resharing,
|
||||
share
|
||||
}: {
|
||||
resharing: boolean;
|
||||
share: string;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
verifyVerificationKeyShare: ({
|
||||
owner,
|
||||
resharing
|
||||
}: {
|
||||
owner: Addr;
|
||||
owner: string;
|
||||
resharing: boolean;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
surpassedThreshold: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
advanceEpochState: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
advanceEpochState: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
triggerReset: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
triggerResharing: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
transferOwnership: ({
|
||||
transferTo
|
||||
}: {
|
||||
transferTo: string;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
updateAnnounceAddress: ({
|
||||
newAddress
|
||||
}: {
|
||||
newAddress: string;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
}
|
||||
export class CoconutDkgClient extends CoconutDkgQueryClient implements CoconutDkgInterface {
|
||||
client: SigningCosmWasmClient;
|
||||
client: ISigningCosmWasmClient;
|
||||
sender: string;
|
||||
contractAddress: string;
|
||||
|
||||
constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
|
||||
constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
|
||||
super(client, contractAddress);
|
||||
this.client = client;
|
||||
this.sender = sender;
|
||||
this.contractAddress = contractAddress;
|
||||
this.initiateDkg = this.initiateDkg.bind(this);
|
||||
this.registerDealer = this.registerDealer.bind(this);
|
||||
this.commitDealing = this.commitDealing.bind(this);
|
||||
this.commitDealingsMetadata = this.commitDealingsMetadata.bind(this);
|
||||
this.commitDealingsChunk = this.commitDealingsChunk.bind(this);
|
||||
this.commitVerificationKeyShare = this.commitVerificationKeyShare.bind(this);
|
||||
this.verifyVerificationKeyShare = this.verifyVerificationKeyShare.bind(this);
|
||||
this.surpassedThreshold = this.surpassedThreshold.bind(this);
|
||||
this.advanceEpochState = this.advanceEpochState.bind(this);
|
||||
this.triggerReset = this.triggerReset.bind(this);
|
||||
this.triggerResharing = this.triggerResharing.bind(this);
|
||||
this.transferOwnership = this.transferOwnership.bind(this);
|
||||
this.updateAnnounceAddress = this.updateAnnounceAddress.bind(this);
|
||||
}
|
||||
|
||||
initiateDkg = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
initiate_dkg: {}
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
registerDealer = async ({
|
||||
announceAddress,
|
||||
bteKeyWithProof,
|
||||
identityKey,
|
||||
resharing
|
||||
}: {
|
||||
announceAddress: string;
|
||||
bteKeyWithProof: string;
|
||||
identityKey: string;
|
||||
resharing: boolean;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
register_dealer: {
|
||||
announce_address: announceAddress,
|
||||
bte_key_with_proof: bteKeyWithProof,
|
||||
identity_key: identityKey,
|
||||
resharing
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
commitDealing = async ({
|
||||
dealingBytes,
|
||||
commitDealingsMetadata = async ({
|
||||
chunks,
|
||||
dealingIndex,
|
||||
resharing
|
||||
}: {
|
||||
dealingBytes: ContractSafeBytes;
|
||||
chunks: DealingChunkInfo[];
|
||||
dealingIndex: number;
|
||||
resharing: boolean;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
commit_dealing: {
|
||||
dealing_bytes: dealingBytes,
|
||||
commit_dealings_metadata: {
|
||||
chunks,
|
||||
dealing_index: dealingIndex,
|
||||
resharing
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
commitDealingsChunk = async ({
|
||||
chunk
|
||||
}: {
|
||||
chunk: PartialContractDealing;
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
commit_dealings_chunk: {
|
||||
chunk
|
||||
}
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
commitVerificationKeyShare = async ({
|
||||
resharing,
|
||||
@@ -248,36 +550,63 @@ export class CoconutDkgClient extends CoconutDkgQueryClient implements CoconutDk
|
||||
}: {
|
||||
resharing: boolean;
|
||||
share: string;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
commit_verification_key_share: {
|
||||
resharing,
|
||||
share
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
verifyVerificationKeyShare = async ({
|
||||
owner,
|
||||
resharing
|
||||
}: {
|
||||
owner: Addr;
|
||||
owner: string;
|
||||
resharing: boolean;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
verify_verification_key_share: {
|
||||
owner,
|
||||
resharing
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
surpassedThreshold = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
surpassed_threshold: {}
|
||||
}, fee, memo, _funds);
|
||||
};
|
||||
advanceEpochState = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
advanceEpochState = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
advance_epoch_state: {}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
}
|
||||
triggerReset = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
trigger_reset: {}
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
triggerResharing = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
trigger_resharing: {}
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
transferOwnership = async ({
|
||||
transferTo
|
||||
}: {
|
||||
transferTo: string;
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
transfer_ownership: {
|
||||
transfer_to: transferTo
|
||||
}
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
updateAnnounceAddress = async ({
|
||||
newAddress
|
||||
}: {
|
||||
newAddress: string;
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
update_announce_address: {
|
||||
new_address: newAddress
|
||||
}
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
}
|
||||
@@ -1,11 +1,12 @@
|
||||
/**
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@0.35.3.
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@1.13.3.
|
||||
* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
|
||||
* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
|
||||
*/
|
||||
|
||||
export interface InstantiateMsg {
|
||||
group_addr: string;
|
||||
key_size: number;
|
||||
mix_denom: string;
|
||||
multisig_addr: string;
|
||||
time_configuration?: TimeConfiguration | null;
|
||||
@@ -19,16 +20,24 @@ export interface TimeConfiguration {
|
||||
verification_key_validation_time_secs: number;
|
||||
}
|
||||
export type ExecuteMsg = {
|
||||
initiate_dkg: {};
|
||||
} | {
|
||||
register_dealer: {
|
||||
announce_address: string;
|
||||
bte_key_with_proof: string;
|
||||
identity_key: string;
|
||||
resharing: boolean;
|
||||
};
|
||||
} | {
|
||||
commit_dealing: {
|
||||
dealing_bytes: ContractSafeBytes;
|
||||
commit_dealings_metadata: {
|
||||
chunks: DealingChunkInfo[];
|
||||
dealing_index: number;
|
||||
resharing: boolean;
|
||||
};
|
||||
} | {
|
||||
commit_dealings_chunk: {
|
||||
chunk: PartialContractDealing;
|
||||
};
|
||||
} | {
|
||||
commit_verification_key_share: {
|
||||
resharing: boolean;
|
||||
@@ -36,41 +45,115 @@ export type ExecuteMsg = {
|
||||
};
|
||||
} | {
|
||||
verify_verification_key_share: {
|
||||
owner: Addr;
|
||||
owner: string;
|
||||
resharing: boolean;
|
||||
};
|
||||
} | {
|
||||
surpassed_threshold: {};
|
||||
} | {
|
||||
advance_epoch_state: {};
|
||||
} | {
|
||||
trigger_reset: {};
|
||||
} | {
|
||||
trigger_resharing: {};
|
||||
} | {
|
||||
transfer_ownership: {
|
||||
transfer_to: string;
|
||||
};
|
||||
} | {
|
||||
update_announce_address: {
|
||||
new_address: string;
|
||||
};
|
||||
};
|
||||
export type ContractSafeBytes = number[];
|
||||
export type Addr = string;
|
||||
export interface DealingChunkInfo {
|
||||
size: number;
|
||||
}
|
||||
export interface PartialContractDealing {
|
||||
chunk_index: number;
|
||||
data: ContractSafeBytes;
|
||||
dealing_index: number;
|
||||
}
|
||||
export type QueryMsg = {
|
||||
get_state: {};
|
||||
} | {
|
||||
get_current_epoch_state: {};
|
||||
} | {
|
||||
get_epoch_state_at_height: {
|
||||
height: number;
|
||||
};
|
||||
} | {
|
||||
get_current_epoch_threshold: {};
|
||||
} | {
|
||||
get_initial_dealers: {};
|
||||
get_epoch_threshold: {
|
||||
epoch_id: number;
|
||||
};
|
||||
} | {
|
||||
can_advance_state: {};
|
||||
} | {
|
||||
get_registered_dealer: {
|
||||
dealer_address: string;
|
||||
epoch_id?: number | null;
|
||||
};
|
||||
} | {
|
||||
get_dealer_details: {
|
||||
dealer_address: string;
|
||||
};
|
||||
} | {
|
||||
get_epoch_dealers_addresses: {
|
||||
epoch_id: number;
|
||||
limit?: number | null;
|
||||
start_after?: string | null;
|
||||
};
|
||||
} | {
|
||||
get_epoch_dealers: {
|
||||
epoch_id: number;
|
||||
limit?: number | null;
|
||||
start_after?: string | null;
|
||||
};
|
||||
} | {
|
||||
get_current_dealers: {
|
||||
limit?: number | null;
|
||||
start_after?: string | null;
|
||||
};
|
||||
} | {
|
||||
get_past_dealers: {
|
||||
get_dealer_indices: {
|
||||
limit?: number | null;
|
||||
start_after?: string | null;
|
||||
};
|
||||
} | {
|
||||
get_dealing: {
|
||||
idx: number;
|
||||
limit?: number | null;
|
||||
start_after?: string | null;
|
||||
get_dealings_metadata: {
|
||||
dealer: string;
|
||||
dealing_index: number;
|
||||
epoch_id: number;
|
||||
};
|
||||
} | {
|
||||
get_dealer_dealings_status: {
|
||||
dealer: string;
|
||||
epoch_id: number;
|
||||
};
|
||||
} | {
|
||||
get_dealing_status: {
|
||||
dealer: string;
|
||||
dealing_index: number;
|
||||
epoch_id: number;
|
||||
};
|
||||
} | {
|
||||
get_dealing_chunk_status: {
|
||||
chunk_index: number;
|
||||
dealer: string;
|
||||
dealing_index: number;
|
||||
epoch_id: number;
|
||||
};
|
||||
} | {
|
||||
get_dealing_chunk: {
|
||||
chunk_index: number;
|
||||
dealer: string;
|
||||
dealing_index: number;
|
||||
epoch_id: number;
|
||||
};
|
||||
} | {
|
||||
get_verification_key: {
|
||||
epoch_id: number;
|
||||
owner: string;
|
||||
};
|
||||
} | {
|
||||
get_verification_keys: {
|
||||
@@ -78,22 +161,11 @@ export type QueryMsg = {
|
||||
limit?: number | null;
|
||||
start_after?: string | null;
|
||||
};
|
||||
} | {
|
||||
get_cw2_contract_version: {};
|
||||
};
|
||||
export interface MigrateMsg {}
|
||||
export interface PagedDealerResponse {
|
||||
dealers: DealerDetails[];
|
||||
per_page: number;
|
||||
start_next_after?: Addr | null;
|
||||
}
|
||||
export interface DealerDetails {
|
||||
address: Addr;
|
||||
announce_address: string;
|
||||
assigned_index: number;
|
||||
bte_public_key_with_proof: string;
|
||||
}
|
||||
export type Timestamp = Uint64;
|
||||
export type Uint64 = number;
|
||||
export type EpochState = "in_progress" | {
|
||||
export type EpochState = ("waiting_initialisation" | "in_progress") | {
|
||||
public_key_submission: {
|
||||
resharing: boolean;
|
||||
};
|
||||
@@ -114,36 +186,132 @@ export type EpochState = "in_progress" | {
|
||||
resharing: boolean;
|
||||
};
|
||||
};
|
||||
export type Timestamp = Uint64;
|
||||
export type Uint64 = number;
|
||||
export interface StateAdvanceResponse {
|
||||
current_state: EpochState;
|
||||
deadline?: Timestamp | null;
|
||||
is_complete: boolean;
|
||||
progress: StateProgress;
|
||||
reached_deadline: boolean;
|
||||
}
|
||||
export interface StateProgress {
|
||||
registered_dealers: number;
|
||||
registered_resharing_dealers: number;
|
||||
submitted_dealings: number;
|
||||
submitted_key_shares: number;
|
||||
verified_keys: number;
|
||||
}
|
||||
export interface ContractVersion {
|
||||
contract: string;
|
||||
version: string;
|
||||
}
|
||||
export type Addr = string;
|
||||
export interface PagedDealerResponse {
|
||||
dealers: DealerDetails[];
|
||||
per_page: number;
|
||||
start_next_after?: Addr | null;
|
||||
}
|
||||
export interface DealerDetails {
|
||||
address: Addr;
|
||||
announce_address: string;
|
||||
assigned_index: number;
|
||||
bte_public_key_with_proof: string;
|
||||
ed25519_identity: string;
|
||||
}
|
||||
export interface Epoch {
|
||||
deadline?: Timestamp | null;
|
||||
epoch_id: number;
|
||||
finish_timestamp: Timestamp;
|
||||
state: EpochState;
|
||||
state_progress: StateProgress;
|
||||
time_configuration: TimeConfiguration;
|
||||
}
|
||||
export type DealerType = "current" | "past" | "unknown";
|
||||
export interface DealerDealingsStatusResponse {
|
||||
all_dealings_fully_submitted: boolean;
|
||||
dealer: Addr;
|
||||
dealing_submission_status: {};
|
||||
epoch_id: number;
|
||||
}
|
||||
export type DealerType = "unknown" | {
|
||||
current: {
|
||||
assigned_index: number;
|
||||
};
|
||||
} | {
|
||||
past: {
|
||||
assigned_index: number;
|
||||
};
|
||||
};
|
||||
export interface DealerDetailsResponse {
|
||||
dealer_type: DealerType;
|
||||
details?: DealerDetails | null;
|
||||
}
|
||||
export interface PagedDealingsResponse {
|
||||
dealings: ContractDealing[];
|
||||
per_page: number;
|
||||
export interface PagedDealerIndexResponse {
|
||||
indices: [Addr, number][];
|
||||
start_next_after?: Addr | null;
|
||||
}
|
||||
export interface ContractDealing {
|
||||
export interface DealingChunkResponse {
|
||||
chunk?: ContractSafeBytes | null;
|
||||
chunk_index: number;
|
||||
dealer: Addr;
|
||||
dealing: ContractSafeBytes;
|
||||
dealing_index: number;
|
||||
epoch_id: number;
|
||||
}
|
||||
export type NullableInitialReplacementData = InitialReplacementData | null;
|
||||
export interface InitialReplacementData {
|
||||
initial_dealers: Addr[];
|
||||
initial_height: number;
|
||||
export interface DealingChunkStatusResponse {
|
||||
chunk_index: number;
|
||||
dealer: Addr;
|
||||
dealing_index: number;
|
||||
epoch_id: number;
|
||||
status: ChunkSubmissionStatus;
|
||||
}
|
||||
export interface PagedVKSharesResponse {
|
||||
per_page: number;
|
||||
shares: ContractVKShare[];
|
||||
export interface ChunkSubmissionStatus {
|
||||
submission_height?: number | null;
|
||||
}
|
||||
export interface DealingStatusResponse {
|
||||
dealer: Addr;
|
||||
dealing_index: number;
|
||||
epoch_id: number;
|
||||
status: DealingStatus;
|
||||
}
|
||||
export interface DealingStatus {
|
||||
chunk_submission_status: {};
|
||||
fully_submitted: boolean;
|
||||
has_metadata: boolean;
|
||||
}
|
||||
export interface DealingMetadataResponse {
|
||||
dealer: Addr;
|
||||
dealing_index: number;
|
||||
epoch_id: number;
|
||||
metadata?: DealingMetadata | null;
|
||||
}
|
||||
export interface DealingMetadata {
|
||||
dealing_index: number;
|
||||
submitted_chunks: {};
|
||||
}
|
||||
export interface PagedDealerAddressesResponse {
|
||||
dealers: Addr[];
|
||||
start_next_after?: Addr | null;
|
||||
}
|
||||
export type NullableEpoch = Epoch | null;
|
||||
export interface RegisteredDealerDetails {
|
||||
details?: DealerRegistrationDetails | null;
|
||||
}
|
||||
export interface DealerRegistrationDetails {
|
||||
announce_address: string;
|
||||
bte_public_key_with_proof: string;
|
||||
ed25519_identity: string;
|
||||
}
|
||||
export type Cw4Contract = Addr;
|
||||
export interface State {
|
||||
group_addr: Cw4Contract;
|
||||
key_size: number;
|
||||
mix_denom: string;
|
||||
multisig_addr: Addr;
|
||||
}
|
||||
export interface VkShareResponse {
|
||||
epoch_id: number;
|
||||
owner: Addr;
|
||||
share?: ContractVKShare | null;
|
||||
}
|
||||
export interface ContractVKShare {
|
||||
announce_address: string;
|
||||
epoch_id: number;
|
||||
@@ -151,4 +319,9 @@ export interface ContractVKShare {
|
||||
owner: Addr;
|
||||
share: string;
|
||||
verified: boolean;
|
||||
}
|
||||
export interface PagedVKSharesResponse {
|
||||
per_page: number;
|
||||
shares: ContractVKShare[];
|
||||
start_next_after?: Addr | null;
|
||||
}
|
||||
@@ -1,13 +1,12 @@
|
||||
/**
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@0.35.3.
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@1.13.3.
|
||||
* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
|
||||
* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
|
||||
*/
|
||||
|
||||
import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
|
||||
import { StdFee } from "@cosmjs/amino";
|
||||
import { Executor, Addr, Duration, Uint128, UncheckedDenom, Threshold, Decimal, InstantiateMsg, UncheckedDepositInfo, ExecuteMsg, Expiration, Timestamp, Uint64, CosmosMsgForEmpty, BankMsg, StakingMsg, DistributionMsg, Binary, IbcMsg, WasmMsg, GovMsg, VoteOption, Vote, Coin, Empty, IbcTimeout, IbcTimeoutBlock, MemberChangedHookMsg, MemberDiff, QueryMsg, MigrateMsg, Cw4Contract, Denom, Config, DepositInfo, Status, ThresholdResponse, ProposalListResponseForEmpty, ProposalResponseForEmpty, VoterListResponse, VoterDetail, VoteListResponse, VoteInfo, VoteResponse, VoterResponse } from "./Cw3FlexMultisig.types";
|
||||
|
||||
import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
|
||||
import { StdFee } from "@interchainjs/types";
|
||||
import { Executor, Addr, Duration, Uint128, UncheckedDenom, Threshold, Decimal, InstantiateMsg, UncheckedDepositInfo, ExecuteMsg, Expiration, Timestamp, Uint64, CosmosMsgForEmpty, BankMsg, WasmMsg, Binary, Vote, Coin, Empty, MemberChangedHookMsg, MemberDiff, QueryMsg, MigrateMsg, Cw4Contract, Denom, Config, DepositInfo, Status, ThresholdResponse, ProposalListResponseForEmpty, ProposalResponseForEmpty, VoterListResponse, VoterDetail, VoteListResponse, VoteInfo, VoteResponse, VoterResponse } from "./Cw3FlexMultisig.types";
|
||||
export interface Cw3FlexMultisigReadOnlyInterface {
|
||||
contractAddress: string;
|
||||
threshold: () => Promise<ThresholdResponse>;
|
||||
@@ -61,10 +60,9 @@ export interface Cw3FlexMultisigReadOnlyInterface {
|
||||
config: () => Promise<Config>;
|
||||
}
|
||||
export class Cw3FlexMultisigQueryClient implements Cw3FlexMultisigReadOnlyInterface {
|
||||
client: CosmWasmClient;
|
||||
client: ICosmWasmClient;
|
||||
contractAddress: string;
|
||||
|
||||
constructor(client: CosmWasmClient, contractAddress: string) {
|
||||
constructor(client: ICosmWasmClient, contractAddress: string) {
|
||||
this.client = client;
|
||||
this.contractAddress = contractAddress;
|
||||
this.threshold = this.threshold.bind(this);
|
||||
@@ -77,7 +75,6 @@ export class Cw3FlexMultisigQueryClient implements Cw3FlexMultisigReadOnlyInterf
|
||||
this.listVoters = this.listVoters.bind(this);
|
||||
this.config = this.config.bind(this);
|
||||
}
|
||||
|
||||
threshold = async (): Promise<ThresholdResponse> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
threshold: {}
|
||||
@@ -197,36 +194,35 @@ export interface Cw3FlexMultisigInterface extends Cw3FlexMultisigReadOnlyInterfa
|
||||
latest?: Expiration;
|
||||
msgs: CosmosMsgForEmpty[];
|
||||
title: string;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
// vote: ({
|
||||
// proposalId,
|
||||
// vote
|
||||
// }: {
|
||||
// proposalId: number;
|
||||
// vote: Vote;
|
||||
// }, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
vote: ({
|
||||
proposalId,
|
||||
vote
|
||||
}: {
|
||||
proposalId: number;
|
||||
vote: Vote;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
execute: ({
|
||||
proposalId
|
||||
}: {
|
||||
proposalId: number;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
close: ({
|
||||
proposalId
|
||||
}: {
|
||||
proposalId: number;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
memberChangedHook: ({
|
||||
diffs
|
||||
}: {
|
||||
diffs: MemberDiff[];
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
}
|
||||
export class Cw3FlexMultisigClient extends Cw3FlexMultisigQueryClient implements Cw3FlexMultisigInterface {
|
||||
client: SigningCosmWasmClient;
|
||||
client: ISigningCosmWasmClient;
|
||||
sender: string;
|
||||
contractAddress: string;
|
||||
|
||||
constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
|
||||
constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
|
||||
super(client, contractAddress);
|
||||
this.client = client;
|
||||
this.sender = sender;
|
||||
@@ -237,7 +233,6 @@ export class Cw3FlexMultisigClient extends Cw3FlexMultisigQueryClient implements
|
||||
this.close = this.close.bind(this);
|
||||
this.memberChangedHook = this.memberChangedHook.bind(this);
|
||||
}
|
||||
|
||||
propose = async ({
|
||||
description,
|
||||
latest,
|
||||
@@ -248,7 +243,7 @@ export class Cw3FlexMultisigClient extends Cw3FlexMultisigQueryClient implements
|
||||
latest?: Expiration;
|
||||
msgs: CosmosMsgForEmpty[];
|
||||
title: string;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
propose: {
|
||||
description,
|
||||
@@ -256,53 +251,53 @@ export class Cw3FlexMultisigClient extends Cw3FlexMultisigQueryClient implements
|
||||
msgs,
|
||||
title
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
vote = async ({
|
||||
proposalId,
|
||||
vote
|
||||
}: {
|
||||
proposalId: number;
|
||||
vote: Vote;
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
vote: {
|
||||
proposal_id: proposalId,
|
||||
vote
|
||||
}
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
// vote = async ({
|
||||
// proposalId,
|
||||
// vote
|
||||
// }: {
|
||||
// proposalId: number;
|
||||
// vote: Vote;
|
||||
// }, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
// return await this.client.execute(this.sender, this.contractAddress, {
|
||||
// vote: {
|
||||
// proposal_id: proposalId,
|
||||
// vote
|
||||
// }
|
||||
// }, fee, memo, _funds);
|
||||
// };
|
||||
execute = async ({
|
||||
proposalId
|
||||
}: {
|
||||
proposalId: number;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
execute: {
|
||||
proposal_id: proposalId
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
close = async ({
|
||||
proposalId
|
||||
}: {
|
||||
proposalId: number;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
close: {
|
||||
proposal_id: proposalId
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
memberChangedHook = async ({
|
||||
diffs
|
||||
}: {
|
||||
diffs: MemberDiff[];
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
member_changed_hook: {
|
||||
diffs
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/**
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@0.35.3.
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@1.13.3.
|
||||
* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
|
||||
* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
|
||||
*/
|
||||
@@ -84,86 +84,17 @@ export type CosmosMsgForEmpty = {
|
||||
bank: BankMsg;
|
||||
} | {
|
||||
custom: Empty;
|
||||
} | {
|
||||
staking: StakingMsg;
|
||||
} | {
|
||||
distribution: DistributionMsg;
|
||||
} | {
|
||||
stargate: {
|
||||
type_url: string;
|
||||
value: Binary;
|
||||
[k: string]: unknown;
|
||||
};
|
||||
} | {
|
||||
ibc: IbcMsg;
|
||||
} | {
|
||||
wasm: WasmMsg;
|
||||
} | {
|
||||
gov: GovMsg;
|
||||
};
|
||||
export type BankMsg = {
|
||||
send: {
|
||||
amount: Coin[];
|
||||
to_address: string;
|
||||
[k: string]: unknown;
|
||||
};
|
||||
} | {
|
||||
burn: {
|
||||
amount: Coin[];
|
||||
[k: string]: unknown;
|
||||
};
|
||||
};
|
||||
export type StakingMsg = {
|
||||
delegate: {
|
||||
amount: Coin;
|
||||
validator: string;
|
||||
[k: string]: unknown;
|
||||
};
|
||||
} | {
|
||||
undelegate: {
|
||||
amount: Coin;
|
||||
validator: string;
|
||||
[k: string]: unknown;
|
||||
};
|
||||
} | {
|
||||
redelegate: {
|
||||
amount: Coin;
|
||||
dst_validator: string;
|
||||
src_validator: string;
|
||||
[k: string]: unknown;
|
||||
};
|
||||
};
|
||||
export type DistributionMsg = {
|
||||
set_withdraw_address: {
|
||||
address: string;
|
||||
[k: string]: unknown;
|
||||
};
|
||||
} | {
|
||||
withdraw_delegator_reward: {
|
||||
validator: string;
|
||||
[k: string]: unknown;
|
||||
};
|
||||
};
|
||||
export type Binary = string;
|
||||
export type IbcMsg = {
|
||||
transfer: {
|
||||
amount: Coin;
|
||||
channel_id: string;
|
||||
timeout: IbcTimeout;
|
||||
to_address: string;
|
||||
[k: string]: unknown;
|
||||
};
|
||||
} | {
|
||||
send_packet: {
|
||||
channel_id: string;
|
||||
data: Binary;
|
||||
timeout: IbcTimeout;
|
||||
[k: string]: unknown;
|
||||
};
|
||||
} | {
|
||||
close_channel: {
|
||||
channel_id: string;
|
||||
[k: string]: unknown;
|
||||
};
|
||||
};
|
||||
export type WasmMsg = {
|
||||
@@ -171,7 +102,6 @@ export type WasmMsg = {
|
||||
contract_addr: string;
|
||||
funds: Coin[];
|
||||
msg: Binary;
|
||||
[k: string]: unknown;
|
||||
};
|
||||
} | {
|
||||
instantiate: {
|
||||
@@ -180,54 +110,30 @@ export type WasmMsg = {
|
||||
funds: Coin[];
|
||||
label: string;
|
||||
msg: Binary;
|
||||
[k: string]: unknown;
|
||||
};
|
||||
} | {
|
||||
migrate: {
|
||||
contract_addr: string;
|
||||
msg: Binary;
|
||||
new_code_id: number;
|
||||
[k: string]: unknown;
|
||||
};
|
||||
} | {
|
||||
update_admin: {
|
||||
admin: string;
|
||||
contract_addr: string;
|
||||
[k: string]: unknown;
|
||||
};
|
||||
} | {
|
||||
clear_admin: {
|
||||
contract_addr: string;
|
||||
[k: string]: unknown;
|
||||
};
|
||||
};
|
||||
export type GovMsg = {
|
||||
vote: {
|
||||
proposal_id: number;
|
||||
vote: VoteOption;
|
||||
[k: string]: unknown;
|
||||
};
|
||||
};
|
||||
export type VoteOption = "yes" | "no" | "abstain" | "no_with_veto";
|
||||
export type Binary = string;
|
||||
export type Vote = "yes" | "no" | "abstain" | "veto";
|
||||
export interface Coin {
|
||||
amount: Uint128;
|
||||
denom: string;
|
||||
[k: string]: unknown;
|
||||
}
|
||||
export interface Empty {
|
||||
[k: string]: unknown;
|
||||
}
|
||||
export interface IbcTimeout {
|
||||
block?: IbcTimeoutBlock | null;
|
||||
timestamp?: Timestamp | null;
|
||||
[k: string]: unknown;
|
||||
}
|
||||
export interface IbcTimeoutBlock {
|
||||
height: number;
|
||||
revision: number;
|
||||
[k: string]: unknown;
|
||||
}
|
||||
export interface Empty {}
|
||||
export interface MemberChangedHookMsg {
|
||||
diffs: MemberDiff[];
|
||||
}
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
/**
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@0.35.3.
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@1.13.3.
|
||||
* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
|
||||
* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
|
||||
*/
|
||||
|
||||
import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
|
||||
import { Coin, StdFee } from "@cosmjs/amino";
|
||||
import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
|
||||
import { Coin, StdFee } from "@interchainjs/types";
|
||||
import { InstantiateMsg, Member, ExecuteMsg, QueryMsg, MigrateMsg, AdminResponse, HooksResponse, MemberListResponse, MemberResponse, TotalWeightResponse } from "./Cw4Group.types";
|
||||
|
||||
export interface Cw4GroupReadOnlyInterface {
|
||||
contractAddress: string;
|
||||
admin: () => Promise<AdminResponse>;
|
||||
@@ -33,10 +32,9 @@ export interface Cw4GroupReadOnlyInterface {
|
||||
hooks: () => Promise<HooksResponse>;
|
||||
}
|
||||
export class Cw4GroupQueryClient implements Cw4GroupReadOnlyInterface {
|
||||
client: CosmWasmClient;
|
||||
client: ICosmWasmClient;
|
||||
contractAddress: string;
|
||||
|
||||
constructor(client: CosmWasmClient, contractAddress: string) {
|
||||
constructor(client: ICosmWasmClient, contractAddress: string) {
|
||||
this.client = client;
|
||||
this.contractAddress = contractAddress;
|
||||
this.admin = this.admin.bind(this);
|
||||
@@ -45,7 +43,6 @@ export class Cw4GroupQueryClient implements Cw4GroupReadOnlyInterface {
|
||||
this.member = this.member.bind(this);
|
||||
this.hooks = this.hooks.bind(this);
|
||||
}
|
||||
|
||||
admin = async (): Promise<AdminResponse> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
admin: {}
|
||||
@@ -103,31 +100,30 @@ export interface Cw4GroupInterface extends Cw4GroupReadOnlyInterface {
|
||||
admin
|
||||
}: {
|
||||
admin?: string;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
updateMembers: ({
|
||||
add,
|
||||
remove
|
||||
}: {
|
||||
add: Member[];
|
||||
remove: string[];
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
addHook: ({
|
||||
addr
|
||||
}: {
|
||||
addr: string;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
removeHook: ({
|
||||
addr
|
||||
}: {
|
||||
addr: string;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
}
|
||||
export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInterface {
|
||||
client: SigningCosmWasmClient;
|
||||
client: ISigningCosmWasmClient;
|
||||
sender: string;
|
||||
contractAddress: string;
|
||||
|
||||
constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
|
||||
constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
|
||||
super(client, contractAddress);
|
||||
this.client = client;
|
||||
this.sender = sender;
|
||||
@@ -137,17 +133,16 @@ export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInter
|
||||
this.addHook = this.addHook.bind(this);
|
||||
this.removeHook = this.removeHook.bind(this);
|
||||
}
|
||||
|
||||
updateAdmin = async ({
|
||||
admin
|
||||
}: {
|
||||
admin?: string;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
update_admin: {
|
||||
admin
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
updateMembers = async ({
|
||||
add,
|
||||
@@ -155,34 +150,34 @@ export class Cw4GroupClient extends Cw4GroupQueryClient implements Cw4GroupInter
|
||||
}: {
|
||||
add: Member[];
|
||||
remove: string[];
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
update_members: {
|
||||
add,
|
||||
remove
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
addHook = async ({
|
||||
addr
|
||||
}: {
|
||||
addr: string;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
add_hook: {
|
||||
addr
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
removeHook = async ({
|
||||
addr
|
||||
}: {
|
||||
addr: string;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
remove_hook: {
|
||||
addr
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/**
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@0.35.3.
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@1.13.3.
|
||||
* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
|
||||
* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
|
||||
*/
|
||||
|
||||
@@ -0,0 +1,256 @@
|
||||
/**
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@1.13.3.
|
||||
* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
|
||||
* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
|
||||
*/
|
||||
|
||||
import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
|
||||
import { StdFee } from "@interchainjs/types";
|
||||
import { Uint128, InstantiateMsg, Coin, ExecuteMsg, QueryMsg, MigrateMsg, PagedBlacklistedAccountResponse, BlacklistedAccount, Blacklisting, BlacklistedAccountResponse, DepositResponse, Deposit, PagedDepositsResponse, DepositData, LatestDepositResponse } from "./Ecash.types";
|
||||
export interface EcashReadOnlyInterface {
|
||||
contractAddress: string;
|
||||
getBlacklistedAccount: ({
|
||||
publicKey
|
||||
}: {
|
||||
publicKey: string;
|
||||
}) => Promise<BlacklistedAccountResponse>;
|
||||
getBlacklistPaged: ({
|
||||
limit,
|
||||
startAfter
|
||||
}: {
|
||||
limit?: number;
|
||||
startAfter?: string;
|
||||
}) => Promise<PagedBlacklistedAccountResponse>;
|
||||
getRequiredDepositAmount: () => Promise<Coin>;
|
||||
getDeposit: ({
|
||||
depositId
|
||||
}: {
|
||||
depositId: number;
|
||||
}) => Promise<DepositResponse>;
|
||||
getLatestDeposit: () => Promise<LatestDepositResponse>;
|
||||
getDepositsPaged: ({
|
||||
limit,
|
||||
startAfter
|
||||
}: {
|
||||
limit?: number;
|
||||
startAfter?: number;
|
||||
}) => Promise<PagedDepositsResponse>;
|
||||
}
|
||||
export class EcashQueryClient implements EcashReadOnlyInterface {
|
||||
client: ICosmWasmClient;
|
||||
contractAddress: string;
|
||||
constructor(client: ICosmWasmClient, contractAddress: string) {
|
||||
this.client = client;
|
||||
this.contractAddress = contractAddress;
|
||||
this.getBlacklistedAccount = this.getBlacklistedAccount.bind(this);
|
||||
this.getBlacklistPaged = this.getBlacklistPaged.bind(this);
|
||||
this.getRequiredDepositAmount = this.getRequiredDepositAmount.bind(this);
|
||||
this.getDeposit = this.getDeposit.bind(this);
|
||||
this.getLatestDeposit = this.getLatestDeposit.bind(this);
|
||||
this.getDepositsPaged = this.getDepositsPaged.bind(this);
|
||||
}
|
||||
getBlacklistedAccount = async ({
|
||||
publicKey
|
||||
}: {
|
||||
publicKey: string;
|
||||
}): Promise<BlacklistedAccountResponse> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_blacklisted_account: {
|
||||
public_key: publicKey
|
||||
}
|
||||
});
|
||||
};
|
||||
getBlacklistPaged = async ({
|
||||
limit,
|
||||
startAfter
|
||||
}: {
|
||||
limit?: number;
|
||||
startAfter?: string;
|
||||
}): Promise<PagedBlacklistedAccountResponse> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_blacklist_paged: {
|
||||
limit,
|
||||
start_after: startAfter
|
||||
}
|
||||
});
|
||||
};
|
||||
getRequiredDepositAmount = async (): Promise<Coin> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_required_deposit_amount: {}
|
||||
});
|
||||
};
|
||||
getDeposit = async ({
|
||||
depositId
|
||||
}: {
|
||||
depositId: number;
|
||||
}): Promise<DepositResponse> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_deposit: {
|
||||
deposit_id: depositId
|
||||
}
|
||||
});
|
||||
};
|
||||
getLatestDeposit = async (): Promise<LatestDepositResponse> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_latest_deposit: {}
|
||||
});
|
||||
};
|
||||
getDepositsPaged = async ({
|
||||
limit,
|
||||
startAfter
|
||||
}: {
|
||||
limit?: number;
|
||||
startAfter?: number;
|
||||
}): Promise<PagedDepositsResponse> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_deposits_paged: {
|
||||
limit,
|
||||
start_after: startAfter
|
||||
}
|
||||
});
|
||||
};
|
||||
}
|
||||
export interface EcashInterface extends EcashReadOnlyInterface {
|
||||
contractAddress: string;
|
||||
sender: string;
|
||||
depositTicketBookFunds: ({
|
||||
identityKey
|
||||
}: {
|
||||
identityKey: string;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
requestRedemption: ({
|
||||
commitmentBs58,
|
||||
numberOfTickets
|
||||
}: {
|
||||
commitmentBs58: string;
|
||||
numberOfTickets: number;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
redeemTickets: ({
|
||||
gw,
|
||||
n
|
||||
}: {
|
||||
gw: string;
|
||||
n: number;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
updateAdmin: ({
|
||||
admin
|
||||
}: {
|
||||
admin: string;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
updateDepositValue: ({
|
||||
newDeposit
|
||||
}: {
|
||||
newDeposit: Coin;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
proposeToBlacklist: ({
|
||||
publicKey
|
||||
}: {
|
||||
publicKey: string;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
addToBlacklist: ({
|
||||
publicKey
|
||||
}: {
|
||||
publicKey: string;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
}
|
||||
export class EcashClient extends EcashQueryClient implements EcashInterface {
|
||||
client: ISigningCosmWasmClient;
|
||||
sender: string;
|
||||
contractAddress: string;
|
||||
constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
|
||||
super(client, contractAddress);
|
||||
this.client = client;
|
||||
this.sender = sender;
|
||||
this.contractAddress = contractAddress;
|
||||
this.depositTicketBookFunds = this.depositTicketBookFunds.bind(this);
|
||||
this.requestRedemption = this.requestRedemption.bind(this);
|
||||
this.redeemTickets = this.redeemTickets.bind(this);
|
||||
this.updateAdmin = this.updateAdmin.bind(this);
|
||||
this.updateDepositValue = this.updateDepositValue.bind(this);
|
||||
this.proposeToBlacklist = this.proposeToBlacklist.bind(this);
|
||||
this.addToBlacklist = this.addToBlacklist.bind(this);
|
||||
}
|
||||
depositTicketBookFunds = async ({
|
||||
identityKey
|
||||
}: {
|
||||
identityKey: string;
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
deposit_ticket_book_funds: {
|
||||
identity_key: identityKey
|
||||
}
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
requestRedemption = async ({
|
||||
commitmentBs58,
|
||||
numberOfTickets
|
||||
}: {
|
||||
commitmentBs58: string;
|
||||
numberOfTickets: number;
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
request_redemption: {
|
||||
commitment_bs58: commitmentBs58,
|
||||
number_of_tickets: numberOfTickets
|
||||
}
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
redeemTickets = async ({
|
||||
gw,
|
||||
n
|
||||
}: {
|
||||
gw: string;
|
||||
n: number;
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
redeem_tickets: {
|
||||
gw,
|
||||
n
|
||||
}
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
updateAdmin = async ({
|
||||
admin
|
||||
}: {
|
||||
admin: string;
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
update_admin: {
|
||||
admin
|
||||
}
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
updateDepositValue = async ({
|
||||
newDeposit
|
||||
}: {
|
||||
newDeposit: Coin;
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
update_deposit_value: {
|
||||
new_deposit: newDeposit
|
||||
}
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
proposeToBlacklist = async ({
|
||||
publicKey
|
||||
}: {
|
||||
publicKey: string;
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
propose_to_blacklist: {
|
||||
public_key: publicKey
|
||||
}
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
addToBlacklist = async ({
|
||||
publicKey
|
||||
}: {
|
||||
publicKey: string;
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
add_to_blacklist: {
|
||||
public_key: publicKey
|
||||
}
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,106 @@
|
||||
/**
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@1.13.3.
|
||||
* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
|
||||
* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
|
||||
*/
|
||||
|
||||
export type Uint128 = string;
|
||||
export interface InstantiateMsg {
|
||||
deposit_amount: Coin;
|
||||
group_addr: string;
|
||||
holding_account: string;
|
||||
multisig_addr: string;
|
||||
}
|
||||
export interface Coin {
|
||||
amount: Uint128;
|
||||
denom: string;
|
||||
}
|
||||
export type ExecuteMsg = {
|
||||
deposit_ticket_book_funds: {
|
||||
identity_key: string;
|
||||
};
|
||||
} | {
|
||||
request_redemption: {
|
||||
commitment_bs58: string;
|
||||
number_of_tickets: number;
|
||||
};
|
||||
} | {
|
||||
redeem_tickets: {
|
||||
gw: string;
|
||||
n: number;
|
||||
};
|
||||
} | {
|
||||
update_admin: {
|
||||
admin: string;
|
||||
};
|
||||
} | {
|
||||
update_deposit_value: {
|
||||
new_deposit: Coin;
|
||||
};
|
||||
} | {
|
||||
propose_to_blacklist: {
|
||||
public_key: string;
|
||||
};
|
||||
} | {
|
||||
add_to_blacklist: {
|
||||
public_key: string;
|
||||
};
|
||||
};
|
||||
export type QueryMsg = {
|
||||
get_blacklisted_account: {
|
||||
public_key: string;
|
||||
};
|
||||
} | {
|
||||
get_blacklist_paged: {
|
||||
limit?: number | null;
|
||||
start_after?: string | null;
|
||||
};
|
||||
} | {
|
||||
get_required_deposit_amount: {};
|
||||
} | {
|
||||
get_deposit: {
|
||||
deposit_id: number;
|
||||
};
|
||||
} | {
|
||||
get_latest_deposit: {};
|
||||
} | {
|
||||
get_deposits_paged: {
|
||||
limit?: number | null;
|
||||
start_after?: number | null;
|
||||
};
|
||||
};
|
||||
export interface MigrateMsg {}
|
||||
export interface PagedBlacklistedAccountResponse {
|
||||
accounts: BlacklistedAccount[];
|
||||
per_page: number;
|
||||
start_next_after?: string | null;
|
||||
}
|
||||
export interface BlacklistedAccount {
|
||||
info: Blacklisting;
|
||||
public_key: string;
|
||||
}
|
||||
export interface Blacklisting {
|
||||
finalized_at_height?: number | null;
|
||||
proposal_id: number;
|
||||
}
|
||||
export interface BlacklistedAccountResponse {
|
||||
account?: Blacklisting | null;
|
||||
}
|
||||
export interface DepositResponse {
|
||||
deposit?: Deposit | null;
|
||||
id: number;
|
||||
}
|
||||
export interface Deposit {
|
||||
bs58_encoded_ed25519_pubkey: string;
|
||||
}
|
||||
export interface PagedDepositsResponse {
|
||||
deposits: DepositData[];
|
||||
start_next_after?: number | null;
|
||||
}
|
||||
export interface DepositData {
|
||||
deposit: Deposit;
|
||||
id: number;
|
||||
}
|
||||
export interface LatestDepositResponse {
|
||||
deposit?: DepositData | null;
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,80 +1,66 @@
|
||||
/**
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@0.35.3.
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@1.13.3.
|
||||
* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
|
||||
* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
|
||||
*/
|
||||
|
||||
export type Decimal = string;
|
||||
export type Percent = Decimal;
|
||||
|
||||
/**
|
||||
* This instantiates the contract.
|
||||
*/
|
||||
export type Uint128 = string;
|
||||
export interface InstantiateMsg {
|
||||
current_nym_node_version: string;
|
||||
epoch_duration: Duration;
|
||||
epochs_in_interval: number;
|
||||
initial_rewarding_params: InitialRewardingParams;
|
||||
interval_operating_cost?: RangedValueForUint128;
|
||||
key_validity_in_epochs?: number | null;
|
||||
profit_margin?: RangedValueForPercent;
|
||||
rewarding_denom: string;
|
||||
rewarding_validator_address: string;
|
||||
version_score_params?: VersionScoreFormulaParams;
|
||||
version_score_weights?: OutdatedVersionWeights;
|
||||
vesting_contract_address: string;
|
||||
}
|
||||
export interface Duration {
|
||||
nanos: number;
|
||||
secs: number;
|
||||
[k: string]: unknown;
|
||||
}
|
||||
export interface InitialRewardingParams {
|
||||
active_set_size: number;
|
||||
active_set_work_factor: Decimal;
|
||||
initial_reward_pool: Decimal;
|
||||
initial_staking_supply: Decimal;
|
||||
interval_pool_emission: Percent;
|
||||
rewarded_set_size: number;
|
||||
rewarded_set_params: RewardedSetParams;
|
||||
staking_supply_scale_factor: Percent;
|
||||
sybil_resistance: Percent;
|
||||
}
|
||||
export interface RewardedSetParams {
|
||||
entry_gateways: number;
|
||||
exit_gateways: number;
|
||||
mixnodes: number;
|
||||
standby: number;
|
||||
}
|
||||
export interface RangedValueForUint128 {
|
||||
maximum: Uint128;
|
||||
minimum: Uint128;
|
||||
}
|
||||
export interface RangedValueForPercent {
|
||||
maximum: Percent;
|
||||
minimum: Percent;
|
||||
}
|
||||
export interface VersionScoreFormulaParams {
|
||||
penalty: Decimal;
|
||||
penalty_scaling: Decimal;
|
||||
}
|
||||
export interface OutdatedVersionWeights {
|
||||
major: number;
|
||||
minor: number;
|
||||
patch: number;
|
||||
prerelease: number;
|
||||
}
|
||||
export type ExecuteMsg = {
|
||||
assign_node_layer: {
|
||||
layer: Layer;
|
||||
mix_id: number;
|
||||
};
|
||||
} | {
|
||||
create_family: {
|
||||
label: string;
|
||||
};
|
||||
} | {
|
||||
join_family: {
|
||||
family_head: FamilyHead;
|
||||
join_permit: MessageSignature;
|
||||
};
|
||||
} | {
|
||||
leave_family: {
|
||||
family_head: FamilyHead;
|
||||
};
|
||||
} | {
|
||||
kick_family_member: {
|
||||
member: string;
|
||||
};
|
||||
} | {
|
||||
create_family_on_behalf: {
|
||||
label: string;
|
||||
owner_address: string;
|
||||
};
|
||||
} | {
|
||||
join_family_on_behalf: {
|
||||
family_head: FamilyHead;
|
||||
join_permit: MessageSignature;
|
||||
member_address: string;
|
||||
};
|
||||
} | {
|
||||
leave_family_on_behalf: {
|
||||
family_head: FamilyHead;
|
||||
member_address: string;
|
||||
};
|
||||
} | {
|
||||
kick_family_member_on_behalf: {
|
||||
head_address: string;
|
||||
member: string;
|
||||
update_admin: {
|
||||
admin: string;
|
||||
};
|
||||
} | {
|
||||
update_rewarding_validator_address: {
|
||||
@@ -82,12 +68,16 @@ export type ExecuteMsg = {
|
||||
};
|
||||
} | {
|
||||
update_contract_state_params: {
|
||||
updated_parameters: ContractStateParams;
|
||||
update: ContractStateParamsUpdate;
|
||||
};
|
||||
} | {
|
||||
update_active_set_size: {
|
||||
active_set_size: number;
|
||||
update_current_nym_node_semver: {
|
||||
current_version: string;
|
||||
};
|
||||
} | {
|
||||
update_active_set_distribution: {
|
||||
force_immediately: boolean;
|
||||
update: ActiveSetUpdate;
|
||||
};
|
||||
} | {
|
||||
update_rewarding_params: {
|
||||
@@ -102,24 +92,23 @@ export type ExecuteMsg = {
|
||||
};
|
||||
} | {
|
||||
begin_epoch_transition: {};
|
||||
} | {
|
||||
advance_current_epoch: {
|
||||
expected_active_set_size: number;
|
||||
new_rewarded_set: LayerAssignment[];
|
||||
};
|
||||
} | {
|
||||
reconcile_epoch_events: {
|
||||
limit?: number | null;
|
||||
};
|
||||
} | {
|
||||
assign_roles: {
|
||||
assignment: RoleAssignment;
|
||||
};
|
||||
} | {
|
||||
bond_mixnode: {
|
||||
cost_params: MixNodeCostParams;
|
||||
cost_params: NodeCostParams;
|
||||
mix_node: MixNode;
|
||||
owner_signature: MessageSignature;
|
||||
};
|
||||
} | {
|
||||
bond_mixnode_on_behalf: {
|
||||
cost_params: MixNodeCostParams;
|
||||
cost_params: NodeCostParams;
|
||||
mix_node: MixNode;
|
||||
owner: string;
|
||||
owner_signature: MessageSignature;
|
||||
@@ -146,12 +135,12 @@ export type ExecuteMsg = {
|
||||
owner: string;
|
||||
};
|
||||
} | {
|
||||
update_mixnode_cost_params: {
|
||||
new_costs: MixNodeCostParams;
|
||||
update_cost_params: {
|
||||
new_costs: NodeCostParams;
|
||||
};
|
||||
} | {
|
||||
update_mixnode_cost_params_on_behalf: {
|
||||
new_costs: MixNodeCostParams;
|
||||
new_costs: NodeCostParams;
|
||||
owner: string;
|
||||
};
|
||||
} | {
|
||||
@@ -163,6 +152,8 @@ export type ExecuteMsg = {
|
||||
new_config: MixNodeConfigUpdate;
|
||||
owner: string;
|
||||
};
|
||||
} | {
|
||||
migrate_mixnode: {};
|
||||
} | {
|
||||
bond_gateway: {
|
||||
gateway: Gateway;
|
||||
@@ -190,8 +181,24 @@ export type ExecuteMsg = {
|
||||
owner: string;
|
||||
};
|
||||
} | {
|
||||
delegate_to_mixnode: {
|
||||
mix_id: number;
|
||||
migrate_gateway: {
|
||||
cost_params?: NodeCostParams | null;
|
||||
};
|
||||
} | {
|
||||
bond_nym_node: {
|
||||
cost_params: NodeCostParams;
|
||||
node: NymNode;
|
||||
owner_signature: MessageSignature;
|
||||
};
|
||||
} | {
|
||||
unbond_nym_node: {};
|
||||
} | {
|
||||
update_node_config: {
|
||||
update: NodeConfigUpdate;
|
||||
};
|
||||
} | {
|
||||
delegate: {
|
||||
node_id: number;
|
||||
};
|
||||
} | {
|
||||
delegate_to_mixnode_on_behalf: {
|
||||
@@ -199,8 +206,8 @@ export type ExecuteMsg = {
|
||||
mix_id: number;
|
||||
};
|
||||
} | {
|
||||
undelegate_from_mixnode: {
|
||||
mix_id: number;
|
||||
undelegate: {
|
||||
node_id: number;
|
||||
};
|
||||
} | {
|
||||
undelegate_from_mixnode_on_behalf: {
|
||||
@@ -208,9 +215,9 @@ export type ExecuteMsg = {
|
||||
mix_id: number;
|
||||
};
|
||||
} | {
|
||||
reward_mixnode: {
|
||||
mix_id: number;
|
||||
performance: Percent;
|
||||
reward_node: {
|
||||
node_id: number;
|
||||
params: NodeRewardingParameters;
|
||||
};
|
||||
} | {
|
||||
withdraw_operator_reward: {};
|
||||
@@ -220,42 +227,62 @@ export type ExecuteMsg = {
|
||||
};
|
||||
} | {
|
||||
withdraw_delegator_reward: {
|
||||
mix_id: number;
|
||||
node_id: number;
|
||||
};
|
||||
} | {
|
||||
withdraw_delegator_reward_on_behalf: {
|
||||
mix_id: number;
|
||||
owner: string;
|
||||
};
|
||||
} | {
|
||||
migrate_vested_mix_node: {};
|
||||
} | {
|
||||
migrate_vested_delegation: {
|
||||
mix_id: number;
|
||||
};
|
||||
};
|
||||
export type Layer = "One" | "Two" | "Three";
|
||||
export type FamilyHead = string;
|
||||
export type Role = "eg" | "l1" | "l2" | "l3" | "xg" | "stb";
|
||||
export type MessageSignature = number[];
|
||||
export type Uint128 = string;
|
||||
export interface ContractStateParams {
|
||||
minimum_gateway_pledge: Coin;
|
||||
minimum_mixnode_delegation?: Coin | null;
|
||||
minimum_mixnode_pledge: Coin;
|
||||
export interface ContractStateParamsUpdate {
|
||||
config_score_params?: ConfigScoreParamsUpdate | null;
|
||||
delegations_params?: DelegationsParams | null;
|
||||
operators_params?: OperatorsParamsUpdate | null;
|
||||
}
|
||||
export interface ConfigScoreParamsUpdate {
|
||||
version_score_formula_params?: VersionScoreFormulaParams | null;
|
||||
version_weights?: OutdatedVersionWeights | null;
|
||||
}
|
||||
export interface DelegationsParams {
|
||||
minimum_delegation?: Coin | null;
|
||||
}
|
||||
export interface Coin {
|
||||
amount: Uint128;
|
||||
denom: string;
|
||||
[k: string]: unknown;
|
||||
}
|
||||
export interface OperatorsParamsUpdate {
|
||||
interval_operating_cost?: RangedValueForUint128 | null;
|
||||
minimum_pledge?: Coin | null;
|
||||
profit_margin?: RangedValueForPercent | null;
|
||||
}
|
||||
export interface ActiveSetUpdate {
|
||||
entry_gateways: number;
|
||||
exit_gateways: number;
|
||||
mixnodes: number;
|
||||
}
|
||||
export interface IntervalRewardingParamsUpdate {
|
||||
active_set_work_factor?: Decimal | null;
|
||||
interval_pool_emission?: Percent | null;
|
||||
reward_pool?: Decimal | null;
|
||||
rewarded_set_size?: number | null;
|
||||
rewarded_set_params?: RewardedSetParams | null;
|
||||
staking_supply?: Decimal | null;
|
||||
staking_supply_scale_factor?: Percent | null;
|
||||
sybil_resistance_percent?: Percent | null;
|
||||
}
|
||||
export interface LayerAssignment {
|
||||
layer: Layer;
|
||||
mix_id: number;
|
||||
export interface RoleAssignment {
|
||||
nodes: number[];
|
||||
role: Role;
|
||||
}
|
||||
export interface MixNodeCostParams {
|
||||
export interface NodeCostParams {
|
||||
interval_operating_cost: Coin;
|
||||
profit_margin_percent: Percent;
|
||||
}
|
||||
@@ -291,32 +318,22 @@ export interface GatewayConfigUpdate {
|
||||
mix_port: number;
|
||||
version: string;
|
||||
}
|
||||
export interface NymNode {
|
||||
custom_http_port?: number | null;
|
||||
host: string;
|
||||
identity_key: string;
|
||||
}
|
||||
export interface NodeConfigUpdate {
|
||||
custom_http_port?: number | null;
|
||||
host?: string | null;
|
||||
restore_default_http_port?: boolean;
|
||||
}
|
||||
export interface NodeRewardingParameters {
|
||||
performance: Percent;
|
||||
work_factor: Decimal;
|
||||
}
|
||||
export type QueryMsg = {
|
||||
get_all_families_paged: {
|
||||
limit?: number | null;
|
||||
start_after?: string | null;
|
||||
};
|
||||
} | {
|
||||
get_all_members_paged: {
|
||||
limit?: number | null;
|
||||
start_after?: string | null;
|
||||
};
|
||||
} | {
|
||||
get_family_by_head: {
|
||||
head: string;
|
||||
};
|
||||
} | {
|
||||
get_family_by_label: {
|
||||
label: string;
|
||||
};
|
||||
} | {
|
||||
get_family_members_by_head: {
|
||||
head: string;
|
||||
};
|
||||
} | {
|
||||
get_family_members_by_label: {
|
||||
label: string;
|
||||
};
|
||||
admin: {};
|
||||
} | {
|
||||
get_contract_version: {};
|
||||
} | {
|
||||
@@ -327,17 +344,19 @@ export type QueryMsg = {
|
||||
get_state_params: {};
|
||||
} | {
|
||||
get_state: {};
|
||||
} | {
|
||||
get_current_nym_node_version: {};
|
||||
} | {
|
||||
get_nym_node_version_history: {
|
||||
limit?: number | null;
|
||||
start_after?: number | null;
|
||||
};
|
||||
} | {
|
||||
get_rewarding_params: {};
|
||||
} | {
|
||||
get_epoch_status: {};
|
||||
} | {
|
||||
get_current_interval_details: {};
|
||||
} | {
|
||||
get_rewarded_set: {
|
||||
limit?: number | null;
|
||||
start_after?: number | null;
|
||||
};
|
||||
} | {
|
||||
get_mix_node_bonds: {
|
||||
limit?: number | null;
|
||||
@@ -389,8 +408,6 @@ export type QueryMsg = {
|
||||
get_bonded_mixnode_details_by_identity: {
|
||||
mix_identity: string;
|
||||
};
|
||||
} | {
|
||||
get_layer_distribution: {};
|
||||
} | {
|
||||
get_gateways: {
|
||||
limit?: number | null;
|
||||
@@ -405,9 +422,71 @@ export type QueryMsg = {
|
||||
address: string;
|
||||
};
|
||||
} | {
|
||||
get_mixnode_delegations: {
|
||||
get_preassigned_gateway_ids: {
|
||||
limit?: number | null;
|
||||
mix_id: number;
|
||||
start_after?: string | null;
|
||||
};
|
||||
} | {
|
||||
get_nym_node_bonds_paged: {
|
||||
limit?: number | null;
|
||||
start_after?: number | null;
|
||||
};
|
||||
} | {
|
||||
get_nym_nodes_detailed_paged: {
|
||||
limit?: number | null;
|
||||
start_after?: number | null;
|
||||
};
|
||||
} | {
|
||||
get_unbonded_nym_node: {
|
||||
node_id: number;
|
||||
};
|
||||
} | {
|
||||
get_unbonded_nym_nodes_paged: {
|
||||
limit?: number | null;
|
||||
start_after?: number | null;
|
||||
};
|
||||
} | {
|
||||
get_unbonded_nym_nodes_by_owner_paged: {
|
||||
limit?: number | null;
|
||||
owner: string;
|
||||
start_after?: number | null;
|
||||
};
|
||||
} | {
|
||||
get_unbonded_nym_nodes_by_identity_key_paged: {
|
||||
identity_key: string;
|
||||
limit?: number | null;
|
||||
start_after?: number | null;
|
||||
};
|
||||
} | {
|
||||
get_owned_nym_node: {
|
||||
address: string;
|
||||
};
|
||||
} | {
|
||||
get_nym_node_details: {
|
||||
node_id: number;
|
||||
};
|
||||
} | {
|
||||
get_nym_node_details_by_identity_key: {
|
||||
node_identity: string;
|
||||
};
|
||||
} | {
|
||||
get_node_rewarding_details: {
|
||||
node_id: number;
|
||||
};
|
||||
} | {
|
||||
get_node_stake_saturation: {
|
||||
node_id: number;
|
||||
};
|
||||
} | {
|
||||
get_role_assignment: {
|
||||
role: Role;
|
||||
};
|
||||
} | {
|
||||
get_rewarded_set_metadata: {};
|
||||
} | {
|
||||
get_node_delegations: {
|
||||
limit?: number | null;
|
||||
node_id: number;
|
||||
start_after?: string | null;
|
||||
};
|
||||
} | {
|
||||
@@ -419,7 +498,7 @@ export type QueryMsg = {
|
||||
} | {
|
||||
get_delegation_details: {
|
||||
delegator: string;
|
||||
mix_id: number;
|
||||
node_id: number;
|
||||
proxy?: string | null;
|
||||
};
|
||||
} | {
|
||||
@@ -432,26 +511,27 @@ export type QueryMsg = {
|
||||
address: string;
|
||||
};
|
||||
} | {
|
||||
get_pending_mix_node_operator_reward: {
|
||||
mix_id: number;
|
||||
get_pending_node_operator_reward: {
|
||||
node_id: number;
|
||||
};
|
||||
} | {
|
||||
get_pending_delegator_reward: {
|
||||
address: string;
|
||||
mix_id: number;
|
||||
node_id: number;
|
||||
proxy?: string | null;
|
||||
};
|
||||
} | {
|
||||
get_estimated_current_epoch_operator_reward: {
|
||||
estimated_performance: Percent;
|
||||
mix_id: number;
|
||||
estimated_work?: Decimal | null;
|
||||
node_id: number;
|
||||
};
|
||||
} | {
|
||||
get_estimated_current_epoch_delegator_reward: {
|
||||
address: string;
|
||||
estimated_performance: Percent;
|
||||
mix_id: number;
|
||||
proxy?: string | null;
|
||||
estimated_work?: Decimal | null;
|
||||
node_id: number;
|
||||
};
|
||||
} | {
|
||||
get_pending_epoch_events: {
|
||||
@@ -477,10 +557,18 @@ export type QueryMsg = {
|
||||
get_signing_nonce: {
|
||||
address: string;
|
||||
};
|
||||
} | {
|
||||
get_key_rotation_state: {};
|
||||
} | {
|
||||
get_key_rotation_id: {};
|
||||
};
|
||||
export interface MigrateMsg {
|
||||
unsafe_skip_state_updates?: boolean | null;
|
||||
vesting_contract_address?: string | null;
|
||||
}
|
||||
export interface AdminResponse {
|
||||
admin?: string | null;
|
||||
}
|
||||
export type Addr = string;
|
||||
export interface PagedAllDelegationsResponse {
|
||||
delegations: Delegation[];
|
||||
@@ -490,23 +578,10 @@ export interface Delegation {
|
||||
amount: Coin;
|
||||
cumulative_reward_ratio: Decimal;
|
||||
height: number;
|
||||
mix_id: number;
|
||||
node_id: number;
|
||||
owner: Addr;
|
||||
proxy?: Addr | null;
|
||||
}
|
||||
export interface PagedFamiliesResponse {
|
||||
families: Family[];
|
||||
start_next_after?: string | null;
|
||||
}
|
||||
export interface Family {
|
||||
head: FamilyHead;
|
||||
label: string;
|
||||
proxy?: string | null;
|
||||
}
|
||||
export interface PagedMembersResponse {
|
||||
members: [string, FamilyHead][];
|
||||
start_next_after?: string | null;
|
||||
}
|
||||
export interface MixnodeDetailsByIdentityResponse {
|
||||
identity_key: string;
|
||||
mixnode_details?: MixNodeDetails | null;
|
||||
@@ -514,12 +589,11 @@ export interface MixnodeDetailsByIdentityResponse {
|
||||
export interface MixNodeDetails {
|
||||
bond_information: MixNodeBond;
|
||||
pending_changes?: PendingMixNodeChanges;
|
||||
rewarding_details: MixNodeRewarding;
|
||||
rewarding_details: NodeRewarding;
|
||||
}
|
||||
export interface MixNodeBond {
|
||||
bonding_height: number;
|
||||
is_unbonding: boolean;
|
||||
layer: Layer;
|
||||
mix_id: number;
|
||||
mix_node: MixNode;
|
||||
original_pledge: Coin;
|
||||
@@ -527,10 +601,11 @@ export interface MixNodeBond {
|
||||
proxy?: Addr | null;
|
||||
}
|
||||
export interface PendingMixNodeChanges {
|
||||
cost_params_change?: number | null;
|
||||
pledge_change?: number | null;
|
||||
}
|
||||
export interface MixNodeRewarding {
|
||||
cost_params: MixNodeCostParams;
|
||||
export interface NodeRewarding {
|
||||
cost_params: NodeCostParams;
|
||||
delegates: Decimal;
|
||||
last_rewarded_epoch: number;
|
||||
operator: Decimal;
|
||||
@@ -545,9 +620,12 @@ export interface ContractVersion {
|
||||
export interface ContractBuildInformation {
|
||||
build_timestamp: string;
|
||||
build_version: string;
|
||||
cargo_debug?: string;
|
||||
cargo_opt_level?: string;
|
||||
commit_branch: string;
|
||||
commit_sha: string;
|
||||
commit_timestamp: string;
|
||||
contract_name?: string;
|
||||
rustc_version: string;
|
||||
}
|
||||
export interface CurrentIntervalResponse {
|
||||
@@ -563,11 +641,29 @@ export interface Interval {
|
||||
epochs_in_interval: number;
|
||||
id: number;
|
||||
total_elapsed_epochs: number;
|
||||
[k: string]: unknown;
|
||||
}
|
||||
export interface MixNodeDelegationResponse {
|
||||
export interface CurrentNymNodeVersionResponse {
|
||||
version?: HistoricalNymNodeVersionEntry | null;
|
||||
}
|
||||
export interface HistoricalNymNodeVersionEntry {
|
||||
id: number;
|
||||
version_information: HistoricalNymNodeVersion;
|
||||
}
|
||||
export interface HistoricalNymNodeVersion {
|
||||
difference_since_genesis: TotalVersionDifference;
|
||||
introduced_at_height: number;
|
||||
semver: string;
|
||||
}
|
||||
export interface TotalVersionDifference {
|
||||
major: number;
|
||||
minor: number;
|
||||
patch: number;
|
||||
prerelease: number;
|
||||
}
|
||||
export interface NodeDelegationResponse {
|
||||
delegation?: Delegation | null;
|
||||
mixnode_still_bonded: boolean;
|
||||
node_still_bonded: boolean;
|
||||
}
|
||||
export interface PagedDelegatorDelegationsResponse {
|
||||
delegations: Delegation[];
|
||||
@@ -578,7 +674,11 @@ export type EpochState = "in_progress" | {
|
||||
final_node_id: number;
|
||||
last_rewarded: number;
|
||||
};
|
||||
} | "reconciling_events" | "advancing_epoch";
|
||||
} | "reconciling_events" | {
|
||||
role_assignment: {
|
||||
next: Role;
|
||||
};
|
||||
};
|
||||
export interface EpochStatus {
|
||||
being_advanced_by: Addr;
|
||||
state: EpochState;
|
||||
@@ -590,22 +690,6 @@ export interface EstimatedCurrentEpochRewardResponse {
|
||||
estimation?: Coin | null;
|
||||
original_stake?: Coin | null;
|
||||
}
|
||||
export interface FamilyByHeadResponse {
|
||||
family?: Family | null;
|
||||
head: FamilyHead;
|
||||
}
|
||||
export interface FamilyByLabelResponse {
|
||||
family?: Family | null;
|
||||
label: string;
|
||||
}
|
||||
export interface FamilyMembersByHeadResponse {
|
||||
head: FamilyHead;
|
||||
members: string[];
|
||||
}
|
||||
export interface FamilyMembersByLabelResponse {
|
||||
label: string;
|
||||
members: string[];
|
||||
}
|
||||
export interface GatewayBondResponse {
|
||||
gateway?: GatewayBond | null;
|
||||
identity: string;
|
||||
@@ -622,10 +706,12 @@ export interface PagedGatewayResponse {
|
||||
per_page: number;
|
||||
start_next_after?: string | null;
|
||||
}
|
||||
export interface LayerDistribution {
|
||||
layer1: number;
|
||||
layer2: number;
|
||||
layer3: number;
|
||||
export interface KeyRotationIdResponse {
|
||||
rotation_id: number;
|
||||
}
|
||||
export interface KeyRotationState {
|
||||
initial_epoch_id: number;
|
||||
validity_epochs: number;
|
||||
}
|
||||
export interface PagedMixnodeBondsResponse {
|
||||
nodes: MixNodeBond[];
|
||||
@@ -637,22 +723,68 @@ export interface PagedMixnodesDetailsResponse {
|
||||
per_page: number;
|
||||
start_next_after?: number | null;
|
||||
}
|
||||
export interface PagedMixNodeDelegationsResponse {
|
||||
delegations: Delegation[];
|
||||
start_next_after?: string | null;
|
||||
}
|
||||
export interface MixnodeDetailsResponse {
|
||||
mix_id: number;
|
||||
mixnode_details?: MixNodeDetails | null;
|
||||
}
|
||||
export interface MixnodeRewardingDetailsResponse {
|
||||
mix_id: number;
|
||||
rewarding_details?: MixNodeRewarding | null;
|
||||
rewarding_details?: NodeRewarding | null;
|
||||
}
|
||||
export interface PagedNodeDelegationsResponse {
|
||||
delegations: Delegation[];
|
||||
start_next_after?: string | null;
|
||||
}
|
||||
export interface NodeRewardingDetailsResponse {
|
||||
node_id: number;
|
||||
rewarding_details?: NodeRewarding | null;
|
||||
}
|
||||
export interface StakeSaturationResponse {
|
||||
current_saturation?: Decimal | null;
|
||||
node_id: number;
|
||||
uncapped_saturation?: Decimal | null;
|
||||
}
|
||||
export interface NumberOfPendingEventsResponse {
|
||||
epoch_events: number;
|
||||
interval_events: number;
|
||||
}
|
||||
export interface PagedNymNodeBondsResponse {
|
||||
nodes: NymNodeBond[];
|
||||
start_next_after?: number | null;
|
||||
}
|
||||
export interface NymNodeBond {
|
||||
bonding_height: number;
|
||||
is_unbonding: boolean;
|
||||
node: NymNode;
|
||||
node_id: number;
|
||||
original_pledge: Coin;
|
||||
owner: Addr;
|
||||
}
|
||||
export interface NodeDetailsResponse {
|
||||
details?: NymNodeDetails | null;
|
||||
node_id: number;
|
||||
}
|
||||
export interface NymNodeDetails {
|
||||
bond_information: NymNodeBond;
|
||||
pending_changes: PendingNodeChanges;
|
||||
rewarding_details: NodeRewarding;
|
||||
}
|
||||
export interface PendingNodeChanges {
|
||||
cost_params_change?: number | null;
|
||||
pledge_change?: number | null;
|
||||
}
|
||||
export interface NodeDetailsByIdentityResponse {
|
||||
details?: NymNodeDetails | null;
|
||||
identity_key: string;
|
||||
}
|
||||
export interface NymNodeVersionHistoryResponse {
|
||||
history: HistoricalNymNodeVersionEntry[];
|
||||
start_next_after?: number | null;
|
||||
}
|
||||
export interface PagedNymNodeDetailsResponse {
|
||||
nodes: NymNodeDetails[];
|
||||
start_next_after?: number | null;
|
||||
}
|
||||
export interface GatewayOwnershipResponse {
|
||||
address: Addr;
|
||||
gateway?: GatewayBond | null;
|
||||
@@ -661,32 +793,47 @@ export interface MixOwnershipResponse {
|
||||
address: Addr;
|
||||
mixnode_details?: MixNodeDetails | null;
|
||||
}
|
||||
export interface NodeOwnershipResponse {
|
||||
address: Addr;
|
||||
details?: NymNodeDetails | null;
|
||||
}
|
||||
export interface PendingRewardResponse {
|
||||
amount_earned?: Coin | null;
|
||||
amount_earned_detailed?: Decimal | null;
|
||||
amount_staked?: Coin | null;
|
||||
mixnode_still_fully_bonded: boolean;
|
||||
node_still_fully_bonded: boolean;
|
||||
}
|
||||
export type PendingEpochEventKind = {
|
||||
delegate: {
|
||||
amount: Coin;
|
||||
mix_id: number;
|
||||
node_id: number;
|
||||
owner: Addr;
|
||||
proxy?: Addr | null;
|
||||
};
|
||||
} | {
|
||||
undelegate: {
|
||||
mix_id: number;
|
||||
node_id: number;
|
||||
owner: Addr;
|
||||
proxy?: Addr | null;
|
||||
};
|
||||
} | {
|
||||
pledge_more: {
|
||||
nym_node_pledge_more: {
|
||||
amount: Coin;
|
||||
node_id: number;
|
||||
};
|
||||
} | {
|
||||
mixnode_pledge_more: {
|
||||
amount: Coin;
|
||||
mix_id: number;
|
||||
};
|
||||
} | {
|
||||
decrease_pledge: {
|
||||
nym_node_decrease_pledge: {
|
||||
decrease_by: Coin;
|
||||
node_id: number;
|
||||
};
|
||||
} | {
|
||||
mixnode_decrease_pledge: {
|
||||
decrease_by: Coin;
|
||||
mix_id: number;
|
||||
};
|
||||
@@ -695,8 +842,12 @@ export type PendingEpochEventKind = {
|
||||
mix_id: number;
|
||||
};
|
||||
} | {
|
||||
update_active_set_size: {
|
||||
new_size: number;
|
||||
unbond_nym_node: {
|
||||
node_id: number;
|
||||
};
|
||||
} | {
|
||||
update_active_set: {
|
||||
update: ActiveSetUpdate;
|
||||
};
|
||||
};
|
||||
export interface PendingEpochEventResponse {
|
||||
@@ -719,7 +870,12 @@ export interface PendingEpochEvent {
|
||||
export type PendingIntervalEventKind = {
|
||||
change_mix_cost_params: {
|
||||
mix_id: number;
|
||||
new_costs: MixNodeCostParams;
|
||||
new_costs: NodeCostParams;
|
||||
};
|
||||
} | {
|
||||
change_nym_node_cost_params: {
|
||||
new_costs: NodeCostParams;
|
||||
node_id: number;
|
||||
};
|
||||
} | {
|
||||
update_rewarding_params: {
|
||||
@@ -748,15 +904,34 @@ export interface PendingIntervalEvent {
|
||||
event: PendingIntervalEventData;
|
||||
id: number;
|
||||
}
|
||||
export type RewardedSetNodeStatus = "active" | "standby";
|
||||
export interface PagedRewardedSetResponse {
|
||||
nodes: [number, RewardedSetNodeStatus][];
|
||||
start_next_after?: number | null;
|
||||
export interface PreassignedGatewayIdsResponse {
|
||||
ids: PreassignedId[];
|
||||
start_next_after?: string | null;
|
||||
}
|
||||
export interface PreassignedId {
|
||||
identity: string;
|
||||
node_id: number;
|
||||
}
|
||||
export interface RolesMetadataResponse {
|
||||
metadata: RewardedSetMetadata;
|
||||
}
|
||||
export interface RewardedSetMetadata {
|
||||
entry_gateway_metadata: RoleMetadata;
|
||||
epoch_id: number;
|
||||
exit_gateway_metadata: RoleMetadata;
|
||||
fully_assigned: boolean;
|
||||
layer1_metadata: RoleMetadata;
|
||||
layer2_metadata: RoleMetadata;
|
||||
layer3_metadata: RoleMetadata;
|
||||
standby_metadata: RoleMetadata;
|
||||
}
|
||||
export interface RoleMetadata {
|
||||
highest_id: number;
|
||||
num_nodes: number;
|
||||
}
|
||||
export interface RewardingParams {
|
||||
active_set_size: number;
|
||||
interval: IntervalRewardParams;
|
||||
rewarded_set_size: number;
|
||||
rewarded_set: RewardedSetParams;
|
||||
}
|
||||
export interface IntervalRewardParams {
|
||||
active_set_work_factor: Decimal;
|
||||
@@ -769,19 +944,37 @@ export interface IntervalRewardParams {
|
||||
sybil_resistance: Percent;
|
||||
}
|
||||
export type String = string;
|
||||
export interface EpochAssignmentResponse {
|
||||
epoch_id: number;
|
||||
nodes: number[];
|
||||
}
|
||||
export type Uint32 = number;
|
||||
export interface StakeSaturationResponse {
|
||||
export interface MixStakeSaturationResponse {
|
||||
current_saturation?: Decimal | null;
|
||||
mix_id: number;
|
||||
uncapped_saturation?: Decimal | null;
|
||||
}
|
||||
export interface ContractState {
|
||||
owner: Addr;
|
||||
owner?: Addr | null;
|
||||
params: ContractStateParams;
|
||||
rewarding_denom: string;
|
||||
rewarding_validator_address: Addr;
|
||||
vesting_contract_address: Addr;
|
||||
}
|
||||
export interface ContractStateParams {
|
||||
config_score_params: ConfigScoreParams;
|
||||
delegations_params: DelegationsParams;
|
||||
operators_params: OperatorsParams;
|
||||
}
|
||||
export interface ConfigScoreParams {
|
||||
version_score_formula_params: VersionScoreFormulaParams;
|
||||
version_weights: OutdatedVersionWeights;
|
||||
}
|
||||
export interface OperatorsParams {
|
||||
interval_operating_cost: RangedValueForUint128;
|
||||
minimum_pledge: Coin;
|
||||
profit_margin: RangedValueForPercent;
|
||||
}
|
||||
export interface UnbondedMixnodeResponse {
|
||||
mix_id: number;
|
||||
unbonded_info?: UnbondedMixnode | null;
|
||||
@@ -797,3 +990,17 @@ export interface PagedUnbondedMixnodesResponse {
|
||||
per_page: number;
|
||||
start_next_after?: number | null;
|
||||
}
|
||||
export interface UnbondedNodeResponse {
|
||||
details?: UnbondedNymNode | null;
|
||||
node_id: number;
|
||||
}
|
||||
export interface UnbondedNymNode {
|
||||
identity_key: string;
|
||||
node_id: number;
|
||||
owner: Addr;
|
||||
unbonding_height: number;
|
||||
}
|
||||
export interface PagedUnbondedNymNodesResponse {
|
||||
nodes: UnbondedNymNode[];
|
||||
start_next_after?: number | null;
|
||||
}
|
||||
@@ -1,13 +1,12 @@
|
||||
/**
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@0.35.3.
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@1.13.3.
|
||||
* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
|
||||
* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
|
||||
*/
|
||||
|
||||
import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
|
||||
import { StdFee } from "@cosmjs/amino";
|
||||
import { InstantiateMsg, ExecuteMsg, FamilyHead, MessageSignature, Uint128, Percent, Decimal, PledgeCap, Coin, MixNodeCostParams, MixNodeConfigUpdate, VestingSpecification, MixNode, Gateway, GatewayConfigUpdate, QueryMsg, Timestamp, Uint64, MigrateMsg, Addr, Account, VestingPeriod, AccountsResponse, BaseVestingAccountInfo, VestingCoinsResponse, AccountVestingCoins, AllDelegationsResponse, VestingDelegation, ContractVersion, ContractBuildInformation, Period, DelegationTimesResponse, NullablePledgeData, PledgeData, OriginalVestingResponse } from "./Vesting.types";
|
||||
import { GetCw2ContractVersionResponse } from './types';
|
||||
import { ICosmWasmClient, ISigningCosmWasmClient } from "./baseClient";
|
||||
import { StdFee } from "@interchainjs/types";
|
||||
import { InstantiateMsg, ExecuteMsg, Uint128, Percent, Decimal, PledgeCap, MessageSignature, Coin, NodeCostParams, MixNodeConfigUpdate, VestingSpecification, MixNode, Gateway, GatewayConfigUpdate, QueryMsg, Timestamp, Uint64, MigrateMsg, Addr, Account, VestingPeriod, AccountsResponse, BaseVestingAccountInfo, VestingCoinsResponse, AccountVestingCoins, AllDelegationsResponse, VestingDelegation, ContractVersion, ContractBuildInformation, Period, DelegationTimesResponse, NullablePledgeData, PledgeData, OriginalVestingResponse } from "./Vesting.types";
|
||||
export interface VestingReadOnlyInterface {
|
||||
contractAddress: string;
|
||||
getContractVersion: () => Promise<ContractBuildInformation>;
|
||||
@@ -156,10 +155,9 @@ export interface VestingReadOnlyInterface {
|
||||
}) => Promise<AllDelegationsResponse>;
|
||||
}
|
||||
export class VestingQueryClient implements VestingReadOnlyInterface {
|
||||
client: CosmWasmClient;
|
||||
client: ICosmWasmClient;
|
||||
contractAddress: string;
|
||||
|
||||
constructor(client: CosmWasmClient, contractAddress: string) {
|
||||
constructor(client: ICosmWasmClient, contractAddress: string) {
|
||||
this.client = client;
|
||||
this.contractAddress = contractAddress;
|
||||
this.getContractVersion = this.getContractVersion.bind(this);
|
||||
@@ -189,7 +187,6 @@ export class VestingQueryClient implements VestingReadOnlyInterface {
|
||||
this.getDelegationTimes = this.getDelegationTimes.bind(this);
|
||||
this.getAllDelegations = this.getAllDelegations.bind(this);
|
||||
}
|
||||
|
||||
getContractVersion = async (): Promise<ContractBuildInformation> => {
|
||||
return this.client.queryContractSmart(this.contractAddress, {
|
||||
get_contract_version: {}
|
||||
@@ -501,56 +498,34 @@ export class VestingQueryClient implements VestingReadOnlyInterface {
|
||||
export interface VestingInterface extends VestingReadOnlyInterface {
|
||||
contractAddress: string;
|
||||
sender: string;
|
||||
createFamily: ({
|
||||
label
|
||||
}: {
|
||||
label: string;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
joinFamily: ({
|
||||
familyHead,
|
||||
joinPermit
|
||||
}: {
|
||||
familyHead: FamilyHead;
|
||||
joinPermit: MessageSignature;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
leaveFamily: ({
|
||||
familyHead
|
||||
}: {
|
||||
familyHead: FamilyHead;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
kickFamilyMember: ({
|
||||
member
|
||||
}: {
|
||||
member: string;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
trackReward: ({
|
||||
address,
|
||||
amount
|
||||
}: {
|
||||
address: string;
|
||||
amount: Coin;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
claimOperatorReward: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
claimOperatorReward: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
claimDelegatorReward: ({
|
||||
mixId
|
||||
}: {
|
||||
mixId: number;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
updateMixnodeCostParams: ({
|
||||
newCosts
|
||||
}: {
|
||||
newCosts: MixNodeCostParams;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
newCosts: NodeCostParams;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
updateMixnodeConfig: ({
|
||||
newConfig
|
||||
}: {
|
||||
newConfig: MixNodeConfigUpdate;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
updateMixnetAddress: ({
|
||||
address
|
||||
}: {
|
||||
address: string;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
delegateToMixnode: ({
|
||||
amount,
|
||||
mixId,
|
||||
@@ -559,14 +534,14 @@ export interface VestingInterface extends VestingReadOnlyInterface {
|
||||
amount: Coin;
|
||||
mixId: number;
|
||||
onBehalfOf?: string;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
undelegateFromMixnode: ({
|
||||
mixId,
|
||||
onBehalfOf
|
||||
}: {
|
||||
mixId: number;
|
||||
onBehalfOf?: string;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
createAccount: ({
|
||||
cap,
|
||||
ownerAddress,
|
||||
@@ -577,12 +552,12 @@ export interface VestingInterface extends VestingReadOnlyInterface {
|
||||
ownerAddress: string;
|
||||
stakingAddress?: string;
|
||||
vestingSpec?: VestingSpecification;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
withdrawVestedCoins: ({
|
||||
amount
|
||||
}: {
|
||||
amount: Coin;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
trackUndelegation: ({
|
||||
amount,
|
||||
mixId,
|
||||
@@ -591,7 +566,7 @@ export interface VestingInterface extends VestingReadOnlyInterface {
|
||||
amount: Coin;
|
||||
mixId: number;
|
||||
owner: string;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
bondMixnode: ({
|
||||
amount,
|
||||
costParams,
|
||||
@@ -599,35 +574,35 @@ export interface VestingInterface extends VestingReadOnlyInterface {
|
||||
ownerSignature
|
||||
}: {
|
||||
amount: Coin;
|
||||
costParams: MixNodeCostParams;
|
||||
costParams: NodeCostParams;
|
||||
mixNode: MixNode;
|
||||
ownerSignature: MessageSignature;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
pledgeMore: ({
|
||||
amount
|
||||
}: {
|
||||
amount: Coin;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
decreasePledge: ({
|
||||
amount
|
||||
}: {
|
||||
amount: Coin;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
unbondMixnode: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
unbondMixnode: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
trackUnbondMixnode: ({
|
||||
amount,
|
||||
owner
|
||||
}: {
|
||||
amount: Coin;
|
||||
owner: string;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
trackDecreasePledge: ({
|
||||
amount,
|
||||
owner
|
||||
}: {
|
||||
amount: Coin;
|
||||
owner: string;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
bondGateway: ({
|
||||
amount,
|
||||
gateway,
|
||||
@@ -636,52 +611,59 @@ export interface VestingInterface extends VestingReadOnlyInterface {
|
||||
amount: Coin;
|
||||
gateway: Gateway;
|
||||
ownerSignature: MessageSignature;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
unbondGateway: (fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
unbondGateway: (fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
trackUnbondGateway: ({
|
||||
amount,
|
||||
owner
|
||||
}: {
|
||||
amount: Coin;
|
||||
owner: string;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
updateGatewayConfig: ({
|
||||
newConfig
|
||||
}: {
|
||||
newConfig: GatewayConfigUpdate;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
transferOwnership: ({
|
||||
toAddress
|
||||
}: {
|
||||
toAddress: string;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
updateStakingAddress: ({
|
||||
toAddress
|
||||
}: {
|
||||
toAddress?: string;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
updateLockedPledgeCap: ({
|
||||
address,
|
||||
cap
|
||||
}: {
|
||||
address: string;
|
||||
cap: PledgeCap;
|
||||
}, fee?: number | StdFee | "auto", memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
trackMigratedMixnode: ({
|
||||
owner
|
||||
}: {
|
||||
owner: string;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
trackMigratedDelegation: ({
|
||||
mixId,
|
||||
owner
|
||||
}: {
|
||||
mixId: number;
|
||||
owner: string;
|
||||
}, fee_?: number | StdFee | "auto", memo_?: string, funds_?: Coin[]) => Promise<any>;
|
||||
}
|
||||
export class VestingClient extends VestingQueryClient implements VestingInterface {
|
||||
client: SigningCosmWasmClient;
|
||||
client: ISigningCosmWasmClient;
|
||||
sender: string;
|
||||
contractAddress: string;
|
||||
|
||||
constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
|
||||
constructor(client: ISigningCosmWasmClient, sender: string, contractAddress: string) {
|
||||
super(client, contractAddress);
|
||||
this.client = client;
|
||||
this.sender = sender;
|
||||
this.contractAddress = contractAddress;
|
||||
this.createFamily = this.createFamily.bind(this);
|
||||
this.joinFamily = this.joinFamily.bind(this);
|
||||
this.leaveFamily = this.leaveFamily.bind(this);
|
||||
this.kickFamilyMember = this.kickFamilyMember.bind(this);
|
||||
this.trackReward = this.trackReward.bind(this);
|
||||
this.claimOperatorReward = this.claimOperatorReward.bind(this);
|
||||
this.claimDelegatorReward = this.claimDelegatorReward.bind(this);
|
||||
@@ -706,117 +688,71 @@ export class VestingClient extends VestingQueryClient implements VestingInterfac
|
||||
this.transferOwnership = this.transferOwnership.bind(this);
|
||||
this.updateStakingAddress = this.updateStakingAddress.bind(this);
|
||||
this.updateLockedPledgeCap = this.updateLockedPledgeCap.bind(this);
|
||||
this.trackMigratedMixnode = this.trackMigratedMixnode.bind(this);
|
||||
this.trackMigratedDelegation = this.trackMigratedDelegation.bind(this);
|
||||
}
|
||||
|
||||
createFamily = async ({
|
||||
label
|
||||
}: {
|
||||
label: string;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
create_family: {
|
||||
label
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
};
|
||||
joinFamily = async ({
|
||||
familyHead,
|
||||
joinPermit
|
||||
}: {
|
||||
familyHead: FamilyHead;
|
||||
joinPermit: MessageSignature;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
join_family: {
|
||||
family_head: familyHead,
|
||||
join_permit: joinPermit
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
};
|
||||
leaveFamily = async ({
|
||||
familyHead
|
||||
}: {
|
||||
familyHead: FamilyHead;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
leave_family: {
|
||||
family_head: familyHead
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
};
|
||||
kickFamilyMember = async ({
|
||||
member
|
||||
}: {
|
||||
member: string;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
kick_family_member: {
|
||||
member
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
};
|
||||
trackReward = async ({
|
||||
address,
|
||||
amount
|
||||
}: {
|
||||
address: string;
|
||||
amount: Coin;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
track_reward: {
|
||||
address,
|
||||
amount
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
claimOperatorReward = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
claimOperatorReward = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
claim_operator_reward: {}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
claimDelegatorReward = async ({
|
||||
mixId
|
||||
}: {
|
||||
mixId: number;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
claim_delegator_reward: {
|
||||
mix_id: mixId
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
updateMixnodeCostParams = async ({
|
||||
newCosts
|
||||
}: {
|
||||
newCosts: MixNodeCostParams;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
newCosts: NodeCostParams;
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
update_mixnode_cost_params: {
|
||||
new_costs: newCosts
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
updateMixnodeConfig = async ({
|
||||
newConfig
|
||||
}: {
|
||||
newConfig: MixNodeConfigUpdate;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
update_mixnode_config: {
|
||||
new_config: newConfig
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
updateMixnetAddress = async ({
|
||||
address
|
||||
}: {
|
||||
address: string;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
update_mixnet_address: {
|
||||
address
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
delegateToMixnode = async ({
|
||||
amount,
|
||||
@@ -826,14 +762,14 @@ export class VestingClient extends VestingQueryClient implements VestingInterfac
|
||||
amount: Coin;
|
||||
mixId: number;
|
||||
onBehalfOf?: string;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
delegate_to_mixnode: {
|
||||
amount,
|
||||
mix_id: mixId,
|
||||
on_behalf_of: onBehalfOf
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
undelegateFromMixnode = async ({
|
||||
mixId,
|
||||
@@ -841,13 +777,13 @@ export class VestingClient extends VestingQueryClient implements VestingInterfac
|
||||
}: {
|
||||
mixId: number;
|
||||
onBehalfOf?: string;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
undelegate_from_mixnode: {
|
||||
mix_id: mixId,
|
||||
on_behalf_of: onBehalfOf
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
createAccount = async ({
|
||||
cap,
|
||||
@@ -859,7 +795,7 @@ export class VestingClient extends VestingQueryClient implements VestingInterfac
|
||||
ownerAddress: string;
|
||||
stakingAddress?: string;
|
||||
vestingSpec?: VestingSpecification;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
create_account: {
|
||||
cap,
|
||||
@@ -867,18 +803,18 @@ export class VestingClient extends VestingQueryClient implements VestingInterfac
|
||||
staking_address: stakingAddress,
|
||||
vesting_spec: vestingSpec
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
withdrawVestedCoins = async ({
|
||||
amount
|
||||
}: {
|
||||
amount: Coin;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
withdraw_vested_coins: {
|
||||
amount
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
trackUndelegation = async ({
|
||||
amount,
|
||||
@@ -888,14 +824,14 @@ export class VestingClient extends VestingQueryClient implements VestingInterfac
|
||||
amount: Coin;
|
||||
mixId: number;
|
||||
owner: string;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
track_undelegation: {
|
||||
amount,
|
||||
mix_id: mixId,
|
||||
owner
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
bondMixnode = async ({
|
||||
amount,
|
||||
@@ -904,10 +840,10 @@ export class VestingClient extends VestingQueryClient implements VestingInterfac
|
||||
ownerSignature
|
||||
}: {
|
||||
amount: Coin;
|
||||
costParams: MixNodeCostParams;
|
||||
costParams: NodeCostParams;
|
||||
mixNode: MixNode;
|
||||
ownerSignature: MessageSignature;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
bond_mixnode: {
|
||||
amount,
|
||||
@@ -915,34 +851,34 @@ export class VestingClient extends VestingQueryClient implements VestingInterfac
|
||||
mix_node: mixNode,
|
||||
owner_signature: ownerSignature
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
pledgeMore = async ({
|
||||
amount
|
||||
}: {
|
||||
amount: Coin;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
pledge_more: {
|
||||
amount
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
decreasePledge = async ({
|
||||
amount
|
||||
}: {
|
||||
amount: Coin;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
decrease_pledge: {
|
||||
amount
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
unbondMixnode = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
unbondMixnode = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
unbond_mixnode: {}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
trackUnbondMixnode = async ({
|
||||
amount,
|
||||
@@ -950,13 +886,13 @@ export class VestingClient extends VestingQueryClient implements VestingInterfac
|
||||
}: {
|
||||
amount: Coin;
|
||||
owner: string;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
track_unbond_mixnode: {
|
||||
amount,
|
||||
owner
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
trackDecreasePledge = async ({
|
||||
amount,
|
||||
@@ -964,13 +900,13 @@ export class VestingClient extends VestingQueryClient implements VestingInterfac
|
||||
}: {
|
||||
amount: Coin;
|
||||
owner: string;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
track_decrease_pledge: {
|
||||
amount,
|
||||
owner
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
bondGateway = async ({
|
||||
amount,
|
||||
@@ -980,19 +916,19 @@ export class VestingClient extends VestingQueryClient implements VestingInterfac
|
||||
amount: Coin;
|
||||
gateway: Gateway;
|
||||
ownerSignature: MessageSignature;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
bond_gateway: {
|
||||
amount,
|
||||
gateway,
|
||||
owner_signature: ownerSignature
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
unbondGateway = async (fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
unbondGateway = async (fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
unbond_gateway: {}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
trackUnbondGateway = async ({
|
||||
amount,
|
||||
@@ -1000,46 +936,46 @@ export class VestingClient extends VestingQueryClient implements VestingInterfac
|
||||
}: {
|
||||
amount: Coin;
|
||||
owner: string;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
track_unbond_gateway: {
|
||||
amount,
|
||||
owner
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
updateGatewayConfig = async ({
|
||||
newConfig
|
||||
}: {
|
||||
newConfig: GatewayConfigUpdate;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
update_gateway_config: {
|
||||
new_config: newConfig
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
transferOwnership = async ({
|
||||
toAddress
|
||||
}: {
|
||||
toAddress: string;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
transfer_ownership: {
|
||||
to_address: toAddress
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
updateStakingAddress = async ({
|
||||
toAddress
|
||||
}: {
|
||||
toAddress?: string;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
update_staking_address: {
|
||||
to_address: toAddress
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
updateLockedPledgeCap = async ({
|
||||
address,
|
||||
@@ -1047,12 +983,37 @@ export class VestingClient extends VestingQueryClient implements VestingInterfac
|
||||
}: {
|
||||
address: string;
|
||||
cap: PledgeCap;
|
||||
}, fee: number | StdFee | "auto" = "auto", memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
update_locked_pledge_cap: {
|
||||
address,
|
||||
cap
|
||||
}
|
||||
}, fee, memo, _funds);
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
}
|
||||
trackMigratedMixnode = async ({
|
||||
owner
|
||||
}: {
|
||||
owner: string;
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
track_migrated_mixnode: {
|
||||
owner
|
||||
}
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
trackMigratedDelegation = async ({
|
||||
mixId,
|
||||
owner
|
||||
}: {
|
||||
mixId: number;
|
||||
owner: string;
|
||||
}, fee_: number | StdFee | "auto" = "auto", memo_?: string, funds_?: Coin[]): Promise<any> => {
|
||||
return await this.client.execute(this.sender, this.contractAddress, {
|
||||
track_migrated_delegation: {
|
||||
mix_id: mixId,
|
||||
owner
|
||||
}
|
||||
}, fee_, memo_, funds_);
|
||||
};
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/**
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@0.35.3.
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@1.13.3.
|
||||
* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
|
||||
* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
|
||||
*/
|
||||
@@ -9,23 +9,6 @@ export interface InstantiateMsg {
|
||||
mixnet_contract_address: string;
|
||||
}
|
||||
export type ExecuteMsg = {
|
||||
create_family: {
|
||||
label: string;
|
||||
};
|
||||
} | {
|
||||
join_family: {
|
||||
family_head: FamilyHead;
|
||||
join_permit: MessageSignature;
|
||||
};
|
||||
} | {
|
||||
leave_family: {
|
||||
family_head: FamilyHead;
|
||||
};
|
||||
} | {
|
||||
kick_family_member: {
|
||||
member: string;
|
||||
};
|
||||
} | {
|
||||
track_reward: {
|
||||
address: string;
|
||||
amount: Coin;
|
||||
@@ -38,7 +21,7 @@ export type ExecuteMsg = {
|
||||
};
|
||||
} | {
|
||||
update_mixnode_cost_params: {
|
||||
new_costs: MixNodeCostParams;
|
||||
new_costs: NodeCostParams;
|
||||
};
|
||||
} | {
|
||||
update_mixnode_config: {
|
||||
@@ -79,7 +62,7 @@ export type ExecuteMsg = {
|
||||
} | {
|
||||
bond_mixnode: {
|
||||
amount: Coin;
|
||||
cost_params: MixNodeCostParams;
|
||||
cost_params: NodeCostParams;
|
||||
mix_node: MixNode;
|
||||
owner_signature: MessageSignature;
|
||||
};
|
||||
@@ -133,9 +116,16 @@ export type ExecuteMsg = {
|
||||
address: string;
|
||||
cap: PledgeCap;
|
||||
};
|
||||
} | {
|
||||
track_migrated_mixnode: {
|
||||
owner: string;
|
||||
};
|
||||
} | {
|
||||
track_migrated_delegation: {
|
||||
mix_id: number;
|
||||
owner: string;
|
||||
};
|
||||
};
|
||||
export type FamilyHead = string;
|
||||
export type MessageSignature = number[];
|
||||
export type Uint128 = string;
|
||||
export type Percent = Decimal;
|
||||
export type Decimal = string;
|
||||
@@ -144,12 +134,12 @@ export type PledgeCap = {
|
||||
} | {
|
||||
absolute: Uint128;
|
||||
};
|
||||
export type MessageSignature = number[];
|
||||
export interface Coin {
|
||||
amount: Uint128;
|
||||
denom: string;
|
||||
[k: string]: unknown;
|
||||
}
|
||||
export interface MixNodeCostParams {
|
||||
export interface NodeCostParams {
|
||||
interval_operating_cost: Coin;
|
||||
profit_margin_percent: Percent;
|
||||
}
|
||||
@@ -353,9 +343,12 @@ export interface ContractVersion {
|
||||
export interface ContractBuildInformation {
|
||||
build_timestamp: string;
|
||||
build_version: string;
|
||||
cargo_debug?: string;
|
||||
cargo_opt_level?: string;
|
||||
commit_branch: string;
|
||||
commit_sha: string;
|
||||
commit_timestamp: string;
|
||||
contract_name?: string;
|
||||
rustc_version: string;
|
||||
}
|
||||
export type Period = "before" | {
|
||||
|
||||
@@ -0,0 +1,200 @@
|
||||
/**
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@1.13.3.
|
||||
* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
|
||||
* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
|
||||
*/
|
||||
|
||||
|
||||
import { StdFee, Coin } from '@interchainjs/types';
|
||||
import { DirectSigner } from '@interchainjs/cosmos';
|
||||
import { getSmartContractState } from 'interchainjs/cosmwasm/wasm/v1/query.rpc.func';
|
||||
import { executeContract } from 'interchainjs/cosmwasm/wasm/v1/tx.rpc.func';
|
||||
import { QuerySmartContractStateRequest, QuerySmartContractStateResponse } from 'interchainjs/cosmwasm/wasm/v1/query';
|
||||
import { MsgExecuteContract } from 'interchainjs/cosmwasm/wasm/v1/tx';
|
||||
import { Chain } from '@chain-registry/v2-types';
|
||||
|
||||
// Encoding utility functions
|
||||
const fromUint8Array = <T>(uint8Array: Uint8Array): T => {
|
||||
const text = new TextDecoder().decode(uint8Array);
|
||||
return JSON.parse(text);
|
||||
};
|
||||
|
||||
const toUint8Array = (obj: any): Uint8Array => {
|
||||
const text = JSON.stringify(obj);
|
||||
return new TextEncoder().encode(text);
|
||||
};
|
||||
|
||||
// Chain registry configuration
|
||||
// The amount under gasPrice represents gas price per unit
|
||||
export interface ChainConfig {
|
||||
chain?: Chain;
|
||||
gasPrice?: {
|
||||
denom: string;
|
||||
amount: string;
|
||||
};
|
||||
}
|
||||
|
||||
// Gas fee calculation utilities
|
||||
export const calculateGasFromChain = (chain: Chain, gasAmount: string): StdFee => {
|
||||
try {
|
||||
const feeTokens = chain.fees?.feeTokens;
|
||||
|
||||
if (feeTokens && feeTokens.length > 0) {
|
||||
const primaryToken = feeTokens[0];
|
||||
// v2 chain-registry uses camelCase: averageGasPrice, lowGasPrice, fixedMinGasPrice
|
||||
const gasPrice = primaryToken.averageGasPrice || primaryToken.lowGasPrice || primaryToken.fixedMinGasPrice || 0.025;
|
||||
const gasAmountNum = parseInt(gasAmount);
|
||||
const feeAmount = Math.ceil(gasAmountNum * gasPrice).toString();
|
||||
|
||||
return {
|
||||
amount: [{
|
||||
denom: primaryToken.denom,
|
||||
amount: feeAmount
|
||||
}],
|
||||
gas: gasAmount
|
||||
};
|
||||
}
|
||||
} catch (error) {
|
||||
console.warn('Failed to calculate gas from chain registry:', error);
|
||||
}
|
||||
|
||||
// Fallback to default
|
||||
return { amount: [], gas: gasAmount };
|
||||
};
|
||||
|
||||
// Default gas amount - users can easily change this
|
||||
export let DEFAULT_GAS_AMOUNT = '200000';
|
||||
|
||||
// Allow users to set their preferred default gas amount
|
||||
export const setDefaultGasAmount = (gasAmount: string): void => {
|
||||
DEFAULT_GAS_AMOUNT = gasAmount;
|
||||
};
|
||||
|
||||
// Get current default gas amount
|
||||
export const getDefaultGasAmount = (): string => DEFAULT_GAS_AMOUNT;
|
||||
|
||||
export const getAutoGasFee = (chainConfig?: ChainConfig): StdFee => {
|
||||
const gasAmount = DEFAULT_GAS_AMOUNT;
|
||||
|
||||
if (chainConfig?.chain) {
|
||||
return calculateGasFromChain(chainConfig.chain, gasAmount);
|
||||
}
|
||||
|
||||
if (chainConfig?.gasPrice) {
|
||||
const gasAmountNum = parseInt(gasAmount);
|
||||
const gasPriceNum = parseFloat(chainConfig.gasPrice.amount);
|
||||
const feeAmount = Math.ceil(gasAmountNum * gasPriceNum).toString();
|
||||
|
||||
return {
|
||||
amount: [{
|
||||
denom: chainConfig.gasPrice.denom,
|
||||
amount: feeAmount
|
||||
}],
|
||||
gas: gasAmount
|
||||
};
|
||||
}
|
||||
|
||||
// Fallback: no fee tokens, just gas amount
|
||||
return { amount: [], gas: gasAmount };
|
||||
};
|
||||
|
||||
// InterchainJS interfaces for CosmWasm clients
|
||||
export interface ICosmWasmClient {
|
||||
queryContractSmart(contractAddr: string, query: any): Promise<any>;
|
||||
}
|
||||
|
||||
export interface ISigningCosmWasmClient extends ICosmWasmClient {
|
||||
execute(
|
||||
sender: string,
|
||||
contractAddress: string,
|
||||
msg: any,
|
||||
fee?: number | StdFee | "auto",
|
||||
memo?: string,
|
||||
funds?: Coin[],
|
||||
chainConfig?: ChainConfig
|
||||
): Promise<any>;
|
||||
}
|
||||
|
||||
export interface ISigningClient {
|
||||
signAndBroadcast(
|
||||
signerAddress: string,
|
||||
messages: any[],
|
||||
fee: number | StdFee | "auto",
|
||||
memo?: string
|
||||
): Promise<any>;
|
||||
}
|
||||
|
||||
// Helper functions to create InterchainJS clients
|
||||
export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
|
||||
return {
|
||||
queryContractSmart: async (contractAddr: string, query: any) => {
|
||||
// Create the request object
|
||||
const request: QuerySmartContractStateRequest = {
|
||||
address: contractAddr,
|
||||
queryData: toUint8Array(query)
|
||||
};
|
||||
|
||||
// Execute the query using InterchainJS
|
||||
const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);
|
||||
|
||||
// Parse and return the result
|
||||
return fromUint8Array(response.data);
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
export function getSigningCosmWasmClient(signingClient: DirectSigner, rpcEndpoint?: string): ISigningCosmWasmClient {
|
||||
return {
|
||||
queryContractSmart: async (contractAddr: string, query: any) => {
|
||||
if (!rpcEndpoint) {
|
||||
throw new Error('rpcEndpoint is required for queryContractSmart in signing client');
|
||||
}
|
||||
const request: QuerySmartContractStateRequest = {
|
||||
address: contractAddr,
|
||||
queryData: toUint8Array(query)
|
||||
};
|
||||
const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);
|
||||
return fromUint8Array(response.data);
|
||||
},
|
||||
execute: async (
|
||||
sender: string,
|
||||
contractAddress: string,
|
||||
msg: any,
|
||||
fee?: number | StdFee | "auto",
|
||||
memo?: string,
|
||||
funds?: Coin[],
|
||||
chainConfig?: ChainConfig
|
||||
) => {
|
||||
// Handle fee conversion
|
||||
let finalFee: StdFee;
|
||||
if (typeof fee === 'number') {
|
||||
finalFee = { amount: [], gas: fee.toString() };
|
||||
} else if (fee === 'auto') {
|
||||
finalFee = getAutoGasFee(chainConfig);
|
||||
} else if (fee) {
|
||||
finalFee = fee;
|
||||
} else {
|
||||
finalFee = getAutoGasFee(chainConfig);
|
||||
}
|
||||
|
||||
// Create the message object
|
||||
const message: MsgExecuteContract = {
|
||||
sender,
|
||||
contract: contractAddress,
|
||||
msg: toUint8Array(msg),
|
||||
funds: funds || []
|
||||
};
|
||||
|
||||
// Execute the transaction using InterchainJS
|
||||
const result = await executeContract(
|
||||
signingClient as any,
|
||||
sender,
|
||||
message,
|
||||
finalFee,
|
||||
memo || ''
|
||||
);
|
||||
|
||||
return result;
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -1,35 +1,48 @@
|
||||
/**
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@0.35.3.
|
||||
* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
|
||||
* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
|
||||
*/
|
||||
* This file was automatically generated by @cosmwasm/ts-codegen@1.13.3.
|
||||
* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
|
||||
* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
|
||||
*/
|
||||
|
||||
import * as _0 from './CoconutBandwidth.types';
|
||||
import * as _1 from './CoconutBandwidth.client';
|
||||
import * as _2 from './CoconutDkg.types';
|
||||
import * as _3 from './CoconutDkg.client';
|
||||
import * as _4 from './Mixnet.types';
|
||||
import * as _5 from './Mixnet.client';
|
||||
import * as _6 from './Cw3FlexMultisig.types';
|
||||
import * as _7 from './Cw3FlexMultisig.client';
|
||||
import * as _8 from './Cw4Group.types';
|
||||
import * as _9 from './Cw4Group.client';
|
||||
import * as _10 from './NameService.types';
|
||||
import * as _11 from './NameService.client';
|
||||
import * as _12 from './ServiceProviderDirectory.types';
|
||||
import * as _13 from './ServiceProviderDirectory.client';
|
||||
import * as _14 from './Vesting.types';
|
||||
import * as _15 from './Vesting.client';
|
||||
export * from './types';
|
||||
|
||||
/** @namespace */
|
||||
import * as _0 from "./Ecash.types";
|
||||
import * as _1 from "./Ecash.client";
|
||||
import * as _2 from "./CoconutDkg.types";
|
||||
import * as _3 from "./CoconutDkg.client";
|
||||
import * as _4 from "./Mixnet.types";
|
||||
import * as _5 from "./Mixnet.client";
|
||||
import * as _6 from "./Cw3FlexMultisig.types";
|
||||
import * as _7 from "./Cw3FlexMultisig.client";
|
||||
import * as _8 from "./Cw4Group.types";
|
||||
import * as _9 from "./Cw4Group.client";
|
||||
import * as _10 from "./Vesting.types";
|
||||
import * as _11 from "./Vesting.client";
|
||||
import * as _12 from "./baseClient";
|
||||
export namespace contracts {
|
||||
export const CoconutBandwidth = { ..._0, ..._1 };
|
||||
export const CoconutDkg = { ..._2, ..._3 };
|
||||
export const Mixnet = { ..._4, ..._5 };
|
||||
export const Cw3FlexMultisig = { ..._6, ..._7 };
|
||||
export const Cw4Group = { ..._8, ..._9 };
|
||||
export const NameService = { ..._10, ..._11 };
|
||||
export const ServiceProviderDirectory = { ..._12, ..._13 };
|
||||
export const Vesting = { ..._14, ..._15 };
|
||||
}
|
||||
export const Ecash = {
|
||||
..._0,
|
||||
..._1
|
||||
};
|
||||
export const CoconutDkg = {
|
||||
..._2,
|
||||
..._3
|
||||
};
|
||||
export const Mixnet = {
|
||||
..._4,
|
||||
..._5
|
||||
};
|
||||
export const Cw3FlexMultisig = {
|
||||
..._6,
|
||||
..._7
|
||||
};
|
||||
export const Cw4Group = {
|
||||
..._8,
|
||||
..._9
|
||||
};
|
||||
export const Vesting = {
|
||||
..._10,
|
||||
..._11
|
||||
};
|
||||
export const baseClient = {
|
||||
..._12
|
||||
};
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nymproject/sdk-example-plain-html-parcel",
|
||||
"version": "1.0.4-rc.2",
|
||||
"version": "1.0.5",
|
||||
"description": "An example project that uses WASM and plain HTML bundled with Parcel v2",
|
||||
"license": "Apache-2.0",
|
||||
"scripts": {
|
||||
@@ -15,7 +15,7 @@
|
||||
"tsc:watch": "tsc --watch"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nymproject/sdk": ">=1.2.2-rc.0 || ^1"
|
||||
"@nymproject/sdk": ">=1.2.3-rc.0 || ^1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/jest": "^27.0.1",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nymproject/sdk-example-plain-html",
|
||||
"version": "1.0.4-rc.2",
|
||||
"version": "1.0.5",
|
||||
"description": "An example project that uses WASM and plain HTML",
|
||||
"license": "Apache-2.0",
|
||||
"scripts": {
|
||||
@@ -16,7 +16,7 @@
|
||||
"tsc:watch": "tsc --watch"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nymproject/sdk": ">=1.2.2-rc.0 || ^1"
|
||||
"@nymproject/sdk": ">=1.2.3-rc.0 || ^1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.15.0",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nymproject/sdk-example-react-webpack-wasm",
|
||||
"version": "1.0.4-rc.2",
|
||||
"version": "1.0.5",
|
||||
"description": "An example project that uses WASM, React, Webpack, Typescript and the Nym theme + components library",
|
||||
"license": "Apache-2.0",
|
||||
"scripts": {
|
||||
@@ -20,7 +20,7 @@
|
||||
"@mui/lab": "^5.0.0-alpha.72",
|
||||
"@mui/material": "^5.0.1",
|
||||
"@mui/styles": "^5.0.1",
|
||||
"@nymproject/sdk": ">=1.2.2-rc.0 || ^1",
|
||||
"@nymproject/sdk": ">=1.2.3-rc.0 || ^1",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"react-dropzone": "^14.2.3",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nymproject/sdk-example-chrome-extension",
|
||||
"version": "1.0.4-rc.2",
|
||||
"version": "1.0.5",
|
||||
"description": "This is an example of how Nym can be used within the context of a Chrome extension.",
|
||||
"license": "ISC",
|
||||
"author": "",
|
||||
@@ -9,7 +9,7 @@
|
||||
"build": "webpack"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nymproject/sdk": ">=1.2.2-rc.0 || ^1"
|
||||
"@nymproject/sdk": ">=1.2.3-rc.0 || ^1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"clean-webpack-plugin": "^4.0.0",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nymproject/sdk-example-firefox-extension",
|
||||
"version": "1.0.4-rc.2",
|
||||
"version": "1.0.5",
|
||||
"description": "This is an example of how Nym can be used within the context of a Firefox extension.",
|
||||
"license": "ISC",
|
||||
"author": "",
|
||||
@@ -9,7 +9,7 @@
|
||||
"build": "yarn webpack"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nymproject/sdk": ">=1.2.2-rc.0 || ^1"
|
||||
"@nymproject/sdk": ">=1.2.3-rc.0 || ^1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"copy-webpack-plugin": "^11.0.0",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nymproject/mix-fetch-example-parcel",
|
||||
"version": "1.0.4-rc.2",
|
||||
"version": "1.0.5",
|
||||
"license": "Apache-2.0",
|
||||
"scripts": {
|
||||
"build": "parcel build --no-cache --no-content-hash",
|
||||
@@ -8,7 +8,7 @@
|
||||
"start": "parcel --no-cache"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nymproject/mix-fetch": ">=1.2.2-rc.0 || ^1",
|
||||
"@nymproject/mix-fetch": ">=1.2.3-rc.0 || ^1",
|
||||
"parcel": "^2.9.3"
|
||||
},
|
||||
"private": false,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nymproject/sdk-example-node-tester-plain-html-parcel",
|
||||
"version": "1.0.4-rc.2",
|
||||
"version": "1.0.5",
|
||||
"description": "An example project that uses WASM and plain HTML bundled with Parcel v2",
|
||||
"license": "Apache-2.0",
|
||||
"scripts": {
|
||||
@@ -15,7 +15,7 @@
|
||||
"tsc:watch": "tsc --watch"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nymproject/sdk": ">=1.2.2-rc.0 || ^1"
|
||||
"@nymproject/sdk": ">=1.2.3-rc.0 || ^1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/jest": "^27.0.1",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nymproject/sdk-example-node-tester-plain-html",
|
||||
"version": "1.0.4-rc.2",
|
||||
"version": "1.0.5",
|
||||
"description": "An example project that uses WASM node tester and plain HTML",
|
||||
"license": "Apache-2.0",
|
||||
"scripts": {
|
||||
@@ -16,7 +16,7 @@
|
||||
"tsc:watch": "tsc --watch"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nymproject/sdk": ">=1.2.2-rc.0 || ^1"
|
||||
"@nymproject/sdk": ">=1.2.3-rc.0 || ^1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.15.0",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nymproject/sdk-example-node-tester-react",
|
||||
"version": "1.0.4-rc.2",
|
||||
"version": "1.0.5",
|
||||
"description": "An example project that uses WASM node tester and React",
|
||||
"license": "Apache-2.0",
|
||||
"scripts": {
|
||||
@@ -11,7 +11,7 @@
|
||||
"@emotion/styled": "^11.11.0",
|
||||
"@mui/icons-material": "^5.14.0",
|
||||
"@mui/material": "^5.14.0",
|
||||
"@nymproject/sdk": ">=1.2.2-rc.0 || ^1",
|
||||
"@nymproject/sdk": ">=1.2.3-rc.0 || ^1",
|
||||
"parcel": "^2.9.3",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nymproject/mix-fetch-node",
|
||||
"version": "1.4.0-rc.0",
|
||||
"version": "1.4.1-rc0",
|
||||
"description": "This package is a drop-in replacement for `fetch` in NodeJS to send HTTP requests over the Nym Mixnet.",
|
||||
"license": "Apache-2.0",
|
||||
"author": "Nym Technologies SA",
|
||||
@@ -28,7 +28,7 @@
|
||||
"tsc": "tsc --noEmit true"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nymproject/mix-fetch-wasm-node": ">=1.2.4-rc.2 || ^1",
|
||||
"@nymproject/mix-fetch-wasm-node": ">=1.2.5-rc.0 || ^1",
|
||||
"comlink": "^4.3.1",
|
||||
"fake-indexeddb": "^5.0.0",
|
||||
"node-fetch": "^3.3.2",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nymproject/mix-fetch-tester-webpack",
|
||||
"version": "1.0.4-rc.2",
|
||||
"version": "1.0.5",
|
||||
"license": "Apache-2.0",
|
||||
"scripts": {
|
||||
"build": "webpack build --progress --config webpack.prod.js",
|
||||
@@ -8,7 +8,7 @@
|
||||
"start": "webpack serve --progress --port 3000"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nymproject/mix-fetch": ">=1.2.2-rc.0 || ^1"
|
||||
"@nymproject/mix-fetch": ">=1.2.3-rc.0 || ^1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.22.10",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nymproject/mix-fetch-tester-parcel",
|
||||
"version": "1.0.4-rc.2",
|
||||
"version": "1.0.5",
|
||||
"license": "Apache-2.0",
|
||||
"scripts": {
|
||||
"build": "npx parcel build --no-cache --no-content-hash",
|
||||
@@ -8,7 +8,7 @@
|
||||
"start": "npx parcel --no-cache"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nymproject/mix-fetch": ">=1.2.2-rc.0 || ^1"
|
||||
"@nymproject/mix-fetch": ">=1.2.3-rc.0 || ^1"
|
||||
},
|
||||
"private": false,
|
||||
"source": "../src/index.html"
|
||||
|
||||
@@ -21,6 +21,7 @@ async function main() {
|
||||
|
||||
// const addr =
|
||||
// 'EVdJ66jqpoVzmktVecy5UJxsTCEWo5gMn5zDZR7Hm8jy.GXNpoX7RcYcxKvBkV3dSHqC78WaPuWieweRPWzYqNhh5@GAjhJcrd6f1edaqUkfWCff6zdHoqo756qYrc2TfPuCXJ';
|
||||
// const addr = '7Y9eyF1p1JmzHnd7TVZufnQHkh93ASc9sRBCFY57ZGr8.F8KPyVMVqFQ5yJC3LqeP2ZC7fukzj9a1T426rjo432yT@q2A2cbooyC16YJzvdYaSMH9X3cSiieZNtfBr8cE8Fi1';
|
||||
const addr = undefined;
|
||||
|
||||
appendOutput('About to set up mixFetch...');
|
||||
@@ -54,12 +55,12 @@ async function main() {
|
||||
appendOutput(JSON.stringify(resp, null, 2));
|
||||
appendOutput(JSON.stringify({ text }, null, 2));
|
||||
|
||||
console.log('disconnecting');
|
||||
await disconnectMixFetch();
|
||||
console.log('disconnected! all further usages should fail');
|
||||
// console.log('disconnecting');
|
||||
// await disconnectMixFetch();
|
||||
// console.log('disconnected! all further usages should fail');
|
||||
|
||||
// get an image
|
||||
url = 'https://nymtech.net/favicon.svg';
|
||||
url = 'https://matrix.org/assets/frontpage/github-mark.svg';
|
||||
resp = await mixFetch(url, args);
|
||||
console.log({ resp });
|
||||
const buffer = await resp.arrayBuffer();
|
||||
|
||||
@@ -35,7 +35,8 @@ module.exports = mergeWithRules({
|
||||
{
|
||||
// copy the WASM files, because webpack doesn't do this automatically even though there are
|
||||
// `new URL(..., import.meta.url)` statements in the web worker
|
||||
from: path.resolve(path.dirname(require.resolve('@nymproject/mix-fetch/package.json')), 'dist/esm/*.wasm'),
|
||||
// from: path.resolve(path.dirname(require.resolve('@nymproject/mix-fetch/package.json')), 'dist/esm/*.wasm'),
|
||||
from: path.resolve(path.dirname(require.resolve('@nymproject/mix-fetch/package.json')), '*.wasm'),
|
||||
to: '[name][ext]',
|
||||
},
|
||||
],
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
const { mergeWithRules } = require('webpack-merge');
|
||||
const webpack = require('webpack');
|
||||
const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
|
||||
const ReactRefreshTypeScript = require('react-refresh-typescript');
|
||||
const commonConfig = require('./webpack.common');
|
||||
|
||||
module.exports = mergeWithRules({
|
||||
@@ -22,7 +20,7 @@ module.exports = mergeWithRules({
|
||||
exclude: /node_modules/,
|
||||
options: {
|
||||
getCustomTransformers: () => ({
|
||||
before: [ReactRefreshTypeScript()],
|
||||
before: [],
|
||||
}),
|
||||
// `ts-loader` does not work with HMR unless `transpileOnly` is used.
|
||||
// If you need type checking, `ForkTsCheckerWebpackPlugin` is an alternative.
|
||||
@@ -36,8 +34,6 @@ module.exports = mergeWithRules({
|
||||
],
|
||||
},
|
||||
plugins: [
|
||||
new ReactRefreshWebpackPlugin(),
|
||||
|
||||
// this can be included automatically by the dev server, however build mode fails if missing
|
||||
new webpack.HotModuleReplacementPlugin(),
|
||||
],
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user