oceanprotocol/market
1
0
Fork 0
mirror of https://github.com/oceanprotocol/market.git synced 2024-12-02 05:57:29 +01:00
Code Releases Activity

updates (#1084)

Browse Source 
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
This commit is contained in:
mihaisc 2022-02-11 13:26:58 +02:00 committed by GitHub
parent aec34dc712
commit fc1f396c96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 2987 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3183
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -21,7 +21,7 @@
"@coingecko/cryptoformat": "^0.4.4", "@coingecko/cryptoformat": "^0.4.4",
"@loadable/component": "^5.15.2", "@loadable/component": "^5.15.2",
"@oceanprotocol/art": "^3.2.0", "@oceanprotocol/art": "^3.2.0",
"@oceanprotocol/lib": "^1.0.0-next.11", "@oceanprotocol/lib": "^1.0.0-next.14",
"@oceanprotocol/typographies": "^0.1.0", "@oceanprotocol/typographies": "^0.1.0",
"@portis/web3": "^4.0.6", "@portis/web3": "^4.0.6",
"@tippyjs/react": "^4.2.6", "@tippyjs/react": "^4.2.6",

1
src/components/Asset/AssetActions/Pool/Add/index.tsx
View File

@ -106,7 +106,6 @@ export default function Add({
const result = await poolInstance.joinswapExternAmountIn( const result = await poolInstance.joinswapExternAmountIn(
accountId, accountId,
poolAddress, poolAddress,
tokenInAddress,
amount, amount,
minPoolAmountOut minPoolAmountOut
) )

1
src/components/Asset/AssetActions/Pool/Remove/index.tsx
View File

@ -64,7 +64,6 @@ export default function Remove({
const result = await poolInstance.exitswapPoolAmountIn( const result = await poolInstance.exitswapPoolAmountIn(
accountId, accountId,
poolAddress, poolAddress,
tokenOutAddress,
amountPoolShares, amountPoolShares,
minOceanAmount minOceanAmount
) )

12
src/components/Publish/_utils.ts
View File

@ -239,8 +239,8 @@ export async function createTokensAndPricing(
vestingAmount: '0', vestingAmount: '0',
vestedBlocks: 2726000, vestedBlocks: 2726000,
initialBaseTokenLiquidity: values.pricing.amountOcean.toString(), initialBaseTokenLiquidity: values.pricing.amountOcean.toString(),
swapFeeLiquidityProvider: 1e15, swapFeeLiquidityProvider: '0.1',
swapFeeMarketRunner: 1e15 swapFeeMarketRunner: '0'
} }
LoggerInstance.log( LoggerInstance.log(
@ -260,7 +260,7 @@ export async function createTokensAndPricing(
) )
LoggerInstance.log('[publish] pool.approve tx', txApprove) LoggerInstance.log('[publish] pool.approve tx', txApprove)
const result = await nftFactory.createNftErcWithPool( const result = await nftFactory.createNftErc20WithPool(
accountId, accountId,
nftCreateData, nftCreateData,
ercParams, ercParams,
@ -283,7 +283,7 @@ export async function createTokensAndPricing(
baseTokenDecimals: 18, baseTokenDecimals: 18,
datatokenDecimals: 18, datatokenDecimals: 18,
fixedRate: values.pricing.price.toString(), fixedRate: values.pricing.price.toString(),
marketFee: 1e15, marketFee: '0',
withMint: true withMint: true
} }
@ -292,7 +292,7 @@ export async function createTokensAndPricing(
freParams freParams
) )
const result = await nftFactory.createNftErcWithFixedRate( const result = await nftFactory.createNftErc20WithFixedRate(
accountId, accountId,
nftCreateData, nftCreateData,
ercParams, ercParams,
@ -324,7 +324,7 @@ export async function createTokensAndPricing(
dispenserParams dispenserParams
) )
const result = await nftFactory.createNftErcWithDispenser( const result = await nftFactory.createNftErc20WithDispenser(
accountId, accountId,
nftCreateData, nftCreateData,
ercParams, ercParams,