Merge branch 'tooling-dashboard/style-balance-box' into tooling-dashb…

…oard/style-my-coins

.github/workflows/_rust_tests.yml

@@ -72,8 +72,7 @@ jobs:
 
   check-unused-deps:
     name: Check Unused Dependencies (${{ matrix.flags }})
-    # Temporarily disabled until the nightly build bug is resolved
-    if: (!cancelled() && false)
+    if: (!cancelled())
     strategy:
       matrix:
         flags: ["--all-features", "--no-default-features"]

apps/wallet-dashboard/app/globals.css

@@ -1,3 +1,5 @@
+@import '@iota/apps-ui-kit/styles';
+
 @tailwind base;
 @tailwind components;
 @tailwind utilities;

apps/wallet-dashboard/app/layout.tsx

@@ -33,6 +33,7 @@ export default function RootLayout({
                 <QueryClientProvider client={queryClient}>
                     <IotaClientProvider networks={allNetworks} defaultNetwork={defaultNetwork}>
                         <WalletProvider
+                            autoConnect={true}
                             theme={[
                                 {
                                     variables: lightTheme,

apps/wallet-dashboard/components/index.ts

@@ -12,7 +12,7 @@ export { default as ExternalImage } from './ExternalImage';
 export { default as TransactionIcon } from './TransactionIcon';
 export { default as Dropdown } from './Dropdown';
 
-export * from './AccountBalance/AccountBalance';
+export * from './account-balance/AccountBalance';
 export * from './Coins';
 export * from './Popup';
 export * from './AppList';

crates/iota-e2e-tests/tests/apy_test.rs

@@ -41,6 +41,7 @@ use test_cluster::TestClusterBuilder;
 /// calculate APY from epoch 1 and 2. Since we need epoch 0 to start staking
 /// anyway, and only have the stake of the pool at the expected number (a
 /// quarter of 3.5B IOTAs) starting from epoch 1, this is totally fine.
+#[ignore = "https://github.com/iotaledger/iota/issues/3552"]
 #[sim_test]
 async fn test_apy() {
     // We need a large stake for low enough APY values such that they are not

crates/iota/src/keytool.rs

@@ -4,8 +4,7 @@
 
 use std::{
     fmt::{Debug, Display, Formatter},
-    fs,
-    path::{Path, PathBuf},
+    path::PathBuf,
     sync::Arc,
 };
 
@@ -150,12 +149,6 @@ pub enum KeyToolCommand {
         #[clap(long, short = 's')]
         sort_by_alias: bool,
     },
-    /// This reads the content at the provided file path. The accepted format
-    /// is a Bech32 encoded [enum IotaKeyPair] or `type AuthorityKeyPair`
-    /// (Base64 encoded `privkey`). This prints out the account keypair as
-    /// Base64 encoded `flag || privkey`, the network keypair, protocol
-    /// keypair, authority keypair as Base64 encoded `privkey`.
-    LoadKeypair { file: PathBuf },
     /// To MultiSig Iota Address. Pass in a list of all public keys `flag || pk`
     /// in Base64. See `keytool list` for example public keys.
     MultiSigAddress {
@@ -220,11 +213,6 @@ pub enum KeyToolCommand {
         #[clap(long)]
         base64pk: String,
     },
-    /// This takes a bech32 encoded [enum IotaKeyPair]. It outputs the keypair
-    /// into a file at the current directory where the address is the
-    /// filename, and prints out its Iota address, Base64 encoded public
-    /// key, the key scheme, and the key scheme flag.
-    Unpack { keypair: String },
     // Commented for now: https://github.com/iotaledger/iota/issues/1777
     // /// Given the max_epoch, generate an OAuth url, ask user to paste the
     // /// redirect with id_token, call salt server, then call the prover server,
@@ -356,15 +344,6 @@ pub struct ExportedKey {
     key: Key,
 }
 
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct KeypairData {
-    account_keypair: String,
-    network_keypair: Option<String>,
-    protocol_keypair: Option<String>,
-    key_scheme: String,
-}
-
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct MultiSigAddress {
@@ -456,7 +435,6 @@ pub enum CommandOutput {
     Import(Key),
     Export(ExportedKey),
     List(Vec<Key>),
-    LoadKeypair(KeypairData),
     MultiSigAddress(MultiSigAddress),
     MultiSigCombinePartialSig(MultiSigCombinePartialSig),
     Show(Key),
@@ -665,44 +643,6 @@ impl KeyToolCommand {
                 }
                 CommandOutput::List(keys)
             }
-            KeyToolCommand::LoadKeypair { file } => {
-                let output = match read_keypair_from_file(&file) {
-                    Ok(keypair) => {
-                        // Account keypair is encoded with the key scheme flag {},
-                        // and network and protocol keypair are not.
-                        let network_protocol_keypair = match &keypair {
-                            IotaKeyPair::Ed25519(kp) => kp.encode_base64(),
-                            IotaKeyPair::Secp256k1(kp) => kp.encode_base64(),
-                            IotaKeyPair::Secp256r1(kp) => kp.encode_base64(),
-                        };
-                        KeypairData {
-                            account_keypair: keypair.encode_base64(),
-                            network_keypair: Some(network_protocol_keypair.clone()),
-                            protocol_keypair: Some(network_protocol_keypair),
-                            key_scheme: keypair.public().scheme().to_string(),
-                        }
-                    }
-                    Err(_) => {
-                        // Authority keypair file is not stored with the flag, it will try read as
-                        // BLS keypair..
-                        match read_authority_keypair_from_file(&file) {
-                            Ok(keypair) => KeypairData {
-                                account_keypair: keypair.encode_base64(),
-                                network_keypair: None,
-                                protocol_keypair: None,
-                                key_scheme: SignatureScheme::BLS12381.to_string(),
-                            },
-                            Err(e) => {
-                                return Err(anyhow!(format!(
-                                    "Failed to read keypair at path {:?} err: {:?}",
-                                    file, e
-                                )));
-                            }
-                        }
-                    }
-                };
-                CommandOutput::LoadKeypair(output)
-            }
             KeyToolCommand::MultiSigAddress {
                 threshold,
                 pks,
@@ -854,16 +794,7 @@ impl KeyToolCommand {
                     serialized_sig_base64: serialized_sig,
                 })
             }
-            KeyToolCommand::Unpack { keypair } => {
-                let key = Key::from(
-                    &IotaKeyPair::decode(&keypair)
-                        .map_err(|_| anyhow!("Invalid Bech32 encoded keypair"))?,
-                );
-                let path_str = format!("{}.key", key.iota_address).to_lowercase();
-                let path = Path::new(&path_str);
-                fs::write(path, keypair)?;
-                CommandOutput::Show(key)
-            } /* Commented for now: https://github.com/iotaledger/iota/issues/1777
+            /* Commented for now: https://github.com/iotaledger/iota/issues/1777
                * KeyToolCommand::ZkLoginInsecureSignPersonalMessage { data, max_epoch } => {
                *     let msg = PersonalMessage {
                *         message: data.as_bytes().to_vec(),

crates/iota/tests/cli_tests.rs

@@ -4170,8 +4170,9 @@ async fn test_faucet() -> Result<(), anyhow::Error> {
     Ok(())
 }
 
-#[sim_test]
+#[tokio::test]
 async fn test_move_new() -> Result<(), anyhow::Error> {
+    let current_dir = std::env::current_dir()?;
     let package_name = "test_move_new";
     IotaCommand::Move {
         package_path: None,
@@ -4195,7 +4196,54 @@ async fn test_move_new() -> Result<(), anyhow::Error> {
     for name in ["sources", "tests", "Move.toml"] {
         assert!(files.contains(&name.to_string()));
     }
+    assert!(std::path::Path::new(&format!("{package_name}/sources/{package_name}.move")).exists());
+    assert!(
+        std::path::Path::new(&format!("{package_name}/tests/{package_name}_tests.move")).exists()
+    );
+
+    // Test if the generated files are valid to build a package
+    IotaCommand::Move {
+        package_path: Some(package_name.parse()?),
+        config: None,
+        build_config: move_package::BuildConfig::default(),
+        cmd: iota_move::Command::Build(iota_move::build::Build {
+            chain_id: None,
+            dump_bytecode_as_base64: false,
+            generate_struct_layouts: false,
+            with_unpublished_dependencies: false,
+        }),
+    }
+    .execute()
+    .await?;
+
+    // iota_move::Command::Build changes the current dir, so we have to switch back
+    // here
+    std::env::set_current_dir(&current_dir)?;
+
+    IotaCommand::Move {
+        package_path: Some(package_name.parse()?),
+        config: None,
+        build_config: move_package::BuildConfig::default(),
+        cmd: iota_move::Command::Test(iota_move::unit_test::Test {
+            test: move_cli::base::test::Test {
+                compute_coverage: false,
+                filter: None,
+                gas_limit: None,
+                list: false,
+                num_threads: 1,
+                report_statistics: None,
+                verbose_mode: false,
+                seed: None,
+                rand_num_iters: None,
+            },
+        }),
+    }
+    .execute()
+    .await?;
 
+    // iota_move::Command::Test changes the current dir, so we have to switch back
+    // here
+    std::env::set_current_dir(current_dir)?;
     std::fs::remove_dir_all(package_name)?;
     Ok(())
 }

docs/content/references/cli/keytool.mdx

@@ -29,9 +29,6 @@ Commands:
                                      provided, the tool will automatically generate one
   export                         Output the private key of the given key identity in Iota CLI Keystore as Bech32 encoded string starting with `iotaprivkey`
   list                           List all keys by its Iota address, Base64 encoded public key, key scheme name in iota.keystore
-  load-keypair                   This reads the content at the provided file path. The accepted format can be [enum IotaKeyPair] (Base64 encoded of 33-byte `flag || privkey`) or `type
-                                     AuthorityKeyPair` (Base64 encoded `privkey`). This prints out the account keypair as Base64 encoded `flag || privkey`, the network keypair, protocol keypair,
-                                     authority keypair as Base64 encoded `privkey`
   multi-sig-address              To MultiSig Iota Address. Pass in a list of all public keys `flag || pk` in Base64. See `keytool list` for example public keys
   multi-sig-combine-partial-sig  Provides a list of participating signatures (`flag || sig || pk` encoded in Base64), threshold, a list of all public keys and a list of their weights that
                                      define the MultiSig address. Returns a valid MultiSig signature and its sender address. The result can be used as signature field for `iota client
@@ -43,8 +40,6 @@ Commands:
   sign-kms                       Creates a signature by leveraging AWS KMS. Pass in a key-id to leverage Amazon KMS to sign a message and the base64 pubkey. Generate PubKey from pem using
                                      iotaledger/base64pemkey Any signature commits to a [struct IntentMessage] consisting of the Base64 encoded of the BCS serialized transaction bytes itself and
                                      its intent. If intent is absent, default will be used
-  unpack                         This takes [enum IotaKeyPair] of Base64 encoded of 33-byte `flag || privkey`). It outputs the keypair into a file at the current directory where the address is
-                                     the filename, and prints out its Iota address, Base64 encoded public key, the key scheme, and the key scheme flag
   help                           Print this message or the help of the given subcommand(s)
 
 Options:

sdk/graphql-transport/src/generated/queries.ts

@@ -342,7 +342,7 @@ export type AuthenticatorStateCreateTransaction = {
 
 export type AuthenticatorStateExpireTransaction = {
   __typename?: 'AuthenticatorStateExpireTransaction';
-  /** The initial version that the AuthenticatorStateUpdate was shared at. */
+  /** The initial version that the AuthenticatorStateUpdateV1 was shared at. */
   authenticatorObjInitialSharedVersion: Scalars['UInt53']['output'];
   /** Expire JWKs that have a lower epoch than this. */
   minEpoch?: Maybe<Epoch>;
@@ -5018,7 +5018,7 @@ export type Validator = {
   stakingPool?: Maybe<MoveObject>;
   /** The epoch at which this pool became active. */
   stakingPoolActivationEpoch?: Maybe<Scalars['UInt53']['output']>;
-  /** The ID of this validator's `0x3::staking_pool::StakingPool`. */
+  /** The ID of this validator's `0x3::staking_pool::StakingPoolV1`. */
   stakingPoolId: Scalars['IotaAddress']['output'];
   /** The total number of IOTA tokens in this pool. */
   stakingPoolIotaBalance?: Maybe<Scalars['BigInt']['output']>;

sdk/graphql-transport/src/methods.ts

@@ -799,6 +799,7 @@ export const RPC_METHODS: {
             iotaTotalSupply: String(systemState.iotaTotalSupply),
             iotaTreasuryCapId: String(systemState.iotaTreasuryCapId),
             maxValidatorCount: String(systemState.systemParameters?.maxValidatorCount),
+            minValidatorCount: String(systemState.systemParameters?.minValidatorCount),
             minValidatorJoiningStake: String(
                 systemState.systemParameters?.minValidatorJoiningStake,
             ),

sdk/typescript/src/client/types/generated.ts

@@ -228,7 +228,7 @@ export interface EndOfEpochInfo {
     epochEndTimestamp: string;
     lastCheckpointId: string;
     mintedTokensAmount: string;
-    /** existing fields from `SystemEpochInfoEvent` (without epoch) */
+    /** existing fields from `SystemEpochInfoEventV1` (without epoch) */
     protocolVersion: string;
     referenceGasPrice: string;
     storageCharge: string;
@@ -690,6 +690,11 @@ export interface IotaSystemStateSummary {
      * epoch to go above this.
      */
     maxValidatorCount: string;
+    /**
+     * Minimum number of active validators at any moment. We do not allow the number of validators in any
+     * epoch to go under this.
+     */
+    minValidatorCount: string;
     /** Lower-bound on the amount of stake required to become a validator. */
     minValidatorJoiningStake: string;
     /** ID of the object that contains the list of new validators that will join at the end of the epoch. */
@@ -1479,7 +1484,7 @@ export type IotaTransactionBlockKind =
       } /** A transaction which updates global authenticator state */
     | {
           epoch: string;
-          kind: 'AuthenticatorStateUpdate';
+          kind: 'AuthenticatorStateUpdateV1';
           new_active_jwks: IotaActiveJwk[];
           round: string;
       } /** A transaction which updates global randomness state */