From 9fc418dc73bffe4e2d6b4f36667d492088ecbab9 Mon Sep 17 00:00:00 2001 From: Frank Hillard Date: Mon, 23 Nov 2020 21:11:54 +0100 Subject: [PATCH] changes in chapter FA12, multisig --- .../Camel/ChapterDeployContract/course.md | 3 ++- .../pages/Chapters/Camel/ChapterFA12/course.md | 15 +++++++++++++-- .../pages/Chapters/Camel/ChapterFA12/exercise.cmd | 2 +- .../pages/Chapters/Camel/ChapterLambda/course.md | 2 +- .../Pascal/ChapterDeployContract/course.md | 3 ++- .../pages/Chapters/Pascal/ChapterFA12/course.md | 15 +++++++++++++-- .../Chapters/Pascal/ChapterFA12/exercise.cmd | 2 +- .../pages/Chapters/Pascal/ChapterLambda/course.md | 2 +- .../Chapters/Pascal/ChapterMultisig/course.md | 2 +- .../Reason/ChapterDeployContract/course.md | 3 ++- .../pages/Chapters/Reason/ChapterFA12/course.md | 15 +++++++++++++-- .../Chapters/Reason/ChapterFA12/exercise.cmd | 2 +- .../pages/Chapters/Reason/ChapterLambda/course.md | 2 +- 13 files changed, 52 insertions(+), 16 deletions(-) diff --git a/src/frontend/src/pages/Chapters/Camel/ChapterDeployContract/course.md b/src/frontend/src/pages/Chapters/Camel/ChapterDeployContract/course.md index c08525d..d8b3afa 100644 --- a/src/frontend/src/pages/Chapters/Camel/ChapterDeployContract/course.md +++ b/src/frontend/src/pages/Chapters/Camel/ChapterDeployContract/course.md @@ -242,4 +242,5 @@ let main (action,store : parameter * storage): return = 1- Write the _compile-storage_ command and the LIGO expression for initializing the *Sol* system containing planet "earth" with coordinates (2,7,1). -2- Write the _dry-run_ command and the LIGO expression for adding a planet "mars" with coordinates (4,15,2) in our *Sol* system. Reuse the *Sol* system of step 1. +2- Write the _dry-run_ command and the LIGO expression for adding a planet "mars" with coordinates (4,15,2) in our *Sol* system. +⚠️ Remind that the _dry-run_ command expects a parameter "" and a parameter "" as shown in Simulating section. For this _dry-run_ command you must write the "" parameter and reuse the *Sol* system of step 1 as "" parameter. diff --git a/src/frontend/src/pages/Chapters/Camel/ChapterFA12/course.md b/src/frontend/src/pages/Chapters/Camel/ChapterFA12/course.md index 3f10dbb..7be73e4 100644 --- a/src/frontend/src/pages/Chapters/Camel/ChapterFA12/course.md +++ b/src/frontend/src/pages/Chapters/Camel/ChapterFA12/course.md @@ -39,7 +39,7 @@ ERC721 is the standard rule set for non-fungible tokens. This Fungible token standard provides basic functionality to transfer tokens, as well as to allow tokens to be approved so they can be spent by another on-chain third party. Possible actions : -_Appove_ - Sender can specify an amount of token that can be spent by someone else (from his account) +_Approve_ - Sender can specify an amount of token that can be spent by someone else (from his account) _Transfer_ - Transfer an amount of tokens from an account to another account (or third-party on-chain smart contract) _GetAllowance_ - Return the amount that can be spent by someone from sender's account _GetBalance_ - Return the sender's account balance @@ -167,7 +167,7 @@ Let's assume that the _TezosAcamedyToken_ has been deployed. Consider your account is _me_ (at address tz1SdT62G8tQp9fdHh4f2m4VtL8aGG6NUcmJ) which has been granted 1,000,000 tokens. Consider alice's account (at address tz1NiAGZgRV8F1E3qYFEPgajntzTRDYkU9h7) -1- We want you to simulate the transfer of 2 TAT (Tezos Academy Token) to *alice*. Write a ligo command line for preparing a simulated storage where you (tz1SdT62G8tQp9fdHh4f2m4VtL8aGG6NUcmJ) possess 1,000,000 tokens and no allowance. +1- We want you to simulate the transfer of 2 TAT (Tezos Academy Token) to *alice*. Complete the ligo command line for preparing a storage state where you (tz1SdT62G8tQp9fdHh4f2m4VtL8aGG6NUcmJ) possess 1,000,000 tokens and no allowance. Write the storage state (all values of the storage must be filled). 2- Write a ligo command line for preparing the invocation of an *Approval* of 2 TAT (Tezos Academy Token) for *alice*. @@ -194,3 +194,14 @@ Consider alice's account (at address tz1NiAGZgRV8F1E3qYFEPgajntzTRDYkU9h7) ``` 10- Write a Tezos command line that simulates your *Transfer* invocation. + +Remind the syntax of the tezos-client transfer command: + +``` +tezos-client transfer from to --arg '' --dry-run +``` + + = number of mutez of the transaction + = account who is emitting the transaction + = name of the contract + = michelson expression representing the entrypoint and its related parameters \ No newline at end of file diff --git a/src/frontend/src/pages/Chapters/Camel/ChapterFA12/exercise.cmd b/src/frontend/src/pages/Chapters/Camel/ChapterFA12/exercise.cmd index fcc1477..4351980 100644 --- a/src/frontend/src/pages/Chapters/Camel/ChapterFA12/exercise.cmd +++ b/src/frontend/src/pages/Chapters/Camel/ChapterFA12/exercise.cmd @@ -7,7 +7,7 @@ ligo dry-run --sender=tz1SdT62G8tQp9fdHh4f2m4VtL8aGG6NUcmJ fa12.mligo main ' from to --arg '' --dry-run // Modify the code below -ligo compile-parameter refa12.mligo main '' +ligo compile-parameter fa12.mligo main '' // Modify the code below ligo compile-storage fa12.mligo main '' // Modify the code below diff --git a/src/frontend/src/pages/Chapters/Camel/ChapterLambda/course.md b/src/frontend/src/pages/Chapters/Camel/ChapterLambda/course.md index babd15c..405fd34 100644 --- a/src/frontend/src/pages/Chapters/Camel/ChapterLambda/course.md +++ b/src/frontend/src/pages/Chapters/Camel/ChapterLambda/course.md @@ -143,7 +143,7 @@ Map.map applyDeduceCatg store.celestialbodies We want you to update our "starmap" contract in order to take this new rule into account. -1- Write the _dry-run_ command and the associated invocation (entry point) for taking the new rule into account. +1- Write the _dry-run_ command and the associated invocation (entry point) for taking the new rule into account. You must write a lambda function within the parentheses of _DeduceCategoryChange_ as shown in the Lambda definition section. The lambda function must implement the three following rules. 2- First rule : if the coordinates of a planet is (0,0,0) then the celestial body is considered as a STAR. diff --git a/src/frontend/src/pages/Chapters/Pascal/ChapterDeployContract/course.md b/src/frontend/src/pages/Chapters/Pascal/ChapterDeployContract/course.md index 41a27e8..0046e48 100644 --- a/src/frontend/src/pages/Chapters/Pascal/ChapterDeployContract/course.md +++ b/src/frontend/src/pages/Chapters/Pascal/ChapterDeployContract/course.md @@ -260,4 +260,5 @@ block { skip } with case action of 1- Write the _compile-storage_ command and the LIGO expression for initializing the *Sol* system containing planet "earth" with coordinates (2,7,1). -2- Write the _dry-run_ command and the LIGO expression for adding a planet "mars" with coordinates (4,15,2) in our *Sol* system. Reuse the *Sol* system of step 1. +2- Write the _dry-run_ command and the LIGO expression for adding a planet "mars" with coordinates (4,15,2) in our *Sol* system. +⚠️ Remind that the _dry-run_ command expects a parameter "" and a parameter "" as shown in Simulating section. For this _dry-run_ command you must write the "" parameter and reuse the *Sol* system of step 1 as "" parameter. diff --git a/src/frontend/src/pages/Chapters/Pascal/ChapterFA12/course.md b/src/frontend/src/pages/Chapters/Pascal/ChapterFA12/course.md index 7265914..d8d3b2b 100644 --- a/src/frontend/src/pages/Chapters/Pascal/ChapterFA12/course.md +++ b/src/frontend/src/pages/Chapters/Pascal/ChapterFA12/course.md @@ -39,7 +39,7 @@ ERC721 is the standard rule set for non-fungible tokens. This Fungible token standard provides basic functionality to transfer tokens, as well as allowing tokens to be approved so they can be spent by another on-chain third party. Possible actions : -_Appove_ - Sender can specify an amount of token that can be spent by someone else (from his account) +_Approve_ - Sender can specify an amount of token that can be spent by someone else (from his account) _Transfer_ - Transfer an amount of tokens from an account to another account (or third-party on-chain smart contract) _GetAllowance_ - Return the amount that can be spent by someone from sender's account _GetBalance_ - Return the sender's account balance @@ -203,7 +203,7 @@ Let's assume _TezosAcamedyToken_ has been deployed. Consider your account is _me_ (at address tz1SdT62G8tQp9fdHh4f2m4VtL8aGG6NUcmJ) which has been granted 1,000,000 token. Consider alice's account (at address tz1NiAGZgRV8F1E3qYFEPgajntzTRDYkU9h7) -1- We want you to simulate the transfer of 2 TAT (Tezos Academy Token) to *alice*. Write a ligo command line for preparing a simulated storage where you (tz1SdT62G8tQp9fdHh4f2m4VtL8aGG6NUcmJ) possess 1,000,000 tokens and no allowance. +1- We want you to simulate the transfer of 2 TAT (Tezos Academy Token) to *alice*. Complete the ligo command line for preparing a storage state where you (tz1SdT62G8tQp9fdHh4f2m4VtL8aGG6NUcmJ) possess 1,000,000 tokens and no allowance. Write the storage state (all values of the storage must be filled). 2- Write a ligo command line for preparing the invocation of an *Approval* of 2 TAT (Tezos Academy Token) for *alice*. @@ -230,3 +230,14 @@ Consider alice's account (at address tz1NiAGZgRV8F1E3qYFEPgajntzTRDYkU9h7) ``` 10- Write a Tezos command line that simulates your *Transfer* invocation. + +Remind the syntax of the tezos-client transfer command: + +``` +tezos-client transfer from to --arg '' --dry-run +``` + + = number of mutez of the transaction + = account who is emitting the transaction + = name of the contract + = michelson expression representing the entrypoint and its related parameters \ No newline at end of file diff --git a/src/frontend/src/pages/Chapters/Pascal/ChapterFA12/exercise.cmd b/src/frontend/src/pages/Chapters/Pascal/ChapterFA12/exercise.cmd index 287e954..ddd4062 100644 --- a/src/frontend/src/pages/Chapters/Pascal/ChapterFA12/exercise.cmd +++ b/src/frontend/src/pages/Chapters/Pascal/ChapterFA12/exercise.cmd @@ -7,7 +7,7 @@ ligo dry-run --sender=tz1SdT62G8tQp9fdHh4f2m4VtL8aGG6NUcmJ fa12.ligo main ' from to --arg '' --dry-run // Modify the code below -ligo compile-parameter refa12.ligo main '' +ligo compile-parameter fa12.ligo main '' // Modify the code below ligo compile-storage fa12.ligo main '' // Modify the code below diff --git a/src/frontend/src/pages/Chapters/Pascal/ChapterLambda/course.md b/src/frontend/src/pages/Chapters/Pascal/ChapterLambda/course.md index 4333c65..de0e562 100644 --- a/src/frontend/src/pages/Chapters/Pascal/ChapterLambda/course.md +++ b/src/frontend/src/pages/Chapters/Pascal/ChapterLambda/course.md @@ -136,7 +136,7 @@ Map.map (applyDeduceCatg, store.celestialbodies); We want you to update our "starmap" contract in order to take this new rule into account. -1- Write the _dry-run_ command and the associated invocation (entry point) for taking the new rule into account. +1- Write the _dry-run_ command and the associated invocation (entry point) for taking the new rule into account. You must write a lambda function within the parentheses of _DeduceCategoryChange_ as shown in the Lambda definition section. The lambda function must implement the three following rules. 2- First rule : if the coordinates of a planet is (0,0,0) then the celestial body is considered as a STAR. diff --git a/src/frontend/src/pages/Chapters/Pascal/ChapterMultisig/course.md b/src/frontend/src/pages/Chapters/Pascal/ChapterMultisig/course.md index 1e221ab..b6514a0 100644 --- a/src/frontend/src/pages/Chapters/Pascal/ChapterMultisig/course.md +++ b/src/frontend/src/pages/Chapters/Pascal/ChapterMultisig/course.md @@ -222,7 +222,7 @@ Notice that in the _Withdraw_ function : Modify the existing *Multisig* contract in order to handle reputation level for each voters. We plan to grant reputation points when the message is really executed (one point of reputation for each voters). - 1- Modify storage to have an additionnal property called *reputation* which associates a _nat_ number to a voter. + 1- Modify the storage to have an additionnal property called *reputation* which associates a _nat_ number to a voter. In the *send* function, notice that voters are computed in a variable *new_store*. diff --git a/src/frontend/src/pages/Chapters/Reason/ChapterDeployContract/course.md b/src/frontend/src/pages/Chapters/Reason/ChapterDeployContract/course.md index 452adec..84d606c 100644 --- a/src/frontend/src/pages/Chapters/Reason/ChapterDeployContract/course.md +++ b/src/frontend/src/pages/Chapters/Reason/ChapterDeployContract/course.md @@ -248,4 +248,5 @@ let main = ((action,store) : (parameter,storage)): return => 1- Write the _compile-storage_ command and the LIGO expression for initializing the *Sol* system containing planet "earth" with coordinates (2,7,1). -2- Write the _dry-run_ command and the LIGO expression for adding a planet "mars" with coordinates (4,15,2) in our *Sol* system. Reuse the *Sol* system of step 1. +2- Write the _dry-run_ command and the LIGO expression for adding a planet "mars" with coordinates (4,15,2) in our *Sol* system. +⚠️ Remind that the _dry-run_ command expects a parameter "" and a parameter "" as shown in Simulating section. For this _dry-run_ command you must write the "" parameter and reuse the *Sol* system of step 1 as "" parameter. diff --git a/src/frontend/src/pages/Chapters/Reason/ChapterFA12/course.md b/src/frontend/src/pages/Chapters/Reason/ChapterFA12/course.md index 842dc06..e2c8c8a 100644 --- a/src/frontend/src/pages/Chapters/Reason/ChapterFA12/course.md +++ b/src/frontend/src/pages/Chapters/Reason/ChapterFA12/course.md @@ -37,7 +37,7 @@ ERC721 is the standard rule set for non-fungible tokens. This Fungible token standard provides basic functionality to transfer tokens, as well as allowing tokens to be approved so they can be spent by another on-chain third party. Possible actions : -_Appove_ - Sender can specify an amount of token that can be spent by someone else (from his account) +_Approve_ - Sender can specify an amount of token that can be spent by someone else (from his account) _Transfer_ - Transfer an amount of tokens from an account to another account (or third-party on-chain smart contract) _GetAllowance_ - Return the amount that can be spent by someone from sender's account _GetBalance_ - Return the sender's account balance @@ -171,7 +171,7 @@ Let's assume _TezosAcamedyToken_ has been deployed. Consider your account is _me_ (at address tz1SdT62G8tQp9fdHh4f2m4VtL8aGG6NUcmJ). Consider alice's account (at address tz1NiAGZgRV8F1E3qYFEPgajntzTRDYkU9h7). -1- We want you to simulate the transfer of 2 TAT (Tezos Academy Token) to *alice*. Write a ligo command line for preparing a simulated storage where you (tz1SdT62G8tQp9fdHh4f2m4VtL8aGG6NUcmJ) possess 1,000,000 tokens and no allowance. +1- We want you to simulate the transfer of 2 TAT (Tezos Academy Token) to *alice*. Complete the ligo command line for preparing a storage state where you (tz1SdT62G8tQp9fdHh4f2m4VtL8aGG6NUcmJ) possess 1,000,000 tokens and no allowance. Write the storage state (all values of the storage must be filled). 2- Write a ligo command line for preparing the invocation of an *Approval* of 2 TAT (Tezos Academy Token) for *alice*. @@ -198,3 +198,14 @@ Consider alice's account (at address tz1NiAGZgRV8F1E3qYFEPgajntzTRDYkU9h7). ``` 10- Write a Tezos command line that simulates your *Transfer* invocation. + +Remind the syntax of the tezos-client transfer command: + +``` +tezos-client transfer from to --arg '' --dry-run +``` + + = number of mutez of the transaction + = account who is emitting the transaction + = name of the contract + = michelson expression representing the entrypoint and its related parameters diff --git a/src/frontend/src/pages/Chapters/Reason/ChapterFA12/exercise.cmd b/src/frontend/src/pages/Chapters/Reason/ChapterFA12/exercise.cmd index f32caab..c155fb8 100644 --- a/src/frontend/src/pages/Chapters/Reason/ChapterFA12/exercise.cmd +++ b/src/frontend/src/pages/Chapters/Reason/ChapterFA12/exercise.cmd @@ -7,7 +7,7 @@ ligo dry-run --sender=tz1SdT62G8tQp9fdHh4f2m4VtL8aGG6NUcmJ fa12.religo main ' from to --arg '' --dry-run // Modify the code below -ligo compile-parameter refa12.religo main '' +ligo compile-parameter fa12.religo main '' // Modify the code below ligo compile-storage fa12.religo main '' // Modify the code below diff --git a/src/frontend/src/pages/Chapters/Reason/ChapterLambda/course.md b/src/frontend/src/pages/Chapters/Reason/ChapterLambda/course.md index e3d32f2..69cd3ab 100644 --- a/src/frontend/src/pages/Chapters/Reason/ChapterLambda/course.md +++ b/src/frontend/src/pages/Chapters/Reason/ChapterLambda/course.md @@ -136,7 +136,7 @@ Map.map (applyDeduceCatg, store.celestialbodies); We want you to update our "starmap" contract in order to take this new rule into account. -1- Write the _dry-run_ command and the associated invocation (entry point) for taking the new rule into account. +1- Write the _dry-run_ command and the associated invocation (entry point) for taking the new rule into account. You must write a lambda function within the parentheses of _DeduceCategoryChange_ as shown in the Lambda definition section. The lambda function must implement the three following rules. 2- First rule : if the coordinates of a planet is (0,0,0) then the celestial body is considered as a STAR.