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

Fee integration #213

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

Fee integration #213

wants to merge 77 commits into from

Commits on Nov 4, 2022

  1. ft-locker: replace admin_controlled with near plugins

    @karim-en
    karim-en committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    2c80d84 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2022

  1. Token factory: replace admin_controlled with near plugins

    @karim-en
    karim-en committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    a9be4d5 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2022

  1. Exclude owner and self from pause

    @karim-en
    karim-en committed Nov 7, 2022
    Configuration menu
    Copy the full SHA
    85b5840 View commit details
    Browse the repository at this point in the history

  2. Bridge token: replace admin_controlled with near plugins

    @karim-en
    karim-en committed Nov 7, 2022
    Configuration menu
    Copy the full SHA
    a59801b View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2022

  1. Fix set owner of the bridge-token

    @karim-en
    karim-en committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    15a3d94 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2022

  1. Bridge token: check predecessor account on init

    @karim-en
    karim-en committed Nov 24, 2022
    Configuration menu
    Copy the full SHA
    dd236ca View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2022

  1. Update wasm builds

    @karim-en
    karim-en committed Nov 25, 2022
    Configuration menu
    Copy the full SHA
    ea77f59 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2023

  1. Factory: update near plugins

    @karim-en
    karim-en committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    2376936 View commit details
    Browse the repository at this point in the history

  2. Ft connector: update near plugins

    @karim-en
    karim-en committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    c66cd39 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2023

  1. Fix tests

    @karim-en
    karim-en committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    1688478 View commit details
    Browse the repository at this point in the history

  2. Revert changes

    @karim-en
    karim-en committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    7377701 View commit details
    Browse the repository at this point in the history

  3. Fix token locker tests

    @karim-en
    karim-en committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    3305531 View commit details
    Browse the repository at this point in the history

  4. Update contracts builds

    @karim-en
    karim-en committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    bf96fdc View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. Make the bridge token upgradable

    @karim-en
    karim-en committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    d62d113 View commit details
    Browse the repository at this point in the history

  2. Fix access role

    @karim-en
    karim-en committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    47e7b73 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2023

  1. WIP: Added fee-integration for 'deposit' and 'withdraw'dd of bridge t… 

    …okens
    @UrAvgDeveloper
    UrAvgDeveloper committed May 1, 2023
    Configuration menu
    Copy the full SHA
    0739ab2 View commit details
    Browse the repository at this point in the history

  2. Bump contracts versions

    @karim-en
    karim-en committed May 1, 2023
    Configuration menu
    Copy the full SHA
    679eb6d View commit details
    Browse the repository at this point in the history

  3. Use tokio::test for integration tests

    @karim-en
    karim-en committed May 1, 2023
    Configuration menu
    Copy the full SHA
    b1a4f21 View commit details
    Browse the repository at this point in the history

  4. Fix version() method

    @karim-en
    karim-en committed May 1, 2023
    Configuration menu
    Copy the full SHA
    309b510 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2023

  1. Fix upgrade & pause withdraw

    @karim-en
    karim-en committed May 2, 2023
    Configuration menu
    Copy the full SHA
    5fffd1f View commit details
    Browse the repository at this point in the history

  2. Add tests for upgrade from 0.1.6

    @karim-en
    karim-en committed May 2, 2023
    Configuration menu
    Copy the full SHA
    803c8ca View commit details
    Browse the repository at this point in the history

  3. fixed deposit

    @UrAvgDeveloper
    UrAvgDeveloper committed May 2, 2023
    Configuration menu
    Copy the full SHA
    b04a460 View commit details
    Browse the repository at this point in the history

  4. changed fee percentage to u128 with 6 decimal precision

    @UrAvgDeveloper
    UrAvgDeveloper committed May 2, 2023
    Configuration menu
    Copy the full SHA
    aeb2fc1 View commit details
    Browse the repository at this point in the history

  5. changed macros to build

    @UrAvgDeveloper
    UrAvgDeveloper committed May 2, 2023
    Configuration menu
    Copy the full SHA
    7263ba0 View commit details
    Browse the repository at this point in the history

  6. changed storage keys for unordered maps

    @UrAvgDeveloper
    UrAvgDeveloper committed May 2, 2023
    Configuration menu
    Copy the full SHA
    b81d5f9 View commit details
    Browse the repository at this point in the history

  7. WIP: Added integration tests for deposits with fee-deduction and with… 

    …out fee-deductions
    @UrAvgDeveloper
    UrAvgDeveloper committed May 2, 2023
    Configuration menu
    Copy the full SHA
    e5fd4b8 View commit details
    Browse the repository at this point in the history

  8. added fee for withdraw

    @UrAvgDeveloper
    UrAvgDeveloper committed May 2, 2023
    Configuration menu
    Copy the full SHA
    763f98f View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. added fee transfer to bridge token factory

    @UrAvgDeveloper
    UrAvgDeveloper committed May 3, 2023
    Configuration menu
    Copy the full SHA
    df095bd View commit details
    Browse the repository at this point in the history

  2. fixed minting logic for fee

    @UrAvgDeveloper
    UrAvgDeveloper committed May 3, 2023
    Configuration menu
    Copy the full SHA
    1445512 View commit details
    Browse the repository at this point in the history

  3. fixed fee amount

    @UrAvgDeveloper
    UrAvgDeveloper committed May 3, 2023
    Configuration menu
    Copy the full SHA
    1bc283c View commit details
    Browse the repository at this point in the history

  4. added const for aurora id

    @UrAvgDeveloper
    UrAvgDeveloper committed May 3, 2023
    Configuration menu
    Copy the full SHA
    a5b59c5 View commit details
    Browse the repository at this point in the history

  5. Added integration tests for deposits and withdraw of tokens with fee

    @UrAvgDeveloper
    UrAvgDeveloper committed May 3, 2023
    Configuration menu
    Copy the full SHA
    7472264 View commit details
    Browse the repository at this point in the history

  6. Update contracts builds

    @karim-en
    karim-en committed May 3, 2023
    Configuration menu
    Copy the full SHA
    a446d81 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2023

  1. added fee claiming

    @UrAvgDeveloper
    UrAvgDeveloper committed May 4, 2023
    Configuration menu
    Copy the full SHA
    3a0e884 View commit details
    Browse the repository at this point in the history

  2. Added integration tests for fee-claim

    @UrAvgDeveloper
    UrAvgDeveloper committed May 4, 2023
    Configuration menu
    Copy the full SHA
    545e89a View commit details
    Browse the repository at this point in the history

  3. created separate file for fee integration test

    @UrAvgDeveloper
    UrAvgDeveloper committed May 4, 2023
    Configuration menu
    Copy the full SHA
    d2a221f View commit details
    Browse the repository at this point in the history

  4. resolving merge conflicts

    @UrAvgDeveloper
    UrAvgDeveloper committed May 4, 2023
    Configuration menu
    Copy the full SHA
    08a4429 View commit details
    Browse the repository at this point in the history

  5. resolving merge conflicts

    @UrAvgDeveloper
    UrAvgDeveloper committed May 4, 2023
    Configuration menu
    Copy the full SHA
    a5e7322 View commit details
    Browse the repository at this point in the history

  6. added finish withdraw unit test

    @UrAvgDeveloper
    UrAvgDeveloper committed May 4, 2023
    Configuration menu
    Copy the full SHA
    83383a0 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2023

  1. Added check for aurora silos in finish_withdraw

    @UrAvgDeveloper
    UrAvgDeveloper committed May 5, 2023
    Configuration menu
    Copy the full SHA
    7684b50 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. added fees as per silo

    @UrAvgDeveloper
    UrAvgDeveloper committed May 11, 2023
    Configuration menu
    Copy the full SHA
    ae26ff0 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. Added feature for withdraw-fee as per-silo-per-token with unit tests

    @UrAvgDeveloper
    UrAvgDeveloper committed May 16, 2023
    Configuration menu
    Copy the full SHA
    a7327e1 View commit details
    Browse the repository at this point in the history

  2. Minor upgradation

    @UrAvgDeveloper
    UrAvgDeveloper committed May 16, 2023
    Configuration menu
    Copy the full SHA
    1537c6e View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. CI-Fix

    @UrAvgDeveloper
    UrAvgDeveloper committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    c326347 View commit details
    Browse the repository at this point in the history

  2. CI-Fix: bridge_token_factory

    @UrAvgDeveloper
    UrAvgDeveloper committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    1dc8221 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. Added readme for fee-integration implementation for bridge-token-factory

    @UrAvgDeveloper
    UrAvgDeveloper committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    4f11c1a View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. Fixed PR-comments(1)

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

  2. Fixed PR-comments(2)

    @UrAvgDeveloper
    UrAvgDeveloper committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    e53607f View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. combined fee-bounds with fee-percentage

    @UrAvgDeveloper
    UrAvgDeveloper committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    2e8a52d View commit details
    Browse the repository at this point in the history

  2. added a separate method to return fee-amount

    @UrAvgDeveloper
    UrAvgDeveloper committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    965d700 View commit details
    Browse the repository at this point in the history

  3. Refactor the fee calculation

    @karim-en
    karim-en committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    382d2c2 View commit details
    Browse the repository at this point in the history

  4. Update contract builds

    @karim-en
    karim-en committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    28fde19 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. Refactor the fee per silo implementation

    @karim-en
    karim-en committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    cce1ee1 View commit details
    Browse the repository at this point in the history

  2. Update contracts builds

    @karim-en
    karim-en committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    7e8edb3 View commit details
    Browse the repository at this point in the history

  3. Implement migration

    @karim-en
    karim-en committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    23b891a View commit details
    Browse the repository at this point in the history

  4. Update contracts build

    @karim-en
    karim-en committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    338114e View commit details
    Browse the repository at this point in the history

  5. Fix upgrade test

    @karim-en
    karim-en committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    bf39452 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Add EthAddressHex type

    @karim-en
    karim-en committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    13509de View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Fix storage deposit on minting fee

    @karim-en
    karim-en committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    feff748 View commit details
    Browse the repository at this point in the history

  2. Update contract builds

    @karim-en
    karim-en committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    fd067ba View commit details
    Browse the repository at this point in the history

  3. Improve naming

    @karim-en
    karim-en committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    6df985a View commit details
    Browse the repository at this point in the history

  4. Refactor silo fee logic

    @karim-en
    karim-en committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    4f89055 View commit details
    Browse the repository at this point in the history

  5. Move the fee to separate file

    @karim-en
    karim-en committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    3f5295c View commit details
    Browse the repository at this point in the history

  6. Change storage deposit logic

    @karim-en
    karim-en committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    1b1d3fd View commit details
    Browse the repository at this point in the history

  7. Update contract build

    @karim-en
    karim-en committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    73b7eec View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. Update bridge-token-factory/src/types.rs

    @karim-en
    karim-en authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    b5e552f View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. Fix claim_fee

    @karim-en
    karim-en committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    5c69b52 View commit details
    Browse the repository at this point in the history

  2. Remove storage deposit from the set fee methods

    @karim-en
    karim-en committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    bc39b1f View commit details
    Browse the repository at this point in the history

  3. Handle fee overflow

    @karim-en
    karim-en committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    a6395e9 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Add description for storage fields

    @karim-en
    karim-en committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    9a9e29d View commit details
    Browse the repository at this point in the history

  2. Fix tests

    @karim-en
    karim-en committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    03b5b59 View commit details
    Browse the repository at this point in the history

  3. Update readme

    @karim-en
    karim-en committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    849520f View commit details
    Browse the repository at this point in the history

  4. Add unset methods

    @karim-en
    karim-en committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    f4058da View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. Remove FeeBounds type

    @karim-en
    karim-en committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    6acd999 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2023

  1. Make calculate fee methods public

    @karim-en
    karim-en committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    6007c21 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. Improve unwrap

    @karim-en
    karim-en committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    f13658a View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. Fix test

    @karim-en
    karim-en committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    a99f8ff View commit details
    Browse the repository at this point in the history