Commit Graph

107 Commits

Author SHA1 Message Date
Idiom
a10c6244b5
Implementing first pass of veAllocate schema, handlers, and test cove… (#490)
* Implementing first pass of veAllocate schema, handlers, and test coverage.

* Fixed compiling issues, wrote compiling & testing outline inside of veAllocate.test. More to come.

* Created documentation. Moving tests away from subgraph and into df-py.

* Expanding documentation to be thorough and cover more of the work involved.

* use barge artifacts

* use proper contracts in ci

* use barge artifacts folder

* fix replace

* use npm contracts dep

* use latest contracts for barge

* fix some lint

* Fix linter errors

* Update schema

* Finished basic integration of setAllocation event and verified queries/schema is working as intended.

* Fixing amount getter.

* Fixed remaining implementation, verified SimpleSubgraph.test is working, and fixed lint errors.

* Fixing import.

* Use .zero()

* Improve readability

* Add allocated to schema

* Update abi

* Update event handlers in the template

* Update veREADME

* Remove `AllocationRemoved` handler

* Hooking data for tx, firstContact, lastUpdate, block

* Update event abi

* Add chainId and nftAddress to schema

* Update `handleAllocationSet`

* Update abi

* Update readme

* Set initial values

* Fix math

* Missing event param

* set initial value of `lastContact`

* veOcean template

* VeOcean entity

* Handler functions - wip

* rename file

* Delegation schema

* veDelegate mapping file

* Rename

* Update template

* Update schema

* Update replaces

* Add handler for delegation

* Update schema

* getveDelegation

* Update naming

* Add deposit entity

* Update template

* Make delegation an array

* Add `handleDelegation`

* Add `handleDeposit` for veOCEAN

* Add `getveOCEAN` util function

* Add `getDeposit` util function

* Add `handleBurnBoost`

* Add `handleExtendBoost`

* Add `handleTransferBoost`

* Set default veOCEAN

* Remove unused import

* Rename Deposit to VeDeposit

* Include block number

* Remove `allocatedTotal`

* Updating schema and fixing errors due to naming changes. Let's keep the user current allocation, maybe we need to create a feature to more easily let them know whether they are fully allocated, or not..

* bump contracts to v1.1.1

* bump contracts

* bump to contracts 1.1.2

* fix script for networks without ve

* add veAllocation.sol's AllocationSetMultiple

* copy artfacts from barge for npm quickstart:barge

* fix using barge artifacts

* temp debug

* use barge artifacts

* use contracts 1.1.3

* use same approach for 'development'

* bump ocean-contracts

Co-authored-by: alexcos20 <alex.coseru@gmail.com>
Co-authored-by: mihaisc <mihai@oceanprotocol.com>
Co-authored-by: trizin <25263018+trizin@users.noreply.github.com>
2022-09-05 15:07:31 +03:00
Jamie Hewitt
02e980fce2
Dispenser tests (#514)
* Setting up initial dispenser tests

* Testing making user1 minter

* Creating dispenser & testing all fields

* Creating deactivate dispenser test

* Fixing handleDeactivate in dispenser

* Adding test for updating allowed swapper

* Writting test for owner withdrawing all datatokens from dispenser
2022-08-12 10:32:48 +03:00
mihaisc
06bbaa54c2
fixed swapper change issue (#510)
* fixed swapper change issue

* fix lint
2022-08-03 08:20:25 -07:00
mihaisc
8416d773cc Release 2.0.3 2022-08-02 20:12:19 +03:00
Jamie Hewitt
fd40e490cc
Tracking templateId (#508)
* Creating a new set of tests for datatokens

* Testing additional fields on datatoken

* Testing value for tx, block and orderCOunt

* Adding additional tests after updating nft metadata

* SPlitting up nft tests and datatoken tests

* Updating tests for additional fields

* Adding tests for remaining datatoken fields

* Adding test for datatoken balances

* Testing if orders are correctly updated in the datatoken

* Adding comment

* Removing comments

* Adding logs

* Updating templateId

* Updating tests + removing comments

* lint:fix
2022-08-02 16:13:43 +03:00
Jamie Hewitt
1289a085bb
Remove tracking of pools (#492)
* Removing pool mapping

* Removing pool utils

* Removing pool transaction types

* Removing TokenTransaction from schema

* Removing pool functions from src/mappings/utils/globalUtils.ts

* Removing pool functions from src/mappings/factoryRouter.ts

* Removing pools from the schema

* removing pool events from subgraph.template.yaml

* Fixing TokenAdded in subgraph template

Co-authored-by: mihaisc <mihai@oceanprotocol.com>
2022-08-01 14:58:09 +03:00
mihaisc
3ced2e4179
Update globalUtils.ts 2022-07-26 06:36:34 -07:00
Alex Coseru
e7cb995797
add event Index to pool transactions (#497) 2022-07-26 12:04:17 +03:00
dependabot[bot]
5e581e8418
Bump @graphprotocol/graph-cli from 0.29.0 to 0.33.0 (#495)
* Bump @graphprotocol/graph-cli from 0.29.0 to 0.33.0

Bumps @graphprotocol/graph-cli from 0.29.0 to 0.33.0.

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

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

* Bump @graphprotocol/graph-cli from 0.29.0 to 0.33.0

Bumps @graphprotocol/graph-cli from 0.29.0 to 0.33.0.

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

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

* fix other defaults

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: mihaisc <mihai@oceanprotocol.com>
2022-07-25 06:12:28 -07:00
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
Jamie Hewitt
cb9890122c Release 2.0.1 2022-06-30 13:00:30 +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
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
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
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
Jamie Hewitt
4e5bcba661
Renaming consumeFee to orderFee (#434) 2022-05-17 12:27:48 +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
mihaisc
a13ff28062
cleanup (#417)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-04-29 14:37:07 +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
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
mihaisc
70fea016fc
fix setup (#396) 2022-03-31 17:49:20 +03:00
mihaisc
17821115f9
fix pool exit values (#392)
* fix pool exit values

* fix lint
2022-03-29 05:59:32 -07:00
mihaisc
9837a71a27
fix liquidity (#383)
* fix liquidity

* fix lint
2022-03-23 12:55:30 +02:00
Alex Coseru
ccded4c4b1
Feature/lastprices (#369)
* consume volume step 1
2022-03-03 11:55:43 +02:00
mihaisc
1cfe520dad
fix lp fee and publish market fee (#368)
* add lp fee

* add publish market fee

* fix lint
2022-03-01 04:12:15 -08:00
mihaisc
ab2d80429a
fix liquidity (#363) 2022-02-25 05:12:17 -08:00
mihaisc
f127e2206f
fix poolSnapshot (#361) 2022-02-25 01:18:49 -08:00
mihaisc
f03dce6497
fix nft on updates (#359) 2022-02-24 06:32:25 -08:00
mihaisc
48ba47be52
Fix poolSnapshot and fixed rate balance (#357)
* fix

* fix lint

* fix import
2022-02-23 09:12:51 -08:00
Alex Coseru
5918c8b035
add vesting details (#353) 2022-02-23 17:47:34 +02:00
Alex Coseru
3aabf53da4
closes #351 (#352) 2022-02-21 13:06:20 +02:00
Alex Coseru
f5c7eeae00
Feature/templates (#349)
* templates
2022-02-21 12:45:24 +02:00
alexcos20
b6e2256826 small fixes 2022-02-20 05:51:01 -08:00
Alex Coseru
68db058782
dispenser updates (#341) 2022-02-20 14:36:26 +02:00
Alex Coseru
cbdbc64a42
add fixedrate balances (#339)
* add fixedrate balances
* fix dispensers
2022-02-20 10:00:16 +02:00
Alex Coseru
cb16470c9a
OPC fees (#337)
* OPC fees
2022-02-18 17:38:51 +02:00
Alex Coseru
772b723d8a
roles (#336)
* roles
2022-02-18 13:09:18 +02:00
alexcos20
59eff980f3 fix logic 2022-02-17 22:55:02 -08:00
Alex Coseru
dfb59ae6fd
add user totalSales and totalOrders (#333) 2022-02-17 17:22:02 +02:00
Alex Coseru
cd27a2432d
add nft.orderCount (#332) 2022-02-17 04:00:54 -08:00
Alex Coseru
11b14081e9
Feature/fees (#330)
Fees
2022-02-17 12:26:05 +02:00
mihaisc
849464135f
Global stats (#319)
* partial global stats

* fix integer

* fixes

* liquidty and swap
2022-02-15 08:13:55 -08:00
Alex Coseru
4df522b426
bump ocean.js to next 18 (#317)
* bump ocean.js to next 18
2022-02-14 19:25:55 +02:00