Merge branch 'main' into docs-chain-time

Author: cameron1024

Cargo.lock

@@ -102,12 +102,12 @@ paths:
                         minimum: 0
                 required:
                   - value
-                  - counter
+                  - counters
               examples:
                 with_delegation:
                   value:
                     {
-                      'counter': 1,
+                      'counters': [1,73,0,123,9999,0,0,987654],
                       'delegation':
                         {
                           'pools':
@@ -125,7 +125,7 @@ paths:
                 without_delegation:
                   value:
                     {
-                      'counter': 0,
+                      'counters': [1,73,0,123,9999,0,0,987654],
                       'delegation': { 'pools': [] },
                       'last_rewards': { 'epoch': 0, 'reward': 0 },
                       'value': 1000,

book/src/core-ledger-doc/api/v0.yaml

@@ -1,4 +1,4 @@
-use crate::common::MainnetWallet;
+use crate::common::CardanoWallet;
 use snapshot_lib::VoterHIR;
 use vitup::config::Block0Initial;
 
@@ -7,7 +7,7 @@ pub trait MainnetWalletExtension {
     fn as_voter_hir(&self, group: &str) -> VoterHIR;
 }
 
-impl MainnetWalletExtension for MainnetWallet {
+impl MainnetWalletExtension for CardanoWallet {
     fn as_initial_entry(&self) -> Block0Initial {
         Block0Initial::External {
             address: self.catalyst_address().to_string(),

src/vit-testing/integration-tests/src/common/mainnet_wallet_ext.rs

@@ -12,7 +12,7 @@ mod wallet;
 pub use reps::{empty_assigner, RepsVoterAssignerSource};
 
 pub use assert::*;
-pub use mainnet_lib::MainnetWallet;
+pub use mainnet_lib::CardanoWallet;
 pub use rewards::{funded_proposals, VotesRegistry};
 pub use snapshot_filter::SnapshotFilter;
 pub use static_data::SnapshotExtensions;

src/vit-testing/integration-tests/src/common/mod.rs

@@ -1,7 +1,8 @@
 use crate::common::get_available_port;
 use crate::common::snapshot::SnapshotServiceStarter;
+use assert_fs::fixture::PathChild;
 use assert_fs::TempDir;
-use mainnet_lib::InMemoryDbSync;
+use mainnet_lib::{DbSyncError, InMemoryDbSync};
 use snapshot_trigger_service::client::SnapshotResult;
 use snapshot_trigger_service::config::{
     ConfigurationBuilder, JobParameters, NetworkType, VotingToolsParams,
@@ -12,7 +13,8 @@ pub fn do_snapshot(
     job_parameters: JobParameters,
     testing_directory: &TempDir,
 ) -> Result<SnapshotResult, Error> {
-    db_sync_instance.persist()?;
+    let mock_json_file = testing_directory.child("database.json");
+    db_sync_instance.persist(mock_json_file.path())?;
 
     let params = VotingToolsParams {
         bin: Some("snapshot_tool".to_string()),
@@ -25,7 +27,7 @@ pub fn do_snapshot(
         additional_params: Some(vec![
             "dry-run".to_string(),
             "--mock-json-file".to_string(),
-            db_sync_instance.db_path().to_str().unwrap().to_string(),
+            mock_json_file.path().to_str().unwrap().to_string(),
         ]),
     };
 
@@ -44,7 +46,7 @@ pub fn do_snapshot(
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
     #[error(transparent)]
-    DbSync(#[from] mainnet_lib::InMemoryDbSyncError),
+    DbSync(#[from] DbSyncError),
     #[error(transparent)]
     SnapshotIntegration(#[from] crate::common::snapshot::Error),
     #[error(transparent)]

src/vit-testing/integration-tests/src/common/snapshot/mock.rs

@@ -1,9 +1,9 @@
-use crate::common::MainnetWallet;
+use crate::common::CardanoWallet;
 use std::path::Path;
 use vitup::mode::standard::WalletProxyController;
 
 pub fn iapyx_from_mainnet(
-    wallet: &MainnetWallet,
+    wallet: &CardanoWallet,
     proxy: &WalletProxyController,
 ) -> Result<iapyx::Controller, iapyx::ControllerBuilderError> {
     iapyx::ControllerBuilder::default()

src/vit-testing/integration-tests/src/common/wallet.rs

@@ -4,7 +4,7 @@ use crate::common::RepsVoterAssignerSource;
 use assert_fs::TempDir;
 use chain_addr::Discrimination;
 use fraction::Fraction;
-use mainnet_lib::MainnetWallet;
+use mainnet_lib::CardanoWallet;
 use mainnet_lib::{MainnetNetworkBuilder, MainnetWalletStateBuilder};
 use snapshot_trigger_service::config::JobParameters;
 use vit_servicing_station_tests::common::data::ArbitraryValidVotingTemplateGenerator;
@@ -25,17 +25,17 @@ pub fn cip_36_support() {
         tag: tag.clone(),
     };
 
-    let alice = MainnetWallet::new(1_000);
-    let bob = MainnetWallet::new(1_000);
-    let clarice = MainnetWallet::new(1_000);
-    let dave = MainnetWallet::new(1_000);
+    let alice = CardanoWallet::new(1_000);
+    let bob = CardanoWallet::new(1_000);
+    let clarice = CardanoWallet::new(1_000);
+    let dave = CardanoWallet::new(1_000);
 
-    let (db_sync, reps) = MainnetNetworkBuilder::default()
+    let (db_sync, _node, reps) = MainnetNetworkBuilder::default()
         .with(alice.as_direct_voter())
         .with(bob.as_representative())
         .with(clarice.as_representative())
         .with(dave.as_delegator(vec![(&bob, 1u8), (&clarice, 1u8)]))
-        .build(&testing_directory);
+        .build();
 
     let snapshot_result = mock::do_snapshot(&db_sync, job_param, &testing_directory).unwrap();
 

src/vit-testing/integration-tests/src/component/backend/cip_36_support.rs

@@ -1,7 +1,7 @@
 use crate::common::mainnet_wallet_ext::MainnetWalletExtension;
 use crate::common::snapshot::mock;
 use crate::common::snapshot_filter::SnapshotFilterSource;
-use crate::common::MainnetWallet;
+use crate::common::CardanoWallet;
 use assert_fs::TempDir;
 use mainnet_lib::{MainnetNetworkBuilder, MainnetWalletStateBuilder};
 use snapshot_lib::VoterHIR;
@@ -13,22 +13,22 @@ pub fn mixed_registration_transactions() {
     let testing_directory = TempDir::new().unwrap().into_persistent();
     let stake = 10_000;
 
-    let alice = MainnetWallet::new(stake);
-    let bob = MainnetWallet::new(stake);
-    let clarice = MainnetWallet::new(stake);
+    let alice = CardanoWallet::new(stake);
+    let bob = CardanoWallet::new(stake);
+    let clarice = CardanoWallet::new(stake);
 
-    let david = MainnetWallet::new(500);
-    let edgar = MainnetWallet::new(1_000);
-    let fred = MainnetWallet::new(8_000);
+    let david = CardanoWallet::new(500);
+    let edgar = CardanoWallet::new(1_000);
+    let fred = CardanoWallet::new(8_000);
 
-    let (db_sync, reps) = MainnetNetworkBuilder::default()
+    let (db_sync, _node, reps) = MainnetNetworkBuilder::default()
         .with(alice.as_direct_voter())
         .with(bob.as_delegator(vec![(&david, 1)]))
         .with(clarice.as_delegator(vec![(&david, 1), (&edgar, 1)]))
         .with(david.as_representative())
         .with(edgar.as_representative())
         .with(fred.as_representative())
-        .build(&testing_directory);
+        .build();
 
     let voters_hir = mock::do_snapshot(&db_sync, JobParameters::fund("fund9"), &testing_directory)
         .unwrap()

src/vit-testing/integration-tests/src/component/snapshot/local.rs

@@ -5,7 +5,7 @@ use crate::common::iapyx_from_mainnet;
 use crate::common::mainnet_wallet_ext::MainnetWalletExtension;
 use crate::common::snapshot::mock;
 use crate::common::snapshot_filter::SnapshotFilterSource;
-use crate::common::MainnetWallet;
+use crate::common::CardanoWallet;
 use assert_fs::TempDir;
 use catalyst_toolbox::rewards::voters::calc_voter_rewards;
 use catalyst_toolbox::rewards::Threshold;
@@ -27,15 +27,15 @@ pub fn voters_with_at_least_one_vote() {
 
     let stake = 10_000;
 
-    let alice_wallet = MainnetWallet::new(stake);
-    let bob_wallet = MainnetWallet::new(stake);
-    let clarice_wallet = MainnetWallet::new(stake);
+    let alice_wallet = CardanoWallet::new(stake);
+    let bob_wallet = CardanoWallet::new(stake);
+    let clarice_wallet = CardanoWallet::new(stake);
 
-    let (db_sync, _) = MainnetNetworkBuilder::default()
+    let (db_sync, _node, _reps) = MainnetNetworkBuilder::default()
         .with(alice_wallet.as_direct_voter())
         .with(bob_wallet.as_direct_voter())
         .with(clarice_wallet.as_direct_voter())
-        .build(&testing_directory);
+        .build();
 
     let snapshot = mock::do_snapshot(&db_sync, JobParameters::fund("fund9"), &testing_directory)
         .unwrap()