Merge branch 'develop' into dev-tools/pull-upstream-3

crates/iota-sdk-types/src/checkpoint.rs

@@ -118,13 +118,18 @@ pub struct SignedCheckpointSummary {
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[cfg_attr(feature = "proptest", derive(test_strategy::Arbitrary))]
 pub struct CheckpointContents(
+<<<<<<<< HEAD:crates/iota-sdk-types/src/checkpoint.rs
 <<<<<<<< HEAD:crates/iota-sdk-types/src/checkpoint.rs
     #[cfg_attr(feature = "proptest", any(proptest::collection::size_range(0..=2).lift()))]
     Vec<CheckpointTransactionInfo>,
 ========
     #[cfg_attr(test, any(proptest::collection::size_range(0..=2).lift()))]
     pub  Vec<CheckpointTransactionInfo>,
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/checkpoint.rs
+========
+    #[cfg_attr(test, any(proptest::collection::size_range(0..=2).lift()))]
+    pub  Vec<CheckpointTransactionInfo>,
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/checkpoint.rs
 );
 
 impl CheckpointContents {
@@ -190,9 +195,12 @@ pub struct CheckpointTransaction {
     pub events: Option<TransactionEvents>,
     /// The state of all inputs to this transaction as they were prior to
     /// execution.
+<<<<<<<< HEAD:crates/iota-sdk-types/src/checkpoint.rs
 <<<<<<<< HEAD:crates/iota-sdk-types/src/checkpoint.rs
     #[cfg_attr(feature = "proptest", any(proptest::collection::size_range(0..=2).lift()))]
 ========
+========
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/checkpoint.rs
     #[cfg_attr(test, any(proptest::collection::size_range(0..=2).lift()))]
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/checkpoint.rs
     pub input_objects: Vec<Object>,

crates/iota-sdk-types/src/crypto/mod.rs

@@ -9,6 +9,7 @@ mod signature;
 mod validator;
 mod zklogin;
 
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/mod.rs
 <<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/mod.rs
 pub use bls12381::{Bls12381PublicKey, Bls12381Signature};
 pub use ed25519::{Ed25519PublicKey, Ed25519Signature};
@@ -17,28 +18,40 @@ pub use intent::{Intent, IntentAppId, IntentScope, IntentVersion};
 pub use bls12381::{Bls12381PrivateKey, Bls12381PublicKey, Bls12381Signature};
 pub use ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature};
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/mod.rs
+========
+pub use bls12381::{Bls12381PrivateKey, Bls12381PublicKey, Bls12381Signature};
+pub use ed25519::{Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature};
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/mod.rs
 pub use multisig::{
     MultisigAggregatedSignature, MultisigCommittee, MultisigMember, MultisigMemberPublicKey,
     MultisigMemberSignature,
 };
 pub use passkey::{PasskeyAuthenticator, PasskeyPublicKey};
 <<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/mod.rs
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/mod.rs
 pub use secp256k1::{Secp256k1PublicKey, Secp256k1Signature};
 pub use secp256r1::{Secp256r1PublicKey, Secp256r1Signature};
 ========
 pub use secp256k1::{Secp256k1PrivateKey, Secp256k1PublicKey, Secp256k1Signature};
 pub use secp256r1::{Secp256r1PrivateKey, Secp256r1PublicKey, Secp256r1Signature};
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/mod.rs
+========
+pub use secp256k1::{Secp256k1PrivateKey, Secp256k1PublicKey, Secp256k1Signature};
+pub use secp256r1::{Secp256r1PrivateKey, Secp256r1PublicKey, Secp256r1Signature};
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/mod.rs
 pub use signature::{SignatureScheme, SimpleSignature, UserSignature};
 pub use validator::{
     ValidatorAggregatedSignature, ValidatorCommittee, ValidatorCommitteeMember, ValidatorSignature,
 };
 pub use zklogin::{
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/mod.rs
 <<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/mod.rs
     Bn254FieldElement, CircomG1, CircomG2, Claim, Jwk, JwkId, ZkLoginAuthenticator, ZkLoginInputs,
     ZkLoginProof, ZkLoginPublicIdentifier,
 };
 ========
+========
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/mod.rs
     Bn254FieldElement, CircomG1, CircomG2, Claim, Jwk, JwkId, JwtDetails, ZkLoginAuthenticator,
     ZkLoginInputs, ZkLoginProof, ZkLoginPublicIdentifier,
 };
@@ -63,6 +76,9 @@ impl core::fmt::Display for SignatureFromBytesError {
 
 #[cfg(feature = "serde")]
 impl std::error::Error for SignatureFromBytesError {}
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/mod.rs
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/mod.rs
+========
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/mod.rs
 
 // Implement various base64 fixed-size array helpers

crates/iota-sdk-types/src/crypto/multisig.rs

@@ -182,13 +182,19 @@ mod serialization {
     use serde_with::{Bytes, DeserializeAs};
 
     use super::*;
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/multisig.rs
 <<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/multisig.rs
     use crate::{Ed25519PublicKey, Secp256k1PublicKey, Secp256r1PublicKey, SignatureScheme};
 ========
+========
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/multisig.rs
     use crate::types::{
         Ed25519PublicKey, Secp256k1PublicKey, Secp256r1PublicKey, SignatureScheme,
         crypto::SignatureFromBytesError,
     };
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/multisig.rs
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/multisig.rs
+========
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/multisig.rs
 
     #[derive(serde_derive::Deserialize)]
@@ -266,6 +272,7 @@ mod serialization {
     }
 
     impl MultisigAggregatedSignature {
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/multisig.rs
 <<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/multisig.rs
         pub(crate) fn to_bytes(&self) -> Vec<u8> {
             let mut buf = Vec::new();
@@ -283,6 +290,11 @@ mod serialization {
         pub(crate) fn from_serialized_bytes<T: AsRef<[u8]>, E: serde::de::Error>(
             bytes: T,
         ) -> Result<Self, E> {
+========
+        pub fn from_serialized_bytes(
+            bytes: impl AsRef<[u8]>,
+        ) -> Result<Self, SignatureFromBytesError> {
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/multisig.rs
 ========
         pub fn from_serialized_bytes(
             bytes: impl AsRef<[u8]>,

crates/iota-sdk-types/src/crypto/passkey.rs

@@ -1,12 +1,18 @@
 <<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/passkey.rs
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/passkey.rs
 use super::{Secp256r1PublicKey, Secp256r1Signature, SimpleSignature};
 
 /// An passkey authenticator with parsed fields. See field defition below. Can
 ========
+========
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/passkey.rs
 use super::{Secp256r1PublicKey, Secp256r1Signature};
 use crate::types::Digest;
 
 /// An passkey authenticator with parsed fields. See field definition below. Can
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/passkey.rs
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/passkey.rs
+========
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/passkey.rs
 /// be initialized from [struct RawPasskeyAuthenticator].
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -19,10 +25,13 @@ pub struct PasskeyAuthenticator {
     /// Initialized from `user_signature` in `RawPasskeyAuthenticator`.
     signature: Secp256r1Signature,
 
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/passkey.rs
 <<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/passkey.rs
     /// Parsed challenge bytes from `client_data_json.challenge`.
     challenge: Vec<u8>,
 ========
+========
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/passkey.rs
     /// Valid intent parsed from the first 3 bytes of
     /// `client_data_json.challenge`.
     intent: [u8; 3],
@@ -85,8 +94,12 @@ mod serialization {
     use serde_with::{Bytes, DeserializeAs};
 
     use super::*;
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/passkey.rs
 <<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/passkey.rs
     use crate::{SignatureScheme, SimpleSignature};
+========
+    use crate::types::{SignatureScheme, SimpleSignature, crypto::SignatureFromBytesError};
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/passkey.rs
 ========
     use crate::types::{SignatureScheme, SimpleSignature, crypto::SignatureFromBytesError};
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/passkey.rs
@@ -158,6 +171,7 @@ mod serialization {
     }
 
     impl PasskeyAuthenticator {
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/passkey.rs
 <<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/passkey.rs
         pub fn new(
             authenticator_data: Vec<u8>,
@@ -173,6 +187,9 @@ mod serialization {
         }
 
         fn try_from_raw<E: serde::de::Error>(
+========
+        fn try_from_raw(
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/passkey.rs
 ========
         fn try_from_raw(
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/passkey.rs
@@ -197,6 +214,12 @@ mod serialization {
                 challenge,
                 origin: _,
             } = serde_json::from_str(&client_data_json).map_err(SignatureFromBytesError::new)?;
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/passkey.rs
+========
+
+            // challenge is 3 byte intent | 32 byte hash
+            let mut challenge_buf = [0; 3 + Digest::LENGTH];
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/passkey.rs
 
             // decode unpadded url endoded base64 data per spec:
             // https://w3c.github.io/webauthn/#base64url-encoding

crates/iota-sdk-types/src/crypto/signature.rs

@@ -36,6 +36,7 @@ impl SimpleSignature {
     }
 }
 
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/signature.rs
 <<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/signature.rs
 impl SimpleSignature {
     #[cfg(feature = "serde")]
@@ -293,6 +294,8 @@ impl<'de> serde::Deserialize<'de> for SimpleSignature {
     }
 }
 
+========
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/signature.rs
 ========
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/signature.rs
 #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
@@ -631,6 +634,7 @@ mod serialization {
             }
         }
     }
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/signature.rs
 
     impl UserSignature {
         pub fn to_bytes(&self) -> Vec<u8> {
@@ -694,6 +698,8 @@ mod serialization {
             Self::from_bytes(&bytes)
         }
     }
+========
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/signature.rs
 
     #[derive(serde_derive::Serialize)]
     #[serde(tag = "scheme", rename_all = "lowercase")]

crates/iota-sdk-types/src/crypto/validator.rs

@@ -1,9 +1,13 @@
 use super::{Bls12381PublicKey, Bls12381Signature};
 <<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/validator.rs
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/validator.rs
 use crate::checkpoint::{EpochId, StakeUnit};
 ========
 use crate::types::checkpoint::{EpochId, StakeUnit};
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/validator.rs
+========
+use crate::types::checkpoint::{EpochId, StakeUnit};
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/validator.rs
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(

crates/iota-sdk-types/src/crypto/zklogin.rs

@@ -1,9 +1,13 @@
 use super::SimpleSignature;
 <<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/zklogin.rs
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/zklogin.rs
 use crate::{checkpoint::EpochId, u256::U256};
 ========
 use crate::types::{checkpoint::EpochId, u256::U256};
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/zklogin.rs
+========
+use crate::types::{checkpoint::EpochId, u256::U256};
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/zklogin.rs
 
 /// An zk login authenticator with all the necessary fields.
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -101,6 +105,9 @@ pub struct CircomG2(pub [[Bn254FieldElement; 2]; 3]);
 #[cfg_attr(feature = "proptest", derive(test_strategy::Arbitrary))]
 ========
 #[cfg_attr(test, derive(test_strategy::Arbitrary))]
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/zklogin.rs
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/zklogin.rs
+========
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/zklogin.rs
 // TODO ensure iss is less than 255 bytes long
 pub struct ZkLoginPublicIdentifier {
@@ -285,8 +292,12 @@ mod serialization {
     use serde_with::{Bytes, DeserializeAs, SerializeAs};
 
     use super::*;
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/zklogin.rs
 <<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/zklogin.rs
     use crate::SignatureScheme;
+========
+    use crate::types::{SignatureScheme, crypto::SignatureFromBytesError};
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/zklogin.rs
 ========
     use crate::types::{SignatureScheme, crypto::SignatureFromBytesError};
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/zklogin.rs
@@ -421,6 +432,7 @@ mod serialization {
     }
 
     impl ZkLoginAuthenticator {
+<<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/zklogin.rs
 <<<<<<<< HEAD:crates/iota-sdk-types/src/crypto/zklogin.rs
         pub(crate) fn to_bytes(&self) -> Vec<u8> {
             let authenticator_ref = AuthenticatorRef {
@@ -439,6 +451,11 @@ mod serialization {
         pub(crate) fn from_serialized_bytes<T: AsRef<[u8]>, E: serde::de::Error>(
             bytes: T,
         ) -> Result<Self, E> {
+========
+        pub fn from_serialized_bytes(
+            bytes: impl AsRef<[u8]>,
+        ) -> Result<Self, SignatureFromBytesError> {
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/crypto/zklogin.rs
 ========
         pub fn from_serialized_bytes(
             bytes: impl AsRef<[u8]>,

crates/iota-sdk-types/src/effects/mod.rs

@@ -1,6 +1,7 @@
 mod v1;
 
 pub use v1::{
+<<<<<<<< HEAD:crates/iota-sdk-types/src/effects/mod.rs
 <<<<<<<< HEAD:crates/iota-sdk-types/src/effects/mod.rs
     ChangedObject, IdOperation, ObjectIn, ObjectOut, TransactionEffectsV1, UnchangedSharedKind,
     UnchangedSharedObject,
@@ -12,6 +13,11 @@ use crate::execution_status::ExecutionStatus;
     UnchangedSharedKind, UnchangedSharedObject,
 };
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/effects/mod.rs
+========
+    ChangedObject, EffectsObjectChange, IdOperation, ObjectIn, ObjectOut, TransactionEffectsV1,
+    UnchangedSharedKind, UnchangedSharedObject,
+};
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/effects/mod.rs
 
 /// The response from processing a transaction or a certified transaction
 #[derive(Eq, PartialEq, Clone, Debug)]
@@ -25,6 +31,7 @@ pub enum TransactionEffects {
     #[cfg_attr(feature = "schemars", schemars(rename = "1"))]
     V1(Box<TransactionEffectsV1>),
 <<<<<<<< HEAD:crates/iota-sdk-types/src/effects/mod.rs
+<<<<<<<< HEAD:crates/iota-sdk-types/src/effects/mod.rs
 }
 
 impl TransactionEffects {
@@ -50,6 +57,8 @@ impl TransactionEffects {
     }
 ========
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/effects/mod.rs
+========
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/effects/mod.rs
 }
 
 #[cfg(feature = "serde")]

crates/iota-sdk-types/src/effects/v1.rs

@@ -1,7 +1,11 @@
 <<<<<<<< HEAD:crates/iota-sdk-types/src/effects/v1.rs
+<<<<<<<< HEAD:crates/iota-sdk-types/src/effects/v1.rs
 use crate::{
 ========
 use crate::types::{
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/effects/v1.rs
+========
+use crate::types::{
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/effects/v1.rs
     EpochId, GasCostSummary, ObjectDigest, ObjectId, TransactionDigest, TransactionEventsDigest,
     digest::EffectsAuxiliaryDataDigest,
@@ -16,6 +20,9 @@ use crate::types::{
 #[cfg_attr(feature = "proptest", derive(test_strategy::Arbitrary))]
 ========
 #[cfg_attr(test, derive(test_strategy::Arbitrary))]
+<<<<<<<< HEAD:crates/iota-sdk-types/src/effects/v1.rs
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/effects/v1.rs
+========
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/effects/v1.rs
 pub struct TransactionEffectsV1 {
     /// The status of the execution
@@ -49,9 +56,12 @@ pub struct TransactionEffectsV1 {
     /// transaction, and in order for a node to catch up and execute it
     /// without consensus sequencing, the version needs to be committed in
     /// the effects.
+<<<<<<<< HEAD:crates/iota-sdk-types/src/effects/v1.rs
 <<<<<<<< HEAD:crates/iota-sdk-types/src/effects/v1.rs
     #[cfg_attr(feature = "proptest", any(proptest::collection::size_range(0..=2).lift()))]
 ========
+========
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/effects/v1.rs
     #[cfg_attr(test, any(proptest::collection::size_range(0..=2).lift()))]
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/effects/v1.rs
     pub unchanged_shared_objects: Vec<UnchangedSharedObject>,

crates/iota-sdk-types/src/events.rs

@@ -10,6 +10,9 @@ use super::{Address, Identifier, ObjectId, StructTag, TypeTag};
 #[cfg_attr(feature = "proptest", derive(test_strategy::Arbitrary))]
 ========
 #[cfg_attr(test, derive(test_strategy::Arbitrary))]
+<<<<<<<< HEAD:crates/iota-sdk-types/src/events.rs
+>>>>>>>> develop:crates/iota-rust-sdk/src/types/events.rs
+========
 >>>>>>>> develop:crates/iota-rust-sdk/src/types/events.rs
 pub struct TransactionEvents(pub Vec<Event>);