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

EIP-0023 Oracle pool 2.0 #41

Open
wants to merge 47 commits into
base: master
Choose a base branch
from
Open

EIP-0023 Oracle pool 2.0 #41

wants to merge 47 commits into from

Commits on Sep 1, 2021

  1. EIP-0022 md file for oracle pool 2.0

    @scalahub
    scalahub committed Sep 1, 2021
    Configuration menu
    Copy the full SHA
    3efd0c6 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2021

  1. Rename EIP-22 to EIP-23 

    22 is already taken by auction contracts
    @scalahub
    scalahub committed Sep 7, 2021
    Configuration menu
    Copy the full SHA
    ab5b37a View commit details
    Browse the repository at this point in the history

  2. Update eip-0023.md

    @scalahub
    scalahub authored Sep 7, 2021
    Configuration menu
    Copy the full SHA
    adc4544 View commit details
    Browse the repository at this point in the history

  3. Add EIP-23 to index of EIPs

    @scalahub
    scalahub authored Sep 7, 2021
    Configuration menu
    Copy the full SHA
    ddbfbfc View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2021

  1. Add description of oracle pool 2.0

    @scalahub
    scalahub committed Sep 11, 2021
    Configuration menu
    Copy the full SHA
    52c467e View commit details
    Browse the repository at this point in the history

  2. Store participant public keys in R4

    @scalahub
    scalahub committed Sep 11, 2021
    Configuration menu
    Copy the full SHA
    ee92d8c View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2021

  1. Add counter to pool box and fix typos

    @scalahub
    scalahub committed Sep 12, 2021
    Configuration menu
    Copy the full SHA
    d35140e View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2021

  1. Update the pool box instead of refresh box

    @scalahub
    scalahub committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    95a2da0 View commit details
    Browse the repository at this point in the history

  2. Fix typos, streamline headings

    @scalahub
    scalahub committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    0ba8625 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2021

  1. Add transaction to extract reward tokens

    @scalahub
    scalahub committed Sep 14, 2021
    Configuration menu
    Copy the full SHA
    2aecd3c View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2021

  1. Add description of refresh and oracle tx

    @scalahub
    scalahub committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    731e8ca View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2021

  1. Keep epoch counter in R5 or oracle box

    @scalahub
    scalahub committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    786cc9f View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2021

  1. Update eip-0023.md

    @scalahub
    scalahub authored Sep 30, 2021
    Configuration menu
    Copy the full SHA
    0faaa3a View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2021

  1. Update box creation height in R5 of ballot

    @scalahub
    scalahub committed Oct 3, 2021
    Configuration menu
    Copy the full SHA
    3eb4c2b View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2021

  1. Add description of the update mechanism

    @scalahub
    scalahub committed Oct 4, 2021
    Configuration menu
    Copy the full SHA
    92e4bf3 View commit details
    Browse the repository at this point in the history

  2. Fix typos, add cross-references to contracts

    @scalahub
    scalahub committed Oct 4, 2021
    Configuration menu
    Copy the full SHA
    2d21b68 View commit details
    Browse the repository at this point in the history

  3. Fix description of update mechanism

    @scalahub
    scalahub committed Oct 4, 2021
    Configuration menu
    Copy the full SHA
    1e4748e View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2021

  1. Oracle can change reward tokens in oracle box

    @scalahub
    scalahub committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    7c3a2a4 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2021

  1. Ensure creation height is preserved in update

    @scalahub
    scalahub committed Oct 25, 2021
    Configuration menu
    Copy the full SHA
    1a49f9e View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2021

  1. Add prerequisites for running own pool

    @scalahub
    scalahub committed Oct 28, 2021
    Configuration menu
    Copy the full SHA
    d12e62a View commit details
    Browse the repository at this point in the history

  2. Fix type in epochLength symbol usage

    @scalahub
    scalahub committed Oct 28, 2021
    Configuration menu
    Copy the full SHA
    ac70adb View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2022

  1. Fix typo in eip-0023.md

    @scalahub
    scalahub committed Apr 19, 2022
    Configuration menu
    Copy the full SHA
    bd7a609 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2022

  1. Store reward tokens in oracle pool box

    @scalahub
    scalahub committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    196e89a View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2022

  1. Add table of contents based on headings

    @scalahub
    scalahub committed Jul 6, 2022
    Configuration menu
    Copy the full SHA
    80de6e9 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2022

  1. Use ballot contract from testing version v2b

    @scalahub
    scalahub committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    a9e08d5 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2022

  1. fix markdown rendering

    @greenhat
    greenhat authored Jul 28, 2022
    Configuration menu
    Copy the full SHA
    5d3c178 View commit details
    Browse the repository at this point in the history

  2. properly fix md rendering;

    @greenhat
    greenhat committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    23e2d40 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2022

  1. Allow preserving pool script during update

    @scalahub
    scalahub committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    abf27ef View commit details
    Browse the repository at this point in the history

  2. Update author list for EIP23 (add greenhat)

    @scalahub
    scalahub authored Jul 29, 2022
    Configuration menu
    Copy the full SHA
    ffb7a76 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2022

  1. Update eip-0023.md 

    Co-authored-by: Denys Zadorozhnyi <[email protected]>
    @scalahub @greenhat
    scalahub and greenhat authored Aug 4, 2022
    Configuration menu
    Copy the full SHA
    01782c7 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2022

  1. Split out EIP-23 contracts into separate files

    @kettlebell
    kettlebell committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    dabfb0a View commit details
    Browse the repository at this point in the history

  2. Add encoded contract hashes to EIP-23

    @kettlebell
    kettlebell committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    fec79b7 View commit details
    Browse the repository at this point in the history

  3. Update eip-0023/eip-0023.md (add link to scastie) 

    Co-authored-by: Denys Zadorozhnyi <[email protected]>
    @kettlebell @greenhat
    kettlebell and greenhat authored Aug 31, 2022
    Configuration menu
    Copy the full SHA
    e485df2 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2022

  1. Merge pull request #78 from kettlebell/eip23_separate_contract_files 

    EIP23 separate contract files
    @scalahub
    scalahub authored Nov 23, 2022
    Configuration menu
    Copy the full SHA
    f3a32eb View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2022

  1. Allow changing pool creation height in update 

    Rewrite confusing text in description
    @scalahub
    scalahub committed Nov 24, 2022
    Configuration menu
    Copy the full SHA
    c6f5425 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into eip23

    @scalahub
    scalahub authored Nov 24, 2022
    Configuration menu
    Copy the full SHA
    1757e00 View commit details
    Browse the repository at this point in the history

  3. Update eip-0023/eip-0023.md 

    Co-authored-by: Denys Zadorozhnyi <[email protected]>
    @scalahub @greenhat
    scalahub and greenhat authored Nov 24, 2022
    Configuration menu
    Copy the full SHA
    cae50b7 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2023

  1. in update contract check reward tokens are either preserved or voted … 

    …by ballot boxes;

make reward token id and amount optional in ballot box;
    @greenhat
    greenhat committed Feb 16, 2023
    Configuration menu
    Copy the full SHA
    b7138e7 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2023

  1. update update contract hash according to changes in #89

    @greenhat
    greenhat committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    f67124b View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2023

  1. Fix link to EIP23 readme file

    @scalahub
    scalahub authored Apr 9, 2023
    Configuration menu
    Copy the full SHA
    821fc1f View commit details
    Browse the repository at this point in the history

  2. Fix link to main readme file

    @scalahub
    scalahub authored Apr 9, 2023
    Configuration menu
    Copy the full SHA
    21be0b3 View commit details
    Browse the repository at this point in the history

  3. Remove text on sample token exchange contract 

    We have not given a sample token exchange contract so we should remove the text.
    @scalahub
    scalahub authored Apr 9, 2023
    Configuration menu
    Copy the full SHA
    2e14357 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Merge pull request #89 from ergoplatform/eip23-update-contract-reward… 

    …-tokens-check

[EIP-0023] In update contract check reward tokens are either preserved or voted by ballot boxes
    @greenhat
    greenhat authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    2b24dc2 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. let ballot token owner (R4 in ballot box) always spend the ballot box;

    @greenhat
    greenhat committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    3bd226b View commit details
    Browse the repository at this point in the history

  2. update ballot contract hash 

    after changes introduced in 3bd226b
hash is calculated in https://scastie.scala-lang.org/W1KaudPGT2WBmJfHDsjlaw
    @greenhat
    greenhat committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    9cbe17c View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Merge pull request #94 from ergoplatform/eip23-owner-can-spend-ballot 

    EIP-0023. Let ballot token owner (R4 in ballot box) always spend the ballot box
    @greenhat
    greenhat authored Aug 10, 2023
    Configuration menu
    Copy the full SHA
    997b99f View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. Update eip-0023/eip-0023.md 

    Co-authored-by: Denys Zadorozhnyi <[email protected]>
    @kushti @greenhat
    kushti and greenhat authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    2b4a2e4 View commit details
    Browse the repository at this point in the history