fix publish with pool

src/@utils/ocean.ts

@@ -16,6 +16,10 @@ export function getOceanConfig(network: string | number): Config {
       ? undefined
       : process.env.NEXT_PUBLIC_INFURA_PROJECT_ID
   ) as Config
+
+  // TODO: remove hack once address is fixed
+  if (network === 'rinkeby' || network === 4)
+    config.oceanTokenAddress = '0x8967bcf84170c91b0d24d4302c2376283b0b3a07'
   return config as Config
 }
 

src/@utils/provider.ts

@@ -1,4 +1,4 @@
-import axios, { CancelToken, AxiosResponse } from 'axios'
+import axios, { CancelToken, AxiosResponse, Method } from 'axios'
 import {
   FileMetadata,
   LoggerInstance,
@@ -22,9 +22,11 @@ export async function getEncryptedFiles(
     const response = await ProviderInstance.encrypt(
       files,
       providerUrl,
-      (url: string, body: string) => {
+      (httpMethod: Method, url: string, body: string, headers: any) => {
-        return axios.post(url, body, {
+        return axios(url, {
-          headers: { 'Content-Type': 'application/octet-stream' }
+          method: httpMethod,
+          data: body,
+          headers: headers
         })
       }
     )

src/components/Publish/index.tsx

@@ -23,11 +23,13 @@ import {
   FreCreationParams,
   PoolCreationParams,
   ProviderInstance,
-  ZERO_ADDRESS
+  ZERO_ADDRESS,
+  Pool,
+  LoggerInstance
 } from '@oceanprotocol/lib'
 import { useSiteMetadata } from '@hooks/useSiteMetadata'
 import Web3 from 'web3'
-import axios from 'axios'
+import axios, { Method } from 'axios'
 import { useCancelToken } from '@hooks/useCancelToken'
 import { getOceanConfig } from '@utils/ocean'
 
@@ -100,22 +102,24 @@ export default function PublishPage({
             publisherAddress: accountId,
             marketFeeCollector: appConfig.marketFeeAddress,
             poolTemplateAddress: config.poolTemplateAddress,
-            rate: values.pricing.price,
+            rate: values.pricing.price.toString(),
             basetokenDecimals: 18,
             vestingAmount: '0',
             vestedBlocks: 2726000,
-            initialBasetokenLiquidity: values.pricing.amountOcean,
+            initialBasetokenLiquidity: values.pricing.amountOcean.toString(),
             swapFeeLiquidityProvider: 1e15,
             swapFeeMarketRunner: 1e15
           }
-          const token = new Datatoken(web3)
           // the spender in this case is the erc721Factory because we are delegating
-          token.approve(
+          const pool = new Pool(web3, LoggerInstance)
+          const txApp = await pool.approve(
+            accountId,
             config.oceanTokenAddress,
             config.erc721FactoryAddress,
-            values.pricing.amountOcean.toString(),
+            '200',
-            accountId
+            false
           )
+          console.log('aprove', txApp)
           const result = await nftFactory.createNftErcWithPool(
             accountId,
             nftCreateData,
@@ -135,7 +139,7 @@ export default function PublishPage({
             marketFeeCollector: appConfig.marketFeeAddress,
             baseTokenDecimals: 18,
             dataTokenDecimals: 18,
-            fixedRate: values.pricing.price,
+            fixedRate: values.pricing.price.toString(),
             marketFee: 1e15,
             withMint: true
           }
@@ -188,9 +192,11 @@ export default function PublishPage({
       const encryptedResponse = await ProviderInstance.encrypt(
         ddo,
         config.providerUri,
-        (url: string, body: string) => {
+        (httpMethod: Method, url: string, body: string, headers: any) => {
-          return axios.post(url, body, {
+          return axios(url, {
-            headers: { 'Content-Type': 'application/octet-stream' },
+            method: httpMethod,
+            data: body,
+            headers: headers,
             cancelToken: newCancelToken()
           })
         }