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

Feat/server config #41

Merged
merged 77 commits into from
May 22, 2024
Merged

Feat/server config #41

merged 77 commits into from
May 22, 2024

Commits on Mar 22, 2024

  1. feat: add server config from .env and settings.toml

    @DhananjayPurohit
    DhananjayPurohit committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    9c35036 View commit details
    Browse the repository at this point in the history

  2. fix: server config for token server

    @DhananjayPurohit
    DhananjayPurohit committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    08c7aba View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. feat: add docker build for github actions

    @DhananjayPurohit
    DhananjayPurohit committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    77971c9 View commit details
    Browse the repository at this point in the history

  2. feat: add dev branch to yaml

    @DhananjayPurohit
    DhananjayPurohit committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    6a02b48 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. fix: token server port

    @DhananjayPurohit
    DhananjayPurohit committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    fb9414e View commit details
    Browse the repository at this point in the history

  2. fix: config for token server port

    @DhananjayPurohit
    DhananjayPurohit committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    3cfdab5 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2024

  1. [WIP] Add Sealing Key

    @ssantos21
    ssantos21 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    8abadd9 View commit details
    Browse the repository at this point in the history

  2. [WIP] Add Sealing Key

    @ssantos21
    ssantos21 committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    6295604 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. [WIP] Add Sealing Key

    @ssantos21
    ssantos21 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    37768f3 View commit details
    Browse the repository at this point in the history

  2. [WIP] Add Sealing Key

    @ssantos21
    ssantos21 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    a0d06ce View commit details
    Browse the repository at this point in the history

  3. [WIP] Add Sealing Key

    @ssantos21
    ssantos21 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    f308e68 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. fix: merge conflicts

    @DhananjayPurohit
    DhananjayPurohit committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    d12e2d3 View commit details
    Browse the repository at this point in the history

  2. fix: comment settings attribute of wallet

    @DhananjayPurohit
    DhananjayPurohit committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    1e6577f View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. fix: dockerfile

    @DhananjayPurohit
    DhananjayPurohit committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    a809302 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. fix: add Rocket.toml to parent folder

    @DhananjayPurohit
    DhananjayPurohit committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    2ca8a85 View commit details
    Browse the repository at this point in the history

  2. fix: merge conflicts

    @DhananjayPurohit
    DhananjayPurohit committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    4e362fb View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. fix: remove Rocket.toml from sub folder

    @DhananjayPurohit
    DhananjayPurohit committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    4289d2d View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. fix: add tls-rustls feature to sqlx

    @DhananjayPurohit
    DhananjayPurohit committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    e570b97 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. fix: route for endpoint /info

    @DhananjayPurohit
    DhananjayPurohit committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    42de8ad View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. feat: add dockerfile for explorer

    @DhananjayPurohit
    DhananjayPurohit committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    8bb0c08 View commit details
    Browse the repository at this point in the history

  2. fix: copy cmd for explorer dockerfile

    @DhananjayPurohit
    DhananjayPurohit committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    0309e5b View commit details
    Browse the repository at this point in the history

  3. fix: dockerfile for explorer

    @DhananjayPurohit
    DhananjayPurohit committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    5a9db1c View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. fix: dockerfile copy cmds

    @DhananjayPurohit
    DhananjayPurohit committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    06caa6c View commit details
    Browse the repository at this point in the history

  2. fix: path for copy cmd

    @DhananjayPurohit
    DhananjayPurohit committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    84efc78 View commit details
    Browse the repository at this point in the history

  3. fix: dockerfile dir for static files

    @DhananjayPurohit
    DhananjayPurohit committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    2df2e53 View commit details
    Browse the repository at this point in the history

  4. fix: remove dir creation from explorer dockerfile

    @DhananjayPurohit
    DhananjayPurohit committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    c11debe View commit details
    Browse the repository at this point in the history

  5. fix: change index.html to explorer.html

    @DhananjayPurohit
    DhananjayPurohit committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    94b5493 View commit details
    Browse the repository at this point in the history

  6. fix: rename explorer.html to index.html

    @DhananjayPurohit
    DhananjayPurohit committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    6cd8d77 View commit details
    Browse the repository at this point in the history

  7. feat: configure nginx.conf

    @DhananjayPurohit
    DhananjayPurohit committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    67ac1e5 View commit details
    Browse the repository at this point in the history

  8. fix: nginx.conf

    @DhananjayPurohit
    DhananjayPurohit committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    d5728bc View commit details
    Browse the repository at this point in the history

  9. fix: root path for nginx.conf

    @DhananjayPurohit
    DhananjayPurohit committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    732d98b View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. feat: add dockerfile and script for keylist cronjob

    @DhananjayPurohit
    DhananjayPurohit committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    9bddce5 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Add docker files to the enclave - HW mode

    @ssantos21
    ssantos21 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    85a155e View commit details
    Browse the repository at this point in the history

  2. Add docker files to the enclave - HW mode

    @ssantos21
    ssantos21 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    cd8470b View commit details
    Browse the repository at this point in the history

  3. Add docker files to the enclave - HW mode

    @ssantos21
    ssantos21 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    ad63075 View commit details
    Browse the repository at this point in the history

  4. Add docker files to the enclave - HW mode

    @ssantos21
    ssantos21 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    9db6062 View commit details
    Browse the repository at this point in the history

  5. Add docker files to the enclave - HW mode

    @ssantos21
    ssantos21 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    dfb55fd View commit details
    Browse the repository at this point in the history

  6. fix: merge conflicts

    @DhananjayPurohit
    DhananjayPurohit committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    77ec346 View commit details
    Browse the repository at this point in the history

  7. fix: mercury server build failure

    @DhananjayPurohit
    DhananjayPurohit committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    eae1e4d View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. fix: file permission in dockerfile for cron

    @DhananjayPurohit
    DhananjayPurohit committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    3dfaab3 View commit details
    Browse the repository at this point in the history

  2. fix: dockerfile for cronjob

    @DhananjayPurohit
    DhananjayPurohit committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    199cea3 View commit details
    Browse the repository at this point in the history

  3. fix: path in cronjob dockerfile

    @DhananjayPurohit
    DhananjayPurohit committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    3389303 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. fix: keylist url

    @DhananjayPurohit
    DhananjayPurohit committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    baf1924 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. fix: add sql connection for saving keylist

    @DhananjayPurohit
    DhananjayPurohit committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    55db5ea View commit details
    Browse the repository at this point in the history

  2. fix: merge conflicts

    @DhananjayPurohit
    DhananjayPurohit committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    36e270e View commit details
    Browse the repository at this point in the history

  3. fix: merge conflicts

    @DhananjayPurohit
    DhananjayPurohit committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    ed2a5a1 View commit details
    Browse the repository at this point in the history

  4. fix: merge conflicts with cargo.lock

    @DhananjayPurohit
    DhananjayPurohit committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    6052254 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. fix: cargo.lock and remove blind_commitment field

    @DhananjayPurohit
    DhananjayPurohit committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    f13e4c0 View commit details
    Browse the repository at this point in the history

  2. Add address validation and remove standalone rust client

    @ssantos21
    ssantos21 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    1f947b8 View commit details
    Browse the repository at this point in the history

  3. fix: merge conflicts

    @DhananjayPurohit
    DhananjayPurohit committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    fa8bf21 View commit details
    Browse the repository at this point in the history

  4. fix: build failure with wasm

    @DhananjayPurohit
    DhananjayPurohit committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    549fd54 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. fix: merge conflicts

    @DhananjayPurohit
    DhananjayPurohit committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    f3198df View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. fix: postgres command

    @DhananjayPurohit
    DhananjayPurohit committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    1ceb561 View commit details
    Browse the repository at this point in the history

  2. debug: pg command

    @DhananjayPurohit
    DhananjayPurohit committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    25b7630 View commit details
    Browse the repository at this point in the history

  3. fix: bash script

    @DhananjayPurohit
    DhananjayPurohit committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    c3d551c View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. fix: keylist url

    @DhananjayPurohit
    DhananjayPurohit committed May 1, 2024
    Configuration menu
    Copy the full SHA
    56482f5 View commit details
    Browse the repository at this point in the history

  2. fix: postgres command

    @DhananjayPurohit
    DhananjayPurohit committed May 1, 2024
    Configuration menu
    Copy the full SHA
    f6131c8 View commit details
    Browse the repository at this point in the history

  3. fix: postgres command to store json as text

    @DhananjayPurohit
    DhananjayPurohit committed May 1, 2024
    Configuration menu
    Copy the full SHA
    1e6e960 View commit details
    Browse the repository at this point in the history

  4. fix: string handling for json

    @DhananjayPurohit
    DhananjayPurohit committed May 1, 2024
    Configuration menu
    Copy the full SHA
    cec0572 View commit details
    Browse the repository at this point in the history

  5. fix: postgres command connection details

    @DhananjayPurohit
    DhananjayPurohit committed May 1, 2024
    Configuration menu
    Copy the full SHA
    e3c9b26 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. fix: add env variables to dockerfile

    @DhananjayPurohit
    DhananjayPurohit committed May 2, 2024
    Configuration menu
    Copy the full SHA
    93ece38 View commit details
    Browse the repository at this point in the history

  2. fix: remove env variables

    @DhananjayPurohit
    DhananjayPurohit committed May 2, 2024
    Configuration menu
    Copy the full SHA
    4e53fa2 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. fix: merge conflicts

    @DhananjayPurohit
    DhananjayPurohit committed May 14, 2024
    Configuration menu
    Copy the full SHA
    7aac172 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. Merge branch 'dev' of https://github.com/commerceblock/mercurylayer i… 

    …nto feat/server-config
    @DhananjayPurohit
    DhananjayPurohit committed May 20, 2024
    Configuration menu
    Copy the full SHA
    83b9a0a View commit details
    Browse the repository at this point in the history

  2. fix: token and serverconfig fields

    @DhananjayPurohit
    DhananjayPurohit committed May 20, 2024
    Configuration menu
    Copy the full SHA
    852fafa View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Merge branch 'dev' of https://github.com/commerceblock/mercurylayer i… 

    …nto feat/server-config
    @DhananjayPurohit
    DhananjayPurohit committed May 21, 2024
    Configuration menu
    Copy the full SHA
    49d4e00 View commit details
    Browse the repository at this point in the history

  2. debug: connection string

    @DhananjayPurohit
    DhananjayPurohit committed May 21, 2024
    Configuration menu
    Copy the full SHA
    b504675 View commit details
    Browse the repository at this point in the history

  3. debug: token server db connection

    @DhananjayPurohit
    DhananjayPurohit committed May 21, 2024
    Configuration menu
    Copy the full SHA
    b83a2e6 View commit details
    Browse the repository at this point in the history

  4. add tls feature to sqlx

    @tomt1664
    tomt1664 authored May 21, 2024
    Configuration menu
    Copy the full SHA
    7c64429 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Merge pull request #48 from commerceblock/fix/tls_sqlx 

    Fix/tls sqlx
    @tomt1664
    tomt1664 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    c06d734 View commit details
    Browse the repository at this point in the history

  2. fix: version for docker images in ci/cd

    @DhananjayPurohit
    DhananjayPurohit committed May 22, 2024
    Configuration menu
    Copy the full SHA
    5f95990 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feat/server-config' of https://github.com/commerceblock… 

    …/mercurylayer into feat/server-config
    @DhananjayPurohit
    DhananjayPurohit committed May 22, 2024
    Configuration menu
    Copy the full SHA
    a82240d View commit details
    Browse the repository at this point in the history

  4. fix: version for mercury server image

    @DhananjayPurohit
    DhananjayPurohit committed May 22, 2024
    Configuration menu
    Copy the full SHA
    128fdec View commit details
    Browse the repository at this point in the history

  5. fix: version commit hash by github actions

    @DhananjayPurohit
    DhananjayPurohit committed May 22, 2024
    Configuration menu
    Copy the full SHA
    5905d67 View commit details
    Browse the repository at this point in the history

  6. fix: last commit hash for actions

    @DhananjayPurohit
    DhananjayPurohit committed May 22, 2024
    Configuration menu
    Copy the full SHA
    ddf5640 View commit details
    Browse the repository at this point in the history

  7. fix: revert commit hashes to smaller string

    @DhananjayPurohit
    DhananjayPurohit committed May 22, 2024
    Configuration menu
    Copy the full SHA
    66e9b44 View commit details
    Browse the repository at this point in the history

  8. fix: add position, token, url as env variable

    @DhananjayPurohit
    DhananjayPurohit committed May 22, 2024
    Configuration menu
    Copy the full SHA
    8fd62d5 View commit details
    Browse the repository at this point in the history