Skip to content
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.

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

Chang support #371

Merged
merged 48 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from 42 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
7840715
Chang initial commit
cffls Jul 27, 2024
213899f
Fix docker compose
cffls Aug 4, 2024
3e3c591
Minor fixes
cffls Aug 11, 2024
157f23e
Add 60s of delay to startTime of genesis
cffls Aug 12, 2024
f6a89c5
Add an OgmiosV6 backend based on ogmios-python
nielstron Aug 21, 2024
0e285e5
Fix ogmios test
nielstron Aug 21, 2024
9449621
Fixes
nielstron Aug 27, 2024
ed52278
Re-add 3.8/3.9
nielstron Aug 27, 2024
b7d8b09
Bump ogmios requirement
nielstron Aug 27, 2024
3a3df8c
Fix mypy errors
nielstron Aug 27, 2024
85a5717
Merge branch 'feat/add_v6_backend' into chang
cffls Aug 29, 2024
f2abd83
Merge remote-tracking branch 'upstream/feat/add_v6_backend' into chang
cffls Aug 29, 2024
6e8f795
Fix python ogmios
cffls Aug 29, 2024
19e6177
Bump default major version to 9
cffls Aug 30, 2024
965dc64
Working plutus v3
cffls Aug 31, 2024
81c4602
Restore test retries
cffls Aug 31, 2024
6b757d8
Remove prints
cffls Aug 31, 2024
9bd906b
Remove more prints
cffls Aug 31, 2024
05a40f2
Format code
cffls Aug 31, 2024
0288645
Fix mypy
cffls Aug 31, 2024
1da49b6
Add tests
cffls Sep 1, 2024
92689b8
Add kupo back to integration test
cffls Sep 1, 2024
5b6bf37
Fix qa
cffls Sep 1, 2024
53264e7
Merge remote-tracking branch 'origin/main' into feat/add_v6_backend
nielstron Sep 2, 2024
5a3c080
Bump ogmios version
nielstron Sep 2, 2024
091673f
Add docker-compose to workflow
nielstron Sep 2, 2024
a8f5ce0
Fix docker-compose version
nielstron Sep 2, 2024
b829608
Use v6 chain context from pycardano itself
nielstron Sep 2, 2024
b0eb69c
Fix
nielstron Sep 2, 2024
19e099e
Merge remote-tracking branch 'upstream/feat/add_v6_backend' into chang
cffls Sep 2, 2024
94be3e3
Add PlutusV3 in a few places
nielstron Sep 2, 2024
37d71e3
Combine coverages
nielstron Sep 2, 2024
7243cd9
Support redeemer map
cffls Sep 3, 2024
fb57ed4
Automatically reduce 0 and empty multiassets (#372)
nielstron Sep 7, 2024
11dc71f
Using log.warning
cffls Sep 8, 2024
66218b1
Restore OgmiosChainBackend and fix docs
cffls Sep 8, 2024
080737d
Format
cffls Sep 8, 2024
05b150d
Blockfrost for chang
cffls Sep 8, 2024
527fb6b
Fix max tx fee
cffls Sep 17, 2024
295a987
Update upload-artifact to v4
cffls Sep 17, 2024
348c5a6
Refactor Redeemer handling in TransactionWitnessSet
bhatt-deep Sep 11, 2024
7727c72
Add tests for TransactionBuilder redeemer handling
bhatt-deep Sep 18, 2024
733f52f
Added unit test
xxAVOGADROxx Sep 21, 2024
388ab97
Run workflow for PRs to chang
nielstron Sep 21, 2024
fcda104
Allow users to configure the serialization format for redeemers
cffls Sep 21, 2024
043578d
Format
cffls Sep 21, 2024
46c453d
Set vkey witnesses to None when empty (#377)
theeldermillenial Sep 22, 2024
ba73b10
Fixed transaction imbalance when burning assets from the same policy …
xxAVOGADROxx Sep 22, 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
18 changes: 15 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
python-version: [3.8, 3.9, '3.10', '3.11']
python-version: ['3.8', '3.9', '3.10', '3.11']

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -59,18 +59,30 @@ jobs:
python-version: ${{ matrix.python-version }}
cache: 'poetry'

- name: Setup docker-compose
uses: KengoTODA/[email protected]
with:
version: '2.14.2'

- name: Run integration tests
run: |
cd integration-test && ./run_tests.sh

- name: "Upload coverage to Codecov"
if: ${{ matrix.python-version == '3.11' }}
uses: codecov/codecov-action@v4
with:
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}

- name: Dump docker logs
if: failure()
run: |
cd integration-test && docker-compose logs --no-color > integration-test.log
cd integration-test && docker compose logs --no-color > integration-test.log

- name: Upload integration-test.log
if: failure()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: integration-test.log
path: integration-test/integration-test.log
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
cov_html
docs/build
dist
.mypy_cache
coverage.xml

# IDE
.idea
Expand Down
52 changes: 32 additions & 20 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,35 +1,39 @@
alabaster==0.7.13 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
annotated-types==0.7.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
asn1crypto==1.5.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
attrs==23.2.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
babel==2.15.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
black==24.4.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
attrs==24.2.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
babel==2.16.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
black==24.8.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
blinker==1.8.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
blockfrost-python==0.5.3 ; python_full_version >= "3.8.1" and python_version < "4"
cachetools==5.3.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
cbor2==5.6.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
certifi==2024.2.2 ; python_full_version >= "3.8.1" and python_version < "4"
cachetools==5.5.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
cardano-tools==2.1.0 ; python_full_version >= "3.8.1" and python_version < "4.0"
cbor2==5.6.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
certifi==2024.8.30 ; python_full_version >= "3.8.1" and python_version < "4"
certvalidator==0.11.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
cffi==1.16.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
cffi==1.17.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
charset-normalizer==3.3.2 ; python_full_version >= "3.8.1" and python_version < "4"
click==8.1.7 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
colorama==0.4.6 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" and (sys_platform == "win32" or platform_system == "Windows")
coloredlogs==15.0.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
cose==0.9.dev8 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
coverage[toml]==7.5.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
cryptography==42.0.7 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
coverage[toml]==7.6.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
cryptography==43.0.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
decorator==5.1.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
docker==7.1.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
docutils==0.19 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
ecdsa==0.19.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
ecpy==1.2.5 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
exceptiongroup==1.2.1 ; python_full_version >= "3.8.1" and python_version < "3.11"
exceptiongroup==1.2.2 ; python_full_version >= "3.8.1" and python_version < "3.11"
execnet==2.1.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
flake8==7.0.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
flake8==7.1.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
flask==2.3.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
frozendict==2.4.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
frozenlist==1.4.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
idna==3.7 ; python_full_version >= "3.8.1" and python_version < "4"
humanfriendly==10.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
idna==3.8 ; python_full_version >= "3.8.1" and python_version < "4"
imagesize==1.4.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
importlib-metadata==7.1.0 ; python_full_version >= "3.8.1" and python_version < "3.10"
importlib-metadata==8.4.0 ; python_full_version >= "3.8.1" and python_version < "3.10"
iniconfig==2.0.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
isort==5.13.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
itsdangerous==2.2.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
Expand All @@ -39,21 +43,28 @@ mccabe==0.7.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
mnemonic==0.21 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
mypy-extensions==1.0.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
mypy==1.4.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
ogmios @ git+https://gitlab.com/viperscience/ogmios-python.git@0b713e78839341d92828340a5552ef8dd1c6224b ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
orjson==3.10.7 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
oscrypto==1.3.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
packaging==24.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
packaging==24.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pathspec==0.12.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pexpect==4.9.0 ; python_full_version >= "3.8.1" and python_version < "4.0"
platformdirs==4.2.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pluggy==1.5.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pprintpp==0.4.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
ptyprocess==0.7.0 ; python_full_version >= "3.8.1" and python_version < "4.0"
py==1.11.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pycodestyle==2.11.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pycodestyle==2.12.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pycparser==2.22 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pydantic-core==2.20.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pydantic==2.8.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pyflakes==3.2.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pygments==2.18.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pynacl==1.5.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pyreadline3==3.4.1 ; sys_platform == "win32" and python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pytest-cov==5.0.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pytest-xdist==3.6.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pytest==8.2.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pytest==8.3.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
pytz==2024.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
pywin32==306 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" and sys_platform == "win32"
requests==2.32.3 ; python_full_version >= "3.8.1" and python_version < "4"
Expand All @@ -74,8 +85,9 @@ sphinxcontrib-serializinghtml==1.1.5 ; python_full_version >= "3.8.1" and python
tomli==2.0.1 ; python_full_version >= "3.8.1" and python_full_version <= "3.11.0a6"
typeguard==4.3.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
types-requests==2.31.0.10 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
typing-extensions==4.12.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
urllib3==2.2.1 ; python_full_version >= "3.8.1" and python_version < "4"
typing-extensions==4.12.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
urllib3==2.2.2 ; python_full_version >= "3.8.1" and python_version < "4"
websocket-client==1.8.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
werkzeug==3.0.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
zipp==3.19.1 ; python_full_version >= "3.8.1" and python_version < "3.10"
websockets==13.0.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
werkzeug==3.0.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
zipp==3.20.1 ; python_full_version >= "3.8.1" and python_version < "3.10"
7 changes: 6 additions & 1 deletion docs/source/api/pycardano.backend.base.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ Backend
:undoc-members:
:show-inheritance:

.. automodule:: pycardano.backend.ogmios
.. automodule:: pycardano.backend.ogmios_v6
:members:
:undoc-members:
:show-inheritance:

.. automodule:: pycardano.backend.ogmios_v5
:members:
:undoc-members:
:show-inheritance:
4 changes: 2 additions & 2 deletions integration-test/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ NETWORK=$1

echo "Bootstrapping network: $NETWORK"

if [ "$NETWORK" = "local-alonzo" ] || [ "$NETWORK" = "local-vasil" ]; then
if [ "$NETWORK" = "local-alonzo" ] || [ "$NETWORK" = "local-vasil" ] || [ "$NETWORK" = "local-chang" ]; then
echo "Updating byron startTime to present in local mode, $NETWORK era"
jq -M ".startTime = ""$(date +%s)" configs/"$NETWORK"/byron-genesis.json > \
jq -M ".startTime = ($(date +%s) + 60)" configs/"$NETWORK"/byron-genesis.json > \
tmp_configs/"$NETWORK"/byron-genesis.json
fi

Expand Down
Loading
Loading