Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@xavier506
xavier506 committed Nov 13, 2020
2 parents bd20da3 + 713cee1 commit c8c6d4c
Show file tree
Hide file tree
Showing 10 changed files with 75 additions and 76 deletions.
6 changes: 3 additions & 3 deletions src/language/en/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"addLiquidity": "Add liquidity now.",
"exchangeStep1": "Enter a valid amount and use the dropdown menu to select the token you own and want to exchange.",
"exchangeStep2": "Select the token you wish to receive. We will calculate this amount for you. You can use the reverse icon anytime.",
"feeStep1": "Here you may vote for the fee you consider to be the fairest for each token. The fee must be greater than zero and no larger than 3%. Please, use a percentage with one decimal format. For example: 0.1%.",
"feeStep1": "Here you may vote for the fee you consider to be the fairest for each token. The fee must be at least 0.1% and no larger than 1%. Please, use a percentage with one decimal format. For example: 0.1%.",
"liquidityStep1": "Here you can look up the current exchange fee for each token using the dropdown menu.",
"pool": "Pool",
"tokenPair": "Token Pair",
Expand Down Expand Up @@ -95,8 +95,8 @@
"successTransaction": "Success transaction",
"placeholder": "This Percentage",
"help": "Help",
"maxValueAllowed": "The max value allowed is 3%",
"minValueAllowed": "Fee has to be larger than 0"
"maxValueAllowed": "The max value allowed is 1%",
"minValueAllowed": "Fee has to be at least 0.1%"
},
"faq": {
"title": "FAQ's"
Expand Down
28 changes: 14 additions & 14 deletions src/language/en/faq.md
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
# Frequently Asked Questions

## What is evodex?
## What is Evodex?

Evodex is a decentralized exchange that allows swapping amongst any EOSio compatible tokens, including cross-chain wrapped tokens like pBTC. The liquidity for market making is provided by users who transfer their funds to liquidity pools in exchange for fees that can be voted upon by all of the liquidity providers.
Evodex is a decentralized exchange that allows swapping amongst any EOS token, including cross-chain wrapped tokens like pBTC. The liquidity for market making is provided by users who transfer their funds to liquidity pools in exchange for fees that can be voted upon by the liquidity providers of each pair.

## How is evodex unique?
## How is Evodex unique?

The main new feature introduced by evodex is that liquidity providers can vote for the fees they want to charge, this is done using a smart contract that calculates each voter's weight in proportion to the stake they have on the pool.
The main new feature introduced by Evodex is that liquidity providers can vote for the fees they want to charge, this is done using a smart contract that calculates each voter's weight in proportion to the stake they have on the pool.

Another difference between evodex and other platforms comes from the different blockchains where they operate, traders only pay fees to liquidity providers, but they don't have to pay transfer fees like in Ethereum and other networks.
Another difference between Evodex and other platforms comes from the different blockchains where they operate, traders only pay fees to liquidity providers, but they don't have to pay transfer fees like in Ethereum and other networks.

## What are Evotokens?
## What are evotokens?

For each registered pair there will be a standard token backed by the assets in the corresponding pair of pools. These new tokens can be freely transferred, facilitating the access and management of the investment position. These tokens are called “evotokens”.
For each registered pair there will be a standard token backed by the assets in the corresponding pool. These new tokens can be freely transferred, facilitating the access and management of the investment position. They are called “evotokens”.
Each trading pair has a variable fee value between 0.1% and 1%. The value of evotokens rises as fees are collected.

Each trading pair has an associated fee value that might be variable. The value of evotokens rises as fees are collected from the exchange and the addition of liquidity operations. The action of removing liquidity (selling evotokens) is free of charge.
## How can I provide liquidity to a pool?

## How can I provide Liquidity to a pool?

You can go to the “Liquidity” section to add or remove liquidity. You need to have the same amount (in value) of both tokens of the pool to provide liquidity. When providing liquidity you have to pay the pool’s fee, this is done to prevent a flash attack when someone would join a pool, change the fee and then quickly exit. Removing liquidity has no fees.
You can go to the “liquidity” section to add or remove liquidity. You need to have the same amount (in value) of both tokens of the pool to provide liquidity. When providing liquidity you have to pay a tiny fee of 0.01% that goes to the pool. This is done to prevent the following flash attack: join a pool, change the fee to the minimum, make a swap and then exit, all in the same transaction.
Removing liquidity has no fees.

## How can I vote on the pool’s fee?

Once you have provided liquidity to a pool you are entitled to vote on the fee that future traders and liquidity providers pay. To vote, go to the “vote fee” tab and select any value from 0.01% to a maximum of 3%, the contract will then average your vote based on the porcentage you own of the pool and update the fee accordingly.
Once you have provided liquidity to a pool you are entitled to vote on the fee that future traders will pay. To vote, go to the “vote fee” tab and select a value from 0.1% to a maximum of 1%. The contract will enter your vote weighted by your share of the pool and update the fee to the weighted median of the votes.

## Can I create my own trading pair?

The creation of trading pairs is not yet supported in our front-end, however the protocol is open and anyone can create a trading pair invoking the “evolutiondex” smart contract. More info can be found on [Evolution Dex’s Github](https://github.com/eosargentina/evolutiondex)
The creation of trading pairs on the contract evolutiondex is not open to the public, but it is expected to be part of the future decentralized governance model. The codes of the smart contracts are public and can be found at [Evolution Dex’s Github](https://github.com/eosargentina/evolutiondex)

## Can I retire my tokens at any time?

Yes, you can retire your tokens at any time by selling your evotokens in the liquidity tab.

## Why does the price change with higher amounts?

The price of a token swap is determined by the balances of the pool. If the liquidity is low compared to the amount you want to exchange you can suffer price slippage.
The price of a token swap is determined by the balances of the pool. If the liquidity is low compared to the amount you want to exchange you can suffer considerable price slippage.
6 changes: 3 additions & 3 deletions src/language/es/es.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"addLiquidity": "Agregue liquidez ahora.",
"exchangeStep1": "Ingrese una cantidad válida y use el menú desplegable para seleccionar el token que posee y desea intercambiar.",
"exchangeStep2": "Seleccione el token que desea recibir. Calcularemos esta cantidad por usted. Puede utilizar el icono de retroceso en cualquier momento.",
"feeStep1": "Aquí puede votar por la tarifa que considere más justa para cada token. La tarifa debe ser superior a cero y no superior al 3%. Por favor, use un porcentaje con un formato decimal. Por ejemplo: 0.1%.",
"feeStep1": "Aquí puede votar por la tarifa que considere más justa para cada token. La tarifa debe ser estar entre el 0.1% y el 1%. Por favor, use un porcentaje con un formato decimal. Por ejemplo: 0.1%.",
"liquidityStep1": "Aquí puede buscar la tarifa de cambio actual para cada token usando el menú desplegable.",
"pool": "Pool",
"tokenPair": "Token",
Expand Down Expand Up @@ -96,8 +96,8 @@
"successTransaction": "Transacción realizada",
"placeholder": "Este Porcentaje",
"help": "Ayuda",
"maxValueAllowed": "Valor máximo permitido es 3%",
"minValueAllowed": "La tarifa debe ser mayor que 0"
"maxValueAllowed": "Valor máximo permitido es 1%",
"minValueAllowed": "La tarifa debe ser al menos 0.1%"
},
"faq": {
"title": "Preguntas Frecuentes"
Expand Down
30 changes: 16 additions & 14 deletions src/language/es/faq.md
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,39 @@
# Preguntas Frecuentes

## ¿Qué es evodex?
## ¿Qué es Evodex?

Evodex es una plataforma de intercambio descentralizado que permite transacciones entre cualquier token compatible con EOSio, incluidos los tokens envueltos en cadenas cruzadas como pBTC. La liquidez para la creación de mercado la proporcionan los usuarios que transfieren sus fondos a piscinas de liquidez (también denominados grupos de liquidez) a cambio de tarifas que pueden ser votadas por todos los proveedores de liquidez.
Evodex es una plataforma de intercambio descentralizado que permite operar tokens sobre la cadena de bloques EOS, incluidos los tokens envueltos provenientes de otras cadenas de bloques, como pBTC. La liquidez para la creación de mercado la proporcionan los usuarios que transfieren sus fondos a pooles de liquidez (también denominados grupos de liquidez) a cambio de tarifas que pueden ser votadas por los proveedores de liquidez de cada

## ¿En qué es único evodex?
## ¿En qué es único Evodex?

La principal característica nueva introducida por evodex es que los proveedores de liquidez pueden votar por las tarifas que quieren cobrar, esto se hace mediante un contrato inteligente que calcula el peso de cada votante en proporción a la participación que tienen en el grupo.
La funcionalidad que distingue a Evodex es la capacidad otorgada a los proveedores de liquidez de votar por las tarifas que quieren cobrar. Esto se hace mediante un contrato inteligente que calcula el peso de cada votante en proporción a la participación que tiene en el pool.

Otra diferencia entre evodex y otras plataformas proviene de las diferentes cadenas de bloques donde operan, los comerciantes solo pagan tarifas a los proveedores de liquidez, pero no tienen que pagar tarifas de transferencia como en Ethereum y otras redes.
Otra diferencia entre Evodex y otras plataformas proviene de las diferentes cadenas de bloques donde operan. Los usuarios solo pagan tarifas a los proveedores de liquidez, pero no tienen que pagar comisiones de transferencia como en Ethereum y otras redes.

## ¿Qué son los Evotokens?
## ¿Qué son los evotokens?

Para cada par registrado, habrá un token estándar respaldado por los activos de las piscinas de liquidez correspondientes. Estos nuevos tokens se pueden transferir libremente, facilitando el acceso y la gestión de la posición de inversión. Estos tokens se denominan "evotokens".
Para cada par registrado, habrá un token estándar respaldado por los activos del grupo de liquidez correspondiente. Estos nuevos tokens se pueden transferir libremente, facilitando el acceso y la gestión de la posición de inversión. Los denominamos "evotokens".

Cada par comercial tiene un valor de tarifa asociado que puede ser variable. El valor de los evotokens aumenta a medida que se cobran las tarifas del intercambio y la adición de operaciones de liquidez. La acción de retirar liquidez (venta de evotokens) es gratuita.
Cada par tiene un valor de tarifa asociado que puede variar entre 0,1% y 1%. El valor de los evotokens aumenta a medida que se recaudan las comisiones.

## ¿Cómo puedo aportar liquidez al pool?

Puede ir a la sección "Liquidez" para agregar o eliminar liquidez. Debe tener la misma cantidad (en valor) de ambos tokens del grupo para proporcionar liquidez. Al proporcionar liquidez, debe pagar la tarifa correspondiente, esto se hace para evitar un ataque repentino de que alguien se una a un grupo de liquidez, cambiaría la tarifa y luego salga rápidamente. Eliminar la liquidez no tiene comisiones.
Puede ir a la sección "liquidez" para agregar o retirar liquidez. Debe tener la misma cantidad (en valor) de ambos tokens del grupo para proporcionar liquidez. Al proporcionar liquidez, debe pagar una pequeña tarifa de 0,01%, que quedará en el pool correspondiente. Esto se hace para evitar un ataque fugaz en el que alguien agrega liquidez, modifica la tarifa al mínimo, realiza una operación de cambio y luego retira la liquidez, todo en la misma transacción. No hay comisión para retirar liquidez.

## ¿Cómo puedo votar la tarifa de una pisicina de liquidez?
## ¿Cómo puedo votar la tarifa de un pool de liquidez?

Una vez que haya proporcionado liquidez a un grupo, tiene derecho a votar sobre la tarifa que pagan los futuros comerciantes y proveedores de liquidez. Para votar, vaya a la pestaña "Votar" y seleccione cualquier valor desde 0.01% hasta un máximo del 3%, el contrato promediará su voto en función del porcentaje que posee del grupo y actualizará la tarifa en consecuencia.
Una vez que haya proporcionado liquidez a un pool, tiene derecho a votar sobre la tarifa que pagarán los futuros clientes. Para votar, vaya a la pestaña "Votar" y seleccione cualquier valor entre 0,1% y 1%. El contrato ingresará su voto ponderado según su participación en el pool, y actualizará la tarifa a la mediana ponderada de todos
los votos ingresados.

## ¿Puedo crear mi propio par comercial?
## ¿Puedo crear mi propio pool de liquidez?

La creación de pares comerciales aún no es compatible con nuestro front-end, sin embargo, el protocolo está abierto y cualquiera puede crear un par comercial invocando el contrato inteligente "evolutiondex". Se puede encontrar más información en el [GitHub de Evolution Dex](https://github.com/eosargentina/evolutiondex).
La creación de pares en el contrato evolutiondex no es libre, pero nos proponemos que sea parte de un futuro gobierno descentralizado. Los códigos de los contratos son públicos:
[GitHub de Evolution Dex](https://github.com/eosargentina/evolutiondex).

## ¿Puedo retirar mis tokens en cualquier momento?

Sí, puedes retirar tus tokens en cualquier momento vendiendo tus evotokens en la pestaña de liquidez.

## ¿Por qué cambia el precio con cantidades mayores?

El precio de un intercambio de tokens está determinado por los saldos del grupo. Si la liquidez es baja en comparación con la cantidad que desea intercambiar, puede sufrir un deslizamiento de precios.
El precio de un intercambio de tokens está determinado por los saldos del grupo. Si la liquidez es baja en comparación con la cantidad que desea intercambiar, puede sufrir un deslizamiento considerable en el precio.
28 changes: 14 additions & 14 deletions src/language/ru/faq.md
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
# Frequently Asked Questions

## What is evodex?
## What is Evodex?

Evodex is a decentralized exchange that allows swapping amongst any EOSio compatible tokens, including cross-chain wrapped tokens like pBTC. The liquidity for market making is provided by users who transfer their funds to liquidity pools in exchange for fees that can be voted upon by all of the liquidity providers.
Evodex is a decentralized exchange that allows swapping amongst any EOS token, including cross-chain wrapped tokens like pBTC. The liquidity for market making is provided by users who transfer their funds to liquidity pools in exchange for fees that can be voted upon by the liquidity providers of each pair.

## How is evodex unique?
## How is Evodex unique?

The main new feature introduced by evodex is that liquidity providers can vote for the fees they want to charge, this is done using a smart contract that calculates each voter's weight in proportion to the stake they have on the pool.
The main new feature introduced by Evodex is that liquidity providers can vote for the fees they want to charge, this is done using a smart contract that calculates each voter's weight in proportion to the stake they have on the pool.

Another difference between evodex and other platforms comes from the different blockchains where they operate, traders only pay fees to liquidity providers, but they don't have to pay transfer fees like in Ethereum and other networks.
Another difference between Evodex and other platforms comes from the different blockchains where they operate, traders only pay fees to liquidity providers, but they don't have to pay transfer fees like in Ethereum and other networks.

## What are Evotokens?
## What are evotokens?

For each registered pair there will be a standard token backed by the assets in the corresponding pair of pools. These new tokens can be freely transferred, facilitating the access and management of the investment position. These tokens are called “evotokens”.
For each registered pair there will be a standard token backed by the assets in the corresponding pool. These new tokens can be freely transferred, facilitating the access and management of the investment position. They are called “evotokens”.
Each trading pair has a variable fee value between 0.1% and 1%. The value of evotokens rises as fees are collected.

Each trading pair has an associated fee value that might be variable. The value of evotokens rises as fees are collected from the exchange and the addition of liquidity operations. The action of removing liquidity (selling evotokens) is free of charge.
## How can I provide liquidity to a pool?

## How can I provide Liquidity to a pool?

You can go to the “Liquidity” section to add or remove liquidity. You need to have the same amount (in value) of both tokens of the pool to provide liquidity. When providing liquidity you have to pay the pool’s fee, this is done to prevent a flash attack when someone would join a pool, change the fee and then quickly exit. Removing liquidity has no fees.
You can go to the “liquidity” section to add or remove liquidity. You need to have the same amount (in value) of both tokens of the pool to provide liquidity. When providing liquidity you have to pay a tiny fee of 0.01% that goes to the pool. This is done to prevent the following flash attack: join a pool, change the fee to the minimum, make a swap and then exit, all in the same transaction.
Removing liquidity has no fees.

## How can I vote on the pool’s fee?

Once you have provided liquidity to a pool you are entitled to vote on the fee that future traders and liquidity providers pay. To vote, go to the “vote fee” tab and select any value from 0.01% to a maximum of 3%, the contract will then average your vote based on the porcentage you own of the pool and update the fee accordingly.
Once you have provided liquidity to a pool you are entitled to vote on the fee that future traders will pay. To vote, go to the “vote fee” tab and select a value from 0.1% to a maximum of 1%. The contract will enter your vote weighted by your share of the pool and update the fee to the weighted median of the votes.

## Can I create my own trading pair?

The creation of trading pairs is not yet supported in our front-end, however the protocol is open and anyone can create a trading pair invoking the “evolutiondex” smart contract. More info can be found on [Evolution Dex’s Github](https://github.com/eosargentina/evolutiondex)
The creation of trading pairs on the contract evolutiondex is not open to the public, but it is expected to be part of the future decentralized governance model. The codes of the smart contracts are public and can be found at [Evolution Dex’s Github](https://github.com/eosargentina/evolutiondex)

## Can I retire my tokens at any time?

Yes, you can retire your tokens at any time by selling your evotokens in the liquidity tab.

## Why does the price change with higher amounts?

The price of a token swap is determined by the balances of the pool. If the liquidity is low compared to the amount you want to exchange you can suffer price slippage.
The price of a token swap is determined by the balances of the pool. If the liquidity is low compared to the amount you want to exchange you can suffer considerable price slippage.
Loading

0 comments on commit c8c6d4c

Please sign in to comment.