Merge branch 'main' into 2091-map-proposal-elements-for-testing

Author: emiride

catalyst_voices/apps/voices/lib/pages/registration/wallet_link/stage/select_wallet_panel.dart

@@ -259,14 +259,3 @@ class _WalletsError extends StatelessWidget {
     );
   }
 }
-
-class _WalletsLoading extends StatelessWidget {
-  const _WalletsLoading();
-
-  @override
-  Widget build(BuildContext context) {
-    return const Center(
-      child: VoicesCircularProgressIndicator(),
-    );
-  }
-}

catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/example/lib/sign_and_submit_tx.dart

@@ -1,5 +1,51 @@
 part of 'main.dart';
 
+TransactionBuilderConfig _buildTransactionBuilderConfig() {
+  return const TransactionBuilderConfig(
+    feeAlgo: TieredFee(
+      constant: 155381,
+      coefficient: 44,
+      refScriptByteCost: 15,
+    ),
+    maxTxSize: 16384,
+    maxValueSize: 5000,
+    coinsPerUtxoByte: Coin(4310),
+  );
+}
+
+Transaction _buildUnsignedTx({
+  required Set<TransactionUnspentOutput> utxos,
+  required ShelleyAddress changeAddress,
+}) {
+  /* cSpell:disable */
+  final preprodFaucetAddress = ShelleyAddress.fromBech32(
+    'addr_test1vzpwq95z3xyum8vqndgdd9mdnmafh3djcxnc6jemlgdmswcve6tkw',
+  );
+  /* cSpell:enable */
+
+  final txOutput = PreBabbageTransactionOutput(
+    address: preprodFaucetAddress,
+    amount: const Balance(coin: Coin(1000000)),
+  );
+
+  final txBuilder = TransactionBuilder(
+    config: _buildTransactionBuilderConfig(),
+    inputs: utxos,
+    networkId: NetworkId.testnet,
+  );
+
+  final txBody = txBuilder
+      .withOutput(txOutput)
+      .withChangeAddressIfNeeded(changeAddress)
+      .buildBody();
+
+  return Transaction(
+    body: txBody,
+    isValid: true,
+    witnessSet: const TransactionWitnessSet(),
+  );
+}
+
 Future<void> _signAndSubmitTx({
   required BuildContext context,
   required CardanoWalletApi api,
@@ -45,49 +91,3 @@ Future<void> _signAndSubmitTx({
     );
   }
 }
-
-Transaction _buildUnsignedTx({
-  required Set<TransactionUnspentOutput> utxos,
-  required ShelleyAddress changeAddress,
-}) {
-  /* cSpell:disable */
-  final preprodFaucetAddress = ShelleyAddress.fromBech32(
-    'addr_test1vzpwq95z3xyum8vqndgdd9mdnmafh3djcxnc6jemlgdmswcve6tkw',
-  );
-  /* cSpell:enable */
-
-  final txOutput = TransactionOutput(
-    address: preprodFaucetAddress,
-    amount: const Balance(coin: Coin(1000000)),
-  );
-
-  final txBuilder = TransactionBuilder(
-    config: _buildTransactionBuilderConfig(),
-    inputs: utxos,
-    networkId: NetworkId.testnet,
-  );
-
-  final txBody = txBuilder
-      .withOutput(txOutput)
-      .withChangeAddressIfNeeded(changeAddress)
-      .buildBody();
-
-  return Transaction(
-    body: txBody,
-    isValid: true,
-    witnessSet: const TransactionWitnessSet(),
-  );
-}
-
-TransactionBuilderConfig _buildTransactionBuilderConfig() {
-  return const TransactionBuilderConfig(
-    feeAlgo: TieredFee(
-      constant: 155381,
-      coefficient: 44,
-      refScriptByteCost: 15,
-    ),
-    maxTxSize: 16384,
-    maxValueSize: 5000,
-    coinsPerUtxoByte: Coin(4310),
-  );
-}

catalyst_voices/packages/libs/catalyst_cardano_serialization/lib/src/builders/input_builder.dart

@@ -192,7 +192,7 @@ final class InputBuilder implements CoinSelector {
   ///   - This method ensures the transaction remains valid by confirming that
   ///     the accumulated balance exceeds or equals the required amount plus
   ///     fees.
-  (List<TransactionOutput>, Coin)? _getChangeAndFee(
+  (List<ShelleyMultiAssetTransactionOutput>, Coin)? _getChangeAndFee(
     AssetId assetId,
     TransactionBuilder builder,
     Set<TransactionUnspentOutput> selectedInputs,
@@ -246,7 +246,7 @@ final class InputBuilder implements CoinSelector {
   ///     the fee remains unchanged.
   ///   - This method handles multi-asset balances and ensures they are included
   ///     in the change outputs, if applicable.
-  (List<TransactionOutput>, Coin) _buildChangeOutputs(
+  (List<ShelleyMultiAssetTransactionOutput>, Coin) _buildChangeOutputs(
     TransactionBuilder builder,
     Balance remainingBalance,
     Coin minFee,
@@ -261,7 +261,7 @@ final class InputBuilder implements CoinSelector {
         ? remainingBalance
         : Balance(coin: remainingBalance.coin);
 
-    final output = TransactionOutput(
+    final output = PreBabbageTransactionOutput(
       address: builder.changeAddress!,
       amount: normalizedBalance,
     );
@@ -275,7 +275,7 @@ final class InputBuilder implements CoinSelector {
       builder.config.coinsPerUtxoByte,
     );
 
-    final changeOutputs = <TransactionOutput>[];
+    final changeOutputs = <ShelleyMultiAssetTransactionOutput>[];
     if (normalizedBalance.coin >= minAda + changeFee) {
       changeOutputs.add(
         output.copyWith(amount: normalizedBalance - Balance(coin: changeFee)),

catalyst_voices/packages/libs/catalyst_cardano_serialization/lib/src/builders/transaction_builder.dart

@@ -25,7 +25,7 @@ final class TransactionBuilder extends Equatable {
 
   /// The list of transaction outputs which describes which address
   /// will receive what amount of [Coin].
-  final List<TransactionOutput> outputs;
+  final List<ShelleyMultiAssetTransactionOutput> outputs;
 
   /// The amount of lovelaces that will be charged as the fee
   /// for adding the transaction to the blockchain.
@@ -183,7 +183,7 @@ final class TransactionBuilder extends Equatable {
   /// The [output] must reach a minimum [Coin] value as calculated
   /// by [TransactionOutputBuilder.minimumAdaForOutput],
   /// otherwise [TxValueBelowMinUtxoValueException] is thrown.
-  TransactionBuilder withOutput(TransactionOutput output) {
+  TransactionBuilder withOutput(ShelleyMultiAssetTransactionOutput output) {
     final valueSize = cbor.encode(output.amount.toCbor()).length;
 
     if (!TransactionOutputBuilder.isOutputSizeValid(
@@ -464,7 +464,7 @@ final class TransactionBuilder extends Equatable {
     required Balance changeEstimator,
   }) {
     final minAda = TransactionOutputBuilder.minimumAdaForOutput(
-      TransactionOutput(
+      PreBabbageTransactionOutput(
         address: address,
         amount: changeEstimator,
       ),
@@ -478,7 +478,7 @@ final class TransactionBuilder extends Equatable {
       case true:
         final feeForChange = TransactionOutputBuilder.feeForOutput(
           config,
-          TransactionOutput(
+          PreBabbageTransactionOutput(
             address: address,
             amount: changeEstimator,
           ),
@@ -493,7 +493,7 @@ final class TransactionBuilder extends Equatable {
             return withFee(changeEstimator.coin);
           case true:
             return withFee(newFee).withOutput(
-              TransactionOutput(
+              PreBabbageTransactionOutput(
                 address: address,
                 amount: changeEstimator - Balance(coin: newFee),
               ),
@@ -663,7 +663,7 @@ final class TransactionBuilder extends Equatable {
   /// remain unchanged.
   TransactionBuilder copyWith({
     Set<TransactionUnspentOutput>? inputs,
-    List<TransactionOutput>? outputs,
+    List<ShelleyMultiAssetTransactionOutput>? outputs,
     Coin? fee,
     TransactionWitnessSetBuilder? witnessBuilder,
   }) {
@@ -742,12 +742,12 @@ final class TransactionOutputBuilder {
   ///
   /// Adds a minimum amount of [Coin] to the transaction to pass
   /// the [minimumAdaForOutput] validation.
-  static TransactionOutput withAssetAndMinRequiredCoin({
+  static ShelleyMultiAssetTransactionOutput withAssetAndMinRequiredCoin({
     required ShelleyAddress address,
     required MultiAsset multiAsset,
     required Coin coinsPerUtxoByte,
   }) {
-    final minOutput = TransactionOutput(
+    final minOutput = PreBabbageTransactionOutput(
       address: address,
       amount: const Balance.zero(),
     );
@@ -762,7 +762,7 @@ final class TransactionOutputBuilder {
     );
 
     final requiredCoin = minimumAdaForOutput(checkOutput, coinsPerUtxoByte);
-    return TransactionOutput(
+    return PreBabbageTransactionOutput(
       address: address,
       amount: Balance(coin: requiredCoin, multiAsset: multiAsset),
     );
@@ -879,7 +879,7 @@ final class TransactionOutputBuilder {
   /// These constraints ensure consistent and predictable transaction
   /// processing.
   static bool isOutputSizeValid(
-    TransactionOutput output,
+    ShelleyMultiAssetTransactionOutput output,
     int maxValueSize,
   ) =>
       cbor.encode(output.amount.toCbor()).length <= maxValueSize;

catalyst_voices/packages/libs/catalyst_cardano_serialization/lib/src/builders/types.dart

@@ -19,7 +19,7 @@ typedef AssetsGroup = List<MapEntry<AssetId, List<TransactionUnspentOutput>>>;
 /// fee.
 typedef SelectionResult = (
   Set<TransactionUnspentOutput>,
-  List<TransactionOutput>,
+  List<ShelleyMultiAssetTransactionOutput>,
   Coin,
 );