Skip to content

Commit

Permalink
GitBook: [#71] edits
Browse files Browse the repository at this point in the history
  • Loading branch information
Cameron authored and gitbook-bot committed Nov 22, 2021
1 parent db67545 commit 3d29312
Show file tree
Hide file tree
Showing 12 changed files with 227 additions and 281 deletions.
5 changes: 0 additions & 5 deletions docs/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,6 @@
* [Contract & Specifications](edgeware-stack/lockdrop/contract-and-specifications/README.md)
* [Lockdrop Contracts](https://github.com/hicommonwealth/edgeware-lockdrop)

***

* [Page 2](page-2.md)
* [Page 1](page-1.md)

## Advanced

* [Setup Multi Signature Account](advanced/setup-multi-signature-account/README.md)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Create Multi Signature Account

We will create a Multi-Signature account using a local Edgeware development network and perform a test transaction from the account. You will have to make sure you have a [local development node running](../../development/develop/smart-contracts/evm-smart-contracts/tutorials/deploy-an-evm-contract/setting-up-a-edgeware-evm-node.md) for this tutorial.
We will create a Multi-Signature account using a local Edgeware development network and perform a test transaction from the account. You will have to make sure you have a [local development node running](../../development/develop/smart-contracts/wasm-smart-contracts/tutorials/setting-up-an-edgeware-node-for-local-development.md) for this tutorial.

Once a development node is active, you're going to click on this link: [https://polkadot.js.org/apps//#/explorer](https://polkadot.js.org/apps/#/explorer). In the top left drop-down menu you're then going navigate to and click on: 'development > Local Node > Switch' and then wait for 'initializing connection' to conclude.

Expand All @@ -14,7 +14,7 @@ From here, you will navigate and hover on the **Accounts** tab on the navigation

Click on **+Multisig**.

You will now choose your signatures (i.e. your teammates accounts). In our scenario, we will choose **Alice, Bob, and Charlie **and we will be setting the **threshold to 2.** This means only 2/3 signatures will be needed to enact the on-chain transaction. You can set the threshold to be equal to or less than the number of signatories involved in the multisig. We will name this multisig our **Team Funding** account.
You will now choose your signatures (i.e. your teammates accounts). In our scenario, we will choose \*\*Alice, Bob, and Charlie \*\*and we will be setting the **threshold to 2.** This means only 2/3 signatures will be needed to enact the on-chain transaction. You can set the threshold to be equal to or less than the number of signatories involved in the multisig. We will name this multisig our **Team Funding** account.

![](<../../.gitbook/assets/Screen Shot 2021-10-11 at 7.19.12 PM.png>)

Expand All @@ -38,7 +38,7 @@ It was broadcasted to the chain, you can see notification on the top right.

![](../../../.gitbook/assets/transfer-ms-first-call.png)

Referring to the image below, we can see the multisig approvals now pending next to our **Team Funding** account. On the **Team Funding **account click send.
Referring to the image below, we can see the multisig approvals now pending next to our **Team Funding** account. On the \*\*Team Funding \*\*account click send.

![](<../../.gitbook/assets/Screen Shot 2021-10-11 at 7.40.04 PM.png>)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Ethereum Libraries

{% hint style="warning" %}
#### Proceed with caution! This page is in progress. :construction_site:
**Proceed with caution! This page is in progress. **:construction\_site:
{% endhint %}

In order for a web app to interact with the Ethereum blockchain (i.e. read blockchain data and/or send transactions to the network), it must connect to an Ethereum node.
Expand Down Expand Up @@ -57,4 +57,3 @@ Official documentation - web3.py
{% embed url="https://docs.ethers.io/v5/" %}
Official documentation - ethers.js
{% endembed %}

48 changes: 24 additions & 24 deletions docs/edgeware-stack/lockdrop/retrieve-your-eth/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,34 @@ description: A guide on retrieving ETH locked in the Edgeware lockdrop event.

There are two ways to retrieve your ETH from a lockdrop user contract:

* Using the Commonwealth unlock tool. \(This tool is down occasionally.\)
* Sending a manual transaction.
* Using the Commonwealth unlock tool. (This tool is down occasionally.)
* Sending a manual transaction.

First, note the difference between a LUC and the MLC:

* **Master Lockdrop Contract \(MLC\) \(v1 and v2\)**
* **Master Lockdrop Contract (MLC) (v1 and v2)**

The coordinating contract that you sent your ETH to - it creates and sends this ETH on to your personal Lockdrop User Contract, which holds your ETH until unlock time. **Do not send the unlock transaction to an MLC - it will fail.**

* MLC v1 \(Old\) `0x1b75b90e60070d37cfa9d87affd124bb345bf70a`
* MLC v2 \(New\) `0xFEC6F679e32D45E22736aD09dFdF6E3368704e31`
* **Lockdrop User Contract \(LUC\)** Your individual lockdrop contract. This holds the ETH and is the contract you will use to unlock and retrieve your ETH. **This is where we will send an unlock transaction. See link below to find your LUC address.**
The coordinating contract that you sent your ETH to - it creates and sends this ETH on to your personal Lockdrop User Contract, which holds your ETH until unlock time. **Do not send the unlock transaction to an MLC - it will fail.**
* MLC v1 (Old) `0x1b75b90e60070d37cfa9d87affd124bb345bf70a`
* MLC v2 (New) `0xFEC6F679e32D45E22736aD09dFdF6E3368704e31`
* **Lockdrop User Contract (LUC)** Your individual lockdrop contract. This holds the ETH and is the contract you will use to unlock and retrieve your ETH. **This is where we will send an unlock transaction. See link below to find your LUC address.**

## Has your lock duration elapsed?

To retrieve your ETH, your lock duration must be complete or the transaction will fail. Before proceeding with this guide, check that your duration is over:

{% page-ref page="../check-the-status-of-your-lock-duration-and-unlock-date.md" %}
{% content-ref url="../check-the-status-of-your-lock-duration-and-unlock-date.md" %}
[check-the-status-of-your-lock-duration-and-unlock-date.md](../check-the-status-of-your-lock-duration-and-unlock-date.md)
{% endcontent-ref %}

{% tabs %}
{% tab title="Send a Transaction Manually" %}
## Prerequisites
### Prerequisites

* Access and control over the _original_ account you sent from when creating your LUC from the MLC - the ETH will be returned here.
* [Metamask](https://chrome.google.com/webstore/detail/metamask/nkbihfbeogaeaoehlefnkodbefgpgknn) or a wallet with transaction abilities with _any_ account connected, it _does not_ have to be the original, but it **does** need enough ETH to pay the 'gas' \(the transaction fee\) for the transaction - likely equal or less than 0.00042 ETH.
* The _contract_ address of your LUC. See above to learn how to find this.
* The unlock time must have passed for your LUC.
* [Metamask](https://chrome.google.com/webstore/detail/metamask/nkbihfbeogaeaoehlefnkodbefgpgknn) or a wallet with transaction abilities with _any_ account connected, it _does not_ have to be the original, but it **does** need enough ETH to pay the 'gas' (the transaction fee) for the transaction - likely equal or less than 0.00042 ETH.
* The _contract_ address of your LUC. See above to learn how to find this.
* The unlock time must have passed for your LUC.

**Steps**

Expand All @@ -42,40 +43,40 @@ To retrieve your ETH, your lock duration must be complete or the transaction wil
4. Carefully enter your LUC's Contract Address into the Recipient Address field.
5. Enter zero for the send amount.
6. Increase your gas limit on a transaction to 40k.
7. Confirm that your transaction speed \(and therefore transaction fee cost\) is satisfactory. \(More fee means quicker processing by the network.\)
7. Confirm that your transaction speed (and therefore transaction fee cost) is satisfactory. (More fee means quicker processing by the network.)
8. Hit Next

{% hint style="info" %}
Unlock attempts fail due to three main reasons:

* The LUC is not yet past it's unlock date of 3, 6 or 12 months.
* The gas limit needs to be increased to 40k.
* The LUC is not yet past it's unlock date of 3, 6 or 12 months.
* The gas limit needs to be increased to 40k.
* You are attempting to send the transaction to an MLC and not your LUC.
{% endhint %}

Now watch for the transaction to be finalized, and confirm that your ETH arrived home safely.
{% endtab %}

{% tab title="Commonwealth Unlock Tool " %}
## Prerequisites
### Prerequisites

* The ETH address of the account you participated in the lockdrop with.
* Control over the account you originally participated in the lockdrop with - the ETH will return here.
* A web3 Wallet with an account with enough ETH to cover the unlock transaction \(gas\) costs.
* Control over the account you originally participated in the lockdrop with - the ETH will return here.
* A web3 Wallet with an account with enough ETH to cover the unlock transaction (gas) costs.
* Your unlock time has elapsed.

{% hint style="info" %}
This tool may be offline or display errors due to Infura - if so, switch to the manual process in this guide.
{% endhint %}

## Steps
### Steps

Visit the [Unlock tool at Commonwealth.im](https://commonwealth.im/edgeware/unlock)

Select the version of the Master Lockdrop Contract you used to participate in the Lockdrop event.

* MLC v1 \(Old\) `0x1b75b90e60070d37cfa9d87affd124bb345bf70a`
* MLC v2 \(New\) `0xFEC6F679e32D45E22736aD09dFdF6E3368704e31`
* MLC v1 (Old) `0x1b75b90e60070d37cfa9d87affd124bb345bf70a`
* MLC v2 (New) `0xFEC6F679e32D45E22736aD09dFdF6E3368704e31`

If you are not sure which you used, examine the transactions at your participating ETH address using a block explorer for the locking transactions.

Expand All @@ -86,9 +87,8 @@ View the LUC instances and select unlock to cue a Metamask or web3 wallet transa
{% hint style="info" %}
Unlock attempts fail due to two main reasons:

* The LUC is not yet past it's unlock date of 3, 6 or 12 months.
* The LUC is not yet past it's unlock date of 3, 6 or 12 months.
* The gas limit needs to be increased to 40k.
{% endhint %}
{% endtab %}
{% endtabs %}

19 changes: 12 additions & 7 deletions docs/edgeware-stack/node/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Edgeware Node

Blockchain networks are composed of individual **nodes** that are connected by a peer-to-peer \(P2P\) network. Nodes are the individual computers on a network running the blockchain software that makes everything work. The `Edgeware Node` subsection includes anything relevant to nodes on operating on Edgeware.
Blockchain networks are composed of individual **nodes** that are connected by a peer-to-peer (P2P) network. Nodes are the individual computers on a network running the blockchain software that makes everything work. The `Edgeware Node` subsection includes anything relevant to nodes on operating on Edgeware.

## For node operators, validators, and other users

Expand All @@ -12,21 +12,26 @@ GitHub repository: [https://github.com/edgeware-network/edgeware-node](https://g

For Mainnet, run:

```text
```
docker run --rm -it decentration/edgeware:v3.3.3 edgeware --chain=edgeware --name <INSERT-NAME> --wasm-execution Compiled
```

For Beresheet testnet, run:

```text
```
docker run --rm -it decentration/edgeware:v3.3.3 edgeware --chain=beresheet --name <INSERT_NAME>
```

For any additional questions or information, refer to our `builders-general` channel in the [Edgeware Discord](https://discord.gg/zdFJm4gA5M).

{% page-ref page="../../quickstart/set-up-a-full-node.md" %}

{% page-ref page="../../development/develop/smart-contracts/wasm-smart-contracts/tutorials/setting-up-an-edgeware-node-for-local-development.md" %}
{% content-ref url="../../quickstart/set-up-a-full-node.md" %}
[set-up-a-full-node.md](../../quickstart/set-up-a-full-node.md)
{% endcontent-ref %}

{% page-ref page="../../development/develop/smart-contracts/wasm-smart-contracts/tutorials/deploy-a-wasm-contract/running-an-edgeware-node.md" %}
{% content-ref url="../../development/develop/smart-contracts/evm-smart-contracts/tutorials/deploy-an-evm-contract/setting-up-a-edgeware-evm-node.md" %}
[setting-up-a-edgeware-evm-node.md](../../development/develop/smart-contracts/evm-smart-contracts/tutorials/deploy-an-evm-contract/setting-up-a-edgeware-evm-node.md)
{% endcontent-ref %}

{% content-ref url="../../development/develop/smart-contracts/wasm-smart-contracts/tutorials/deploy-a-wasm-contract/running-an-edgeware-node.md" %}
[running-an-edgeware-node.md](../../development/develop/smart-contracts/wasm-smart-contracts/tutorials/deploy-a-wasm-contract/running-an-edgeware-node.md)
{% endcontent-ref %}
Loading

0 comments on commit 3d29312

Please sign in to comment.