Code

Feat/server config#41

Code

Merged

tomt1664 merged 77 commits intodevcommerceblock/mercurylayer:devfrom feat/server-configcommerceblock/mercurylayer:feat/server-configCopy head branch name to clipboardMay 22, 2024

+1,028-506

Commits

Commits on Mar 22, 2024

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

  DhananjayPurohit

  committed
  9c35036

• fix: server config for token server

  DhananjayPurohit

  committed
  08c7aba

Commits on Mar 26, 2024

• feat: add docker build for github actions

  DhananjayPurohit

  committed
  77971c9

• feat: add dev branch to yaml

  DhananjayPurohit

  committed
  6a02b48

Commits on Mar 27, 2024

• fix: token server port

  DhananjayPurohit

  committed
  fb9414e

• fix: config for token server port

  DhananjayPurohit

  committed
  3cfdab5

Commits on Mar 31, 2024

• [WIP] Add Sealing Key

  ssantos21

  committed
  8abadd9

• [WIP] Add Sealing Key

  ssantos21

  committed
  6295604

Commits on Apr 2, 2024

• [WIP] Add Sealing Key

  ssantos21

  committed
  37768f3

• [WIP] Add Sealing Key

  ssantos21

  committed
  a0d06ce

• [WIP] Add Sealing Key

  ssantos21

  committed
  f308e68

Commits on Apr 3, 2024

• fix: merge conflicts

  DhananjayPurohit

  committed
  d12e2d3

• fix: comment settings attribute of wallet

  DhananjayPurohit

  committed
  1e6577f

Commits on Apr 4, 2024

• fix: dockerfile

  DhananjayPurohit

  committed
  a809302

Commits on Apr 5, 2024

• fix: add Rocket.toml to parent folder

  DhananjayPurohit

  committed
  2ca8a85

• fix: merge conflicts

  DhananjayPurohit

  committed
  4e362fb

Commits on Apr 8, 2024

• fix: remove Rocket.toml from sub folder

  DhananjayPurohit

  committed
  4289d2d

Commits on Apr 10, 2024

• fix: add tls-rustls feature to sqlx

  DhananjayPurohit

  committed
  e570b97

Commits on Apr 11, 2024

• fix: route for endpoint /info

  DhananjayPurohit

  committed
  42de8ad

Commits on Apr 15, 2024

• feat: add dockerfile for explorer

  DhananjayPurohit

  committed
  8bb0c08

• fix: copy cmd for explorer dockerfile

  DhananjayPurohit

  committed
  0309e5b

• fix: dockerfile for explorer

  DhananjayPurohit

  committed
  5a9db1c

Commits on Apr 16, 2024

• fix: dockerfile copy cmds

  DhananjayPurohit

  committed
  06caa6c

• fix: path for copy cmd

  DhananjayPurohit

  committed
  84efc78

• fix: dockerfile dir for static files

  DhananjayPurohit

  committed
  2df2e53

• fix: remove dir creation from explorer dockerfile

  DhananjayPurohit

  committed
  c11debe

• fix: change index.html to explorer.html

  DhananjayPurohit

  committed
  94b5493

• fix: rename explorer.html to index.html

  DhananjayPurohit

  committed
  6cd8d77

• feat: configure nginx.conf

  DhananjayPurohit

  committed
  67ac1e5

• fix: nginx.conf

  DhananjayPurohit

  committed
  d5728bc

• fix: root path for nginx.conf

  DhananjayPurohit

  committed
  732d98b

Commits on Apr 17, 2024

• feat: add dockerfile and script for keylist cronjob

  DhananjayPurohit

  committed
  9bddce5

Commits on Apr 18, 2024

• Add docker files to the enclave - HW mode

  ssantos21

  committed
  85a155e

• Add docker files to the enclave - HW mode

  ssantos21

  committed
  cd8470b

• Add docker files to the enclave - HW mode

  ssantos21

  committed
  ad63075

• Add docker files to the enclave - HW mode

  ssantos21

  committed
  9db6062

• Add docker files to the enclave - HW mode

  ssantos21

  committed
  dfb55fd

• fix: merge conflicts

  DhananjayPurohit

  committed
  77ec346

• fix: mercury server build failure

  DhananjayPurohit

  committed
  eae1e4d

Commits on Apr 19, 2024

• fix: file permission in dockerfile for cron

  DhananjayPurohit

  committed
  3dfaab3

• fix: dockerfile for cronjob

  DhananjayPurohit

  committed
  199cea3

• fix: path in cronjob dockerfile

  DhananjayPurohit

  committed
  3389303

Commits on Apr 22, 2024

• fix: keylist url

  DhananjayPurohit

  committed
  baf1924

Commits on Apr 24, 2024

• fix: add sql connection for saving keylist

  DhananjayPurohit

  committed
  55db5ea

• fix: merge conflicts

  DhananjayPurohit

  committed
  36e270e

• fix: merge conflicts

  DhananjayPurohit

  committed
  ed2a5a1

• fix: merge conflicts with cargo.lock

  DhananjayPurohit

  committed
  6052254

Commits on Apr 26, 2024

• fix: cargo.lock and remove blind_commitment field

  DhananjayPurohit

  committed
  f13e4c0

• Add address validation and remove standalone rust client

  ssantos21

  committed
  1f947b8

• fix: merge conflicts

  DhananjayPurohit

  committed
  fa8bf21

• fix: build failure with wasm

  DhananjayPurohit

  committed
  549fd54

Commits on Apr 29, 2024

• fix: merge conflicts

  DhananjayPurohit

  committed
  f3198df

Commits on Apr 30, 2024

• fix: postgres command

  DhananjayPurohit

  committed
  1ceb561

• debug: pg command

  DhananjayPurohit

  committed
  25b7630

• fix: bash script

  DhananjayPurohit

  committed
  c3d551c

Commits on May 1, 2024

• fix: keylist url

  DhananjayPurohit

  committed
  56482f5

• fix: postgres command

  DhananjayPurohit

  committed
  f6131c8

• fix: postgres command to store json as text

  DhananjayPurohit

  committed
  1e6e960

• fix: string handling for json

  DhananjayPurohit

  committed
  cec0572

• fix: postgres command connection details

  DhananjayPurohit

  committed
  e3c9b26

Commits on May 2, 2024

• fix: add env variables to dockerfile

  DhananjayPurohit

  committed
  93ece38

• fix: remove env variables

  DhananjayPurohit

  committed
  4e53fa2

Commits on May 14, 2024

• fix: merge conflicts

  DhananjayPurohit

  committed
  7aac172

Commits on May 20, 2024

• Merge branch 'dev' of https://github.com/commerceblock/mercurylayer into feat/server-config

  DhananjayPurohit

  committed
  83b9a0a

• fix: token and serverconfig fields

  DhananjayPurohit

  committed
  852fafa

Commits on May 21, 2024

• Merge branch 'dev' of https://github.com/commerceblock/mercurylayer into feat/server-config

  DhananjayPurohit

  committed
  49d4e00

• debug: connection string

  DhananjayPurohit

  committed
  b504675

• debug: token server db connection

  DhananjayPurohit

  committed
  b83a2e6

• add tls feature to sqlx

  tomt1664

  authored
  7c64429

Commits on May 22, 2024

• Merge pull request #48 from commerceblock/fix/tls_sqlx

  Show description for c06d734
  tomt1664

  authored
  c06d734

• fix: version for docker images in ci/cd

  DhananjayPurohit

  committed
  5f95990

• Merge branch 'feat/server-config' of https://github.com/commerceblock/mercurylayer into feat/server-config

  DhananjayPurohit

  committed
  a82240d

• fix: version for mercury server image

  DhananjayPurohit

  committed
  128fdec

• fix: version commit hash by github actions

  DhananjayPurohit

  committed
  5905d67

• fix: last commit hash for actions

  DhananjayPurohit

  committed
  ddf5640

• fix: revert commit hashes to smaller string

  DhananjayPurohit

  committed
  66e9b44

• fix: add position, token, url as env variable

  DhananjayPurohit

  committed
  8fd62d5