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.

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

feat: implement escrow contract in solidity for zksync #171

Merged
merged 114 commits into from
Mar 22, 2024

Commits on Feb 15, 2024

  1. feat: move ethereum submodules

    uri-99 committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    7fc7be1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    93d0112 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1eac4a7 View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'origin/168-refactor-rename-contractsx-c…

    …airo-to-starknet-and-solidity-to-ethereum' into 108-feat-implement-escrow-contract-in-solidity-for-zksync
    uri-99 committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    38dafb8 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a1a1d45 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. Configuration menu
    Copy the full SHA
    096cf27 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e1e259a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    40ba812 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8373dfc View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f689896 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. fix: make deps

    uri-99 committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    bf9485b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    409ff93 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    69f12d5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6f11a0e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4cdf6ae View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f64e559 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. Configuration menu
    Copy the full SHA
    1f5396e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4dae694 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    15321ab View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8dcd2ef View commit details
    Browse the repository at this point in the history
  5. feat: msg to L2, UNTESTED

    uri-99 committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    433fce0 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Configuration menu
    Copy the full SHA
    396d999 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6709998 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    264c355 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    46aa32f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3f8bf68 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    59a2421 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    579215f View commit details
    Browse the repository at this point in the history
  8. feat: zksync init after deploy

    uri-99 committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    82de6d5 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Configuration menu
    Copy the full SHA
    55bdc31 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7294c8d View commit details
    Browse the repository at this point in the history
  3. chore: forge init

    uri-99 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    40098ac View commit details
    Browse the repository at this point in the history
  4. forge install: forge-std

    v1.7.6
    uri-99 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    2d04ff6 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    40e7481 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e15049a View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    65cd703 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    61ca08a View commit details
    Browse the repository at this point in the history
  9. test: initial setOrder test

    uri-99 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    8cfaa2e View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    3bed841 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    8ed9692 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. Configuration menu
    Copy the full SHA
    e2310ba View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6d0d9a3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c9589fb View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2a589e0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    793be33 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    97c1a62 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    1da8827 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    e9745ae View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    fa387b7 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    d193973 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    ea179a6 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    8d1d3c6 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    9b5d810 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    0bac8cc View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Configuration menu
    Copy the full SHA
    3df24b5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1181a14 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. Configuration menu
    Copy the full SHA
    d14c0a4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e344ad8 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Configuration menu
    Copy the full SHA
    6f6b624 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1aa3019 View commit details
    Browse the repository at this point in the history
  3. test: add pending order test

    uri-99 committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    c95d2c6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c32132a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    11a80e5 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ee93d52 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. Configuration menu
    Copy the full SHA
    d77907d View commit details
    Browse the repository at this point in the history
  2. refactor: removed unnecesarry vars from escrow (native_token_eth_in_z…

    …ksync, mm_ethereum_wallet)
    uri-99 committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    660c3c6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    32879d0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    bd9e158 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1a70417 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b244e97 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. Configuration menu
    Copy the full SHA
    319b11d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3116f35 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. Configuration menu
    Copy the full SHA
    61fa05a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7a562ad View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fb58fe8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    dca0c47 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    45aca9c View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9308f0d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    5e1a00a View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. Configuration menu
    Copy the full SHA
    83cd4c6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1ac1ae4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    90c8afa View commit details
    Browse the repository at this point in the history
  4. fix(wip): new diamondProxy address for integration tests. cant execut…

    …e a function but there is a contract
    uri-99 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    1c04dcb View commit details
    Browse the repository at this point in the history
  5. test: add --gas-report to eth-test + cast call to verify address is a…

    … contract in set_order.sh
    uri-99 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    9d5f0ea View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Configuration menu
    Copy the full SHA
    432ec12 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bf922b8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4f4e72e View commit details
    Browse the repository at this point in the history
  4. fix: change file names in CI

    uri-99 committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    09e35e2 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    218b7be View commit details
    Browse the repository at this point in the history
  6. fix: env var names in CI

    uri-99 committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    2686e5e View commit details
    Browse the repository at this point in the history
  7. fix: another .env var in CI

    uri-99 committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    c9a0d78 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    e4c8d02 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    52e1d91 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. Configuration menu
    Copy the full SHA
    4950359 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c1754ff View commit details
    Browse the repository at this point in the history
  3. refactor: Update contracts/ethereum/.env.example

    Co-authored-by: Julian Arce <[email protected]>
    uri-99 and JuArce authored Mar 22, 2024
    Configuration menu
    Copy the full SHA
    9f171ae View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4c263cb View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9b368ec View commit details
    Browse the repository at this point in the history
  6. remove: unnecesarry comment

    uri-99 committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    59254c8 View commit details
    Browse the repository at this point in the history
  7. remove: wrong comment

    uri-99 committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    5cf09e4 View commit details
    Browse the repository at this point in the history
  8. refactor: add \n at EOF

    uri-99 committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    16f0187 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    78fe4bb View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    3858f13 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    6021e32 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    ec8d049 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    f4ae3af View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    aeb8971 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    ba4f5d7 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    e57ff90 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    9cf435d View commit details
    Browse the repository at this point in the history
  18. refactor: style \n at EOF

    uri-99 committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    6e9df50 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    5e6522b View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    295b7f0 View commit details
    Browse the repository at this point in the history
  21. fix: add new line

    JuArce authored Mar 22, 2024
    Configuration menu
    Copy the full SHA
    5686ff0 View commit details
    Browse the repository at this point in the history