Skip to content
This repository has been archived by the owner on Jul 1, 2024. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
shoom3301 committed Dec 16, 2021
2 parents 0f60af7 + 491d971 commit df52eec
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 5 deletions.
1 change: 0 additions & 1 deletion docs/governance/overview.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ The creation of the 1inch Network DAO marked the move towards full-fledged DAO f

1INCH token is the governance token of the 1inch Network DAO. Anyone may participate in the DAO’s discussions, however only users with 1inch governance tokens may vote on proposals. To ensure that all participants in the governance process have a vested interest in the success of the project, holders of 1INCH must first deposit it in the staking contract (see [Voting Process](#Voting-Process)).

**NOTE -- 1inch governance process overview**

![](../../static/img/table_gov_process.png)
2 changes: 0 additions & 2 deletions docs/governance/voting-process.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,8 @@ Currently, 1inch DAO voting uses governance token balances and delegations on th
### Distribution

![](../../static/img/1inch_token_dis.png)
1INCH token distribution overview

![](../../static/img/1inch_token_dis_colm.png)
1INCH token distribution schedule


### Token Addresses
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ sidebar_position: 2
| Field | Type | Description |
| -------------------- | --------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `id` | `Number` | is a pass-through, integer identifier starting at 1 |
| `wrapEth` | `Boolean?`| if this flag is enabled, then in the case of a limit order, the taker asset of which is WETH, the taker does not need to give permission to use WETH. Aggregation protocol router will use ETH instead of WETH as taker asset |
| `wrapEth` | `Boolean?`| if this flag is enabled, then in the case of a limit order, the taker asset of which is `WETH`, the taker will receive `ETH` instead of `WETH` |
| `expiresInTimestamp` | `Number` | is the timestamp in seconds when the limit order will no longer be available for execution. For example: 1623166270029 |
| `makerAssetAddress` | `String` | the address of the asset you want to sell (address of a token contract) |
| `takerAssetAddress` | `String` | the address of the asset you want to buy (address of a token contract) |
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"write-heading-ids": "docusaurus write-heading-ids",
"postinstall": "yarn run copy:lo-smartcontract-docs",
"clone-lo-smartcontract": "git clone https://github.com/1inch/limit-order-protocol.git ./git-submodules/limit-order-protocol",
"precopy:lo-smartcontract-docs": "rimraf ./git-submodules/limit-order-protocol && yarn run clone-lo-smartcontract",
"copy:lo-smartcontract-docs": "git submodule update --remote --merge && rimraf docs/limit-order-protocol/smart-contract/* && cp -R git-submodules/limit-order-protocol/docgen/docs/* docs/limit-order-protocol/smart-contract/ && touch docs/limit-order-protocol/smart-contract/_category_.json && echo '{\"label\": \"Smart contracts\",\"position\": 4}' > docs/limit-order-protocol/smart-contract/_category_.json"
},
"dependencies": {
Expand Down

0 comments on commit df52eec

Please sign in to comment.