feat(iota-types)!: replace ProgrammableTransaction (#10975)

iotaledger/iota-rust-sdk#585

Author: Thoralf-M

Cargo.lock

@@ -454,7 +454,7 @@ iota-replay = { path = "crates/iota-replay" }
 iota-rest-kv = { path = "crates/iota-rest-kv" }
 iota-rpc-loadgen = { path = "crates/iota-rpc-loadgen" }
 iota-sdk = { path = "crates/iota-sdk" }
-iota-sdk-types = { git = "https://github.com/iotaledger/iota-rust-sdk.git", rev = "981bd87dce9c0adfc18639641761d32dc9ee7b7e", default-features = false }
+iota-sdk-types = { git = "https://github.com/iotaledger/iota-rust-sdk.git", rev = "edf0c1fedbd8c45b20c5fe2b5220c755254c605c", default-features = false }
 iota-simulator = { path = "crates/iota-simulator" }
 iota-snapshot = { path = "crates/iota-snapshot" }
 iota-source-validation = { path = "crates/iota-source-validation" }

Cargo.toml

@@ -21,7 +21,10 @@ use iota_types::{
     fp_ensure,
     object::Object,
     programmable_transaction_builder::ProgrammableTransactionBuilder,
-    transaction::{CallArg, Command, InputObjectKind, TransactionData, TransactionKind},
+    transaction::{
+        CallArg, Command, InputObjectKind, ProgrammableTransactionExt, TransactionData,
+        TransactionKind,
+    },
 };
 
 #[async_trait]

crates/iota-transaction-builder/src/lib.rs

@@ -26,8 +26,8 @@ mod checked {
         object::{Object, Owner},
         transaction::{
             CheckedInputObjects, InputObjectKind, InputObjects, ObjectReadResult,
-            ObjectReadResultKind, ReceivingObjectReadResult, ReceivingObjects, TransactionData,
-            TransactionDataAPI, TransactionKind,
+            ObjectReadResultKind, ProgrammableTransactionExt, ReceivingObjectReadResult,
+            ReceivingObjects, TransactionData, TransactionDataAPI, TransactionKind,
         },
     };
     use tracing::{error, instrument};

crates/iota-transaction-checks/src/lib.rs

@@ -28,8 +28,8 @@ use iota_sdk_types::{
     move_core::{Identifier, StructTag, TypeParseError, TypeTag},
     object::{GenesisObject, Object, ObjectData},
     transaction::{
-        GasPayment, GenesisTransaction, ProgrammableTransaction, RandomnessStateUpdate,
-        SignedTransaction, Transaction, TransactionKind, TransactionV1,
+        GasPayment, GenesisTransaction, RandomnessStateUpdate, SignedTransaction, Transaction,
+        TransactionKind, TransactionV1,
     },
     validator::{ValidatorAggregatedSignature, ValidatorCommittee, ValidatorCommitteeMember},
 };
@@ -198,10 +198,7 @@ impl TryFrom<crate::transaction::TransactionKind> for TransactionKind {
 
         match value {
             InternalTxnKind::ProgrammableTransaction(programmable_transaction) => {
-                TransactionKind::ProgrammableTransaction(ProgrammableTransaction {
-                    inputs: programmable_transaction.inputs,
-                    commands: programmable_transaction.commands,
-                })
+                TransactionKind::ProgrammableTransaction(programmable_transaction)
             }
             InternalTxnKind::Genesis(genesis_transaction) => {
                 TransactionKind::Genesis(GenesisTransaction {
@@ -251,10 +248,7 @@ impl TryFrom<TransactionKind> for crate::transaction::TransactionKind {
     fn try_from(value: TransactionKind) -> Result<Self, Self::Error> {
         match value {
             TransactionKind::ProgrammableTransaction(programmable_transaction) => {
-                Self::ProgrammableTransaction(crate::transaction::ProgrammableTransaction {
-                    inputs: programmable_transaction.inputs,
-                    commands: programmable_transaction.commands,
-                })
+                Self::ProgrammableTransaction(programmable_transaction)
             }
             TransactionKind::Genesis(genesis_transaction) => {
                 Self::Genesis(crate::transaction::GenesisTransaction {

crates/iota-types/src/iota_sdk_types_conversions.rs

@@ -228,9 +228,9 @@ impl ProgrammableTransactionBuilder {
         object_ref: ObjectRef,
     ) -> anyhow::Result<()> {
         let rec_arg = self.pure(recipient).unwrap();
-        let obj_arg = self.obj(CallArg::ImmutableOrOwned(object_ref));
+        let obj_arg = self.obj(CallArg::ImmutableOrOwned(object_ref))?;
         self.commands
-            .push(Command::new_transfer_objects(vec![obj_arg?], rec_arg));
+            .push(Command::new_transfer_objects(vec![obj_arg], rec_arg));
         Ok(())
     }