Skip to content
This repository has been archived by the owner on Jan 12, 2019. It is now read-only.

Xcert update and proposal for Xcert exchange. #7

Merged
merged 16 commits into from
Mar 4, 2018
Merged

Xcert update and proposal for Xcert exchange. #7

merged 16 commits into from
Mar 4, 2018

Commits on Feb 22, 2018

  1. XcertProxy and interface for XcertExchange

    @MoMannn
    MoMannn committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    c9ed2ca View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2018

  1. Start of XcertExchange implementation.

    @MoMannn
    MoMannn committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    5ee653e View commit details
    Browse the repository at this point in the history

  2. started writing tests

    @MoMannn
    MoMannn committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    1363a82 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2018

  1. Basic tests for performTransfer, code refactor, cancel transfer, star… 

    …ted working on mint
    @MoMannn
    MoMannn committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    7a1ae88 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2018

  1. Minting and canceling mint(needs tests!).

    @MoMannn
    MoMannn committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    b279f8a View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2018

  1. Adding interfaces.

    @MoMannn
    MoMannn committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    196ffe6 View commit details
    Browse the repository at this point in the history

  2. Rewrite of Xcert to follow the latest EIP721 changes. Tests still nee… 

    …d rewriting.
    @MoMannn
    MoMannn committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    c55990d View commit details
    Browse the repository at this point in the history

  3. truffle update from 4.0.6 to 4.1.0

    @MoMannn
    MoMannn committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    fc53ae3 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2018

  1. added Xcert tests (tests for safeTransfer to a smart contract that ca… 

    …n receive NFToken still needed).
    @MoMannn
    MoMannn committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    642a97f View commit details
    Browse the repository at this point in the history

  2. Xcert added mint authorization and tests for it.

    @MoMannn
    MoMannn committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    2f34fcf View commit details
    Browse the repository at this point in the history

  3. All proxies finished (TokenTransferProxy, NFTokenTransferProxy, Xcert… 

    …MintProxy) - tests still needed
    @MoMannn
    MoMannn committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    1baa6aa View commit details
    Browse the repository at this point in the history

  4. Added ERC20 interface.

    @MoMannn
    MoMannn committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    23e7523 View commit details
    Browse the repository at this point in the history

  5. Exchange and its tests.

    @MoMannn
    MoMannn committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    64b21fe View commit details
    Browse the repository at this point in the history

  6. Mintable exchange and basic tests.

    @MoMannn
    MoMannn committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    92a49de View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2018

  1. Merge branch 'dev' of git://github.com/0xcert/ethereum into dev 

    # Conflicts:
#	contracts/tokens/ERC20.sol
#	contracts/tokens/Xcert.sol
#	test/tokens/Xcert.test.js
    @MoMannn
    MoMannn committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    e76ce1b View commit details
    Browse the repository at this point in the history

  2. Skipped safe transfer tests because of truffle bug: trufflesuite/truf… 

    …fle#737
    @MoMannn
    MoMannn committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    3625d66 View commit details
    Browse the repository at this point in the history