Commit Graph

152 Commits

Author SHA1 Message Date
alexcos20
329ea980b6 Release 4.0.0 2023-11-21 15:57:20 +02:00
Alex Coseru
c6004336ae
Predictoor support (#678)
* first cut, still WIP

* use specific contracts image

* fix missing abi

* more predictoor

* more predictoor

* done predictoor logic

* fix

* update

* merge #682

* update ready logic

* fixes

* lint

* increase timeout

* add oasis-saphire-testnet

* bump to contracts v2.0.0-next.2

* add loop for crappy rpc

* merge template

* fixes 1

* fixes

* fix predictor detection

* Use latest predictoor contracts (#708)

* Update tests.yml

* Update handlers

* Update schema

* Linter

* Update abi and fields

* use latest contracts

* use latest contracts

* expose agg preds in trueval

* fix abi path

* remove unused abis

* fix

---------

Co-authored-by: trizin <25263018+trizin@users.noreply.github.com>

* bump contracts

* Remove floatValue from predictoor trueval handler  (#714)

* Update predictSlot status on trueval submit (#716)

* Update status

* Fix

* Update contracts version

* Use number for predict slot

* Fixes

* Linter

* Fix

* Fix

* tostring

* Fix

* Fix

* Fix

* use contracts v2.0.0-next.11

* use latest graph-cli

* remove --debug flag

* Feature/add predictoor pause event (#723)

* bump contracts

* add pause for predictoorContract

* bump contracts to v2.0.0-13

* bum contracts & add sapphire mainnet

* fix lock

---------

Co-authored-by: trizin <25263018+trizin@users.noreply.github.com>
2023-11-21 15:55:49 +02:00
alexcos20
f5b5400261 Release 3.0.10 2023-08-15 15:03:29 +03:00
Alex Coseru
299d196162
Template id detection (#705)
* handle templateIds

* lint

* fixes

* fixes
2023-08-15 15:00:49 +03:00
alexcos20
a62a4c189d Release 3.0.9 2023-07-04 17:34:31 +03:00
alexcos20
207a4ac806 Release 3.0.8 2023-05-16 16:36:12 +03:00
trizin
2ca1280328
Add lockedAmount to veDelegation (#672)
* Add lockedAmount to veDelegation

* Fix typo

* Fixes

* Add lockedAmountinVe

* Replace lockedAmountinVe with timeLeft

* Use event.params.ts

* Fixes

* Fix

* Delete maxtime

* Fix

* Fix and rename

* Revert "Fix and rename"

This reverts commit 70846eafe2.

* fix

* fix

---------

Co-authored-by: alexcos20 <alex.coseru@gmail.com>
2023-05-13 15:38:57 +03:00
Maria Carmina
e1df119197
Fix #628 & #629 & #621: Store event log index for all records (#630)
* Store eventIndex.

* Changed in veDelegation. Removed import of String.

* linter.

* Removed tx hash.

* Revert some tweaks.

* added logIndex.

* converted to big int.

* 0 -> BigInt.zero().

* Added eventIndex to template and OPC.

* updated tweak

* updated tweak2

* Added eventIndex in tests.

* revert.

* Added eventIndex for TokenCreated and NFTCreated events. Increase time sleep for graphql request.

* Changed position of eventIndex in entity.

* Added eventIndex for order events and for dt events. Added new test commands in package.json.

* Added eventIndex for NFT Update events.

* Added eventIndex for dispenser.

* Modified dispenser tests.

* Reverted sleep secs. Updated tests.

* Updated dispenser tests. Added eventIndex for FRE.

* Added eventIndex in df rewards.

* Updated Ve with eventIndex.

* Updating order id with event index.

* Updated @ocean/lib with multichain version.

* Updated to number type.

* Updated tests for order.

* some changes.

* Fix dt tests. Added logs for provider fee. Need fix for Simple publish and consume tests.

* Problem raised by retrieving order event index in provider fee event handler.

* Added function for searching the right order.

* Debug order with provider fee.

* Removed console logs.

* Added debug logs.

* Hardcoded eventIndex just for testing.

* Paste logs from graph node.

* added extra sleep in test.

* fixed command.

* Added comments. Modified util function for Order Reuse.

* Added more logs and other tweaks.

* fixed command for docker logs.

* Added more logs.

* Converted to lowercase.

* Removed condition just for test.

* Added more logs. Order is not null.

* Call getOrder.

* Added verification back.

* converted to hex and add toString.

* Pass toString as param.

* Added ethereumjs util.

* replaced with ==.

* Refactored logic.

* Print event index.

* added more logs of event index.

* Modified tweaks and asserts.

* Added log for reuse order.

* updates.

* Reverted changes.

* Added check for eventIndex == 0.

* Enhanced the code. Replaced while with for.

* Added more logs for reuse test.

* added another condition.

* Added logs in tests. Removed redundant condition.

* Added more logs to test.

* Fixed typo.

* still debugging

* Refactored code.

* Getting closer.

* Fix tests for orders part. Removed logs.

* Removed more logs.

* Fix DT tests related to order.

* Implemented Publishing Market Fee event handler. Added test.

* Added consume market fee handler. Test consume market fee handler.

* Fixed tests for fees. Added TODOs.

* Generated ID with eventIndex in ficed rate. Added assert errors messages.

* Added FRE tests to workflow.

* Generated dispenser transaction with event index.

* Fixed dispenser tests.

* Add event index for NftUpdate entity ID.

* Changed IDs for VeDelegation and VeAllocationUpdate.

* Added full test suite to workflow.

* Fixed nft transfer ID.

* print blocks.

* test just dt and ending test to see the last block.

* Added df test.

* Added dispenser test.

* Added FRE test.

* Added NFT test.

* Added simple publish consume test.

* Added simple subgraph test.

* Added users test.

* Added ve test.

* Increased sleep time.

* commented delegation test.

* respect lint

* Fixed ending tests. Removed commented code. Brought back test suite.

* Print values from failing tests. Updated mappings.

* Rollback changes in veDelegation and veUtils. Added more prints for debug in tests.

* Removed veDelegation creation record.

* Rollback to the approach for veDelegation like it is in main.

* Removed prints. Match changes with main.

* Removed -1 from last block.

* Added prints for eventIndex. Fixed some suggestions.

* Fixed veDelegation.

* Removed prints.
2023-05-13 15:00:52 +03:00
alexcos20
8691538078 Release 3.0.7 2023-04-28 17:38:04 +03:00
Alex Coseru
5b2ccbc276
switch amount from wei to numeric (#666) 2023-04-28 17:37:02 +03:00
alexcos20
9fd0553337 Release 3.0.6 2023-04-28 09:38:03 +03:00
Alex Coseru
c33868d841
proper veDelegation (#663) 2023-04-28 09:36:56 +03:00
alexcos20
68944f02a5 Release 3.0.5 2023-04-26 12:36:25 +03:00
trizin
4794dec64e
Add missing veDelegation.save() (#658) 2023-04-20 15:18:57 +03:00
alexcos20
c8541a071e Release 3.0.4 2023-04-14 11:33:19 +03:00
Alex Coseru
b376cb3942
add more veOcean stats (#655)
* add more veOcean stats
2023-04-14 11:30:27 +03:00
alexcos20
d888d7d256 Release 3.0.3 2023-04-06 11:14:15 +03:00
Jamie Hewitt
420a229a61
Removing amountFraction and adding timestamp (#647)
* Removing amountFraction

* Adding block timestamp

* initiating veDelegation timestamp

* add tx as well

---------

Co-authored-by: alexcos20 <alex.coseru@gmail.com>
2023-04-06 11:13:22 +03:00
Jamie Hewitt
0cf40d40ce
Fixing decimals issue (#644)
* Fixing decimals issue

* Updating package.json
2023-04-04 23:41:50 +03:00
mihaisc
de5f1aab4b Release 3.0.2 2023-03-31 16:53:29 +03:00
Jamie Hewitt
0a3d513262
Storing the fraction of veOcean (#623)
* storing the fraction of veOcean

* Added moment.js

* Adding moment to package-lock.json

* Updating test

* Updating test

* Fixing failing transaction in test

* Increasing lock time

* Adding additional assert statements

* updating test

* Updating veDelegation test

* Updating query

* Updating test

* Updating test

* Making percentage update conditional

* Update handle extend boost

* Updating fraction amount

* Updating tests

* Adding comments

* Increasing sleep times

* Adding comment

* Revert "Increasing sleep times"

This reverts commit dc21fcdf8d.

* Removing comment

* Adding test

* Combining tests

* Updating test

* removing comments

* Remove comment

* Ensuring amountFraction is set to zero after burnBoost

* Changing bigInt to BigDecimal

* Updating test

* adding comment

* Setting zero value for new VeDelegation amountFraction

* Updating test query

* Updating tests

* Updating test

* Increase test sleep time

---------

Co-authored-by: idiom-bytes <69865342+idiom-bytes@users.noreply.github.com>
2023-03-30 08:29:31 -04:00
alexcos20
3de53c5197 Release 3.0.1 2023-01-27 17:22:44 +02:00
alexcos20
7c35711f72 Release 2.1.4 2023-01-27 17:19:12 +02:00
Alex Coseru
26a53431ea
fix veDeposit id generation (#606)
* fix veDeposit id generation

* handle both deposit & withdraw
2023-01-25 12:18:23 +02:00
Jamie Hewitt
9c56b00faa
Tracking OPC fees (#593)
* Tracking OPC fees

* Updating tests

* Updating tests

* Using basetoken decimals when tracking oceanFeeAmount

* Comparing the value of oceanFeeAmount returned from the event to the value stored in the subgraph

* Tracking consumeMarketFeeAmount and marketFeeAmount
2023-01-17 14:57:52 +03:00
Jamie Hewitt
20c27cd521
nft transfer event (#573)
* Updating schema

* updating nft.owner with newOwner

* Updating nftOwner in Order

* Fixing tests with nft.owner and nft.creator

* Tracking nft transferHistory

* removing nftOwner from order

* Removing nftOwner test from order

* Updating schema for nftTransferHistory

* Updating tests for transferHistory

* Updating test

* Fixing test

* Fixing timestamp test

* Revert "removing nftOwner from order"

This reverts commit 6f9aae3c40.

* Reverting removal of nftOwner Test + resolving conflicts
2022-11-24 15:40:31 +02:00
mihaisc
6c4fc1c346
add lastPriceToken (#567)
* add lastPriceToken

* test

* Updating tests to include lastPriceToken

Co-authored-by: Jamie Hewitt <jamie.hewitt15@gmail.com>
2022-11-21 16:31:13 +02:00
mihaisc
ae78cae608 Release 2.1.3 2022-09-30 16:11:58 +03:00
mihaisc
95fcfe9ba7
add chainId and nftAddress (#552)
* add chainId and nftAddress

* handle null
2022-09-30 16:10:16 +03:00
alexcos20
92094086f9 Release 2.1.2 2022-09-28 13:55:41 +03:00
Alex Coseru
868f991f17
fix tokenRemoved (#549) 2022-09-28 13:54:46 +03:00
alexcos20
253dc63fa8 Release 2.1.1 2022-09-26 08:40:16 +03:00
alexcos20
6c4b270564 Release 2.1.0 2022-09-23 15:55:09 +03:00
Alex Coseru
fe68442fe2
Feature/more ve (#543)
* link deposits to veOcean

* add FeeDistributor, claims & checkpoints

* fix lint

* link claims to VeOcean

* fix handleCheckpoint

* add comments & fix bug

* link veAllocationUser to veOcean (#537)

* advance chain

* fix veOcean withdraw

* bump contracts to 1.1.7

* fix test
2022-09-23 15:54:27 +03:00
alexcos20
91122175dc Release 2.0.7 2022-09-21 16:08:16 +03:00
Alex Coseru
8cb1d83a26
Feature/graphnode 27 (#541)
* use custom barge

* update for 27

* bump to latest contracts

* add description

* use main barge
2022-09-21 16:07:10 +03:00
Berkay Saglam
f61cce9722
Add gasUsed and gasPrice to order (#540)
* Add gasused to order



Co-authored-by: alexcos20 <alex.coseru@gmail.com>
2022-09-20 23:47:09 +03:00
alexcos20
181a4f45d0 Release 2.0.6 2022-09-14 12:48:23 +03:00
Alex Coseru
39b58ba8fe
fix nftUpdate critical bug (#534) 2022-09-14 12:47:31 +03:00
Alex Coseru
73089dacc3
add erc725 key/value store (#533) 2022-09-13 20:07:10 +03:00
alexcos20
a74e3edb3a Release 2.0.5 2022-09-13 15:47:25 +03:00
Alex Coseru
b1a58b7f13
Feature/df rewards (#531)
* bump contracts * oceanjs

* add DFRewards
2022-09-13 15:45:03 +03:00
Alex Coseru
c5d86d10df
nft updates (#530)
* nft updates

* use hasMetadata
2022-09-13 11:30:38 +03:00
alexcos20
7a627a3bfd Release 2.0.4 2022-09-07 13:31:36 +03:00
Alex Coseru
0900c1fe88
update tests for new ocean.js 2.0 (#526)
* update tests for new ocean.js 2.0

* add tx&block to veDeposit

* add veOcean tests

* bump to oceanlib 2.0.0
2022-09-07 13:30:53 +03:00
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