1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-06-28 16:47:52 +02:00

Merge branch 'main' into feature/compute

This commit is contained in:
Matthias Kretschmann 2021-04-09 16:19:01 +02:00
commit b1a2b2453d
Signed by: m
GPG Key ID: 606EEEF3C479A91F
2 changed files with 12 additions and 2 deletions

2
package-lock.json generated
View File

@ -16410,7 +16410,7 @@
}
},
"ethereumjs-abi": {
"version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#1a27c59c15ab1e95ee8e5c4ed6ad814c49cc439e",
"version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#1ce6a1d64235fabe2aaf827fd606def55693508f",
"from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
"requires": {
"bn.js": "^4.11.8",

View File

@ -136,12 +136,21 @@ function usePricing(): UsePricing {
setStep(1, 'buy', ddo)
Logger.log('Price found for buying', price)
Decimal.set({ precision: 18 })
switch (price?.type) {
case 'pool': {
const oceanAmmount = new Decimal(price.value).times(1.05).toString()
const maxPrice = new Decimal(price.value).times(2).toString()
setStep(2, 'buy', ddo)
Logger.log('Buying token from pool', price, accountId, price)
Logger.log(
'Buying token from pool',
price,
accountId,
oceanAmmount,
maxPrice
)
tx = await ocean.pool.buyDT(
accountId,
price.address,
@ -198,6 +207,7 @@ function usePricing(): UsePricing {
): Promise<TransactionReceipt | void> {
if (!ocean || !accountId) return
Decimal.set({ precision: 18 })
if (!config.oceanTokenAddress) {
Logger.error(`'oceanTokenAddress' not set in config`)
return