Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge feat/governance-v2 into development #1104

Merged
merged 39 commits into from
Jul 17, 2023
Merged

Merge feat/governance-v2 into development #1104

merged 39 commits into from
Jul 17, 2023

Commits on Mar 3, 2023

  1. SERVICES-1379: compute undistributedBoostedRewards including unclaime… 

    …d rewards
    @dragos-rebegea
    dragos-rebegea committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    3552f89 View commit details
    Browse the repository at this point in the history

  2. SERVICES-1379: make the code more readable

    @dragos-rebegea
    dragos-rebegea committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    5e51073 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. SERVICES-1554: update user services to use GetOrSet and ErrorLoggerAs… 

    …ync decorators

Signed-off-by: Claudiu Lataretu <[email protected]>
    @claudiulataretu
    claudiulataretu committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    e1d1add View commit details
    Browse the repository at this point in the history

  2. SERVICES-1554: update user energy to use GetOrSet decorator 

    - removed user.energy.getter.service.ts
- updated dependencies to use user energy compute service

Signed-off-by: Claudiu Lataretu <[email protected]>
    @claudiulataretu
    claudiulataretu committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    669a50b View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. SERVICES-1554: uncomment decorators 

    Signed-off-by: Claudiu Lataretu <[email protected]>
    @claudiulataretu
    claudiulataretu committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    d2452d1 View commit details
    Browse the repository at this point in the history

  2. SERVICES-1554: fix user metaEsdt token type 

    Signed-off-by: Claudiu Lataretu <[email protected]>
    @claudiulataretu
    claudiulataretu committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    1d20b17 View commit details
    Browse the repository at this point in the history

  3. SERVICES-1554: remove dependencies of GenericResolver from user resol… 

    …vers

Signed-off-by: Claudiu Lataretu <[email protected]>
    @claudiulataretu
    claudiulataretu committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    fb88eef View commit details
    Browse the repository at this point in the history

  4. SERVICES-1554: refactor user service spec 

    - use pre-defined mocked providers

Signed-off-by: Claudiu Lataretu <[email protected]>
    @claudiulataretu
    claudiulataretu committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    1e7129e View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. Merge pull request #1067 from multiversx/SERVICES-1554-user-module 

    [SERVICES-1554] refactor user module
    @claudiulataretu
    claudiulataretu authored Jun 8, 2023
    Configuration menu
    Copy the full SHA
    b27a33a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1070 from multiversx/development 

    Merge development into feat/code-refactor-with-decorators
    @claudiulataretu
    claudiulataretu authored Jun 8, 2023
    Configuration menu
    Copy the full SHA
    760c364 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. Merge pull request #1076 from multiversx/development 

    Merge development into feat/code-refactor-with-decorators
    @claudiulataretu
    claudiulataretu authored Jun 19, 2023
    Configuration menu
    Copy the full SHA
    7afc483 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. SERVICES-1573: remove time constraint from pd_close_minute 

    Signed-off-by: Claudiu Lataretu <[email protected]>
    @claudiulataretu
    claudiulataretu committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    3e44144 View commit details
    Browse the repository at this point in the history

  2. SERVICES-1573: add method to get block by nonce 

    Signed-off-by: Claudiu Lataretu <[email protected]>
    @claudiulataretu
    claudiulataretu committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    6b31942 View commit details
    Browse the repository at this point in the history

  3. SERVICES-1573: use time interval to get price discovery data 

    Signed-off-by: Claudiu Lataretu <[email protected]>
    @claudiulataretu
    claudiulataretu committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    f494245 View commit details
    Browse the repository at this point in the history

  4. SERVICES-1573: denominate PD lauched token price from rabbitmq handler 

    Signed-off-by: Claudiu Lataretu <[email protected]>
    @claudiulataretu
    claudiulataretu committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    961c925 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. Merge branch 'main' into merge/main-into-feat-code-refactor 

    Signed-off-by: Claudiu Lataretu <[email protected]>
    @claudiulataretu
    claudiulataretu committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    c61bae7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1079 from multiversx/merge/main-into-feat-code-re… 

    …factor

Merge main into feat/code-refactor-with-decorators
    @claudiulataretu
    claudiulataretu authored Jun 22, 2023
    Configuration menu
    Copy the full SHA
    c0596a9 View commit details
    Browse the repository at this point in the history

  3. SERVICES-1573: use accepted token decimals for lauched token price de… 

    …nomination

Signed-off-by: Claudiu Lataretu <[email protected]>
    @claudiulataretu
    claudiulataretu committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    2c5f08d View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2023

  1. Merge pull request #1082 from multiversx/development 

    Merge development into feat/code-refactor-with-decorators
    @claudiulataretu
    claudiulataretu authored Jun 26, 2023
    Configuration menu
    Copy the full SHA
    33d3c96 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1084 from multiversx/development 

    Merge development into feat/code-refactor-with-decorators
    @claudiulataretu
    claudiulataretu authored Jun 26, 2023
    Configuration menu
    Copy the full SHA
    c2a04d5 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Merge pull request #1086 from multiversx/development 

    Merge development into feat/code-refactor-with-decorators
    @claudiulataretu
    claudiulataretu authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    9540c04 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1078 from multiversx/SERVICES-1573-price-discover… 

    …y-module

[SERVICES-1573] fix price discovery charts
    @claudiulataretu
    claudiulataretu authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    0a1d809 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1090 from multiversx/feat/code-refactor-with-deco… 

    …rators

Merge feat/code-refactor-with-decorators into development
    @claudiulataretu
    claudiulataretu authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    f663edc View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. SERVICES-1379: Merge branch 'main' into SERVICES-1379 

    # Conflicts:
#	src/modules/farm/v2/farm.v2.resolver.ts
#	src/modules/farm/v2/services/farm.v2.abi.service.ts
#	src/modules/farm/v2/services/farm.v2.getter.service.ts
    @dragos-rebegea
    dragos-rebegea committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    9ffccc0 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. SERVICES-1379: add tests

    @dragos-rebegea
    dragos-rebegea committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    aaddc93 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into merge/main-into-development 

    Signed-off-by: Claudiu Lataretu <[email protected]>
    @claudiulataretu
    claudiulataretu committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    9bb1ed4 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1093 from multiversx/merge/main-into-development 

    Merge main into development
    @claudiulataretu
    claudiulataretu authored Jul 10, 2023
    Configuration menu
    Copy the full SHA
    bb398e5 View commit details
    Browse the repository at this point in the history

  4. SERVICES-1379: fixes after review

    @dragos-rebegea
    dragos-rebegea committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    5c4de31 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. MEX-316: governance implementation

    @dragos-rebegea
    dragos-rebegea committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    81158b1 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. MEX-316: fixes and add resolver fields for user related info

    @dragos-rebegea
    dragos-rebegea committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    782613a View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. SERVICES-1379: remove farm v2 getter

    @dragos-rebegea
    dragos-rebegea committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    82bab4e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1096 from multiversx/SERVICES-1379 

    Services 1379
    @dragos-rebegea
    dragos-rebegea authored Jul 14, 2023
    Configuration menu
    Copy the full SHA
    555a353 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1097 from multiversx/main 

    Merge main into development
    @claudiulataretu
    claudiulataretu authored Jul 14, 2023
    Configuration menu
    Copy the full SHA
    1b9d179 View commit details
    Browse the repository at this point in the history

  4. MEX-316: cleaner hasVoted field implementation

    @dragos-rebegea
    dragos-rebegea committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    e22e7c9 View commit details
    Browse the repository at this point in the history

  5. MEX-316: cleaner hasVoted field implementation

    @dragos-rebegea
    dragos-rebegea committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    52c9ba6 View commit details
    Browse the repository at this point in the history

  6. MEX-316: registerEnumType GovernanceProposalStatus

    @dragos-rebegea
    dragos-rebegea committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    6e4773d View commit details
    Browse the repository at this point in the history

  7. MEX-316: fix imports

    @dragos-rebegea
    dragos-rebegea committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    938f9b6 View commit details
    Browse the repository at this point in the history

  8. MEX-316: remove unused argument

    @dragos-rebegea
    dragos-rebegea committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    5618622 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #1095 from multiversx/MEX-316 

    MEX-316: governance implementation
    @dragos-rebegea
    dragos-rebegea authored Jul 14, 2023
    Configuration menu
    Copy the full SHA
    8614afc View commit details
    Browse the repository at this point in the history