Skip to content

Fix/disallow attach inline datum #325

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 5 commits into from
Mar 4, 2024
Merged

Fix/disallow attach inline datum #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3faeb64
Raise an error when trying to supply a datum when inline datums are
nielstron Mar 2, 2024
bca29b7
Add a test to check the inline datum issue
nielstron Mar 2, 2024
db8ff3d
Allow datum when datum hash was attached to the target utxo
cffls Mar 4, 2024
4cbe340
Fix linter
cffls Mar 4, 2024
536d1bc
Always keep datum_hash in TransactionOutput if the datum isn't inline
cffls Mar 4, 2024
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: 0 additions & 2 deletions pycardano/backend/ogmios.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,6 @@ def _utxos_kupo(self, address: str) -> List[UTxO]:
)
if datum_hash and result.get("datum_type", "inline"):
datum = self._get_datum_from_kupo(result["datum_hash"])
if datum is not None:
datum_hash = None

if not result["value"]["assets"]:
tx_out = TransactionOutput(
Expand Down
9 changes: 9 additions & 0 deletions pycardano/txbuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,15 @@ def add_script_input(
f"Datum hash in transaction output is {utxo.output.datum_hash}, "
f"but actual datum hash from input datum is {datum_hash(datum)}."
)
if (
datum is not None
and utxo.output.datum_hash is None
and utxo.output.datum is not None
):
raise InvalidArgumentException(
f"Inline Datum found in transaction output {utxo.input}, "
"so attaching a Datum to the transaction input manually is not allowed."
)

if datum is not None:
self.datums[datum_hash(datum)] = datum
Expand Down
24 changes: 24 additions & 0 deletions test/pycardano/test_txbuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,30 @@ def test_estimate_execution_unit(chain_context):
assert [plutus_script] == witness.plutus_v1_script


def test_add_script_input_inline_datum_extra(chain_context):
tx_builder = TransactionBuilder(chain_context)
tx_in1 = TransactionInput.from_primitive(
["18cbe6cadecd3f89b60e08e68e5e6c7d72d730aaa1ad21431590f7e6643438ef", 0]
)
tx_in2 = TransactionInput.from_primitive(
["18cbe6cadecd3f89b60e08e68e5e6c7d72d730aaa1ad21431590f7e6643438ef", 1]
)
plutus_script = PlutusV1Script(b"dummy test script")
script_hash = plutus_script_hash(plutus_script)
script_address = Address(script_hash)
datum = PlutusData()
utxo1 = UTxO(tx_in1, TransactionOutput(script_address, 10000000, datum=datum))
redeemer1 = Redeemer(PlutusData(), ExecutionUnits(1000000, 1000000))
pytest.raises(
InvalidArgumentException,
tx_builder.add_script_input,
utxo1,
plutus_script,
datum,
redeemer1,
)


def test_tx_builder_exact_fee_no_change(chain_context):
tx_builder = TransactionBuilder(chain_context)
sender = "addr_test1vrm9x2zsux7va6w892g38tvchnzahvcd9tykqf3ygnmwtaqyfg52x"
Expand Down