From 13a13803f3084270f5228bcbca2ec4ebfa9ac49b Mon Sep 17 00:00:00 2001 From: Frank Hillard Date: Fri, 4 Sep 2020 15:57:25 +0200 Subject: [PATCH] english fix --- .../pages/Chapters/Camel/ChapterDeployContract/course.md | 6 +++--- src/frontend/src/pages/Chapters/Camel/ChapterFA12/course.md | 6 +++--- .../src/pages/Chapters/Camel/ChapterFA20Operator/course.md | 6 +++--- .../pages/Chapters/Camel/ChapterFA20Permission/course.md | 4 ++-- .../pages/Chapters/Pascal/ChapterDeployContract/course.md | 6 +++--- .../src/pages/Chapters/Pascal/ChapterFA12/course.md | 6 +++--- .../src/pages/Chapters/Pascal/ChapterFA20Operator/course.md | 6 +++--- .../pages/Chapters/Reason/ChapterDeployContract/course.md | 6 +++--- .../src/pages/Chapters/Reason/ChapterFA12/course.md | 6 +++--- .../src/pages/Chapters/Reason/ChapterFA20Operator/course.md | 6 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/frontend/src/pages/Chapters/Camel/ChapterDeployContract/course.md b/src/frontend/src/pages/Chapters/Camel/ChapterDeployContract/course.md index cdd8d5b..c08525d 100644 --- a/src/frontend/src/pages/Chapters/Camel/ChapterDeployContract/course.md +++ b/src/frontend/src/pages/Chapters/Camel/ChapterDeployContract/course.md @@ -44,8 +44,8 @@ tezos-client originate contract for transferring name given to the contract path of the Michelson smart contract code (TZ file). - is the quantity of tez being transfered to the newly deployed contract. If a contract balance reaches 0 then it is deactivated. - account from which the tez are taken from (and transfered to the new contract). + is the quantity of tez being transferred to the newly deployed contract. If a contract balance reaches 0 then it is deactivated. + account from which the tez are taken from (and transferred to the new contract). is a Michelson expression. The --init parameter is used to specify initial state of the storage. it specifies the the maximal fee the user is willing to pay for this operation (using the --burn-cap parameter). @@ -59,7 +59,7 @@ Here is the syntax of the tezos command line to invoke a smart contract : tezos-client transfer from to --arg '' --dry-run ``` - is the quantity of tez being transfered to the contract. + is the quantity of tez being transferred to the contract. name given to the contract name of the entry point and corresponding parameters. For example 'Increment(5)'. diff --git a/src/frontend/src/pages/Chapters/Camel/ChapterFA12/course.md b/src/frontend/src/pages/Chapters/Camel/ChapterFA12/course.md index 93ca781..782518f 100644 --- a/src/frontend/src/pages/Chapters/Camel/ChapterFA12/course.md +++ b/src/frontend/src/pages/Chapters/Camel/ChapterFA12/course.md @@ -14,7 +14,7 @@ A _token_ or _crypto-currency_ is a numerical asset emitted on a blockchain. Fungible means divisible. -A Fungible token is a Financial Application where the account balance represents the value associated to an _address_. This value can be splitted into smaller parts which can be transfered to another account. +A Fungible token is a Financial Application where the account balance represents the value associated to an _address_. This value can be splitted into smaller parts which can be transferred to another account. A Non-fungible token (NFT) is a Financial Application whose balance cannot be splitted into smaller parts. Crypto-kitties is an example of a game using non fungible tokens (on the Ethereum blockchain). For example, a video game avatar (such as avatar on world of warcraft) is a character having some skills/attributes (strength, dexterity,...) and one may want to sell his avatar, but cannot sell the strength property of his avatar separately. It makes sense to keep the whole avatar into a undivisible set of attributes. @@ -181,9 +181,9 @@ Consider alice's account (at address tz1NiAGZgRV8F1E3qYFEPgajntzTRDYkU9h7) 5- Write a Tezos command line that simulates your invocation. -6- Now that the approval has been executed on the blockchain, 2 TAT can be transfered from your address to *alice*'s. Write a ligo command line for preparing the invocation of a *Transfer* of 2 TAT (Tezos Academy Token) from you to *alice*. +6- Now that the approval has been executed on the blockchain, 2 TAT can be transferred from your address to *alice*'s. Write a ligo command line for preparing the invocation of a *Transfer* of 2 TAT (Tezos Academy Token) from you to *alice*. -7- Write a ligo command line for preparing a simulated storage where you (tz1SdT62G8tQp9fdHh4f2m4VtL8aGG6NUcmJ) possess 1,000,000 tokens and an allowance is initialized with 2 TAT that can be transfered from *me* to *alice* (tz1NiAGZgRV8F1E3qYFEPgajntzTRDYkU9h7). +7- Write a ligo command line for preparing a simulated storage where you (tz1SdT62G8tQp9fdHh4f2m4VtL8aGG6NUcmJ) possess 1,000,000 tokens and an allowance is initialized with 2 TAT that can be transferred from *me* to *alice* (tz1NiAGZgRV8F1E3qYFEPgajntzTRDYkU9h7). 8- Write a ligo command line that simulates your invocation of the previous *Transfer* on storage prepared at step 7. (Don't forget to specify that you are sending this transaction). diff --git a/src/frontend/src/pages/Chapters/Camel/ChapterFA20Operator/course.md b/src/frontend/src/pages/Chapters/Camel/ChapterFA20Operator/course.md index cd9f913..26a92e7 100644 --- a/src/frontend/src/pages/Chapters/Camel/ChapterFA20Operator/course.md +++ b/src/frontend/src/pages/Chapters/Camel/ChapterFA20Operator/course.md @@ -86,7 +86,7 @@ an _operator_ is a relationship between two address (owner address and operator ### FA2 Permission Policies and Configuration -Most token standards specify logic that validates a transfer transaction and can either approve or reject a transfer. +Most token standards specify the logic that validates a transfer transaction and that can either approve or reject a transfer. Such logic (called _Permission Policy_) could validate who initiates a transfer, the transfer amount, and who can receive tokens. This FA2 standard defines a framework to compose and configure such permission policies. @@ -166,7 +166,7 @@ Operator(Owner_transfer) * Receiver(Owner_no_hook) * Sender(Owner_no_hook) ## Your mission We are working on a non_fungible/single-asset token. -Our NFT "token" is almost ready but to allow a new rule. We need Bob to transfert a token taken from Vera account and send it to alice's account. +Our NFT "token" is almost ready but to allow a new rule. We need Bob to transfer a token taken from Vera account and send it to alice's account. - Alice's account address is "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" - Bob's account address is "tz1faswCTDciRzE4oJ9jn2Vm2dvjeyA9fUzU" @@ -178,7 +178,7 @@ Our NFT "token" is almost ready but to allow a new rule. We need Bob to transfer 2- Complete the _ligo dry-run_ command for authorizing Bob to transfer tokens taken from Vera account, transaction emitted by Vera. (reuse the storage you made on step 1). You can use *operator\_update\_to\_michelson* function to convert your parameters into the format expected by *Update\_operators* entry point. -3- Complete the _ligo dry-run_ command for simulating the transfer of 1 token from Vera'account to Alice's account, transaction emitted by Bob. The transfered token id is number 1 (token\_id and and amount must be 1). You can use the *transfer\_to\_michelson* function to convert your parameters into the format expected by *Transfer* entry point. +3- Complete the _ligo dry-run_ command for simulating the transfer of 1 token from Vera'account to Alice's account, transaction emitted by Bob. The transferred token id is number 1 (token\_id and and amount must be 1). You can use the *transfer\_to\_michelson* function to convert your parameters into the format expected by *Transfer* entry point. You will have to modify the storage accordingly: - "Vera account is owner of the token 1" (step 1) diff --git a/src/frontend/src/pages/Chapters/Camel/ChapterFA20Permission/course.md b/src/frontend/src/pages/Chapters/Camel/ChapterFA20Permission/course.md index 3619570..4227fc8 100644 --- a/src/frontend/src/pages/Chapters/Camel/ChapterFA20Permission/course.md +++ b/src/frontend/src/pages/Chapters/Camel/ChapterFA20Permission/course.md @@ -172,7 +172,7 @@ Operator(Owner_transfer) * Receiver(Owner_no_hook) * Sender(Owner_no_hook) ## Your mission We are working on a non_fungible/multi-asset token. -Our NFT "token" is almost ready but to allow a new rule. We need Bob to transfert a token taken from Vera account and send it to alice's account. +Our NFT "token" is almost ready but to allow a new rule. We need Bob to transfer a token taken from Vera account and send it to alice's account. 1- First we have to set the right operator policy to authorize delegation when deploying the contract. We want you to prepare the initial state of storage. Write the _ligo compile-storage_ command for the *token* contract with following recommandations : @@ -185,7 +185,7 @@ Our NFT "token" is almost ready but to allow a new rule. We need Bob to transfer - Vera account is owner of the token 1 - alice's account has no token - Jay is the administrator of the contract -- the token type transfered is 0 (token_id) +- the token type transferred is 0 (token_id) 2- Write the _ligo dry-run_ command for authorizing Bob to transfer token taken from Vera account, transaction emitted by Jay. (reuse the storage you made on step 1) diff --git a/src/frontend/src/pages/Chapters/Pascal/ChapterDeployContract/course.md b/src/frontend/src/pages/Chapters/Pascal/ChapterDeployContract/course.md index b75fcf4..41a27e8 100644 --- a/src/frontend/src/pages/Chapters/Pascal/ChapterDeployContract/course.md +++ b/src/frontend/src/pages/Chapters/Pascal/ChapterDeployContract/course.md @@ -44,8 +44,8 @@ tezos-client originate contract for transferring name given to the contract path of the Michelson smart contract code (TZ file). - is the quantity of tez being transfered to the newly deployed contract. If a contract balance reaches 0 then it is deactivated. - account from which the tez are taken from (and transfered to the new contract). + is the quantity of tez being transferred to the newly deployed contract. If a contract balance reaches 0 then it is deactivated. + account from which the tez are taken from (and transferred to the new contract). is a Michelson expression. The --init parameter is used to specify initial state of the storage. it specifies the the maximal fee the user is willing to pay for this operation (using the --burn-cap parameter). @@ -59,7 +59,7 @@ Here is the syntax of the tezos command line to invoke a smart contract : tezos-client transfer from to --arg '' --dry-run ``` - is the quantity of tez being transfered to the contract. + is the quantity of tez being transferred to the contract. name given to the contract name of the entry point and corresponding parameters. For example 'Increment(5)'. diff --git a/src/frontend/src/pages/Chapters/Pascal/ChapterFA12/course.md b/src/frontend/src/pages/Chapters/Pascal/ChapterFA12/course.md index 8743936..b6dbb37 100644 --- a/src/frontend/src/pages/Chapters/Pascal/ChapterFA12/course.md +++ b/src/frontend/src/pages/Chapters/Pascal/ChapterFA12/course.md @@ -14,7 +14,7 @@ A _token_ or _crypto-currency_ is a numerical asset emitted on a blockchain. Fungible means divisible. -A Fungible token is a Financial Application where the account balance represents the value associated to an _address_. This value can be splitted into smaller parts which can be transfered to another account. +A Fungible token is a Financial Application where the account balance represents the value associated to an _address_. This value can be splitted into smaller parts which can be transferred to another account. A Non-fungible token (NFT) is a Financial Application whose balance cannot be splitted into smaller parts. Crypto-kitties is an example of a game using non fungible tokens (on the Ethereum blockchain). For example, a video game avatar (such as avatar on world of warcraft) is a character having some skills/attributes (strength, dexterity,...) and one may want to sell his avatar, but cannot sell the strength property of his avatar separately. It makes sense to keep the whole avatar into a undivisible set of attributes. @@ -217,9 +217,9 @@ Consider alice's account (at address tz1NiAGZgRV8F1E3qYFEPgajntzTRDYkU9h7) 5- Write a Tezos command line that simulates your invocation. -6- Now that the approval has been executed on the blockchain, 2 TAT can be transfered from your address to *alice*'s. Write a ligo command line for preparing the invocation of a *Transfer* of 2 TAT (Tezos Academy Token) from you to *alice*. +6- Now that the approval has been executed on the blockchain, 2 TAT can be transferred from your address to *alice*'s. Write a ligo command line for preparing the invocation of a *Transfer* of 2 TAT (Tezos Academy Token) from you to *alice*. -7- Write a ligo command line for preparing a simulated storage where you (tz1SdT62G8tQp9fdHh4f2m4VtL8aGG6NUcmJ) possess 1,000,000 tokens and an allowance is initialized with 2 TAT that can be transfered from *me* to *alice* (tz1NiAGZgRV8F1E3qYFEPgajntzTRDYkU9h7). +7- Write a ligo command line for preparing a simulated storage where you (tz1SdT62G8tQp9fdHh4f2m4VtL8aGG6NUcmJ) possess 1,000,000 tokens and an allowance is initialized with 2 TAT that can be transferred from *me* to *alice* (tz1NiAGZgRV8F1E3qYFEPgajntzTRDYkU9h7). 8- Write a ligo command line that simulates your invocation of the previous *Transfer* on storage prepared at step 7. (Don't forget to specify that you are sending this transaction). diff --git a/src/frontend/src/pages/Chapters/Pascal/ChapterFA20Operator/course.md b/src/frontend/src/pages/Chapters/Pascal/ChapterFA20Operator/course.md index 418dd16..8b8fa19 100644 --- a/src/frontend/src/pages/Chapters/Pascal/ChapterFA20Operator/course.md +++ b/src/frontend/src/pages/Chapters/Pascal/ChapterFA20Operator/course.md @@ -93,7 +93,7 @@ an _operator_ is a relationship between two address (owner address and operator ### FA2 Permission Policies and Configuration -Most token standards specify logic that validates a transfer transaction and can either approve or reject a transfer. +Most token standards specify the logic that validates a transfer transaction and that can either approve or reject a transfer. Such logic (called _Permission Policy_) could validate who initiates a transfer, the transfer amount, and who can receive tokens. This FA2 standard defines a framework to compose and configure such permission policies. @@ -190,7 +190,7 @@ Operator(Owner_transfer) * Receiver(Owner_no_hook) * Sender(Owner_no_hook) ## Your mission We are working on a non_fungible/single-asset token. -Our NFT "token" is almost ready but to allow a new rule. We need Bob to transfert a token taken from Vera account and send it to alice's account. +Our NFT "token" is almost ready but to allow a new rule. We need Bob to transfer a token taken from Vera account and send it to alice's account. - Alice's account address is "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" - Bob's account address is "tz1faswCTDciRzE4oJ9jn2Vm2dvjeyA9fUzU" @@ -202,7 +202,7 @@ Our NFT "token" is almost ready but to allow a new rule. We need Bob to transfer 2- Complete the _ligo dry-run_ command for authorizing Bob to transfer tokens taken from Vera account, transaction emitted by Vera. (reuse the storage you made on step 1). You can use *Layout.convert\_to\_right\_comb* function to convert your parameters into the format expected by *Update\_operators* entry point. -3- Complete the _ligo dry-run_ command for simulating the transfer of 1 token from Vera'account to Alice's account, transaction emitted by Bob. The transfered token id is number 1 (token\_id and and amount must be 1). You can use the *Layout.convert\_to\_right\_comb* function to convert your parameters into the format expected by *Transfer* entry point. +3- Complete the _ligo dry-run_ command for simulating the transfer of 1 token from Vera'account to Alice's account, transaction emitted by Bob. The transferred token id is number 1 (token\_id and and amount must be 1). You can use the *Layout.convert\_to\_right\_comb* function to convert your parameters into the format expected by *Transfer* entry point. You will have to modify the storage accordingly: - "Vera account is owner of the token 1" (step 1) diff --git a/src/frontend/src/pages/Chapters/Reason/ChapterDeployContract/course.md b/src/frontend/src/pages/Chapters/Reason/ChapterDeployContract/course.md index 866e7f5..452adec 100644 --- a/src/frontend/src/pages/Chapters/Reason/ChapterDeployContract/course.md +++ b/src/frontend/src/pages/Chapters/Reason/ChapterDeployContract/course.md @@ -44,8 +44,8 @@ tezos-client originate contract for transferring name given to the contract path of the Michelson smart contract code (TZ file). - is the quantity of tez being transfered to the newly deployed contract. If a contract balance reaches 0 then it is deactivated. - account from which the tez are taken from (and transfered to the new contract). + is the quantity of tez being transferred to the newly deployed contract. If a contract balance reaches 0 then it is deactivated. + account from which the tez are taken from (and transferred to the new contract). is a Michelson expression. The --init parameter is used to specify initial state of the storage. it specifies the the maximal fee the user is willing to pay for this operation (using the --burn-cap parameter). @@ -59,7 +59,7 @@ Here is the syntax of the tezos command line to invoke a smart contract : tezos-client transfer from to --arg '' --dry-run ``` - is the quantity of tez being transfered to the contract. + is the quantity of tez being transferred to the contract. name given to the contract name of the entry point and corresponding parameters. For example 'Increment(5)'. diff --git a/src/frontend/src/pages/Chapters/Reason/ChapterFA12/course.md b/src/frontend/src/pages/Chapters/Reason/ChapterFA12/course.md index a2348a3..189ed9e 100644 --- a/src/frontend/src/pages/Chapters/Reason/ChapterFA12/course.md +++ b/src/frontend/src/pages/Chapters/Reason/ChapterFA12/course.md @@ -12,7 +12,7 @@ Financial assets are opposed to non-financial assets, such as property rights wh A _token_ or _crypto-currency_ is a numerical asset emitted on a blockchain. -Fungible means divisible. A Fungible token is a Financial Application where the account balance represents the value associated to an _address_. This value can be splitted into smaller parts which can be transfered to another account. +Fungible means divisible. A Fungible token is a Financial Application where the account balance represents the value associated to an _address_. This value can be splitted into smaller parts which can be transferred to another account. A Non-fungible token (NFT) is a Financial Application whose balance cannot be splitted into smaller parts. Crypto-kitties is an example of a game using non fungible tokens (on the Ethereum blockchain). For example, a video game avatar (such as avatar on world of warcraft) is a character having some skills/attributes (strength, dexterity,...) and one may want to sell his avatar, but cannot sell the strength property of his avatar separately. It makes sense to keep the whole avatar into a undivisible set of attributes. @@ -185,9 +185,9 @@ Consider alice's account (at address tz1NiAGZgRV8F1E3qYFEPgajntzTRDYkU9h7). 5- Write a Tezos command line that simulates your invocation. -6- Now that the approval has been executed on the blockchain, 2 TAT can be transfered from your address to *alice*'s. Write a ligo command line for preparing the invocation of a *Transfer* of 2 TAT (Tezos Academy Token) from you to *alice*. +6- Now that the approval has been executed on the blockchain, 2 TAT can be transferred from your address to *alice*'s. Write a ligo command line for preparing the invocation of a *Transfer* of 2 TAT (Tezos Academy Token) from you to *alice*. -7- Write a ligo command line for preparing a simulated storage where you (tz1SdT62G8tQp9fdHh4f2m4VtL8aGG6NUcmJ) possess 1,000,000 tokens and an allowance is initialized with 2 TAT that can be transfered from *me* to *alice* (tz1NiAGZgRV8F1E3qYFEPgajntzTRDYkU9h7). +7- Write a ligo command line for preparing a simulated storage where you (tz1SdT62G8tQp9fdHh4f2m4VtL8aGG6NUcmJ) possess 1,000,000 tokens and an allowance is initialized with 2 TAT that can be transferred from *me* to *alice* (tz1NiAGZgRV8F1E3qYFEPgajntzTRDYkU9h7). 8- Write a ligo command line that simulates your invocation of the previous *Transfer* on storage prepared at step 7. (Don't forget to specify that you are sending this transaction). diff --git a/src/frontend/src/pages/Chapters/Reason/ChapterFA20Operator/course.md b/src/frontend/src/pages/Chapters/Reason/ChapterFA20Operator/course.md index ec9bfca..37143ac 100644 --- a/src/frontend/src/pages/Chapters/Reason/ChapterFA20Operator/course.md +++ b/src/frontend/src/pages/Chapters/Reason/ChapterFA20Operator/course.md @@ -106,7 +106,7 @@ let isOperator = ((tokenOwner, tokenOperator, storage): (tokenOwner, tokenOperat ### FA2 Permission Policies and Configuration -Most token standards specify logic that validates a transfer transaction and can either approve or reject a transfer. +Most token standards specify the logic that validates a transfer transaction and that can either approve or reject a transfer. Such logic (called _Permission Policy_) could validate who initiates a transfer, the transfer amount, and who can receive tokens. This FA2 standard defines a framework to compose and configure such permission policies. @@ -212,7 +212,7 @@ type permissionsDescriptorParameter = contract(permissionsDescriptorMichelson); ## Your mission We are working on a non_fungible/single-asset token. -Our NFT "token" is almost ready but to allow a new rule. We need Bob to transfert a token taken from Vera account and send it to alice's account. +Our NFT "token" is almost ready but to allow a new rule. We need Bob to transfer a token taken from Vera account and send it to alice's account. - Alice's account address is "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" - Bob's account address is "tz1faswCTDciRzE4oJ9jn2Vm2dvjeyA9fUzU" @@ -224,7 +224,7 @@ Our NFT "token" is almost ready but to allow a new rule. We need Bob to transfer 2- Complete the _ligo dry-run_ command for authorizing Bob to transfer tokens taken from Vera account, transaction emitted by Vera. (reuse the storage you made on step 1). You can use *Layout.convert\_to\_right\_comb* function to convert your parameters into the format expected by *Update\_operators* entry point. -3- Complete the _ligo dry-run_ command for simulating the transfer of 1 token from Vera'account to Alice's account, transaction emitted by Bob. The transfered token id is number 1 (token\_id and and amount must be 1). You can use the *Layout.convert\_to\_right\_comb* function to convert your parameters into the format expected by *Transfer* entry point. +3- Complete the _ligo dry-run_ command for simulating the transfer of 1 token from Vera'account to Alice's account, transaction emitted by Bob. The transferred token id is number 1 (token\_id and and amount must be 1). You can use the *Layout.convert\_to\_right\_comb* function to convert your parameters into the format expected by *Transfer* entry point. You will have to modify the storage accordingly: - "Vera account is owner of the token 1" (step 1)