Merge pull request #231 from oceanprotocol/feature/FixedPriceExchange

FixedPriceExchange

package-lock.json

@@ -927,9 +927,9 @@
       }
     },
     "@oceanprotocol/contracts": {
-      "version": "0.3.5",
+      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.3.5.tgz",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.4.1.tgz",
-      "integrity": "sha512-z7ziNbRwsPrJi+zGyokgUEKivD90a5/9jjV+WLj1q5U96g60rd5rxox4EKNPNGlHx/m5rWBJhHBV4rseJjtFjg=="
+      "integrity": "sha512-gc6bCt3pq9cpk1mYDKfsZhLlaM+8yQDFmOjtmT1KGXRmnTBcvmwCQXMrL5VohFaFi7Iqio3FZtuhYyRaEjikCw=="
     },
     "@octokit/auth-token": {
       "version": "2.4.2",

package.json

@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@ethereum-navigator/navigator": "^0.5.0",
-    "@oceanprotocol/contracts": "^0.3.5",
+    "@oceanprotocol/contracts": "^0.4.1",
     "decimal.js": "^10.2.0",
     "fs": "0.0.1-security",
     "node-fetch": "^2.6.0",

src/balancer/OceanPool.ts

@@ -333,7 +333,7 @@ export class OceanPool extends Pool {
     const factory = new this.web3.eth.Contract(this.factoryABI, this.factoryAddress, {
       from: account
     })
-    const events = await factory.getPastEvents('SPoolRegistered', {
+    const events = await factory.getPastEvents('BPoolRegistered', {
       filter: {},
       fromBlock: 0,
       toBlock: 'latest'

src/balancer/Pool.ts

@@ -2,7 +2,7 @@ import Web3 from 'web3'
 import { AbiItem } from 'web3-utils/types'
 import { TransactionReceipt } from 'web3-core'
 import Decimal from 'decimal.js'
-import jsonpoolABI from '@oceanprotocol/contracts/artifacts/SPool.json'
+import jsonpoolABI from '@oceanprotocol/contracts/artifacts/BPool.json'
 import { PoolFactory } from './PoolFactory'
 
 /**

src/balancer/PoolFactory.ts

@@ -1,6 +1,6 @@
 import Web3 from 'web3'
 import { AbiItem } from 'web3-utils/types'
-import jsonFactoryABI from '@oceanprotocol/contracts/artifacts/SFactory.json'
+import jsonFactoryABI from '@oceanprotocol/contracts/artifacts/BFactory.json'
 
 export class PoolFactory {
   public GASLIMIT_DEFAULT = 5000000
@@ -43,13 +43,13 @@ export class PoolFactory {
     })
 
     const transactiondata = await factory.methods
-      .newSPool()
+      .newBPool()
       .send({ from: account, gas: this.GASLIMIT_DEFAULT })
 
     let pooladdress: string
 
     try {
-      pooladdress = transactiondata.events.SPoolRegistered.returnValues[0]
+      pooladdress = transactiondata.events.BPoolRegistered.returnValues[0]
     } catch (e) {
       console.error(e)
     }

src/datatokens/Datatokens.ts

@@ -35,26 +35,37 @@ export class DataTokens {
   /**
    * Create new datatoken
    * @param {String} metaDataStoreURI
+   * @param {String} name Token name
+   * @param {String} symbol Token symbol
+   * @param {String} cap Maximum cap (Number) - will be converted to wei
    * @param {String} address
    * @return {Promise<string>} datatoken address
    */
-  public async create(metaDataStoreURI: string, address: string): Promise<string> {
+  public async create(
+    metaDataStoreURI: string,
+    name: string,
+    symbol: string,
+    cap: string,
+    address: string
+  ): Promise<string> {
     // Create factory contract object
     const factory = new this.web3.eth.Contract(this.factoryABI, this.factoryAddress, {
       from: address
     })
     const estGas = await factory.methods
-      .createToken(metaDataStoreURI)
+      .createToken(metaDataStoreURI, name, symbol, this.web3.utils.toWei(cap))
       .estimateGas(function (err, estGas) {
         if (err) console.log('Datatokens: ' + err)
         return estGas
       })
     // Invoke createToken function of the contract
-    const trxReceipt = await factory.methods.createToken(metaDataStoreURI).send({
+    const trxReceipt = await factory.methods
-      from: address,
+      .createToken(metaDataStoreURI, name, symbol, this.web3.utils.toWei(cap))
-      gas: estGas + 1,
+      .send({
-      gasPrice: '3000000000'
+        from: address,
-    })
+        gas: estGas + 1,
+        gasPrice: '3000000000'
+      })
 
     let tokenAddress = null
     try {

src/exchange/FixedRateExchange.ts

@@ -0,0 +1,346 @@
+import defaultFixedRateExchangeABI from '@oceanprotocol/contracts/artifacts/FixedRateExchange.json'
+import BigNumber from 'bignumber.js'
+import { TransactionReceipt } from 'web3-core'
+
+export interface FixedPricedExchange {
+  exchangeID?: string
+  exchangeOwner: string
+  dataToken: string
+  baseToken: string
+  fixedRate: string
+  active: boolean
+  supply: string
+}
+
+const DEFAULT_GAS_LIMIT = 200000
+
+export class OceanFixedRateExchange {
+  /** Ocean related functions */
+  public oceanAddress: string = null
+  public fixedRateExchangeAddress: string
+  public fixedRateExchangeABI: any
+  public web3: any
+  public contract: any = null
+
+  /**
+   * Instantiate FixedRateExchange
+   * @param {any} web3
+   * @param {String} fixedRateExchangeAddress
+   * @param {any} fixedRateExchangeABI
+   * @param {String} oceanAddress
+   */
+  constructor(
+    web3: any,
+    fixedRateExchangeAddress: string = null,
+    fixedRateExchangeABI: any = null,
+    oceanAddress: string = null
+  ) {
+    this.web3 = web3
+    this.fixedRateExchangeAddress = fixedRateExchangeAddress
+    this.fixedRateExchangeABI = fixedRateExchangeABI || defaultFixedRateExchangeABI.abi
+    this.oceanAddress = oceanAddress
+    if (web3)
+      this.contract = new this.web3.eth.Contract(
+        this.fixedRateExchangeABI,
+        this.fixedRateExchangeAddress
+      )
+  }
+
+  /**
+   * Creates new exchange pair between Ocean Token and data token.
+   * @param {String} dataToken Data Token Contract Address
+   * @param {Number} rate exchange rate
+   * @param {String} address User address
+   * @return {Promise<string>} exchangeId
+   */
+  public async create(dataToken: string, rate: string, address: string): Promise<string> {
+    const estGas = await this.contract.methods
+      .create(this.oceanAddress, dataToken, this.web3.utils.toWei(rate))
+      .estimateGas(function (err, estGas) {
+        if (err) console.log('FixedPriceExchange: ' + err)
+        return estGas
+      })
+    const trxReceipt = await this.contract.methods
+      .create(this.oceanAddress, dataToken, this.web3.utils.toWei(rate))
+      .send({
+        from: address,
+        gas: estGas + 1
+      })
+
+    let exchangeId = null
+    try {
+      exchangeId = trxReceipt.events.ExchangeCreated.returnValues[0]
+    } catch (e) {
+      console.error(e)
+    }
+    return exchangeId
+  }
+
+  /**
+   * Creates unique exchange identifier.
+   * @param {String} dataToken Data Token Contract Address
+   * @param {String} owner Owner of the exchange
+   * @return {Promise<string>} exchangeId
+   */
+  public async generateExchangeId(dataToken: string, owner: string): Promise<string> {
+    const exchangeId = await this.contract.methods
+      .generateExchangeId(this.oceanAddress, dataToken, owner)
+      .call()
+    return exchangeId
+  }
+
+  /**
+   * Atomic swap
+   * @param {String} exchangeId ExchangeId
+   * @param {Number} dataTokenAmount Amount of Data Tokens
+   * @param {String} address User address
+   * @return {Promise<TransactionReceipt>} transaction receipt
+   */
+  public async buyDT(
+    exchangeId: string,
+    dataTokenAmount: string,
+    address: string
+  ): Promise<TransactionReceipt> {
+    let estGas
+    try {
+      estGas = await this.contract.methods
+        .swap(exchangeId, this.web3.utils.toWei(String(dataTokenAmount)))
+        .estimateGas(function (err, g) {
+          if (err) {
+            return DEFAULT_GAS_LIMIT
+          } else {
+            return g
+          }
+        })
+    } catch (e) {
+      estGas = DEFAULT_GAS_LIMIT
+    }
+    try {
+      const trxReceipt = await this.contract.methods
+        .swap(exchangeId, this.web3.utils.toWei(String(dataTokenAmount)))
+        .send({
+          from: address,
+          gas: estGas + 1
+        })
+      return trxReceipt
+    } catch (e) {
+      console.error(e)
+      return null
+    }
+  }
+
+  /**
+   * Gets total number of exchanges
+   * @param {String} exchangeId ExchangeId
+   * @param {Number} dataTokenAmount Amount of Data Tokens
+   * @return {Promise<Number>} no of available exchanges
+   */
+  public async getNumberOfExchanges(): Promise<number> {
+    const numExchanges = await this.contract.methods.getNumberOfExchanges().call()
+    return numExchanges
+  }
+
+  /**
+   * Set new rate
+   * @param {String} exchangeId ExchangeId
+   * @param {Number} newRate New rate
+   * @param {String} address User account
+   * @return {Promise<TransactionReceipt>} transaction receipt
+   */
+  public async setRate(
+    exchangeId: string,
+    newRate: number,
+    address: string
+  ): Promise<TransactionReceipt> {
+    let estGas
+    try {
+      estGas = await this.contract.methods
+        .setRate(exchangeId, this.web3.utils.toWei(String(newRate)))
+        .estimateGas(function (err, estGas) {
+          if (err) {
+            // console.log('FixedPriceExchange: ' + err)
+            return DEFAULT_GAS_LIMIT
+          }
+          return estGas
+        })
+    } catch (e) {
+      estGas = DEFAULT_GAS_LIMIT
+    }
+    const trxReceipt = await this.contract.methods
+      .setRate(exchangeId, this.web3.utils.toWei(String(newRate)))
+      .send({
+        from: address,
+        gas: estGas + 1
+      })
+    return trxReceipt
+  }
+
+  /**
+   * Activate an exchange
+   * @param {String} exchangeId ExchangeId
+   * @param {String} address User address
+   * @return {Promise<TransactionReceipt>} transaction receipt
+   */
+  public async activate(
+    exchangeId: string,
+    address: string
+  ): Promise<TransactionReceipt> {
+    let estGas
+    try {
+      estGas = await this.contract.methods
+        .activate(exchangeId)
+        .estimateGas(function (err, estGas) {
+          if (err) {
+            // console.log('FixedPriceExchange: ' + err)
+            estGas = DEFAULT_GAS_LIMIT
+          }
+          return estGas
+        })
+    } catch (e) {
+      estGas = DEFAULT_GAS_LIMIT
+    }
+    const trxReceipt = await this.contract.methods.activate(exchangeId).send({
+      from: address,
+      gas: estGas + 1
+    })
+    return trxReceipt
+  }
+
+  /**
+   * Deactivate an exchange
+   * @param {String} exchangeId ExchangeId
+   * @param {String} address User address
+   * @return {Promise<TransactionReceipt>} transaction receipt
+   */
+  public async deactivate(
+    exchangeId: string,
+    address: string
+  ): Promise<TransactionReceipt> {
+    let estGas
+    try {
+      estGas = await this.contract.methods
+        .deactivate(exchangeId)
+        .estimateGas(function (err, estGas) {
+          if (err) {
+            // console.log('FixedPriceExchange: ' + err)
+            estGas = DEFAULT_GAS_LIMIT
+          }
+          return estGas
+        })
+    } catch (e) {
+      estGas = DEFAULT_GAS_LIMIT
+    }
+    const trxReceipt = await this.contract.methods.deactivate(exchangeId).send({
+      from: address,
+      gas: estGas + 1
+    })
+    return trxReceipt
+  }
+
+  /**
+   * Get Rate
+   * @param {String} exchangeId ExchangeId
+   * @return {Promise<string>} Rate (converted from wei)
+   */
+  public async getRate(exchangeId: string): Promise<string> {
+    const weiRate = await this.contract.methods.getRate(exchangeId).call()
+    return this.web3.utils.fromWei(weiRate)
+  }
+
+  /**
+   * Get Supply
+   * @param {String} exchangeId ExchangeId
+   * @return {Promise<string>} Rate (converted from wei)
+   */
+  public async getSupply(exchangeId: string): Promise<string> {
+    const weiRate = await this.contract.methods.getSupply(exchangeId).call()
+    return this.web3.utils.fromWei(weiRate)
+  }
+
+  /**
+   * getOceanNeeded
+   * @param {String} exchangeId ExchangeId
+   * @param {Number} dataTokenAmount Amount of Data Tokens
+   * @return {Promise<string>} Ocean amount needed
+   */
+  public async getOceanNeeded(
+    exchangeId: string,
+    dataTokenAmount: string
+  ): Promise<string> {
+    const weiRate = await this.contract.methods
+      .CalcInGivenOut(exchangeId, this.web3.utils.toWei(dataTokenAmount))
+      .call()
+    return this.web3.utils.fromWei(weiRate)
+  }
+
+  /**
+   * Get exchange details
+   * @param {String} exchangeId ExchangeId
+   * @return {Promise<FixedPricedExchange>} Exchange details
+   */
+  public async getExchange(exchangeId: string): Promise<FixedPricedExchange> {
+    const result: FixedPricedExchange = await this.contract.methods
+      .getExchange(exchangeId)
+      .call()
+    return result
+  }
+
+  /**
+   * Get all exchanges
+   * @param {String} exchangeId ExchangeId
+   * @return {Promise<String[]>} Exchanges list
+   */
+  public async getExchanges(): Promise<string[]> {
+    return await this.contract.methods.getExchanges().call()
+  }
+
+  /**
+   * Check if an exchange is active
+   * @param {String} exchangeId ExchangeId
+   * @return {Promise<Boolean>} Result
+   */
+  public async isActive(exchangeId: string): Promise<boolean> {
+    const result = await this.contract.methods.isActive(exchangeId).call()
+    return result
+  }
+
+  /**
+   * Calculates how many basetokens are needed to get specifyed amount of datatokens
+   * @param {String} exchangeId ExchangeId
+   * @param {String} dataTokenAmount dataTokenAmount
+   * @return {Promise<Boolean>} Result
+   */
+  public async CalcInGivenOut(
+    exchangeId: string,
+    dataTokenAmount: string
+  ): Promise<boolean> {
+    const result = await this.contract.methods
+      .CalcInGivenOut(exchangeId, this.web3.utils.toWei(dataTokenAmount))
+      .call()
+    return this.web3.utils.fromWei(result)
+  }
+
+  public async searchforDT(
+    dataTokenAddress: string,
+    minSupply: string
+  ): Promise<FixedPricedExchange[]> {
+    const result: FixedPricedExchange[] = []
+    const events = await this.contract.getPastEvents('ExchangeCreated', {
+      filter: { datatoken: dataTokenAddress },
+      fromBlock: 0,
+      toBlock: 'latest'
+    })
+    for (let i = 0; i < events.length; i++) {
+      const constituents = await this.getExchange(events[i].returnValues[0])
+      constituents.exchangeID = events[i].returnValues[0]
+      if (constituents.active === true) {
+        const supply = new BigNumber(this.web3.utils.fromWei(constituents.supply))
+        const required = new BigNumber(minSupply)
+        if (supply >= required) {
+          result.push(constituents)
+        }
+      }
+    }
+    return result
+  }
+}

src/models/Config.ts

@@ -74,6 +74,17 @@ export class Config {
    */
   public poolABI?: any
 
+  /**
+   * FixedRateExchangeAddress
+   * @type {string}
+   */
+  public fixedRateExchangeAddress?: string
+
+  /**
+   * FixedRateExchangeAddressABI
+   * @type {any}
+   */
+  public fixedRateExchangeAddressABI?: any
   /**
    * Log level.
    * @type {boolean | LogLevel}

src/ocean/Assets.ts

@@ -56,7 +56,10 @@ export class Assets extends Instantiable {
     metadata: Metadata,
     publisher: Account,
     services: Service[] = [],
-    dtAddress?: string
+    dtAddress?: string,
+    name?: string,
+    symbol?: string,
+    cap?: string
   ): SubscribablePromise<CreateProgressStep, DDO> {
     this.logger.log('Creating asset')
     return new SubscribablePromise(async (observer) => {
@@ -65,11 +68,20 @@ export class Assets extends Instantiable {
       }
       if (!dtAddress) {
         this.logger.log('Creating datatoken')
+        if (!name) name = 'DataToken'
+        if (!symbol) symbol = 'DT'
+        if (!cap) cap = '1410000000000000000000000000'
         observer.next(CreateProgressStep.CreatingDataToken)
         const metadataStoreURI = this.ocean.metadatastore.getURI()
         const jsonBlob = { t: 1, url: metadataStoreURI }
         const { datatokens } = this.ocean
-        dtAddress = await datatokens.create(JSON.stringify(jsonBlob), publisher.getId())
+        dtAddress = await datatokens.create(
+          JSON.stringify(jsonBlob),
+          name,
+          symbol,
+          cap,
+          publisher.getId()
+        )
         this.logger.log('DataToken creted')
         observer.next(CreateProgressStep.DataTokenCreated)
       }

src/ocean/Ocean.ts

@@ -13,6 +13,10 @@ import {
 } from '../Instantiable.abstract'
 import { Compute } from './Compute'
 import { OceanPool } from '../balancer/OceanPool'
+import {
+  OceanFixedRateExchange,
+  FixedPricedExchange
+} from '../exchange/FixedRateExchange'
 
 /**
  * Main interface for Ocean Protocol.
@@ -57,6 +61,12 @@ export class Ocean extends Instantiable {
       instanceConfig.config.poolFactoryAddress,
       instanceConfig.config.oceanTokenAddress
     )
+    instance.fixedRateExchange = new OceanFixedRateExchange(
+      instanceConfig.config.web3Provider,
+      instanceConfig.config.fixedRateExchangeAddress,
+      instanceConfig.config.fixedRateExchangeAddressABI,
+      instanceConfig.config.oceanTokenAddress
+    )
     instance.versions = await Versions.getInstance(instanceConfig)
     instance.network = new Network()
     return instance
@@ -123,6 +133,12 @@ export class Ocean extends Instantiable {
    */
   public pool: OceanPool
 
+  /**
+   * Ocean FixedRateExchange submodule
+   * @type {OceanFixedRateExchange}
+   */
+  public fixedRateExchange: OceanFixedRateExchange
+
   /**
      * Ocean tokens submodule
      * @type {OceanTokens}

src/utils/ConfigHelper.ts

@@ -19,17 +19,19 @@ const configs = [
     factoryAddress: null,
     metadataStoreUri: 'http://127.0.0.1:5000',
     providerUri: 'http://127.0.0.1:8030',
-    poolFactoryAddress: null
+    poolFactoryAddress: null,
+    fixedRateExchangeAddress: null
   },
   {
     chainId: 4,
     network: 'rinkeby',
     url: 'https://rinkeby.infura.io/v3',
-    factoryAddress: '0xcDfEe5D80041224cDCe9AE2334E85B3236385EA3',
+    factoryAddress: '0x3ECd1429101f93149D799Ef257C07a2B1Dc30897',
     oceanTokenAddress: '0x8967BCF84170c91B0d24D4302C2376283b0B3a07',
     metadataStoreUri: 'https://aquarius.rinkeby.v3.dev-ocean.com',
     providerUri: 'https://provider.rinkeby.v3.dev-ocean.com',
-    poolFactoryAddress: '0xA4531C624A3D88323a1e178DABe1233AF178701B'
+    poolFactoryAddress: '0x9B90A1358fbeEC1C4bB1DA7D4E85C708f87556Ec',
+    fixedRateExchangeAddress: '0x991c08bD00761A299d3126a81a985329096896D4'
   },
   {
     chainId: 1,
@@ -39,7 +41,8 @@ const configs = [
     oceanTokenAddress: '0x985dd3d42de1e256d09e1c10f112bccb8015ad41',
     metadataStoreUri: null,
     providerUri: null,
-    poolFactoryAddress: null
+    poolFactoryAddress: null,
+    fixedRateExchangeAddress: null
   }
 ]
 

test/FixedPriceContractHandler.ts

@@ -0,0 +1,49 @@
+import Web3 from 'web3'
+import { Contract } from 'web3-eth-contract'
+import { AbiItem } from 'web3-utils/types'
+
+export class FixedPricedContractHandler {
+  public contract: Contract
+  public accounts: string[]
+  public contractBytecode: string
+  public contractAddress: string
+  public web3: Web3
+
+  constructor(contractABI: AbiItem | AbiItem[], contractBytecode: string, web3: Web3) {
+    this.web3 = web3
+    this.contract = new this.web3.eth.Contract(contractABI)
+    this.contractBytecode = contractBytecode
+  }
+
+  public async getAccounts() {
+    this.accounts = await this.web3.eth.getAccounts()
+  }
+
+  public async deployContracts() {
+    await this.getAccounts()
+    // get est gascost
+    const estGas = await this.contract
+      .deploy({
+        data: this.contractBytecode,
+        arguments: []
+      })
+      .estimateGas(function (err, estGas) {
+        if (err) console.log('DeployContracts: ' + err)
+        return estGas
+      })
+    // deploy the contract and get it's address
+    this.contractAddress = await this.contract
+      .deploy({
+        data: this.contractBytecode,
+        arguments: []
+      })
+      .send({
+        from: this.accounts[0],
+        gas: estGas + 1,
+        gasPrice: '3000000000'
+      })
+      .then(function (contract) {
+        return contract.options.address
+      })
+  }
+}

test/TestContractHandler.ts

@@ -1,7 +1,7 @@
 import Web3 from 'web3'
 import { Contract } from 'web3-eth-contract'
 import { AbiItem } from 'web3-utils/types'
-
+const communityCollector = '0xeE9300b7961e0a01d9f0adb863C7A227A07AaD75'
 export class TestContractHandler {
   public factory: Contract
   public template: Contract
@@ -40,7 +40,14 @@ export class TestContractHandler {
     estGas = await this.template
       .deploy({
         data: this.templateBytecode,
-        arguments: ['Template Contract', 'TEMPLATE', minter, cap, blob]
+        arguments: [
+          'Template Contract',
+          'TEMPLATE',
+          minter,
+          cap,
+          blob,
+          communityCollector
+        ]
       })
       .estimateGas(function (err, estGas) {
         if (err) console.log('DeployContracts: ' + err)
@@ -50,7 +57,14 @@ export class TestContractHandler {
     this.templateAddress = await this.template
       .deploy({
         data: this.templateBytecode,
-        arguments: ['Template Contract', 'TEMPLATE', minter, cap, blob]
+        arguments: [
+          'Template Contract',
+          'TEMPLATE',
+          minter,
+          cap,
+          blob,
+          communityCollector
+        ]
       })
       .send({
         from: minter,
@@ -64,7 +78,7 @@ export class TestContractHandler {
     estGas = await this.factory
       .deploy({
         data: this.factoryBytecode,
-        arguments: [this.templateAddress]
+        arguments: [this.templateAddress, communityCollector]
       })
       .estimateGas(function (err, estGas) {
         if (err) console.log('DeployContracts: ' + err)
@@ -74,7 +88,7 @@ export class TestContractHandler {
     this.factoryAddress = await this.factory
       .deploy({
         data: this.factoryBytecode,
-        arguments: [this.templateAddress]
+        arguments: [this.templateAddress, communityCollector]
       })
       .send({
         from: minter,

test/integration/ComputeFlow.test.ts

@@ -79,7 +79,13 @@ describe('Compute flow', () => {
         datatokensTemplate.abi as AbiItem[],
         web3
       )
-      tokenAddress = await datatoken.create(blob, alice.getId())
+      tokenAddress = await datatoken.create(
+        blob,
+        'AliceDT',
+        'DTA',
+        '10000000000',
+        alice.getId()
+      )
       assert(tokenAddress != null)
     })
 

test/integration/Marketplaceflow.test.ts

@@ -57,7 +57,13 @@ describe('Marketplace flow', () => {
         datatokensTemplate.abi as AbiItem[],
         web3
       )
-      tokenAddress = await datatoken.create(blob, alice.getId())
+      tokenAddress = await datatoken.create(
+        blob,
+        'AliceDT',
+        'DTA',
+        '10000000000',
+        alice.getId()
+      )
       assert(tokenAddress != null)
     })
 

test/integration/Simpleflow.test.ts

@@ -41,7 +41,7 @@ describe('Simple flow', () => {
         datatokensTemplate.abi as AbiItem[],
         web3
       )
-      tokenAddress = await datatoken.create(blob, alice)
+      tokenAddress = await datatoken.create(blob, 'AliceDT', 'DTA', '10000000000', alice)
     })
     it('Alice mints 100 tokens', async () => {
       await datatoken.mint(tokenAddress, alice, tokenAmount)

test/unit/Datatokens.test.ts

@@ -45,7 +45,7 @@ describe('DataTokens', () => {
     })
 
     it('should create datatokens smart contract', async () => {
-      tokenAddress = await datatoken.create(blob, minter)
+      tokenAddress = await datatoken.create(blob, 'AliceDT', 'DTA', '10000000000', minter)
       assert(tokenAddress !== null)
     })
 

test/unit/balancer/Balancer.test.ts

@@ -10,8 +10,8 @@ import factory from '@oceanprotocol/contracts/artifacts/DTFactory.json'
 import datatokensTemplate from '@oceanprotocol/contracts/artifacts/DataTokenTemplate.json'
 
 // this will be replaced by our SFactory/SPool
-import OceanPoolFactory from '@oceanprotocol/contracts/artifacts/SFactory.json'
+import OceanPoolFactory from '@oceanprotocol/contracts/artifacts/BFactory.json'
-import OceanSPool from '@oceanprotocol/contracts/artifacts/SPool.json'
+import OceanSPool from '@oceanprotocol/contracts/artifacts/BPool.json'
 const web3 = new Web3('http://127.0.0.1:8545')
 
 describe('Balancer flow', () => {
@@ -74,7 +74,7 @@ describe('Balancer flow', () => {
     })
 
     it('should create datatokens smart contract', async () => {
-      tokenAddress = await datatoken.create(blob, alice)
+      tokenAddress = await datatoken.create(blob, 'AliceDT', 'DTA', '10000000000', alice)
       assert(tokenAddress !== null)
     })
     it('Create a dummy OceanToken', async () => {
@@ -85,7 +85,13 @@ describe('Balancer flow', () => {
         datatokensTemplate.abi as AbiItem[],
         web3
       )
-      oceanTokenAddress = await oceandatatoken.create(blob, alice)
+      oceanTokenAddress = await oceandatatoken.create(
+        blob,
+        'AliceDT2',
+        'DTA2',
+        '10000000000',
+        alice
+      )
     })
     it('should initialize OceanPool class', async () => {
       Pool = new OceanPool(

test/unit/exchanges/FixedPriceExchange.test.ts

@@ -0,0 +1,233 @@
+import { assert } from 'chai'
+import { AbiItem } from 'web3-utils/types'
+import { TestContractHandler } from '../../TestContractHandler'
+import { FixedPricedContractHandler } from '../../FixedPriceContractHandler'
+import { DataTokens } from '../../../src/datatokens/Datatokens'
+import {
+  OceanFixedRateExchange,
+  FixedPricedExchange
+} from '../../../src/exchange/FixedRateExchange'
+
+import Web3 from 'web3'
+import factory from '@oceanprotocol/contracts/artifacts/DTFactory.json'
+import datatokensTemplate from '@oceanprotocol/contracts/artifacts/DataTokenTemplate.json'
+
+import BigNumber from 'bignumber.js'
+import FixedRateExchangeContract = require('@oceanprotocol/contracts/artifacts/FixedRateExchange.json')
+const web3 = new Web3('http://127.0.0.1:8545')
+
+describe('FixedRateExchange flow', () => {
+  let oceanTokenAddress
+  let FixedRateExchangeAddress
+  let FixedRateClass
+  let oceandatatoken
+  let aliceExchangeId
+  let bob
+  let alice
+  let datatoken
+  let tokenAddress
+
+  let alicePoolAddress
+  let currentDtPrice
+  let owner
+  let contracts
+
+  const consoleDebug = false
+  let greatPool
+  const tokenAmount = '1000000000000000000000000000000000'
+  const fixedPriceRate = '0.5'
+  const updatedPriceRate = '2'
+  const swapAmount = '1'
+  const blob = 'http://localhost:8030/api/v1/services/consume'
+  describe('#test', () => {
+    before(async () => {
+      // deploy SFactory
+      const Contracts = new FixedPricedContractHandler(
+        FixedRateExchangeContract.abi as AbiItem[],
+        FixedRateExchangeContract.bytecode,
+        web3
+      )
+      await Contracts.getAccounts()
+      owner = Contracts.accounts[0]
+
+      await Contracts.deployContracts()
+      FixedRateExchangeAddress = Contracts.contractAddress
+      assert(FixedRateExchangeAddress !== null)
+
+      // deploy DT Factory
+      contracts = new TestContractHandler(
+        factory.abi as AbiItem[],
+        datatokensTemplate.abi as AbiItem[],
+        datatokensTemplate.bytecode,
+        factory.bytecode,
+        web3
+      )
+      await contracts.getAccounts()
+      owner = contracts.accounts[0]
+      alice = contracts.accounts[1]
+      bob = contracts.accounts[2]
+      await contracts.deployContracts(owner)
+
+      // initialize DataTokens
+      datatoken = new DataTokens(
+        contracts.factoryAddress,
+        factory.abi as AbiItem[],
+        datatokensTemplate.abi as AbiItem[],
+        web3
+      )
+      assert(datatoken !== null)
+    })
+
+    it('should create datatokens smart contract', async () => {
+      tokenAddress = await datatoken.create(
+        blob,
+        'AliceDT',
+        'DTA',
+        web3.utils.toWei('1000000000000000'),
+        alice
+      )
+      assert(tokenAddress !== null)
+      if (consoleDebug) console.log("Alice's address:" + alice)
+      if (consoleDebug) console.log('data Token address:' + tokenAddress)
+    })
+    it('Create a dummy OceanToken', async () => {
+      // Bob creates a Datatoken
+      oceandatatoken = new DataTokens(
+        contracts.factoryAddress,
+        factory.abi as AbiItem[],
+        datatokensTemplate.abi as AbiItem[],
+        web3
+      )
+      oceanTokenAddress = await oceandatatoken.create(
+        blob,
+        'BobDT',
+        'DTB',
+        web3.utils.toWei('1000000000000000'),
+        bob
+      )
+      if (consoleDebug) console.log("Bob's address:" + bob)
+      if (consoleDebug) console.log('oceanTokenAddress:' + oceanTokenAddress)
+    })
+
+    it('should initialize FixedExchangeRate class', async () => {
+      FixedRateClass = new OceanFixedRateExchange(
+        web3,
+        FixedRateExchangeAddress,
+        FixedRateExchangeContract.abi,
+        oceanTokenAddress
+      )
+      assert(FixedRateClass !== null)
+    })
+
+    it('Alice mints 1000 tokens', async () => {
+      const txid = await datatoken.mint(tokenAddress, alice, tokenAmount)
+      if (consoleDebug) console.log(txid)
+      assert(txid !== null)
+    })
+    it('Bob mints 1000 Ocean tokens', async () => {
+      const txid = await oceandatatoken.mint(oceanTokenAddress, bob, tokenAmount)
+      if (consoleDebug) console.log(txid)
+      assert(txid !== null)
+    })
+    it('Alice should have 1000 tokens', async () => {
+      const balance = await datatoken.balance(tokenAddress, alice)
+      if (consoleDebug) console.log("Alice's datatoke balance:" + balance)
+    })
+    it('Bob should have 1000 ocean tokens', async () => {
+      const balance = await oceandatatoken.balance(oceanTokenAddress, bob)
+      if (consoleDebug) console.log("Bob's ocean balance:" + balance)
+    })
+    it('Alice allows Exchange to spend 1000 data tokens', async () => {
+      const txid = await datatoken.approve(
+        tokenAddress,
+        FixedRateExchangeAddress,
+        tokenAmount,
+        alice
+      )
+      if (consoleDebug) console.log(txid)
+    })
+    it('Bob allows Exchange to spend 1000 ocean tokens', async () => {
+      const txid = await oceandatatoken.approve(
+        oceanTokenAddress,
+        FixedRateExchangeAddress,
+        tokenAmount,
+        bob
+      )
+      if (consoleDebug) console.log(txid)
+    })
+    it('Alice should aproved speding datatokens', async () => {
+      const balance = await datatoken.allowance(
+        tokenAddress,
+        alice,
+        FixedRateExchangeAddress
+      )
+      if (consoleDebug) console.log('Alice datatoken allowance:' + balance)
+    })
+    it('Bob should aproved speding oceantokens', async () => {
+      const balance = await oceandatatoken.allowance(
+        oceanTokenAddress,
+        bob,
+        FixedRateExchangeAddress
+      )
+      if (consoleDebug) console.log('Bob ocean allowance:' + balance)
+    })
+    it('Alice creates a new FixedRate Exchange with a rate of 0.5', async () => {
+      aliceExchangeId = await FixedRateClass.create(tokenAddress, fixedPriceRate, alice)
+      if (consoleDebug) console.log('aliceExchangeId:' + aliceExchangeId)
+    })
+    it('Bob should find the exchange', async () => {
+      const exchangeDetails = await FixedRateClass.searchforDT(tokenAddress, '0')
+      assert(exchangeDetails[0].exchangeID === aliceExchangeId)
+    })
+    it('Bob should get the exchange details', async () => {
+      const exchangeDetails = await FixedRateClass.getExchange(aliceExchangeId)
+      if (consoleDebug) console.log(exchangeDetails)
+    })
+
+    it('Bob should get the amount of Ocean needed', async () => {
+      const OceansNeeded = await FixedRateClass.CalcInGivenOut(
+        aliceExchangeId,
+        swapAmount
+      )
+      if (consoleDebug) console.log('Oceans needed:' + OceansNeeded)
+      assert(OceansNeeded !== null)
+    })
+    it('Bob should swap 1 DataToken', async () => {
+      const swapResult = await FixedRateClass.buyDT(aliceExchangeId, swapAmount, bob)
+      if (consoleDebug) console.log(swapResult)
+      assert(swapResult !== null)
+    })
+    it('Alice datatoken balance after swap', async () => {
+      const balance = await datatoken.balance(tokenAddress, alice)
+      if (consoleDebug) console.log('Alice datatoken balance:' + balance)
+    })
+    it('Alice ocean  balance after swap', async () => {
+      const balance = await oceandatatoken.balance(oceanTokenAddress, alice)
+      if (consoleDebug) console.log('Alice ocean balance:' + balance)
+    })
+    it('Bob datatoken balance after swap', async () => {
+      const balance = await datatoken.balance(tokenAddress, bob)
+      if (consoleDebug) console.log('Bob datatoken balance:' + balance)
+    })
+    it('Bob ocean  balance after swap', async () => {
+      const balance = await oceandatatoken.balance(oceanTokenAddress, bob)
+      if (consoleDebug) console.log('Bob ocean balance:' + balance)
+    })
+    it('Alice should update the rate', async () => {
+      const tx = await FixedRateClass.setRate(aliceExchangeId, updatedPriceRate, alice)
+      assert(tx !== null)
+    })
+    it('Alice should be able to deactivate the exchange', async () => {
+      const tx = await FixedRateClass.deactivate(aliceExchangeId, alice)
+      assert(tx !== null)
+      const exchangeDetails = await FixedRateClass.getExchange(aliceExchangeId)
+      assert(exchangeDetails.active === false)
+    })
+    it('Alice should be able to activate the exchange', async () => {
+      const tx = await FixedRateClass.activate(aliceExchangeId, alice)
+      assert(tx !== null)
+      const exchangeDetails = await FixedRateClass.getExchange(aliceExchangeId)
+      assert(exchangeDetails.active === true)
+    })
+  })
+})