Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions .github/actions/nix-cachix-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,21 @@ runs:
using: composite

steps:
- name: 🧹 Free disk space
if: runner.os == 'Linux'
shell: bash
run: |
echo "Disk space before cleanup:"
df -h /
# Remove unnecessary tools to free up disk space
sudo rm -rf /usr/share/dotnet
sudo rm -rf /usr/local/lib/android
sudo rm -rf /opt/ghc
sudo rm -rf /opt/hostedtoolcache/CodeQL
sudo docker image prune --all --force || true
echo "Disk space after cleanup:"
df -h /

- name: ❄ Prepare nix
uses: cachix/install-nix-action@v30
with:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/ci-nix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ on:
branches:
- master
- release
- v1.2.0-base
pull_request:
branches:
- master
- v1.2.0-base
schedule:
# Everyday at 4:00 AM
- cron: "0 4 * * *"
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ concurrency:

on:
push:
branches: [ "master" ]
branches: [ "master", "v1.2.0-base" ]
tags: [ "*.*.*" ]
pull_request:
branches: [ "master", "v1.2.0-base" ]
workflow_dispatch:
inputs:
ref_name:
Expand Down Expand Up @@ -73,6 +75,12 @@ jobs:
# And the version as the git commit.
VERSION=${{github.sha}}

# For PRs, tag as pr-<number>
if [[ "${{github.event_name}}" == "pull_request" ]]; then
IMAGE_LABEL=pr-${{github.event.pull_request.number}}
VERSION=${{github.event.pull_request.head.sha}}
fi

# Determine whether we are building a tag and if yes, set the label
# name to be the tag name, and the version to be the tag.
BUILDING_TAG=${{github.ref_type == 'tag'}}
Expand Down
1 change: 1 addition & 0 deletions hydra-node/hydra-node.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ common project-config
OverloadedStrings
PartialTypeSignatures
PatternSynonyms
StrictData
TypeFamilies
ViewPatterns

Expand Down
2 changes: 1 addition & 1 deletion hydra-node/src/Hydra/Chain.hs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import Test.QuickCheck.Instances.Time ()

-- | Hardcoded limit for commit tx on mainnet
maxMainnetLovelace :: Coin
maxMainnetLovelace = Coin 100_000_000
maxMainnetLovelace = Coin 1_000_000_000

-- | Hardcoded limit for maximum number of parties in a head protocol The value
-- is obtained from calculating the costs of running the scripts and on-chan
Expand Down
2 changes: 2 additions & 0 deletions hydra-node/src/Hydra/HeadLogic.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1678,13 +1678,15 @@ aggregate st = \case
, localTxs = mempty
, allTxs = mempty
, seenSnapshot = NoSeenSnapshot
, currentDepositTxId = Nothing
}
ConfirmedSnapshot{snapshot = Snapshot{utxo}} ->
coordinatedHeadState
{ localUTxO = utxo
, localTxs = mempty
, allTxs = mempty
, seenSnapshot = LastSeenSnapshot snapshotNumber
, currentDepositTxId = Nothing
}
}
_otherState -> st
Expand Down
Loading