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.

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

Jump to bottom

CIP-0040? | Collateral output #216

Merged
merged 18 commits into from
Jul 2, 2022
Merged

CIP-0040? | Collateral output #216

merged 18 commits into from
Jul 2, 2022

Commits on Jan 17, 2021

  1. added work from PR#25 to support single stake pool links as well

    @rphair
    rphair committed Jan 17, 2021
    Configuration menu
    Copy the full SHA
    b4c7280 View commit details
    Browse the repository at this point in the history

  2. for brevity

    @rphair
    rphair committed Jan 17, 2021
    Configuration menu
    Copy the full SHA
    b24d0ef View commit details
    Browse the repository at this point in the history

  3. for clarity

    @rphair
    rphair committed Jan 17, 2021
    Configuration menu
    Copy the full SHA
    235ad40 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2021

  1. response to first round of editing by co-author

    @rphair
    rphair committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    75faa8f View commit details
    Browse the repository at this point in the history

  2. second round of co-author edits

    @rphair
    rphair committed Jan 18, 2021
    1 Configuration menu
    Copy the full SHA
    0389fa1 View commit details
    Browse the repository at this point in the history

  3. reclassified wallet integration as Motivation rather than Rationale

    @rphair
    rphair committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    adbee6f View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2021

  1. 2 of 3 changes from @nicarq via PR 65

    @rphair
    rphair committed Feb 20, 2021
    Configuration menu
    Copy the full SHA
    176b5c0 View commit details
    Browse the repository at this point in the history

  2. undone most recent commit (removing PR65 suggestions)

    @rphair
    rphair committed Feb 20, 2021
    Configuration menu
    Copy the full SHA
    20f35f6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:rphair/CIPs 

    Attempted to move HEAD back one commit, then something went wrong.
    @rphair
    rphair committed Feb 20, 2021
    Configuration menu
    Copy the full SHA
    f43d28c View commit details
    Browse the repository at this point in the history

  4. undone most recent commit (removing PR65 suggestions)

    @rphair
    rphair committed Feb 20, 2021
    Configuration menu
    Copy the full SHA
    85c4b77 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2021

  1. Merge remote-tracking branch 'upstream/master'

    @rphair
    rphair committed Apr 12, 2021
    Configuration menu
    Copy the full SHA
    db81cb6 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2022

  1. Collateral output CIP

    @SebastienGllmt
    SebastienGllmt committed Feb 10, 2022
    Configuration menu
    Copy the full SHA
    efd6491 View commit details
    Browse the repository at this point in the history

  2. rename file

    @SebastienGllmt
    SebastienGllmt committed Feb 10, 2022
    Configuration menu
    Copy the full SHA
    d3c48ce View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2022

  1. Include self-contained balancing requirement

    @SebastienGllmt
    SebastienGllmt committed Feb 14, 2022
    Configuration menu
    Copy the full SHA
    07ff3b5 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2022

  1. Add Andre to the CIP

    @SebastienGllmt
    SebastienGllmt committed Feb 15, 2022
    Configuration menu
    Copy the full SHA
    138565e View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2022

  1. Merge branch 'master' of github.com:cardano-foundation/CIPs

    @rphair
    rphair committed Jul 2, 2022
    Configuration menu
    Copy the full SHA
    b136b3b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'output-collateral' of github.com:cardano-foundation/CIP… 

    …s into cip-0040-pre-merge

attempt to fix PR216 as 3rd party
    @rphair
    rphair committed Jul 2, 2022
    Configuration menu
    Copy the full SHA
    89239b2 View commit details
    Browse the repository at this point in the history

  3. pre merge changes, attempt as 3rd party

    @rphair
    rphair committed Jul 2, 2022
    Configuration menu
    Copy the full SHA
    c50eff3 View commit details
    Browse the repository at this point in the history