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

Update simple script documentation with Allegra time locking scripts #2165

Merged
merged 1 commit into from
Dec 10, 2020

Conversation

Jimbo4350
Copy link
Contributor

No description provided.

@Jimbo4350 Jimbo4350 force-pushed the jordan/update-simple-script-docs branch from 6148250 to 2f4f219 Compare December 3, 2020 15:06
doc/reference/simple-scripts.md Outdated Show resolved Hide resolved
doc/reference/simple-scripts.md Outdated Show resolved Hide resolved
doc/reference/simple-scripts.md Outdated Show resolved Hide resolved
@Jimbo4350 Jimbo4350 force-pushed the jordan/update-simple-script-docs branch 4 times, most recently from 26f5462 to c6b5742 Compare December 3, 2020 17:20
@kevinhammond kevinhammond self-requested a review December 7, 2020 19:33
@Jimbo4350 Jimbo4350 force-pushed the jordan/update-simple-script-docs branch from 8368b7a to 7a9a06a Compare December 8, 2020 08:46
@intricate
Copy link
Contributor

bors r+

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Dec 10, 2020

👎 Rejected by too few approved reviews

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

@kevinhammond
Copy link
Contributor

kevinhammond commented Dec 10, 2020

bors r+

iohk-bors bot added a commit that referenced this pull request Dec 10, 2020
2165: Update simple script documentation with Allegra time locking scripts r=kevinhammond a=Jimbo4350



Co-authored-by: Jordan Millar <jordan.millar@iohk.io>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Dec 10, 2020

Canceled.

@intricate
Copy link
Contributor

bors r+

iohk-bors bot added a commit that referenced this pull request Dec 10, 2020
2165: Update simple script documentation with Allegra time locking scripts r=intricate a=Jimbo4350



Co-authored-by: Jordan Millar <jordan.millar@iohk.io>
Co-authored-by: Duncan Coutts <duncan@well-typed.com>
@kevinhammond
Copy link
Contributor

bors r+

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Dec 10, 2020

Already running a review

@kevinhammond
Copy link
Contributor

bors r

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Dec 10, 2020

Build failed:

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.

Thanks! The edits look good. Just two below that need revising.

address. The authorisation condition to use the address is that one holds the
secret (signing) part of the cryptographic key (for that address) and thus be
able to make a cryptographic signature for that key.

The script-based addresses use a script per address. The authorisation
condition to use the address is that the _evaluation_ of the script for the
address results in success. The script expresses the authorisation conditions
and evaluation of the script tests if those conditions are met. For example, a
and evaluation of script tests if those conditions are met. For example, a
Copy link
Contributor

Choose a reason for hiding this comment

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

the definite article was needed here

In the Allegra and later eras the simple multisig script language above is
extended with two additional terms for expressing conditions on the time.
In the Allegra and later eras, the simple multisig script language above is
extended with two additional terms for expressing any time conditions.
Copy link
Contributor

Choose a reason for hiding this comment

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

It's not any condition on time, only certain conditions can be expresses. For example I cannot express that it is a Tuesday.

Document the Allegra time locking features. Wewrite the introductory
explanation of scripts in general. Generalise from talking only about
multi-sig to talking about the simple script language more generally,
including the Allegra extensions.

Co-authored-by: Jordan Millar <jordan.millar@iohk.io>
Co-authored-by: olgahryniuk <67585499+olgahryniuk@users.noreply.github.com>
@dcoutts dcoutts force-pushed the jordan/update-simple-script-docs branch from 55bda58 to 31eb810 Compare December 10, 2020 14:21
@dcoutts
Copy link
Contributor

dcoutts commented Dec 10, 2020

bors merge

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Dec 10, 2020

@iohk-bors iohk-bors bot merged commit 3dc372c into master Dec 10, 2020
@iohk-bors iohk-bors bot deleted the jordan/update-simple-script-docs branch December 10, 2020 15:00
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.

4 participants