Commit Graph

302 Commits

Author SHA1 Message Date
Jamie Hewitt 3ebc29a74d
Issue 471 provider fees (#474)
* Adding providerFee to Order in the schema

* Adding ProviderFee to subgraph.template.yaml

* Creating order utils

* Saving providerFee as a string

* Saving providerFee as an array of all previous provider fees

* Creating test for providerFee

* Removing arrary from providerFee

* Updating or Creating OrderResue provider fee

* lint:fix

* Creating additional tests for testing providerFees on Order and reuseOrder

* lint:fix

* Updating JSON string notation

* Fixing first test

* fixing second test: testing provider fees after calling reuseOrder on a using a previous txId

* added providerFeeValidUntil

Co-authored-by: mihaisc <mihai@oceanprotocol.com>
2022-07-12 11:11:43 +03:00
dependabot[bot] db8cf22d16
Bump parse-url from 6.0.0 to 6.0.2 (#485)
Bumps [parse-url](https://github.com/IonicaBizau/parse-url) from 6.0.0 to 6.0.2.
- [Release notes](https://github.com/IonicaBizau/parse-url/releases)
- [Commits](https://github.com/IonicaBizau/parse-url/commits)

---
updated-dependencies:
- dependency-name: parse-url
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-06 13:38:40 +01:00
dependabot[bot] 5da91c2282
Bump @oceanprotocol/lib from 1.1.3 to 1.1.5 (#481)
Bumps [@oceanprotocol/lib](https://github.com/oceanprotocol/ocean.js) from 1.1.3 to 1.1.5.
- [Release notes](https://github.com/oceanprotocol/ocean.js/releases)
- [Changelog](https://github.com/oceanprotocol/ocean.js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/oceanprotocol/ocean.js/compare/v1.1.3...v1.1.5)

---
updated-dependencies:
- dependency-name: "@oceanprotocol/lib"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-04 10:12:39 +01:00
dependabot[bot] f85bfef788
Bump release-it from 15.1.0 to 15.1.1 (#479)
Bumps [release-it](https://github.com/release-it/release-it) from 15.1.0 to 15.1.1.
- [Release notes](https://github.com/release-it/release-it/releases)
- [Changelog](https://github.com/release-it/release-it/blob/master/CHANGELOG.md)
- [Commits](https://github.com/release-it/release-it/compare/15.1.0...15.1.1)

---
updated-dependencies:
- dependency-name: release-it
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-04 10:11:22 +01:00
dependabot[bot] 7aa2be4a34
Bump eslint-plugin-prettier from 4.0.0 to 4.2.1 (#478)
Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 4.0.0 to 4.2.1.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v4.0.0...v4.2.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-04 10:11:00 +01:00
Jamie Hewitt cb9890122c Release 2.0.1 2022-06-30 13:00:30 +03:00
Jamie Hewitt 011e256f5a
changing lastPriceToken from token to string (#477) 2022-06-30 12:54:05 +03:00
mihaisc d864a5ade7
Release 2.0.0 2022-06-29 14:55:25 +03:00
mihaisc a5d0c10855
Release 1.2.1 2022-06-29 14:54:09 +03:00
Jamie Hewitt bc693e7797
changing the type of lastPriceToken from string to Token on Order (#462)
* changing the type of lastPriceToken from string to Token

* Fixing tests
2022-06-27 12:24:34 +03:00
dependabot[bot] 8b66fa992b
Bump @oceanprotocol/lib from 1.1.2 to 1.1.3 (#470)
Bumps [@oceanprotocol/lib](https://github.com/oceanprotocol/ocean.js) from 1.1.2 to 1.1.3.
- [Release notes](https://github.com/oceanprotocol/ocean.js/releases)
- [Changelog](https://github.com/oceanprotocol/ocean.js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/oceanprotocol/ocean.js/compare/v1.1.2...v1.1.3)

---
updated-dependencies:
- dependency-name: "@oceanprotocol/lib"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-27 12:21:54 +03:00
dependabot[bot] 7b0163f220
Bump release-it from 15.0.0 to 15.1.0 (#469)
Bumps [release-it](https://github.com/release-it/release-it) from 15.0.0 to 15.1.0.
- [Release notes](https://github.com/release-it/release-it/releases)
- [Changelog](https://github.com/release-it/release-it/blob/master/CHANGELOG.md)
- [Commits](https://github.com/release-it/release-it/compare/15.0.0...15.1.0)

---
updated-dependencies:
- dependency-name: release-it
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-27 12:21:12 +03:00
mihaisc 09e79380c3
fix weight (#468) 2022-06-24 15:42:51 +03:00
Jamie Hewitt 603a25f26a
Tracking transfer event & updating nft owner (#436)
* Adding Tranfer eventHandler to subgraph.template.yaml

* Started adding transfer event to mapping

* updating getNftTokenWithID function

* Pulling from Origin v4main

* Removing console.log

* Updating token Utils

* Updating newOwner with User & writting new test

* Updating test

* Ensuring account is in lowercase

* Creating seperate test for transfering an NFT query

* Updating test name

* Removing console.logs

* Moviving transfer event tracking from factory to template

* Moving handleNftTransferred to nftUpdate mapping

* Adding logging

* Using correct token address

* Fix linting

* Checking the correct owner account has been set originally
2022-06-24 10:06:44 +03:00
mihaisc 28979c8c79
add version (#455) 2022-06-23 14:51:32 +03:00
mihaisc d87fbed5b5
create token (#467) 2022-06-23 14:51:14 +03:00
mihaisc d1844f4853
update graph-node (#457) 2022-06-23 06:43:52 +03:00
dependabot[bot] 88cf1967c6
Bump prettier from 2.6.2 to 2.7.1 (#458)
Bumps [prettier](https://github.com/prettier/prettier) from 2.6.2 to 2.7.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.6.2...2.7.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-21 17:04:11 +03:00
dependabot[bot] c9636756e2
Bump @oceanprotocol/lib from 1.0.0 to 1.1.2 (#460)
Bumps [@oceanprotocol/lib](https://github.com/oceanprotocol/ocean.js) from 1.0.0 to 1.1.2.
- [Release notes](https://github.com/oceanprotocol/ocean.js/releases)
- [Changelog](https://github.com/oceanprotocol/ocean.js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/oceanprotocol/ocean.js/compare/v1.0.0...v1.1.2)

---
updated-dependencies:
- dependency-name: "@oceanprotocol/lib"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-21 16:34:45 +03:00
dependabot[bot] a531fb347d
Bump eslint-config-oceanprotocol from 2.0.1 to 2.0.3 (#459)
Bumps [eslint-config-oceanprotocol](https://github.com/oceanprotocol/eslint-config-oceanprotocol) from 2.0.1 to 2.0.3.
- [Release notes](https://github.com/oceanprotocol/eslint-config-oceanprotocol/releases)
- [Changelog](https://github.com/oceanprotocol/eslint-config-oceanprotocol/blob/main/CHANGELOG.md)
- [Commits](https://github.com/oceanprotocol/eslint-config-oceanprotocol/compare/v2.0.1...v2.0.3)

---
updated-dependencies:
- dependency-name: eslint-config-oceanprotocol
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-21 15:12:27 +03:00
Jamie Hewitt b6ce8bae1f
Using main branch of barge for tests (#464) 2022-06-20 16:46:54 +03:00
mihaisc a8dd151a01
fix (#456) 2022-06-13 19:11:25 +03:00
mihaisc 401df35f6a
fix (#454) 2022-06-10 03:47:04 -07:00
mihaisc 569eb98d8f
fix global stats pool count (#453)
* fix global stats pool count

* fix lint
2022-06-10 02:10:46 -07:00
dependabot[bot] aa4574994b
Bump @oceanprotocol/lib from 1.0.0-next.45 to 1.0.0 (#452)
Bumps [@oceanprotocol/lib](https://github.com/oceanprotocol/ocean.js) from 1.0.0-next.45 to 1.0.0.
- [Release notes](https://github.com/oceanprotocol/ocean.js/releases)
- [Changelog](https://github.com/oceanprotocol/ocean.js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/oceanprotocol/ocean.js/compare/v1.0.0-next.45...v1.0.0)

---
updated-dependencies:
- dependency-name: "@oceanprotocol/lib"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-10 01:45:30 -07:00
Alex Coseru e48b39a80a
latest contracts&ocean.js (#449) 2022-06-05 21:17:37 +03:00
dependabot[bot] 74ee630291
Bump @graphprotocol/graph-ts from 0.26.0 to 0.27.0 (#442)
Bumps @graphprotocol/graph-ts from 0.26.0 to 0.27.0.

---
updated-dependencies:
- dependency-name: "@graphprotocol/graph-ts"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-26 11:15:30 +03:00
mihaisc 90f7e6482f
add reuse order (#444)
* add reuse order

* fix lint

* add yaml to gitignore

* delete yaml
2022-05-25 20:04:26 +03:00
Alex Coseru ebecf1f423
bump to ocean.js 44 (#439) 2022-05-18 08:07:03 +03:00
Alex Coseru 8f44e7808d
bump ocean.js (#438) 2022-05-17 12:28:03 +03:00
Jamie Hewitt 4e5bcba661
Renaming consumeFee to orderFee (#434) 2022-05-17 12:27:48 +03:00
dependabot[bot] ed462c4e10
Bump eslint-config-oceanprotocol from 1.5.0 to 2.0.1 (#435)
Bumps [eslint-config-oceanprotocol](https://github.com/oceanprotocol/eslint-config-oceanprotocol) from 1.5.0 to 2.0.1.
- [Release notes](https://github.com/oceanprotocol/eslint-config-oceanprotocol/releases)
- [Changelog](https://github.com/oceanprotocol/eslint-config-oceanprotocol/blob/main/CHANGELOG.md)
- [Commits](https://github.com/oceanprotocol/eslint-config-oceanprotocol/compare/v1.5.0...v2.0.1)

---
updated-dependencies:
- dependency-name: eslint-config-oceanprotocol
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-17 12:13:12 +03:00
Jamie Hewitt 796bff70e7
removing Vesting and opcFee (#432)
* removing opcFee

* Removing OPCFeeChanged from subgraph.template.yaml

* Adding OPCFeeChanged event back into subgraph.template.yml

* Adding SSContractAdded and SSContractRemoved back in

* Formatting
2022-05-12 20:31:12 +03:00
Jamie Hewitt cb7e36fc98
Updating readme example queries (#431)
* Adding pools with highest liquidity example query

* Updating all pools query

* Updating all data NFTs query

* Updating All pool transactions for a given user

* Adding example query: All pool transactions for a given user in an individual pool

* Adding commnet to readme

* Adding All Datatokens example query

* Updating to show 1000 results
2022-05-11 11:46:07 +03:00
Alex Coseru 232c9387f4
bump ocean.js & add polygon (#429) 2022-05-10 09:23:41 +03:00
dependabot[bot] 2ff87797ac
Bump async from 2.6.3 to 2.6.4 (#419)
Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-10 09:06:27 +03:00
dependabot[bot] e3bf0417b9
Bump release-it from 14.14.2 to 15.0.0 (#420)
Bumps [release-it](https://github.com/release-it/release-it) from 14.14.2 to 15.0.0.
- [Release notes](https://github.com/release-it/release-it/releases)
- [Changelog](https://github.com/release-it/release-it/blob/master/CHANGELOG.md)
- [Commits](https://github.com/release-it/release-it/compare/14.14.2...15.0.0)

---
updated-dependencies:
- dependency-name: release-it
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-02 14:33:27 +03:00
dependabot[bot] 898a99cfea
Bump @types/mocha from 9.1.0 to 9.1.1 (#424)
Bumps [@types/mocha](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mocha) from 9.1.0 to 9.1.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mocha)

---
updated-dependencies:
- dependency-name: "@types/mocha"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-02 14:33:17 +03:00
dependabot[bot] f71fc093ed
Bump typescript from 4.6.3 to 4.6.4 (#422)
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.6.3 to 4.6.4.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.6.3...v4.6.4)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-02 11:28:29 +03:00
dependabot[bot] cd9963d5a7
Bump mocha from 9.2.2 to 10.0.0 (#423)
Bumps [mocha](https://github.com/mochajs/mocha) from 9.2.2 to 10.0.0.
- [Release notes](https://github.com/mochajs/mocha/releases)
- [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mochajs/mocha/compare/v9.2.2...v10.0.0)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-02 11:27:48 +03:00
dependabot[bot] db7ccf070e
Bump eslint-plugin-import from 2.24.2 to 2.26.0 (#409)
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.24.2 to 2.26.0.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.24.2...v2.26.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-29 17:18:15 +03:00
dependabot[bot] 8049e1ac1a
Bump @types/chai from 4.3.0 to 4.3.1 (#412)
Bumps [@types/chai](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chai) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chai)

---
updated-dependencies:
- dependency-name: "@types/chai"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-29 17:18:09 +03:00
dependabot[bot] 1e28dca65f
Bump release-it from 14.14.0 to 14.14.2 (#414)
Bumps [release-it](https://github.com/release-it/release-it) from 14.14.0 to 14.14.2.
- [Release notes](https://github.com/release-it/release-it/releases)
- [Changelog](https://github.com/release-it/release-it/blob/master/CHANGELOG.md)
- [Commits](https://github.com/release-it/release-it/compare/14.14.0...14.14.2)

---
updated-dependencies:
- dependency-name: release-it
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-29 17:18:00 +03:00
mihaisc a13ff28062
cleanup (#417)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-04-29 14:37:07 +03:00
Ana 04eddaaac0
Fix README subgraph links (#407) 2022-04-07 14:00:48 +03:00
mihaisc 23e87b558e fix spot price again 2022-04-05 19:55:35 +03:00
mihaisc c531773136
fix (#405) 2022-04-05 19:20:56 +03:00
mihaisc d8751fcb99
convert spot price from wei (#403)
* convert spot price from wei

* use proper decimals
2022-04-04 22:10:18 +03:00
dependabot[bot] c5885359fe
Bump ansi-regex from 3.0.0 to 3.0.1 (#402)
Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-04 16:10:33 +03:00
Alex Coseru 7073cd8743
bump contracts to alpha28 and ocean.js to alpha 33 (#401)
* bump contracts to alpha28 and ocean.js to alpha 33

* update dev deps

* fix pool reserves
2022-04-04 15:52:30 +03:00