Skip to content

Commit

Permalink
Update org/repository links (#1493)
Browse files Browse the repository at this point in the history
Kept some of the old docker image references on input-output-hk as these
docker images don't exist in the new org.
  • Loading branch information
ch1bo committed Jul 11, 2024
1 parent 91b9836 commit 3e7bd6b
Show file tree
Hide file tree
Showing 70 changed files with 245 additions and 245 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
blank_issues_enabled: true
contact_links:
- name: Contributing guidelines
url: https://github.com/input-output-hk/hydra/blob/master/CONTRIBUTING.md
url: https://github.com/cardano-scaling/hydra/blob/master/CONTRIBUTING.md
about: Some rules & processes we honor.

- name: Feature ideas
url: https://github.com/input-output-hk/hydra/discussions/categories/ideas
url: https://github.com/cardano-scaling/hydra/discussions/categories/ideas
about: Maybe someone else had the same or a similar idea already?

- name: All issues
url: https://github.com/input-output-hk/hydra/issues
url: https://github.com/cardano-scaling/hydra/issues
about: Check whether your issue is not already covered here.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_idea.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ body:
value: |
**Thank you for contributing to our project!** :green_heart:
Instead of opening this issue, consider [starting a new idea discussion](https://github.com/input-output-hk/hydra/discussions/new?category=ideas).
Instead of opening this issue, consider [starting a new idea discussion](https://github.com/cardano-scaling/hydra/discussions/new?category=ideas).
That way, we can discuss & refine your idea together, before we adopt it as a feature into the roadmap.
- type: textarea
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ sudo chown "$(whoami)" /srv/var/cardano

# Add the server as a github runner

In the project settings, go to Actions/Runners and click on [New self-hosted runner](https://github.com/input-output-hk/hydra/settings/actions/runners/new) and follow the procedure.
In the project settings, go to Actions/Runners and click on [New self-hosted runner](https://github.com/cardano-scaling/hydra/settings/actions/runners/new) and follow the procedure.

:warning: When asked, add the following label to this runner: `cardano`

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
VERSION_NAME=${{github.ref_name}}
# Use 'FROM' instruction to use docker build with --label
echo "FROM ${{matrix.target}}" | docker build \
--label org.opencontainers.image.source=https://github.com/input-output-hk/hydra \
--label org.opencontainers.image.source=https://github.com/cardano-scaling/hydra \
--label org.opencontainers.image.licenses=Apache-2.0 \
--label org.opencontainers.image.created=$(date -Is) \
--label org.opencontainers.image.revision=${{github.sha}} \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/explorer/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
restart: always

hydra-explorer:
image: ghcr.io/input-output-hk/hydra-explorer:0.17.0
image: ghcr.io/cardano-scaling/hydra-explorer:0.17.0
volumes:
- /srv/var/cardano/state-preview:/data
ports:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: 📥 Checkout repository
uses: actions/checkout@v4
with:
repository: input-output-hk/hydra
repository: cardano-scaling/hydra
ref: release
# Also ensure we have all history with all tags
fetch-depth: 0
Expand Down
214 changes: 107 additions & 107 deletions CHANGELOG.md

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ The documentation is also available in multiple languages and we can easily add

### Bug reports

[Submit an issue](https://github.com/input-output-hk/hydra/issues/new/choose)
[Submit an issue](https://github.com/cardano-scaling/hydra/issues/new/choose)
using the "Bug report :bug:" template. It's very important that you fill the
template as thoroughly as possible.

Expand All @@ -40,9 +40,9 @@ Feature ideas are precursors to high-level features items, which will be
discussed and fleshed out to ideally become items on our feature roadmap.

We use the [Ideas discussions
category](https://github.com/input-output-hk/hydra/discussions/categories/ideas)
category](https://github.com/cardano-scaling/hydra/discussions/categories/ideas)
to discuss and vote on feature ideas, but you can also [submit an
issue](https://github.com/input-output-hk/hydra/issues/new/choose) using the
issue](https://github.com/cardano-scaling/hydra/issues/new/choose) using the
"Feature idea :thought_balloon:" template and we convert that to a discussion.

We expect a description of
Expand Down Expand Up @@ -118,7 +118,7 @@ before we merge any contributions.
### Coding standards

Make sure to follow our [Coding
Standards](https://github.com/input-output-hk/hydra/wiki/Coding-Standards).
Standards](https://github.com/cardano-scaling/hydra/wiki/Coding-Standards).
It includes guidelines on Haskell code style, but also on Git commit messages
and some processes (TODO: clarify separation or unify with these guidelines). To
propose new standards or changes to the existing standards, file an issue.
Expand Down Expand Up @@ -188,7 +188,7 @@ During development
+ Make sure `CHANGELOG.md` is kept up-to-date with high-level, technical, but user-focused list of changes according to [keepachangelog](https://keepachangelog.com/en/1.0.0/)
+ Bump `UNRELEASED` version in `CHANGELOG.md` according to [semver](https://semver.org/)
+ Ensure `unstable` version of docker images is used in demo
- `sed -i.bak -e "s,\(ghcr.io/input-output-hk/hydra-[^:]*\):[^[:space:]]*,\1:unstable," demo/*`
- `sed -i.bak -e "s,\(ghcr.io/cardano-scaling/hydra-[^:]*\):[^[:space:]]*,\1:unstable," demo/*`
+ All `hydra-` packages are versioned the same, at latest on release their versions are aligned.
+ Other packages are versioned independently of `hydra-` packages and keep a dedicated changelog.

Expand All @@ -213,7 +213,7 @@ To perform a release of next `<version>`:
`aarch64-darwin` (the same for `cardano-node` instead of `hydra`)
* The just published `hydra-scripts-tx-id` from step 1

[smoke-test]: https://github.com/input-output-hk/hydra/actions/workflows/smoke-test.yaml
[smoke-test]: https://github.com/cardano-scaling/hydra/actions/workflows/smoke-test.yaml

## Communication

Expand Down Expand Up @@ -272,7 +272,7 @@ To conduct this meeting and write this report:
+ Store latest roadmap screenshot in slides and on [miro](https://miro.com/app/board/uXjVMA4bSao=/), with and without 💭 **idea** items
+ Check milestones and versions are consistent
+ Mark up and summarize notable changes in the roadmap to last month to support slides
- Update repository status in slides using <https://github.com/input-output-hk/hydra/pulse/monthly>
- Update repository status in slides using <https://github.com/cardano-scaling/hydra/pulse/monthly>

- Prepare invitation, by creating an event in discord, update the invitation used last month with it.
- Send invitation to Hydra and Mithril #announcements channels on our discord server.
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<div align="center">
<p>Implementation of the Hydra scalability protocols.</p>
<a href='https://github.com/input-output-hk/hydra/actions'><img src="https://img.shields.io/github/actions/workflow/status/input-output-hk/hydra/ci-nix.yaml?branch=master&label=Tests&style=for-the-badge" /></a>
<a href='https://github.com/input-output-hk/hydra/pkgs/container/hydra-node'><img src="https://img.shields.io/github/actions/workflow/status/input-output-hk/hydra/docker.yaml?branch=master&label=Docker&style=for-the-badge" /></a>
<a href='https://github.com/cardano-scaling/hydra/actions'><img src="https://img.shields.io/github/actions/workflow/status/cardano-scaling/hydra/ci-nix.yaml?branch=master&label=Tests&style=for-the-badge" /></a>
<a href='https://github.com/cardano-scaling/hydra/pkgs/container/hydra-node'><img src="https://img.shields.io/github/actions/workflow/status/cardano-scaling/hydra/docker.yaml?branch=master&label=Docker&style=for-the-badge" /></a>
</div>

## :sunrise_over_mountains: Introduction
Expand Down Expand Up @@ -50,8 +50,8 @@ The quickest way to get a `hydra-node` running is to use our [docker
images](https://github.com/orgs/input-output-hk/packages?repo_name=hydra).

```sh
docker pull ghcr.io/input-output-hk/hydra-node
docker run --rm ghcr.io/input-output-hk/hydra-node --help
docker pull ghcr.io/cardano-scaling/hydra-node
docker run --rm ghcr.io/cardano-scaling/hydra-node --help
```

Get started with the [user manual 📖](https://hydra.family/head-protocol/docs/getting-started)!
Expand Down Expand Up @@ -83,8 +83,8 @@ The best way to contribute is to provide feedback. Give the [demo](./demo) a spi
Should you have any questions, ideas or issues, we would like to hear from you:

- #ask-hydra on the IOG [Discord server](https://discord.gg/Qq5vNTg9PT)
- create a Github [Discussion](https://github.com/input-output-hk/hydra/discussions)
- open a Github [Issue](https://github.com/input-output-hk/hydra/issues/new)
- create a Github [Discussion](https://github.com/cardano-scaling/hydra/discussions)
- open a Github [Issue](https://github.com/cardano-scaling/hydra/issues/new)

Please follow our [Contributing Guidelines](./CONTRIBUTING.md) and [Code of Conduct](./CODE-OF-CONDUCT.md).

Expand Down
6 changes: 3 additions & 3 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ how we will respond to and remediate such reports.
If you discover a security vulnerability in Hydra, we encourage you to
responsibly disclose it to us. To report a vulnerability, please use
the [private reporting form on
GitHub](https://github.com/input-output-hk/hydra/security/advisories/new)
GitHub](https://github.com/cardano-scaling/hydra/security/advisories/new)
to draft a new _Security advisory_.

Please include as much details as needed to clearly qualify the issue:
Expand Down Expand Up @@ -91,13 +91,13 @@ report security vulnerabilities to us.
## Contact Information

To report a security vulnerability, please use [GitHub
form](https://github.com/input-output-hk/hydra/security/advisories/new).
form](https://github.com/cardano-scaling/hydra/security/advisories/new).

## Revision of Policy

This Security Vulnerability Disclosure Policy may be updated or
revised as necessary. Please check the latest version of this policy
on the [Hydra repository](https://github.com/input-output-hk/hydra/blob/master/SECURITY.md).
on the [Hydra repository](https://github.com/cardano-scaling/hydra/blob/master/SECURITY.md).

## Conclusion

Expand Down
4 changes: 2 additions & 2 deletions SUPPORT.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ these communication channels to reach the Hydra team and get answers in a way
where others can benefit from it as well:

- #ask-hydra on the IOG [Discord server](https://discord.gg/Qq5vNTg9PT)
- create a Github [Discussion](https://github.com/input-output-hk/hydra/discussions)
- open a Github [Issue](https://github.com/input-output-hk/hydra/issues/new)
- create a Github [Discussion](https://github.com/cardano-scaling/hydra/discussions)
- open a Github [Issue](https://github.com/cardano-scaling/hydra/issues/new)

# Reporting a Vulnerability

Expand Down
2 changes: 1 addition & 1 deletion cardano-api-classy/cardano-api-classy.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ license-files:

source-repository head
type: git
location: https://github.com/input-output-hk/hydra
location: https://github.com/cardano-scaling/hydra

common project-config
default-language: GHC2021
Expand Down
12 changes: 6 additions & 6 deletions demo/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:

hydra-node-1:
# NOTE: Make sure to use the same image in ./seed-devnet.sh
image: ghcr.io/input-output-hk/hydra-node:0.17.0
image: ghcr.io/cardano-scaling/hydra-node:0.17.0
build:
context: ../
target: hydra-node
Expand Down Expand Up @@ -56,7 +56,7 @@ services:

hydra-node-2:
# NOTE: Make sure to use the same image in ./seed-devnet.sh
image: ghcr.io/input-output-hk/hydra-node:0.17.0
image: ghcr.io/cardano-scaling/hydra-node:0.17.0
build:
context: ../
target: hydra-node
Expand Down Expand Up @@ -91,7 +91,7 @@ services:

hydra-node-3:
# NOTE: Make sure to use the same image in ./seed-devnet.sh
image: ghcr.io/input-output-hk/hydra-node:0.17.0
image: ghcr.io/cardano-scaling/hydra-node:0.17.0
build:
context: ../
target: hydra-node
Expand Down Expand Up @@ -125,7 +125,7 @@ services:
restart: always

hydra-tui-1:
image: ghcr.io/input-output-hk/hydra-tui:0.17.0
image: ghcr.io/cardano-scaling/hydra-tui:0.17.0
build:
context: ../
target: hydra-tui
Expand All @@ -142,7 +142,7 @@ services:
ipv4_address: 172.16.238.11

hydra-tui-2:
image: ghcr.io/input-output-hk/hydra-tui:0.17.0
image: ghcr.io/cardano-scaling/hydra-tui:0.17.0
build:
context: ../
target: hydra-tui
Expand All @@ -159,7 +159,7 @@ services:
ipv4_address: 172.16.238.21

hydra-tui-3:
image: ghcr.io/input-output-hk/hydra-tui:0.17.0
image: ghcr.io/cardano-scaling/hydra-tui:0.17.0
build:
context: ../
target: hydra-tui
Expand Down
2 changes: 1 addition & 1 deletion demo/seed-devnet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function hnode() {
docker run --rm -it \
--pull always \
-v ${SCRIPT_DIR}/devnet:/devnet \
ghcr.io/input-output-hk/hydra-node:0.17.0 -- ${@}
ghcr.io/cardano-scaling/hydra-node:0.17.0 -- ${@}
fi
}

Expand Down
2 changes: 1 addition & 1 deletion docs/adr/2021-11-25_012-top-down-test-driven-design.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ We tactically drop to _Unit tests_ level when dealing with the protocol's "fine
## Consequences

* Development of each "feature", whether new or change to existing one, should start with a test defined at the highest level possible, but no higher
* A detailed presentation of the various testing layers is available in the [wiki](https://github.com/input-output-hk/hydra/wiki/Testing-Strategy)
* A detailed presentation of the various testing layers is available in the [wiki](https://github.com/cardano-scaling/hydra/wiki/Testing-Strategy)
4 changes: 2 additions & 2 deletions docs/adr/2022-02-14_014-hydra-script-tokens.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ Accepted

* Heads can be identified by looking for the `ST` in `init`, `collectCom`, `close`, `contest` or `fanout` transactions, or the `PT` in `commit` transactions. In both cases, the `CurrencySymbol == HeadId`
* Our scripts become simpler as we only need to check that ST/PT are paid forward, instead of needing to check datums
* The datum produced by `commit` txs (and consumed by `collectCom`) is `Just SerializedTxOut`, which is simpler than also keeping the participant which committed in the datum (compare to full life-cycle of [0.3.0](https://github.com/input-output-hk/hydra/tree/0.3.0/docs/images/on-chain-full.jpg)).
* The datum produced by `commit` txs (and consumed by `collectCom`) is `Just SerializedTxOut`, which is simpler than also keeping the participant which committed in the datum (compare to full life-cycle of [0.3.0](https://github.com/cardano-scaling/hydra/tree/0.3.0/docs/images/on-chain-full.jpg)).

* The `v_head` script validator does not need to be parameterized, which makes discovering new Heads (and also tracking them for metrics) easier as the address to watch for is common to all Heads (of the same `v_head` version).
* The `v_head` script (path) for the abort life-cycle can be implemented already much safer by checking that all PTs are burned on the `abort` transaction (counting inputs in abort life-cycle of [0.3.0](https://github.com/input-output-hk/hydra/tree/0.3.0/docs/images/on-chain-abort.jpg)).
* The `v_head` script (path) for the abort life-cycle can be implemented already much safer by checking that all PTs are burned on the `abort` transaction (counting inputs in abort life-cycle of [0.3.0](https://github.com/cardano-scaling/hydra/tree/0.3.0/docs/images/on-chain-abort.jpg)).
* Updated diagrams for the [full](img/on-chain-full.jpg) and [abort](img/on-chain-abort.jpg) on-chain life-cycles of a Hydra Head.

## Follow-up questions
Expand Down
2 changes: 1 addition & 1 deletion docs/adr/2022-03-17_015-admin-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Draft
* This poses significant challenges for operating a _cluster_ of Hydra nodes as one needs to know beforehand everything about the cluster, then pass a large number of arguments to some program or docker-compose file, before any node can be started
* This is a pain that's been felt first-hand for benchmarking and testing purpose
* Having static network configuration is probably not sustainable in the long run, even if we don't add any fancy multihead capabilities to the node, as it would make it significantly harder to have automated creation of Heads.
* There's been an [attempt](https://github.com/input-output-hk/hydra/pull/222) at providing a file-based network configuration but this was deemed unconvincing
* There's been an [attempt](https://github.com/cardano-scaling/hydra/pull/222) at providing a file-based network configuration but this was deemed unconvincing
* [Hydra paper (sec. 4, p. 13)](https://eprint.iacr.org/2020/299.pdf) explicitly assumes the existence of a _setup_ phase
* This _setup_ is currently left aside, e.g. exchange of keys for setting up multisig and identifying peers. The [hydra-node](https://github.com/input-output-hk/hydra/blob/abailly-iohk/admin-api-adr/hydra-node/exe/hydra-node/Main.hs#L41) executable is statically configured and those things are assumed to be known beforehand

Expand Down
4 changes: 2 additions & 2 deletions docs/adr/2022-04-13_018-single-state.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Superseded by [ADR 23](/adr/23) and [ADR 26](/adr/26)

* Currently the `hydra-node` maintains two pieces of state during the life-cycle of a Hydra Head:
1. A `HeadState tx` provided by the `HydraHead tx m` handle interface and part of the `Hydra.Node` module. It provides the basis for the main `hydra-node` business logic in `Hydra.Node.processNextEvent` and `Hydra.HeadLogic.update`
[Creation](https://github.com/input-output-hk/hydra/blob/a98e2907c4e425de2736782793383aad63132c14/hydra-node/src/Hydra/Node.hs#L256-L257), [Usage](https://github.com/input-output-hk/hydra/blob/a98e2907c4e425de2736782793383aad63132c14/hydra-node/src/Hydra/Node.hs#L174)
[Creation](https://github.com/cardano-scaling/hydra/blob/a98e2907c4e425de2736782793383aad63132c14/hydra-node/src/Hydra/Node.hs#L256-L257), [Usage](https://github.com/cardano-scaling/hydra/blob/a98e2907c4e425de2736782793383aad63132c14/hydra-node/src/Hydra/Node.hs#L174)
2. `SomeOnChainHeadState` is kept in the `Hydra.Chain.Direct` to keep track of the latest known head state, including notable transaction outputs and information how to spend it (e.g. scripts and datums)
[Code](https://github.com/input-output-hk/hydra/blob/a98e2907c4e425de2736782793383aad63132c14/hydra-node/src/Hydra/Chain/Direct.hs#L156-L162), [Usage 1](https://github.com/input-output-hk/hydra/blob/a98e2907c4e425de2736782793383aad63132c14/hydra-node/src/Hydra/Chain/Direct.hs#L449), [Usage 2](https://github.com/input-output-hk/hydra/blob/a98e2907c4e425de2736782793383aad63132c14/hydra-node/src/Hydra/Chain/Direct.hs#L414), [Usage 3](https://github.com/input-output-hk/hydra/blob/a98e2907c4e425de2736782793383aad63132c14/hydra-node/src/Hydra/Chain/Direct.hs#L349-L352)
(There are other unrelated things kept in memory like the event history in the API server or a peer map in the network heartbeat component.)
Expand All @@ -28,7 +28,7 @@ Superseded by [ADR 23](/adr/23) and [ADR 26](/adr/26)
type ChainCallback tx m = OnChainTx tx -> m ()
```
* Given by the usage sites above, the `Hydra.Chain.Direct` module requires additional info to do both, construct protocol transactions with `postTx` as well as observe potential `OnChainTx` ([here](https://github.com/input-output-hk/hydra/blob/a98e2907c4e425de2736782793383aad63132c14/hydra-node/src/Hydra/Chain/Direct.hs#L333-L336)). Hence we see that, operation of the `Hydra.Chain.Direct` component (and likely any implementing the interface fully) is **inherently stateful**.
* We are looking at upcoming features to [handle rollbacks](https://github.com/input-output-hk/hydra/issues/185) and dealing with [persisting the head state](https://github.com/input-output-hk/hydra/issues/187).
* We are looking at upcoming features to [handle rollbacks](https://github.com/cardano-scaling/hydra/issues/185) and dealing with [persisting the head state](https://github.com/cardano-scaling/hydra/issues/187).
- Both could benefit from the idea, that the `HeadState` is just a result of pure `Event` processing (a.k.a event sourcing).
- Right now the `HeadState` kept in `Hydra.Node` alone, is not enough to fully describe the state of the `hydra-node`. Hence it would not be enough to just persist all the `Event`s and replaying them to achieve persistence, nor resetting to some previous `HeadState` in the presence of a rollback.

Expand Down
Loading

0 comments on commit 3e7bd6b

Please sign in to comment.