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

Add documentation for total collateral and return collateral. #4183

Merged
merged 1 commit into from
Jul 18, 2022

Conversation

Jimbo4350
Copy link
Contributor

@Jimbo4350 Jimbo4350 commented Jul 14, 2022

Related to: #3739

doc/reference/plutus/babbage-script-example.md Outdated Show resolved Hide resolved
doc/reference/plutus/babbage-script-example.md Outdated Show resolved Hide resolved
@Jimbo4350 Jimbo4350 force-pushed the jordan/return-total-collateral branch from ba166e6 to 4c4a7c5 Compare July 15, 2022 13:07
@Jimbo4350
Copy link
Contributor Author

bors r+

iohk-bors bot added a commit that referenced this pull request Jul 18, 2022
4183: Add documentation for total collateral and return collateral. r=Jimbo4350 a=Jimbo4350

Related to: #3739 

Co-authored-by: Jordan Millar <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 18, 2022

This PR was included in a batch that successfully built, but then failed to merge into master. It will not be retried.

Additional information:

{"message":"Waiting on code owner review from JaredCorduan, dcoutts, erikd, and/or newhoggy.","documentation_url":"https://docs.github.com/articles/about-protected-branches"}

Copy link
Contributor

@kevinhammond kevinhammond left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

Copy link
Contributor

@dcoutts dcoutts left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Jimbo4350
Copy link
Contributor Author

bors r+

iohk-bors bot added a commit that referenced this pull request Jul 18, 2022
4183: Add documentation for total collateral and return collateral. r=Jimbo4350 a=Jimbo4350

Related to: #3739 

Co-authored-by: Jordan Millar <[email protected]>
@Jimbo4350
Copy link
Contributor Author

bors r -

Update example-babbage-script-usage.sh to use total and return
collateral
Update mkfiles.sh with jq to properly update the shelley genesis
@Jimbo4350 Jimbo4350 force-pushed the jordan/return-total-collateral branch from 9a62c50 to 5e0acf8 Compare July 18, 2022 21:10
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 18, 2022

Canceled.

@Jimbo4350
Copy link
Contributor Author

bors r+

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 18, 2022

Build succeeded:

@iohk-bors iohk-bors bot merged commit 68e4cde into master Jul 18, 2022
@iohk-bors iohk-bors bot deleted the jordan/return-total-collateral branch July 18, 2022 21:48
@CarlosLopezDeLara CarlosLopezDeLara mentioned this pull request Jul 20, 2022
40 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants