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

Charge for size and witnesses #791

Merged
merged 63 commits into from
Jun 23, 2019
Merged

Charge for size and witnesses #791

merged 63 commits into from
Jun 23, 2019

Commits on May 29, 2019

  1. Fee= VerificationCost+ApplicationCost

    @shargon
    shargon committed May 29, 2019
    Configuration menu
    Copy the full SHA
    dd427c7 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2019

  1. NetworkFee for verification

    @shargon
    shargon committed May 30, 2019
    Configuration menu
    Copy the full SHA
    fe9a505 View commit details
    Browse the repository at this point in the history

  2. Clean

    @shargon
    shargon committed May 30, 2019
    Configuration menu
    Copy the full SHA
    7cda593 View commit details
    Browse the repository at this point in the history

  3. Clean

    @shargon
    shargon committed May 30, 2019
    Configuration menu
    Copy the full SHA
    d690f7b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into tx-fee

    @shargon
    shargon authored May 30, 2019
    Configuration menu
    Copy the full SHA
    481f182 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2019

  1. Update

    @shargon
    shargon committed May 31, 2019
    Configuration menu
    Copy the full SHA
    1a1247a View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2019

  1. Merge branch 'master' into tx-fee

    @shargon
    shargon authored Jun 1, 2019
    Configuration menu
    Copy the full SHA
    72ad07a View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2019

  1. Remove priority from Policy and MemoryPool

    @shargon
    shargon committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    c0675d0 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2019

  1. Fix CalculateFee

    @shargon
    shargon committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    e8cc7a6 View commit details
    Browse the repository at this point in the history

  2. Allow to cancel transactions with more Gas

    @shargon
    shargon committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    a3775cb View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2019

  1. Merge branch 'master' into tx-fee

    @shargon
    shargon authored Jun 6, 2019
    Configuration menu
    Copy the full SHA
    408b836 View commit details
    Browse the repository at this point in the history

  2. Revert change 

    We need to test this first
    @shargon
    shargon committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    d08d311 View commit details
    Browse the repository at this point in the history

  3. Add Cosigners

    @shargon
    shargon committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    fa51de3 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2019

  1. some fixes

    @erikzhang
    erikzhang committed Jun 10, 2019
    Configuration menu
    Copy the full SHA
    777b479 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2019

  1. Merge pull request #12 from shargon/add-cosigners 

    Add Cosigners
    @shargon
    shargon authored Jun 11, 2019
    Configuration menu
    Copy the full SHA
    8a5a56f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into tx-fee

    @shargon
    shargon authored Jun 11, 2019
    Configuration menu
    Copy the full SHA
    355d521 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into tx-fee

    @vncoelho
    vncoelho authored Jun 11, 2019
    Configuration menu
    Copy the full SHA
    c62898c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into tx-fee

    @vncoelho
    vncoelho authored Jun 11, 2019
    Configuration menu
    Copy the full SHA
    685e9f3 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2019

  1. Merge branch 'master' into tx-fee

    @shargon
    shargon authored Jun 12, 2019
    Configuration menu
    Copy the full SHA
    555d370 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2019

  1. Merge branch 'master' into tx-fee

    @erikzhang
    erikzhang authored Jun 13, 2019
    Configuration menu
    Copy the full SHA
    1eeaa2a View commit details
    Browse the repository at this point in the history

  2. Update Transaction.cs

    @shargon
    shargon authored Jun 13, 2019
    Configuration menu
    Copy the full SHA
    7dda436 View commit details
    Browse the repository at this point in the history

  3. format

    @erikzhang
    erikzhang committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    838a72b View commit details
    Browse the repository at this point in the history

  4. fix overflow

    @erikzhang
    erikzhang committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    57a70b8 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2019

  1. Merge branch 'master' into tx-fee

    @igormcoelho
    igormcoelho authored Jun 14, 2019
    Configuration menu
    Copy the full SHA
    cba0157 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2019

  1. Merge branch 'master' into tx-fee

    @shargon
    shargon authored Jun 15, 2019
    Configuration menu
    Copy the full SHA
    d483153 View commit details
    Browse the repository at this point in the history

  2. fix Wallet.MakeTransaction()

    @erikzhang
    erikzhang committed Jun 15, 2019
    Configuration menu
    Copy the full SHA
    43e61e7 View commit details
    Browse the repository at this point in the history

  3. fix Transaction.CalculateFees()

    @erikzhang
    erikzhang committed Jun 15, 2019
    Configuration menu
    Copy the full SHA
    206876e View commit details
    Browse the repository at this point in the history

  4. remove contract get from verification

    @igormcoelho
    igormcoelho committed Jun 15, 2019
    Configuration menu
    Copy the full SHA
    6d0dad2 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2019

  1. Revert "remove contract get from verification" 

    This reverts commit 6d0dad2.
    @erikzhang
    erikzhang committed Jun 16, 2019
    Configuration menu
    Copy the full SHA
    37c668d View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2019

  1. Merge branch 'master' into tx-fee

    @shargon
    shargon authored Jun 17, 2019
    Configuration menu
    Copy the full SHA
    945d9ff View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2019

  1. Fix fee calculation

    @erikzhang
    erikzhang committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    d10b452 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into tx-fee

    @erikzhang
    erikzhang authored Jun 19, 2019
    Configuration menu
    Copy the full SHA
    267e22a View commit details
    Browse the repository at this point in the history

  3. fix

    @erikzhang
    erikzhang committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    9e9dafb View commit details
    Browse the repository at this point in the history

  4. fix tests

    @erikzhang
    erikzhang committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    fb764e7 View commit details
    Browse the repository at this point in the history

  5. Update MemoryPool.cs

    @erikzhang
    erikzhang committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    c0022c9 View commit details
    Browse the repository at this point in the history

  6. fix tests

    @erikzhang
    erikzhang committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    bcb765d View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2019

  1. Merge branch 'master' into tx-fee

    @shargon
    shargon authored Jun 20, 2019
    Configuration menu
    Copy the full SHA
    00ada69 View commit details
    Browse the repository at this point in the history

  2. UT - Good calculation!

    @shargon
    shargon committed Jun 20, 2019
    1 Configuration menu
    Copy the full SHA
    1021dd6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into tx-fee

    @shargon
    shargon authored Jun 20, 2019
    Configuration menu
    Copy the full SHA
    6eb94ef View commit details
    Browse the repository at this point in the history

  4. Clean

    @shargon
    shargon committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    ae38243 View commit details
    Browse the repository at this point in the history

  5. Revert Nep5Token.cs

    @erikzhang
    erikzhang committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    1b0a2df View commit details
    Browse the repository at this point in the history

  6. Revert conditional

    @shargon
    shargon committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    071cee5 View commit details
    Browse the repository at this point in the history

  7. Improve readability

    @shargon
    shargon committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    cd61b98 View commit details
    Browse the repository at this point in the history

  8. Revert "Improve readability" 

    This reverts commit cd61b98.
    @shargon
    shargon committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    5840174 View commit details
    Browse the repository at this point in the history

  9. Possible fix for unit test

    @shargon
    shargon committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    7fc2809 View commit details
    Browse the repository at this point in the history

  10. Error verbosity

    @shargon
    shargon committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    72782c7 View commit details
    Browse the repository at this point in the history

  11. Add using for ApplicationEngine

    @shargon
    shargon committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    3121228 View commit details
    Browse the repository at this point in the history

  12. Fix unit test

    @shargon
    shargon committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    85527bf View commit details
    Browse the repository at this point in the history

  13. more readable merkleroot test

    @igormcoelho
    igormcoelho committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    b2a638d View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2019

  1. Sample for multisig contract

    @shargon
    shargon committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    9ac9412 View commit details
    Browse the repository at this point in the history

  2. Sign ut

    @shargon
    shargon committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    1ce9d16 View commit details
    Browse the repository at this point in the history

  3. Signed!

    @shargon
    shargon committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    9179080 View commit details
    Browse the repository at this point in the history

  4. Same format for single signature unit test

    @shargon
    shargon committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    1f36f84 View commit details
    Browse the repository at this point in the history

  5. Prevent create unwanted objects

    @shargon
    shargon committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    fc3e729 View commit details
    Browse the repository at this point in the history

  6. format

    @erikzhang
    erikzhang committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    e484fbe View commit details
    Browse the repository at this point in the history

  7. Remove snapshot from MakeTransaction()

    @erikzhang
    erikzhang committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    5bbfd02 View commit details
    Browse the repository at this point in the history

  8. Rename

    @erikzhang
    erikzhang committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    63f24fc View commit details
    Browse the repository at this point in the history

  9. format

    @erikzhang
    erikzhang committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    ff1d71e View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into tx-fee

    @igormcoelho
    igormcoelho authored Jun 21, 2019
    Configuration menu
    Copy the full SHA
    13ae9a1 View commit details
    Browse the repository at this point in the history

  11. using json based NEP6Wallet import

    @igormcoelho
    igormcoelho committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    70ccc77 View commit details
    Browse the repository at this point in the history

  12. at least using read serializable array

    @igormcoelho
    igormcoelho committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    dd39152 View commit details
    Browse the repository at this point in the history

  13. revert last commit

    @igormcoelho
    igormcoelho committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    ccad415 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2019

  1. Merge branch 'master' into tx-fee

    @erikzhang
    erikzhang authored Jun 22, 2019
    Configuration menu
    Copy the full SHA
    5c1db4e View commit details
    Browse the repository at this point in the history