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

Feralfile Exhibition V4 #19

Merged
merged 50 commits into from
Jun 29, 2023
Merged

Feralfile Exhibition V4 #19

merged 50 commits into from
Jun 29, 2023

Commits on Jun 5, 2023

  1. Implemented buyArtworks function

    @tienngovan
    tienngovan committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    5af4d3b View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. Fixed prettier issue

    @tienngovan
    tienngovan committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    8b02210 View commit details
    Browse the repository at this point in the history

  2. Implemented buy artwork with paid by vault contract

    @tienngovan
    tienngovan committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    caaf8c1 View commit details
    Browse the repository at this point in the history

  3. Remove ipfs from mint & add vault contract support

    @lpopo0856 @tienngovan
    lpopo0856 authored and tienngovan committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    875a9af View commit details
    Browse the repository at this point in the history

  4. better test language

    @lpopo0856 @tienngovan
    lpopo0856 authored and tienngovan committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    1df88f3 View commit details
    Browse the repository at this point in the history

  5. add test for vault

    @lpopo0856 @tienngovan
    lpopo0856 authored and tienngovan committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    46a4fa1 View commit details
    Browse the repository at this point in the history

  6. fixed conflict

    @tienngovan
    tienngovan committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    7e8c13a View commit details
    Browse the repository at this point in the history

  7. fixed revenue and cost

    @tienngovan
    tienngovan committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    043d054 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. Add prettier github action

    @lemonlatte
    lemonlatte committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    3c663e8 View commit details
    Browse the repository at this point in the history

  2. Fix the cost transfer logic

    @lpopo0856
    lpopo0856 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    d468d6d View commit details
    Browse the repository at this point in the history

  3. Better cost sending condition

    @lpopo0856
    lpopo0856 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    9521dba View commit details
    Browse the repository at this point in the history

  4. Merge pull request #20 from bitmark-inc/remove-ipfs-and-add-vault-con… 

    …tract

Remove ipfs and add vault contract
    @lpopo0856
    lpopo0856 authored Jun 7, 2023
    Configuration menu
    Copy the full SHA
    39c2475 View commit details
    Browse the repository at this point in the history

  5. send remaining funds to cost addr

    @lpopo0856
    lpopo0856 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    f6e7848 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #22 from bitmark-inc/handle-remaining-funds 

    Send remaining funds to cost addr
    @lpopo0856
    lpopo0856 authored Jun 7, 2023
    Configuration menu
    Copy the full SHA
    e48f7fc View commit details
    Browse the repository at this point in the history

  7. add vault contract signature validation

    @lpopo0856
    lpopo0856 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    b3b0f98 View commit details
    Browse the repository at this point in the history

  8. make signer private

    @lpopo0856
    lpopo0856 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    6ce78d2 View commit details
    Browse the repository at this point in the history

  9. Fix signer logic

    @lpopo0856
    lpopo0856 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    0ef7594 View commit details
    Browse the repository at this point in the history

  10. adding paid lock

    @lpopo0856
    lpopo0856 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    70d8477 View commit details
    Browse the repository at this point in the history

  11. adding withdraw function to exhibition contract

    @lpopo0856
    lpopo0856 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    1b22ff8 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. update gitginore

    @jollyjoker992
    jollyjoker992 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    97e06a8 View commit details
    Browse the repository at this point in the history

  2. Add prettier github action

    @lemonlatte @jollyjoker992
    lemonlatte authored and jollyjoker992 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    40ad906 View commit details
    Browse the repository at this point in the history

  3. add mint functions

    @jollyjoker992
    jollyjoker992 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    cf97c81 View commit details
    Browse the repository at this point in the history

  4. some minor fixes

    @jollyjoker992
    jollyjoker992 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    5166620 View commit details
    Browse the repository at this point in the history

  5. minor fixes

    @jollyjoker992
    jollyjoker992 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    538fbe9 View commit details
    Browse the repository at this point in the history

  6. update test cases

    @jollyjoker992
    jollyjoker992 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    94dc849 View commit details
    Browse the repository at this point in the history

  7. fix conflict error

    @jollyjoker992
    jollyjoker992 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    22bdc57 View commit details
    Browse the repository at this point in the history

  8. fix prettier merge

    @jollyjoker992
    jollyjoker992 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    fc80bc9 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #21 from bitmark-inc/mint-token 

    Mint functions
    @jollyjoker992
    jollyjoker992 authored Jun 8, 2023
    Configuration menu
    Copy the full SHA
    87b81b1 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'origin/FF_V4' into sig-validation-for-v… 

    …ault

# Conflicts:
#	contracts/FeralfileArtworkV4.sol
#	test/feralfile_exhibition_v4.js
    @lpopo0856
    lpopo0856 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    7879bef View commit details
    Browse the repository at this point in the history

  11. Fix testing and more comments

    @lpopo0856
    lpopo0856 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    652022a View commit details
    Browse the repository at this point in the history

  12. better testing

    @lpopo0856
    lpopo0856 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    ad9e773 View commit details
    Browse the repository at this point in the history

  13. follow the private naming

    @lpopo0856
    lpopo0856 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    efdc296 View commit details
    Browse the repository at this point in the history

  14. fix PR review

    @lpopo0856
    lpopo0856 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    b65bbd3 View commit details
    Browse the repository at this point in the history

  15. create seperate public address for vault

    @lpopo0856
    lpopo0856 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    8446f84 View commit details
    Browse the repository at this point in the history

  16. introduce necessary interface

    @lpopo0856
    lpopo0856 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    2a1f8ea View commit details
    Browse the repository at this point in the history

  17. add more test case to vault

    @lpopo0856
    lpopo0856 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    ff072f1 View commit details
    Browse the repository at this point in the history

  18. remove unused vault var

    @lpopo0856
    lpopo0856 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    9a980d7 View commit details
    Browse the repository at this point in the history

  19. add contractURI to constructor

    @jollyjoker992
    jollyjoker992 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    08ec7aa View commit details
    Browse the repository at this point in the history

  20. Merge remote-tracking branch 'origin/FF_V4' into sig-validation-for-v… 

    …ault

# Conflicts:
#	contracts/FeralfileArtworkV4.sol
    @lpopo0856
    lpopo0856 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    5788928 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. Merge pull request #23 from bitmark-inc/sig-validation-for-vault 

    Signature validation for vault
    @lpopo0856
    lpopo0856 authored Jun 9, 2023
    Configuration menu
    Copy the full SHA
    0a1b627 View commit details
    Browse the repository at this point in the history

  2. Add migration to deploy

    @lpopo0856
    lpopo0856 committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    2b9a133 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. add function to stop sale along with handling remaining token

    @jollyjoker992
    jollyjoker992 committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    b4b68c5 View commit details
    Browse the repository at this point in the history

  2. update access specifier

    @jollyjoker992
    jollyjoker992 committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    7dea8e0 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. don't allow to send token to the contract

    @jollyjoker992
    jollyjoker992 committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    842e9c4 View commit details
    Browse the repository at this point in the history

  2. add some transfer tests

    @jollyjoker992
    jollyjoker992 committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    4d1ca3c View commit details
    Browse the repository at this point in the history

  3. fix wrong condition for stop sale and transfer

    @jollyjoker992
    jollyjoker992 committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    df9c093 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. update error message

    @jollyjoker992
    jollyjoker992 committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    c24e4fc View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2023

  1. add more checks for stopSaleAndTransfer and burnArtworks

    @jollyjoker992
    jollyjoker992 committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    8b8ef33 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. add some validations

    @jollyjoker992
    jollyjoker992 committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    083f1f4 View commit details
    Browse the repository at this point in the history

  2. remove tokenBaseURI from constructor, fix migration scripts

    @jollyjoker992
    jollyjoker992 committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    78295a7 View commit details
    Browse the repository at this point in the history