From b740a4c642684ac0c10a85e315d6f448475cc0ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Sporny?= <404@rspo.dev> Date: Wed, 13 Aug 2025 14:47:51 +0200 Subject: [PATCH 1/4] feat: merge Radek's fork into repo branch --- e2e-tests/requirements.txt | 1 + e2e-tests/tests/reserve/conftest.py | 28 ++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/e2e-tests/requirements.txt b/e2e-tests/requirements.txt index 711e81b121..f7f9789890 100644 --- a/e2e-tests/requirements.txt +++ b/e2e-tests/requirements.txt @@ -13,3 +13,4 @@ pytest-json-ctrf==0.3.5 numpy==2.2.3 ecdsa==0.19.1 bech32==1.2.0 +cbor2==5.6.5 \ No newline at end of file diff --git a/e2e-tests/tests/reserve/conftest.py b/e2e-tests/tests/reserve/conftest.py index 20a50621d3..472d68f914 100644 --- a/e2e-tests/tests/reserve/conftest.py +++ b/e2e-tests/tests/reserve/conftest.py @@ -5,6 +5,8 @@ from src.partner_chains_node.models import Reserve, VFunction import json import logging +import binascii +import cbor2 def pytest_collection_modifyitems(items): @@ -202,14 +204,32 @@ def _attach_v_function_to_utxo(address, filepath): return _attach_v_function_to_utxo +def unwrap_cbor(data: bytes) -> bytes: + """Decode CBOR until we get raw bytes (Plutus script code).""" + decoded = cbor2.loads(data) + while isinstance(decoded, bytes): + try: + decoded = cbor2.loads(decoded) + except Exception: + break + return decoded + + @fixture(scope="package") def reference_utxo(api: BlockchainApi): def _reference_utxo(v_function_address, cbor): + target_inner = unwrap_cbor(binascii.unhexlify(cbor)) + utxo_dict = api.cardano_cli.get_utxos(v_function_address) - reference_utxo = next( - filter(lambda utxo: utxo_dict[utxo]["referenceScript"]["script"]["cborHex"] == cbor, utxo_dict), None - ) - return reference_utxo + + # Find the UTxO whose reference script matches (after CBOR unwrapping) + for utxo, details in utxo_dict.items(): + ref_cbor_hex = details["referenceScript"]["script"]["cborHex"] + ref_inner = unwrap_cbor(binascii.unhexlify(ref_cbor_hex)) + if ref_inner == target_inner: + return utxo + + return None return _reference_utxo From 4f7a26f3607e9ddb912ee30d59e09caef25f4191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Sporny?= <404@rspo.dev> Date: Thu, 14 Aug 2025 10:04:26 +0200 Subject: [PATCH 2/4] Compare raw plutus script (#957) * tests: compare raw plutus script changed: - ferenece_utxo fixture is now unwrapping cborHex to compare raw plutus script, omitting cbor byte length header, useful in cardano-node 10.4.1 * tests: remove double cborhex wrapping changed: - o need to compare raw plutus bytes in v-function tests, just removed d ouble cbor wrapping * tests: unify reserve related timeouts --- e2e-tests/config/scripts/v-function-1975.script | 2 +- e2e-tests/config/scripts/v-function-2025.script | 2 +- e2e-tests/src/partner_chains_node/smart_contracts.py | 10 +++++----- e2e-tests/tests/reserve/conftest.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/e2e-tests/config/scripts/v-function-1975.script b/e2e-tests/config/scripts/v-function-1975.script index 9c0eb3e6e5..10576c1d3a 100644 --- a/e2e-tests/config/scripts/v-function-1975.script +++ b/e2e-tests/config/scripts/v-function-1975.script @@ -1,5 +1,5 @@ { "type": "PlutusScriptV2", "description": "V-function that allows to release one token each minute since 1975-07-02 21:36 UTC (timestamp 000173568960)", - "cborHex": "59072659072301000033233223222253232335332232353232325333573466e1d20000021323232323232332212330010030023232325333573466e1d2000002132323232323232323232332323233323333323332332332222222222221233333333333300100d00c00b00a00900800700600500400300230013574202460026ae84044c00c8c8c8c94ccd5cd19b87480000084cc8848cc00400c008c070d5d080098029aba135744002260489201035054310035573c0046aae74004dd5000998018009aba100f23232325333573466e1d20000021323232333322221233330010050040030023232325333573466e1d20000021332212330010030023020357420026600803e6ae84d5d100089814a481035054310035573c0046aae74004dd51aba1004300835742006646464a666ae68cdc3a4000004224440062a666ae68cdc3a4004004264244460020086eb8d5d08008a999ab9a3370e9002001099091118010021aba100113029491035054310035573c0046aae74004dd51aba10023300175c6ae84d5d1001111919192999ab9a3370e900100108910008a999ab9a3370e9000001099091180100198029aba10011302a491035054310035573c0046aae74004dd50009aba20013574400226046921035054310035573c0046aae74004dd500098009aba100d30013574201860046004eb4cc00404cd5d080519980200a3ad35742012646464a666ae68cdc3a40000042646466442466002006004646464a666ae68cdc3a40000042664424660020060046600aeb4d5d080098021aba1357440022604c921035054310035573c0046aae74004dd51aba10033232325333573466e1d20000021332212330010030023300575a6ae84004c010d5d09aba2001130264901035054310035573c0046aae74004dd51aba1357440064646464a666ae68cdc3a400000420482a666ae68cdc3a4004004204a2604c921035054310035573c0046aae74004dd5000911919192999ab9a3370e9000001089110010a999ab9a3370e90010010990911180180218029aba100115333573466e1d20040021122200113026491035054310035573c0046aae74004dd500089810a49035054310035573c0046aae74004dd51aba10083300175c6ae8401c8c88c008dd60009813111999aab9f0012028233502730043574200460066ae88008084ccc00c044008d5d0802998008011aba1004300275c40024464460046eac004c09088cccd55cf800901311919a8131991091980080180118031aab9d001300535573c00260086ae8800cd5d080100f98099aba1357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d100089808249035054310035573c0046aae74004dd51aba10073001357426ae8801c8c8c8c94ccd5cd19b87480000084c848888c00c014dd71aba100115333573466e1d20020021321222230010053008357420022a666ae68cdc3a400800426424444600400a600c6ae8400454ccd5cd19b87480180084c848888c010014c014d5d080089808249035054310035573c0046aae74004dd500091919192999ab9a3370e900000109909111111180280418029aba100115333573466e1d20020021321222222230070083005357420022a666ae68cdc3a400800426644244444446600c012010600a6ae84004dd71aba1357440022a666ae68cdc3a400c0042664424444444660040120106eb8d5d08009bae357426ae8800454ccd5cd19b87480200084cc8848888888cc004024020dd71aba1001375a6ae84d5d10008a999ab9a3370e90050010891111110020a999ab9a3370e900600108911111100189807a49035054310035573c0046aae74004dd500091919192999ab9a3370e9000001099091180100198029aba100115333573466e1d2002002132333222122333001005004003375a6ae84008dd69aba1001375a6ae84d5d10009aba20011300e4901035054310035573c0046aae74004dd500091919192999ab9a3370e900000109909118010019bae357420022a666ae68cdc3a400400426424460020066eb8d5d080089806a481035054310035573c0046aae74004dd500091919192999ab9a3370e900000109991091980080180118029aba1001375a6ae84d5d1000898062481035054310035573c0046aae74004dd500091919192999ab9a3370e900000109bae3574200226016921035054310035573c0046aae74004dd500089803a49035054310035573c0046aae74004dd5003111999a8009002919199ab9a337126602044a66a002290001109a801112999ab9a3371e004010260260022600c006600244444444444401066e0ccdc09a9a980091111111111100291001112999a80110a99a80108008b0b0b002a4181520e00e00ca006400a400a6eb401c48800848800440084c00524010350543500232633573800200424002600644a66a002290001109a8011119b800013006003122002122122330010040032323001001223300330020020014c01051a677485800001" + "cborHex": "59072301000033233223222253232335332232353232325333573466e1d20000021323232323232332212330010030023232325333573466e1d2000002132323232323232323232332323233323333323332332332222222222221233333333333300100d00c00b00a00900800700600500400300230013574202460026ae84044c00c8c8c8c94ccd5cd19b87480000084cc8848cc00400c008c070d5d080098029aba135744002260489201035054310035573c0046aae74004dd5000998018009aba100f23232325333573466e1d20000021323232333322221233330010050040030023232325333573466e1d20000021332212330010030023020357420026600803e6ae84d5d100089814a481035054310035573c0046aae74004dd51aba1004300835742006646464a666ae68cdc3a4000004224440062a666ae68cdc3a4004004264244460020086eb8d5d08008a999ab9a3370e9002001099091118010021aba100113029491035054310035573c0046aae74004dd51aba10023300175c6ae84d5d1001111919192999ab9a3370e900100108910008a999ab9a3370e9000001099091180100198029aba10011302a491035054310035573c0046aae74004dd50009aba20013574400226046921035054310035573c0046aae74004dd500098009aba100d30013574201860046004eb4cc00404cd5d080519980200a3ad35742012646464a666ae68cdc3a40000042646466442466002006004646464a666ae68cdc3a40000042664424660020060046600aeb4d5d080098021aba1357440022604c921035054310035573c0046aae74004dd51aba10033232325333573466e1d20000021332212330010030023300575a6ae84004c010d5d09aba2001130264901035054310035573c0046aae74004dd51aba1357440064646464a666ae68cdc3a400000420482a666ae68cdc3a4004004204a2604c921035054310035573c0046aae74004dd5000911919192999ab9a3370e9000001089110010a999ab9a3370e90010010990911180180218029aba100115333573466e1d20040021122200113026491035054310035573c0046aae74004dd500089810a49035054310035573c0046aae74004dd51aba10083300175c6ae8401c8c88c008dd60009813111999aab9f0012028233502730043574200460066ae88008084ccc00c044008d5d0802998008011aba1004300275c40024464460046eac004c09088cccd55cf800901311919a8131991091980080180118031aab9d001300535573c00260086ae8800cd5d080100f98099aba1357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d100089808249035054310035573c0046aae74004dd51aba10073001357426ae8801c8c8c8c94ccd5cd19b87480000084c848888c00c014dd71aba100115333573466e1d20020021321222230010053008357420022a666ae68cdc3a400800426424444600400a600c6ae8400454ccd5cd19b87480180084c848888c010014c014d5d080089808249035054310035573c0046aae74004dd500091919192999ab9a3370e900000109909111111180280418029aba100115333573466e1d20020021321222222230070083005357420022a666ae68cdc3a400800426644244444446600c012010600a6ae84004dd71aba1357440022a666ae68cdc3a400c0042664424444444660040120106eb8d5d08009bae357426ae8800454ccd5cd19b87480200084cc8848888888cc004024020dd71aba1001375a6ae84d5d10008a999ab9a3370e90050010891111110020a999ab9a3370e900600108911111100189807a49035054310035573c0046aae74004dd500091919192999ab9a3370e9000001099091180100198029aba100115333573466e1d2002002132333222122333001005004003375a6ae84008dd69aba1001375a6ae84d5d10009aba20011300e4901035054310035573c0046aae74004dd500091919192999ab9a3370e900000109909118010019bae357420022a666ae68cdc3a400400426424460020066eb8d5d080089806a481035054310035573c0046aae74004dd500091919192999ab9a3370e900000109991091980080180118029aba1001375a6ae84d5d1000898062481035054310035573c0046aae74004dd500091919192999ab9a3370e900000109bae3574200226016921035054310035573c0046aae74004dd500089803a49035054310035573c0046aae74004dd5003111999a8009002919199ab9a337126602044a66a002290001109a801112999ab9a3371e004010260260022600c006600244444444444401066e0ccdc09a9a980091111111111100291001112999a80110a99a80108008b0b0b002a4181520e00e00ca006400a400a6eb401c48800848800440084c00524010350543500232633573800200424002600644a66a002290001109a8011119b800013006003122002122122330010040032323001001223300330020020014c01051a677485800001" } diff --git a/e2e-tests/config/scripts/v-function-2025.script b/e2e-tests/config/scripts/v-function-2025.script index 0c58942b91..9699cb44ca 100644 --- a/e2e-tests/config/scripts/v-function-2025.script +++ b/e2e-tests/config/scripts/v-function-2025.script @@ -1,5 +1,5 @@ { "type": "PlutusScriptV2", "description": "V-function that allows to release one token each minute since 2025-02-07 10:46 UTC (timestamp 1738925213000)", - "cborHex": "59072a59072701000033233223222253232335332232353232325333573466e1d20000021323232323232332212330010030023232325333573466e1d2000002132323232323232323232332323233323333323332332332222222222221233333333333300100d00c00b00a00900800700600500400300230013574202460026ae84044c00c8c8c8c94ccd5cd19b87480000084cc8848cc00400c008c070d5d080098029aba135744002260489201035054310035573c0046aae74004dd5000998018009aba100f23232325333573466e1d20000021323232333322221233330010050040030023232325333573466e1d20000021332212330010030023020357420026600803e6ae84d5d100089814a481035054310035573c0046aae74004dd51aba1004300835742006646464a666ae68cdc3a4000004224440062a666ae68cdc3a4004004264244460020086eb8d5d08008a999ab9a3370e9002001099091118010021aba100113029491035054310035573c0046aae74004dd51aba10023300175c6ae84d5d1001111919192999ab9a3370e900100108910008a999ab9a3370e9000001099091180100198029aba10011302a491035054310035573c0046aae74004dd50009aba20013574400226046921035054310035573c0046aae74004dd500098009aba100d30013574201860046004eb4cc00404cd5d080519980200a3ad35742012646464a666ae68cdc3a40000042646466442466002006004646464a666ae68cdc3a40000042664424660020060046600aeb4d5d080098021aba1357440022604c921035054310035573c0046aae74004dd51aba10033232325333573466e1d20000021332212330010030023300575a6ae84004c010d5d09aba2001130264901035054310035573c0046aae74004dd51aba1357440064646464a666ae68cdc3a400000420482a666ae68cdc3a4004004204a2604c921035054310035573c0046aae74004dd5000911919192999ab9a3370e9000001089110010a999ab9a3370e90010010990911180180218029aba100115333573466e1d20040021122200113026491035054310035573c0046aae74004dd500089810a49035054310035573c0046aae74004dd51aba10083300175c6ae8401c8c88c008dd60009813111999aab9f0012028233502730043574200460066ae88008084ccc00c044008d5d0802998008011aba1004300275c40024464460046eac004c09088cccd55cf800901311919a8131991091980080180118031aab9d001300535573c00260086ae8800cd5d080100f98099aba1357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d100089808249035054310035573c0046aae74004dd51aba10073001357426ae8801c8c8c8c94ccd5cd19b87480000084c848888c00c014dd71aba100115333573466e1d20020021321222230010053008357420022a666ae68cdc3a400800426424444600400a600c6ae8400454ccd5cd19b87480180084c848888c010014c014d5d080089808249035054310035573c0046aae74004dd500091919192999ab9a3370e900000109909111111180280418029aba100115333573466e1d20020021321222222230070083005357420022a666ae68cdc3a400800426644244444446600c012010600a6ae84004dd71aba1357440022a666ae68cdc3a400c0042664424444444660040120106eb8d5d08009bae357426ae8800454ccd5cd19b87480200084cc8848888888cc004024020dd71aba1001375a6ae84d5d10008a999ab9a3370e90050010891111110020a999ab9a3370e900600108911111100189807a49035054310035573c0046aae74004dd500091919192999ab9a3370e9000001099091180100198029aba100115333573466e1d2002002132333222122333001005004003375a6ae84008dd69aba1001375a6ae84d5d10009aba20011300e4901035054310035573c0046aae74004dd500091919192999ab9a3370e900000109909118010019bae357420022a666ae68cdc3a400400426424460020066eb8d5d080089806a481035054310035573c0046aae74004dd500091919192999ab9a3370e900000109991091980080180118029aba1001375a6ae84d5d1000898062481035054310035573c0046aae74004dd500091919192999ab9a3370e900000109bae3574200226016921035054310035573c0046aae74004dd500089803a49035054310035573c0046aae74004dd5003111999a8009002919199ab9a337126602044a66a002290001109a801112999ab9a3371e004010260260022600c006600244444444444401066e0ccdc09a9a980091111111111100291001112999a80110a99a80108008b0b0b002a4181520e00e00ca006400a400a6eb401c48800848800440084c00524010350543500232633573800200424002600644a66a002290001109a8011119b800013006003122002122122330010040032323001001223300330020020014c01091b00000194e00505480001" + "cborHex": "59072701000033233223222253232335332232353232325333573466e1d20000021323232323232332212330010030023232325333573466e1d2000002132323232323232323232332323233323333323332332332222222222221233333333333300100d00c00b00a00900800700600500400300230013574202460026ae84044c00c8c8c8c94ccd5cd19b87480000084cc8848cc00400c008c070d5d080098029aba135744002260489201035054310035573c0046aae74004dd5000998018009aba100f23232325333573466e1d20000021323232333322221233330010050040030023232325333573466e1d20000021332212330010030023020357420026600803e6ae84d5d100089814a481035054310035573c0046aae74004dd51aba1004300835742006646464a666ae68cdc3a4000004224440062a666ae68cdc3a4004004264244460020086eb8d5d08008a999ab9a3370e9002001099091118010021aba100113029491035054310035573c0046aae74004dd51aba10023300175c6ae84d5d1001111919192999ab9a3370e900100108910008a999ab9a3370e9000001099091180100198029aba10011302a491035054310035573c0046aae74004dd50009aba20013574400226046921035054310035573c0046aae74004dd500098009aba100d30013574201860046004eb4cc00404cd5d080519980200a3ad35742012646464a666ae68cdc3a40000042646466442466002006004646464a666ae68cdc3a40000042664424660020060046600aeb4d5d080098021aba1357440022604c921035054310035573c0046aae74004dd51aba10033232325333573466e1d20000021332212330010030023300575a6ae84004c010d5d09aba2001130264901035054310035573c0046aae74004dd51aba1357440064646464a666ae68cdc3a400000420482a666ae68cdc3a4004004204a2604c921035054310035573c0046aae74004dd5000911919192999ab9a3370e9000001089110010a999ab9a3370e90010010990911180180218029aba100115333573466e1d20040021122200113026491035054310035573c0046aae74004dd500089810a49035054310035573c0046aae74004dd51aba10083300175c6ae8401c8c88c008dd60009813111999aab9f0012028233502730043574200460066ae88008084ccc00c044008d5d0802998008011aba1004300275c40024464460046eac004c09088cccd55cf800901311919a8131991091980080180118031aab9d001300535573c00260086ae8800cd5d080100f98099aba1357440026ae88004d5d10009aba2001357440026ae88004d5d10009aba2001357440026ae88004d5d100089808249035054310035573c0046aae74004dd51aba10073001357426ae8801c8c8c8c94ccd5cd19b87480000084c848888c00c014dd71aba100115333573466e1d20020021321222230010053008357420022a666ae68cdc3a400800426424444600400a600c6ae8400454ccd5cd19b87480180084c848888c010014c014d5d080089808249035054310035573c0046aae74004dd500091919192999ab9a3370e900000109909111111180280418029aba100115333573466e1d20020021321222222230070083005357420022a666ae68cdc3a400800426644244444446600c012010600a6ae84004dd71aba1357440022a666ae68cdc3a400c0042664424444444660040120106eb8d5d08009bae357426ae8800454ccd5cd19b87480200084cc8848888888cc004024020dd71aba1001375a6ae84d5d10008a999ab9a3370e90050010891111110020a999ab9a3370e900600108911111100189807a49035054310035573c0046aae74004dd500091919192999ab9a3370e9000001099091180100198029aba100115333573466e1d2002002132333222122333001005004003375a6ae84008dd69aba1001375a6ae84d5d10009aba20011300e4901035054310035573c0046aae74004dd500091919192999ab9a3370e900000109909118010019bae357420022a666ae68cdc3a400400426424460020066eb8d5d080089806a481035054310035573c0046aae74004dd500091919192999ab9a3370e900000109991091980080180118029aba1001375a6ae84d5d1000898062481035054310035573c0046aae74004dd500091919192999ab9a3370e900000109bae3574200226016921035054310035573c0046aae74004dd500089803a49035054310035573c0046aae74004dd5003111999a8009002919199ab9a337126602044a66a002290001109a801112999ab9a3371e004010260260022600c006600244444444444401066e0ccdc09a9a980091111111111100291001112999a80110a99a80108008b0b0b002a4181520e00e00ca006400a400a6eb401c48800848800440084c00524010350543500232633573800200424002600644a66a002290001109a8011119b800013006003122002122122330010040032323001001223300330020020014c01091b00000194e00505480001" } diff --git a/e2e-tests/src/partner_chains_node/smart_contracts.py b/e2e-tests/src/partner_chains_node/smart_contracts.py index d1408c9d25..5651df8fb9 100644 --- a/e2e-tests/src/partner_chains_node/smart_contracts.py +++ b/e2e-tests/src/partner_chains_node/smart_contracts.py @@ -190,7 +190,7 @@ def init(self, genesis_utxo: str, payment_key): f"--genesis-utxo {genesis_utxo} " f"--ogmios-url {self.config.stack_config.ogmios_url}" ) - response = self.run_command.exec(cmd) + response = self.run_command.exec(cmd, timeout=self.config.timeouts.main_chain_tx) parsed_response = parse_json_response(response) return handle_governance_signature(parsed_response, self.parent) @@ -217,7 +217,7 @@ def release(self, genesis_utxo: str, reference_utxo, amount, payment_key): f"--genesis-utxo {genesis_utxo} " f"--ogmios-url {self.config.stack_config.ogmios_url}" ) - response = self.run_command.exec(cmd) + response = self.run_command.exec(cmd, timeout=self.config.timeouts.main_chain_tx) return parse_json_response(response) def deposit(self, genesis_utxo: str, amount, payment_key): @@ -228,7 +228,7 @@ def deposit(self, genesis_utxo: str, amount, payment_key): f"--genesis-utxo {genesis_utxo} " f"--ogmios-url {self.config.stack_config.ogmios_url}" ) - response = self.run_command.exec(cmd) + response = self.run_command.exec(cmd, timeout=self.config.timeouts.main_chain_tx) parsed_response = parse_json_response(response) return handle_governance_signature(parsed_response, self.parent) @@ -240,7 +240,7 @@ def update_settings(self, genesis_utxo: str, v_function_hash, payment_key): f"--genesis-utxo {genesis_utxo} " f"--ogmios-url {self.config.stack_config.ogmios_url}" ) - response = self.run_command.exec(cmd) + response = self.run_command.exec(cmd, timeout=self.config.timeouts.main_chain_tx) parsed_response = parse_json_response(response) return handle_governance_signature(parsed_response, self.parent) @@ -251,7 +251,7 @@ def handover(self, genesis_utxo: str, payment_key): f"--genesis-utxo {genesis_utxo} " f"--ogmios-url {self.config.stack_config.ogmios_url}" ) - response = self.run_command.exec(cmd) + response = self.run_command.exec(cmd, timeout=self.config.timeouts.main_chain_tx) parsed_response = parse_json_response(response) return handle_governance_signature(parsed_response, self.parent) diff --git a/e2e-tests/tests/reserve/conftest.py b/e2e-tests/tests/reserve/conftest.py index 472d68f914..e2fa2ddaab 100644 --- a/e2e-tests/tests/reserve/conftest.py +++ b/e2e-tests/tests/reserve/conftest.py @@ -28,7 +28,7 @@ def governance_address(config: ApiConfig) -> str: @fixture(scope="session") -def payment_key(config: ApiConfig, governance_skey_with_cli): +def payment_key(config: ApiConfig, cardano_payment_key, governance_skey_with_cli): return config.nodes_config.governance_authority.mainchain_key From 5024949c1b6b3f273a29ea13b7bcc6a679e98c55 Mon Sep 17 00:00:00 2001 From: Skylar Simoncelli <128400943+skylar-simoncelli@users.noreply.github.com> Date: Wed, 20 Aug 2025 15:06:21 +0200 Subject: [PATCH 3/4] fix: try downgrading ogmios --- dev/local-environment/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/local-environment/setup.sh b/dev/local-environment/setup.sh index 16ea393a44..d2ba748e94 100755 --- a/dev/local-environment/setup.sh +++ b/dev/local-environment/setup.sh @@ -3,7 +3,7 @@ PARTNER_CHAINS_NODE_IMAGE="ghcr.io/input-output-hk/partner-chains/partner-chains-node-unstable:latest" CARDANO_IMAGE="ghcr.io/intersectmbo/cardano-node:10.4.1" DBSYNC_IMAGE="ghcr.io/intersectmbo/cardano-db-sync:13.6.0.4" -OGMIOS_IMAGE="cardanosolutions/ogmios:v6.12.0" +OGMIOS_IMAGE="cardanosolutions/ogmios:v6.11.0" POSTGRES_IMAGE="postgres:latest" TESTS_IMAGE="python:3.12-slim" From a318aff0f61ed3fa041b61aeba296c7d0348f550 Mon Sep 17 00:00:00 2001 From: skylar-simoncelli Date: Wed, 20 Aug 2025 16:15:15 +0200 Subject: [PATCH 4/4] fix: wait until epoch 3 for wizards and reserve --- .github/actions/tests/local-environment-tests/action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/tests/local-environment-tests/action.yml b/.github/actions/tests/local-environment-tests/action.yml index 83484b394f..a5dd6c39e4 100644 --- a/.github/actions/tests/local-environment-tests/action.yml +++ b/.github/actions/tests/local-environment-tests/action.yml @@ -121,7 +121,7 @@ runs: shell: bash - name: Run Epoch 2 Tests - if: ${{ inputs.markers != 'full' && inputs.markers != 'ariadne' && inputs.markers != 'delegator_rewards' }} + if: ${{ inputs.markers != 'full' && inputs.markers != 'ariadne' && inputs.markers != 'delegator_rewards' && inputs.markers != 'wizards' && inputs.markers != 'reserve' }} uses: ./.github/actions/tests/run-e2e-tests with: env: ${{ env.TEST_ENVIRONMENT }} @@ -131,7 +131,7 @@ runs: local-environment: "true" - name: Wait for Epoch 3 - if: ${{ inputs.markers == 'full' || inputs.markers == 'ariadne' || inputs.markers == 'delegator_rewards' }} + if: ${{ inputs.markers == 'full' || inputs.markers == 'ariadne' || inputs.markers == 'delegator_rewards' || inputs.markers == 'wizards' || inputs.markers == 'reserve' }} uses: ./.github/actions/tests/wait-for-epoch with: epoch: 3 @@ -140,7 +140,7 @@ runs: environment: - name: Run Epoch 3 Tests - if: ${{ inputs.markers == 'full' || inputs.markers == 'ariadne' || inputs.markers == 'delegator_rewards' }} + if: ${{ inputs.markers == 'full' || inputs.markers == 'ariadne' || inputs.markers == 'delegator_rewards' || inputs.markers == 'wizards' || inputs.markers == 'reserve' }} uses: ./.github/actions/tests/run-e2e-tests with: env: ${{ env.TEST_ENVIRONMENT }}