Skip to content

Reference UTxOs are UTxOs (not TransactionInputs) #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 18, 2023
Merged

Reference UTxOs are UTxOs (not TransactionInputs) #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c5b409
Make reference inputs also UTxOs
nielstron Mar 15, 2023
ca678e7
Fix None reference inputs if none given
nielstron Mar 16, 2023
f284423
Allow TransactionInputs too, collect inputs as sets
nielstron Mar 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/source/guides/transaction.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ Step 6
Add additional transaction information as needed:

>>> builder.ttl = 3600
>>> builder.reference_inputs.add(tx_in)
>>> builder.reference_inputs.add(utxo)

Step 7

Expand Down
16 changes: 10 additions & 6 deletions pycardano/txbuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class TransactionBuilder:

withdrawals: Optional[Withdrawals] = field(default=None)

reference_inputs: Set[TransactionInput] = field(
reference_inputs: Set[Union[UTxO, TransactionInput]] = field(
init=False, default_factory=lambda: set()
)

Expand Down Expand Up @@ -237,19 +237,19 @@ def add_script_input(

if utxo.output.script:
self._inputs_to_scripts[utxo] = utxo.output.script
self.reference_inputs.add(utxo.input)
self.reference_inputs.add(utxo)
self._reference_scripts.append(utxo.output.script)
elif not script:
for i in self.context.utxos(str(utxo.output.address)):
if i.output.script:
self._inputs_to_scripts[utxo] = i.output.script
self.reference_inputs.add(i.input)
self.reference_inputs.add(i)
self._reference_scripts.append(i.output.script)
break
elif isinstance(script, UTxO):
assert script.output.script is not None
self._inputs_to_scripts[utxo] = script.output.script
self.reference_inputs.add(script.input)
self.reference_inputs.add(script)
self._reference_scripts.append(script.output.script)
else:
self._inputs_to_scripts[utxo] = script
Expand Down Expand Up @@ -283,7 +283,7 @@ def add_minting_script(
if isinstance(script, UTxO):
assert script.output.script is not None
self._minting_script_to_redeemers.append((script.output.script, redeemer))
self.reference_inputs.add(script.input)
self.reference_inputs.add(script)
self._reference_scripts.append(script.output.script)
else:
self._minting_script_to_redeemers.append((script, redeemer))
Expand Down Expand Up @@ -777,7 +777,11 @@ def _build_tx_body(self) -> TransactionBody:
withdraws=self.withdrawals,
collateral_return=self._collateral_return,
total_collateral=self._total_collateral,
reference_inputs=list(self.reference_inputs) or None,
reference_inputs=[
i.input if isinstance(i, UTxO) else i for i in self.reference_inputs
]
if self.reference_inputs
else None,
)
return tx_body

Expand Down