-
Notifications
You must be signed in to change notification settings - Fork 147
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(bancor):remove bancor from asch1.5
- Loading branch information
1 parent
f5b3769
commit ae7ddc7
Showing
8 changed files
with
604 additions
and
593 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,118 +1,118 @@ | ||
| async function doExchange(sourceCurrency, targetCurrency, bancor, result, context) { | ||
| const senderId = context.sender.address | ||
| const exchangeFee = result.targetAmount.times(0.001).round() | ||
| const realTargetAmount = result.targetAmount.minus(exchangeFee) | ||
| // decrease source, increase target | ||
| if (sourceCurrency === 'XAS') { | ||
| app.sdb.increase('Account', { xas: -result.sourceAmount.toNumber() }, { address: senderId }) | ||
| app.balances.increase(app.councilAddress, targetCurrency, exchangeFee.toString()) | ||
| app.balances.increase(senderId, targetCurrency, realTargetAmount.toString()) | ||
| } else if (targetCurrency === 'XAS') { | ||
| app.balances.decrease(senderId, sourceCurrency, result.sourceAmount.toString()) | ||
| app.sdb.increase('Account', { xas: exchangeFee.toNumber() }, { address: app.councilAddress }) | ||
| app.sdb.increase('Account', { xas: realTargetAmount.toNumber() }, { address: senderId }) | ||
| } else { | ||
| app.balances.decrease(senderId, sourceCurrency, result.sourceAmount.toString()) | ||
| app.balances.increase(app.councilAddress, targetCurrency, exchangeFee.toString()) | ||
| app.balances.increase(senderId, targetCurrency, realTargetAmount.toString()) | ||
| } | ||
| let sourcePrecision = 0 | ||
| let targetPrecision = 0 | ||
| let type = '' | ||
| let price = 0.0 | ||
| const bancorObj = bancor.getBancorInfo() | ||
| if (sourceCurrency === bancorObj.money) { | ||
| type = 'BUY' | ||
| sourcePrecision = bancorObj.moneyPrecision | ||
| targetPrecision = bancorObj.stockPrecision | ||
| app.logger.debug(`====> exchange: BUY, price = ${result.targetAmount.toString()} / 10 ^ ${targetPrecision} / (${result.sourceAmount.toString()} / 10 ^ ${sourcePrecision})`) | ||
| price = Number(result.targetAmount.div(10 ** Number(targetPrecision)) | ||
| .div(result.sourceAmount.div(10 ** Number(sourcePrecision))) | ||
| .toFixed(sourcePrecision).toString()) | ||
| } else { | ||
| type = 'SELL' | ||
| sourcePrecision = bancorObj.stockPrecision | ||
| targetPrecision = bancorObj.moneyPrecision | ||
| app.logger.debug(`====> exchange: SELL, price = ${result.sourceAmount.toString()} / 10 ^ ${sourcePrecision} / (${result.targetAmount.toString()} / 10 ^ ${targetPrecision})`) | ||
| price = Number(result.sourceAmount.div(10 ** Number(sourcePrecision)) | ||
| .div(result.targetAmount.div(10 ** Number(targetPrecision))) | ||
| .toFixed(targetPrecision).toString()) | ||
| } | ||
| // Record exchange transactions | ||
| app.sdb.create('BancorExchange', { | ||
| id: context.trs.id, | ||
| address: senderId, | ||
| timestamp: app.util.slots.getTime(), | ||
| type, | ||
| owner: bancorObj.owner, | ||
| source: sourceCurrency, | ||
| sourcePrecision, | ||
| target: targetCurrency, | ||
| targetPrecision, | ||
| price, | ||
| targetAmount: result.targetAmount.toString(), | ||
| sourceAmount: result.sourceAmount.toString(), | ||
| }) | ||
| } | ||
| // async function doExchange(sourceCurrency, targetCurrency, bancor, result, context) { | ||
| // const senderId = context.sender.address | ||
| // const exchangeFee = result.targetAmount.times(0.001).round() | ||
| // const realTargetAmount = result.targetAmount.minus(exchangeFee) | ||
| // // decrease source, increase target | ||
| // if (sourceCurrency === 'XAS') { | ||
| // app.sdb.increase('Account', { xas: -result.sourceAmount.toNumber() }, { address: senderId }) | ||
| // app.balances.increase(app.councilAddress, targetCurrency, exchangeFee.toString()) | ||
| // app.balances.increase(senderId, targetCurrency, realTargetAmount.toString()) | ||
| // } else if (targetCurrency === 'XAS') { | ||
| // app.balances.decrease(senderId, sourceCurrency, result.sourceAmount.toString()) | ||
| // app.sdb.increase('Account', { xas: exchangeFee.toNumber() }, { address: app.councilAddress }) | ||
| // app.sdb.increase('Account', { xas: realTargetAmount.toNumber() }, { address: senderId }) | ||
| // } else { | ||
| // app.balances.decrease(senderId, sourceCurrency, result.sourceAmount.toString()) | ||
| // app.balances.increase(app.councilAddress, targetCurrency, exchangeFee.toString()) | ||
| // app.balances.increase(senderId, targetCurrency, realTargetAmount.toString()) | ||
| // } | ||
| // let sourcePrecision = 0 | ||
| // let targetPrecision = 0 | ||
| // let type = '' | ||
| // let price = 0.0 | ||
| // const bancorObj = bancor.getBancorInfo() | ||
| // if (sourceCurrency === bancorObj.money) { | ||
| // type = 'BUY' | ||
| // sourcePrecision = bancorObj.moneyPrecision | ||
| // targetPrecision = bancorObj.stockPrecision | ||
| // app.logger.debug(`====> exchange: BUY, price = ${result.targetAmount.toString()} / 10 ^ ${targetPrecision} / (${result.sourceAmount.toString()} / 10 ^ ${sourcePrecision})`) | ||
| // price = Number(result.targetAmount.div(10 ** Number(targetPrecision)) | ||
| // .div(result.sourceAmount.div(10 ** Number(sourcePrecision))) | ||
| // .toFixed(sourcePrecision).toString()) | ||
| // } else { | ||
| // type = 'SELL' | ||
| // sourcePrecision = bancorObj.stockPrecision | ||
| // targetPrecision = bancorObj.moneyPrecision | ||
| // app.logger.debug(`====> exchange: SELL, price = ${result.sourceAmount.toString()} / 10 ^ ${sourcePrecision} / (${result.targetAmount.toString()} / 10 ^ ${targetPrecision})`) | ||
| // price = Number(result.sourceAmount.div(10 ** Number(sourcePrecision)) | ||
| // .div(result.targetAmount.div(10 ** Number(targetPrecision))) | ||
| // .toFixed(targetPrecision).toString()) | ||
| // } | ||
| // // Record exchange transactions | ||
| // app.sdb.create('BancorExchange', { | ||
| // id: context.trs.id, | ||
| // address: senderId, | ||
| // timestamp: app.util.slots.getTime(), | ||
| // type, | ||
| // owner: bancorObj.owner, | ||
| // source: sourceCurrency, | ||
| // sourcePrecision, | ||
| // target: targetCurrency, | ||
| // targetPrecision, | ||
| // price, | ||
| // targetAmount: result.targetAmount.toString(), | ||
| // sourceAmount: result.sourceAmount.toString(), | ||
| // }) | ||
| // } | ||
|
|
||
| module.exports = { | ||
| async exchangeByTarget(sourceCurrency, targetCurrency, targetAmount, bancorInfo) { | ||
| app.validate('amount', String(targetAmount)) | ||
| const senderId = this.sender.address | ||
| const bancorSimulate = await app.util.bancor | ||
| .create(bancorInfo.money, bancorInfo.stock, bancorInfo.owner) | ||
| if (!bancorSimulate) return 'Bancor is not ready' | ||
| const simulateResult = await bancorSimulate.exchangeByTarget(sourceCurrency, | ||
| targetCurrency, targetAmount, false) | ||
| // module.exports = { | ||
| // async exchangeByTarget(sourceCurrency, targetCurrency, targetAmount, bancorInfo) { | ||
| // app.validate('amount', String(targetAmount)) | ||
| // const senderId = this.sender.address | ||
| // const bancorSimulate = await app.util.bancor | ||
| // .create(bancorInfo.money, bancorInfo.stock, bancorInfo.owner) | ||
| // if (!bancorSimulate) return 'Bancor is not ready' | ||
| // const simulateResult = await bancorSimulate.exchangeByTarget(sourceCurrency, | ||
| // targetCurrency, targetAmount, false) | ||
|
|
||
| // Check source account has sufficient balance to handle the exchange | ||
| if (sourceCurrency === 'XAS') { | ||
| if (simulateResult.sourceAmount.gt(String(this.sender.xas))) return 'Insufficient balance' | ||
| } else if (targetCurrency === 'XAS') { | ||
| const bigAmount = app.util.bignumber(targetAmount) | ||
| if (bigAmount.gt(String(this.sender.xas))) return 'Insufficient balance' | ||
| } else { | ||
| const sourceBalance = await app.balances.get(senderId, sourceCurrency) | ||
| const targetBalance = await app.balances.get(senderId, targetCurrency) | ||
| if (sourceBalance.gt(simulateResult.sourceAmount)) return `Insufficient balance for ${sourceCurrency}` | ||
| if (targetBalance.gt(targetAmount)) return `Insufficient balance for ${targetCurrency}` | ||
| } | ||
| const bancor = await app.util.bancor | ||
| .create(bancorInfo.money, bancorInfo.stock, bancorInfo.owner) | ||
| const result = await bancor.exchangeByTarget(sourceCurrency, targetCurrency, targetAmount, true) | ||
| await doExchange(sourceCurrency, targetCurrency, bancor, result, this) | ||
| return null | ||
| }, | ||
| // // Check source account has sufficient balance to handle the exchange | ||
| // if (sourceCurrency === 'XAS') { | ||
| // if (simulateResult.sourceAmount.gt(String(this.sender.xas))) return 'Insufficient balance' | ||
| // } else if (targetCurrency === 'XAS') { | ||
| // const bigAmount = app.util.bignumber(targetAmount) | ||
| // if (bigAmount.gt(String(this.sender.xas))) return 'Insufficient balance' | ||
| // } else { | ||
| // const sourceBalance = await app.balances.get(senderId, sourceCurrency) | ||
| // const targetBalance = await app.balances.get(senderId, targetCurrency) | ||
| // if (sourceBalance.gt(simulateResult.sourceAmount)) return `Insufficient balance for ${sourceCurrency}` | ||
| // if (targetBalance.gt(targetAmount)) return `Insufficient balance for ${targetCurrency}` | ||
| // } | ||
| // const bancor = await app.util.bancor | ||
| // .create(bancorInfo.money, bancorInfo.stock, bancorInfo.owner) | ||
| // const result = await bancor.exchangeByTarget(sourceCurrency, targetCurrency, targetAmount, true) | ||
| // await doExchange(sourceCurrency, targetCurrency, bancor, result, this) | ||
| // return null | ||
| // }, | ||
|
|
||
| async exchangeBySource(sourceCurrency, targetCurrency, sourceAmount, bancorInfo) { | ||
| app.validate('amount', String(sourceAmount)) | ||
| const senderId = this.sender.address | ||
| // Check source account has sufficient balance to handle the exchange | ||
| if (sourceCurrency === 'XAS') { | ||
| if (app.util.bignumber(sourceAmount).gt(String(this.sender.xas))) return 'Insufficient balance' | ||
| } else { | ||
| const balance = app.balances.get(senderId, sourceCurrency) | ||
| if (balance.lt(sourceAmount)) return 'Insufficient balance' | ||
| } | ||
| // async exchangeBySource(sourceCurrency, targetCurrency, sourceAmount, bancorInfo) { | ||
| // app.validate('amount', String(sourceAmount)) | ||
| // const senderId = this.sender.address | ||
| // // Check source account has sufficient balance to handle the exchange | ||
| // if (sourceCurrency === 'XAS') { | ||
| // if (app.util.bignumber(sourceAmount).gt(String(this.sender.xas))) return 'Insufficient balance' | ||
| // } else { | ||
| // const balance = app.balances.get(senderId, sourceCurrency) | ||
| // if (balance.lt(sourceAmount)) return 'Insufficient balance' | ||
| // } | ||
|
|
||
| const bancor = await app.util.bancor | ||
| .create(bancorInfo.money, bancorInfo.stock, bancorInfo.owner) | ||
| if (!bancor) return 'Bancor is not ready' | ||
| const result = await bancor.exchangeBySource(sourceCurrency, targetCurrency, sourceAmount, true) | ||
| await doExchange(sourceCurrency, targetCurrency, bancor, result, this) | ||
| return null | ||
| }, | ||
| // const bancor = await app.util.bancor | ||
| // .create(bancorInfo.money, bancorInfo.stock, bancorInfo.owner) | ||
| // if (!bancor) return 'Bancor is not ready' | ||
| // const result = await bancor.exchangeBySource(sourceCurrency, targetCurrency, sourceAmount, true) | ||
| // await doExchange(sourceCurrency, targetCurrency, bancor, result, this) | ||
| // return null | ||
| // }, | ||
|
|
||
| async burnXAS() { | ||
| const bancor = await app.util.bancor.create('BCH', 'XAS') | ||
| if (!bancor) return 'Bancor is not ready' | ||
| const balance = await app.balances.get(app.repurchaseAddr, 'BCH') | ||
| const result = await bancor.exchangeBySource('BCH', 'XAS', balance, true) | ||
| app.balances.decrease(app.repurchaseAddr, 'BCH', result.sourceAmount.toString()) | ||
| if (app.buringPoolAddr) { | ||
| app.sdb.createOrLoad('Account', { xas: 0, address: app.buringPoolAddr, name: null }) | ||
| app.sdb.increase('Account', { xas: result.targetAmount.toNumber() }, { address: app.buringPoolAddr }) | ||
| } | ||
| return null | ||
| }, | ||
| } | ||
| // async burnXAS() { | ||
| // const bancor = await app.util.bancor.create('BCH', 'XAS') | ||
| // if (!bancor) return 'Bancor is not ready' | ||
| // const balance = await app.balances.get(app.repurchaseAddr, 'BCH') | ||
| // const result = await bancor.exchangeBySource('BCH', 'XAS', balance, true) | ||
| // app.balances.decrease(app.repurchaseAddr, 'BCH', result.sourceAmount.toString()) | ||
| // if (app.buringPoolAddr) { | ||
| // app.sdb.createOrLoad('Account', { xas: 0, address: app.buringPoolAddr, name: null }) | ||
| // app.sdb.increase('Account', { xas: result.targetAmount.toNumber() }, { address: app.buringPoolAddr }) | ||
| // } | ||
| // return null | ||
| // }, | ||
| // } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.