Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,5 @@ export STATS_EXCLUDE_MEMBER_UIDS=
export COOKIE_DOMAIN=localhost
export USE_PRIVATE_KEY=true


source_env_if_exists .envrc.local
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@
[submodule "liza"]
path = liza
url = git@github.com:bitzlato/liza.git
[submodule "kyc-service"]
path = kyc-service
url = git@github.com:bitzlato/kyc-service
17 changes: 16 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ nvm:
.envrc:
direnv allow

configure_apps: app_baseapp app_barong app_peatio app_liza
configure_apps: app_baseapp app_barong app_peatio app_liza app_kyc_service

GeoLite2-Country.mmdb:
ifeq ($(UNAME), Darwin)
Expand Down Expand Up @@ -94,6 +94,9 @@ start_rango:
start_liza:
cd liza; bundle exec foreman start

start_kyc_service:
cd kyc-service; bundle exec foreman start

app_baseapp:
cd baseapp; yarn rebuild
rm -f baseapp/web/public/config/env.js; ln -s env.localdev.js baseapp/web/public/config/env.js
Expand All @@ -111,6 +114,10 @@ app_peatio:
bin/rake tmp:clear tmp:create; \
bin/rake db:reset

app_kyc_service:
cd kyc-service; rbenv install -s; bundle; \
bundle exec rails db:setup; \

app_liza:
cd liza; git submodule init; git submodule update; \
rbenv install -s; bundle; \
Expand All @@ -119,3 +126,11 @@ app_liza:

secrets:
bundle exec peatio security keygen --path=secrets

checkout_all_master:
cd kyc-service; git checkout main; git pull; bundle install; bundle exec rake db:setup; cd ..; \
cd barong; git checkout master; git pull; bundle install; bundle exec rake db:setup; cd ..; \
cd liza; git checkout master; git pull; bundle install; bundle exec rake db:setup; cd ..; \
cd peatio; git checkout master; git pull; bundle install; bundle exec rake db:migrate; cd ..; \
cd rango; git checkout master; git pull; cd ..; \
cd baseapp; git checkout master; git pull; yarn install; cd web; yarn install; cd ..\..;
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,13 @@ make start_rango
make start_liza
```

**6th terminal session (kyc-service)**

```bash
make start_kyc_service
```


Open page http://localhost:8080/ in browser.

## Run main apps in light mode (only web, no daemons)
Expand Down
2 changes: 1 addition & 1 deletion barong
3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ services:
BASEAPP_PORT: 3002
RANGO_PORT: 8090
LIZA_PORT: 3003
KYC_PORT: 3008

# Good idea. But it does not work on macos because of https://docs.docker.com/docker-for-mac/networking/#there-is-no-docker0-bridge-on-macos
# The better way it to set peatio.local and ws.local in /etc/hosts manualy
Expand All @@ -77,7 +78,7 @@ services:
environment:
SKIP_SETCAP: 1
VAULT_TOKEN: ${VAULT_TOKEN}
VAULT_DEV_ROOT_TOKEN_ID: changeme
VAULT_DEV_ROOT_TOKEN_ID: ${VAULT_TOKEN}
VAULT_ADDR: http://vault:8200

tower:
Expand Down
1 change: 1 addition & 0 deletions kyc-service
Submodule kyc-service added at 6e3f42
2 changes: 1 addition & 1 deletion liza
Submodule liza updated from dba6e1 to 6a307c
2 changes: 1 addition & 1 deletion peatio
Submodule peatio updated 96 files
+1 −0 .github/workflows/benchmarks.yml
+1 −0 .github/workflows/ruby.yml
+1 −1 .semver
+1 −1 Gemfile.lock
+9 −4 app/api/v2/account/beneficiaries.rb
+1 −8 app/api/v2/account/deposits.rb
+0 −8 app/api/v2/admin/currencies.rb
+1 −8 app/api/v2/admin/deposits.rb
+0 −9 app/api/v2/admin/entities/currency.rb
+10 −10 app/api/v2/entities/currency.rb
+1 −3 app/api/v2/entities/payment_address.rb
+15 −10 app/api/v2/helpers.rb
+0 −3 app/api/v2/management/currencies.rb
+28 −0 app/api/v2/management/entities/member_transfer.rb
+79 −0 app/api/v2/management/member_transfers.rb
+1 −0 app/api/v2/management/mount.rb
+3 −1 app/api/v2/management/transfers.rb
+0 −15 app/api/v2/validations.rb
+0 −4 app/gateways/abstract_gateway.rb
+0 −9 app/gateways/bitcoin_cash_gateway.rb
+1 −1 app/gateways/bitzlato_gateway.rb
+6 −2 app/gateways/ethereum_gateway.rb
+1 −1 app/gateways/ethereum_gateway/abstract_command.rb
+3 −1 app/gateways/ethereum_gateway/balances_concern.rb
+8 −7 app/gateways/ethereum_gateway/collection_concern.rb
+2 −0 app/gateways/ethereum_gateway/transaction_creator.rb
+3 −2 app/models/blockchain.rb
+28 −0 app/models/blockchain_currency.rb
+5 −28 app/models/currency.rb
+3 −2 app/models/deposit.rb
+25 −0 app/models/member_transfer.rb
+4 −6 app/models/payment_address.rb
+3 −2 app/models/transfer.rb
+1 −5 app/models/wallet.rb
+5 −6 app/services/blockchain_service.rb
+2 −2 app/services/currency_services/depth_price.rb
+4 −2 app/services/withdrawer.rb
+17 −14 app/workers/amqp/deposit_coin_address.rb
+6 −1 app/workers/daemons/bargainer_job.rb
+1 −1 app/workers/daemons/blockchain_processor.rb
+6 −3 app/workers/daemons/collector.rb
+5 −1 app/workers/daemons/liabilities_compactor.rb
+58 −13 config/bargainers.yml
+3 −3 config/deploy.rb
+13 −1 config/deploy/production.rb
+2 −0 config/deploy/s1.rb
+0 −29 config/deploy/s2.rb
+1 −0 config/deploy/s2.rb
+1 −1 config/deploy/sandbox.rb
+2 −1 config/initializers/bugsnag.rb
+5 −4 config/initializers/exception_reporting.rb
+24 −22 config/initializers/mng_api.rb
+12 −3 config/management_api.yml
+3 −23 config/seed/blockchains.yml
+0 −30 config/seed/currencies.yml
+6 −12 config/seed/markets.yml
+4 −4 config/seed/wallets.yml
+0 −15 config/seed/whitelisted_smart_contracts.yml
+3 −3 config/swap.yml
+3 −0 config/systemd/amqp_daemon@.service.erb
+3 −0 config/systemd/daemon@.service.erb
+3 −0 config/systemd/market_amqp_daemon@.service.erb
+32 −0 db/migrate/20211222155200_create_blockchain_currencies.rb
+7 −0 db/migrate/20211223192517_add_cc_code_to_currencies.rb
+7 −0 db/migrate/20211226123302_change_blockchain_id_null_in_currencies.rb
+137 −0 db/migrate/20220110182834_add_avalanche_blockchain.rb
+7 −0 db/migrate/20220113150944_change_currency_id_limit_in_blockchain_currencies.rb
+20 −0 db/migrate/20220113155904_change_currency_id_limit.rb
+80 −0 db/migrate/20220131124813_compact_orders_func.rb
+20 −0 db/migrate/20220131124954_create_member_transfers.rb
+55 −0 db/migrate/20220201162824_migrate_transfers_to_member_transfers.rb
+11 −3 db/seeds.rb
+117 −23 db/structure.sql
+0 −80 lib/currency_renamer.rb
+29 −0 lib/tasks/payment_addresses.rake
+1 −1 lib/tasks/seed.rake
+16 −0 spec/api/v2/account/beneficiaries_spec.rb
+0 −12 spec/api/v2/account/deposits_spec.rb
+126 −0 spec/api/v2/management/member_transfers_spec.rb
+1 −1 spec/api/v2/management/transfers_spec.rb
+8 −0 spec/factories/blockchain_currencies.rb
+13 −12 spec/factories/blockchains.rb
+12 −44 spec/factories/currencies.rb
+36 −0 spec/factories/member_transfer.rb
+1 −15 spec/factories/wallet.rb
+1 −1 spec/gateways/ethereum_gateway/collection_concern_spec.rb
+9 −7 spec/gateways/ethereum_gateway/gas_refueler_spec.rb
+1 −1 spec/gateways/ethereum_gateway/transaction_creator_spec.rb
+3 −3 spec/gateways/ethereum_gateway_spec.rb
+53 −0 spec/models/blockchain_currency_spec.rb
+6 −51 spec/models/currency_spec.rb
+1 −1 spec/services/balances_updater_spec.rb
+46 −1 spec/services/blockchain_service_spec.rb
+15 −11 spec/support/stub_ethereum.rb
+14 −3 spec/workers/amqp/deposit_coin_address_spec.rb
+31 −7 spec/workers/daemons/collector_spec.rb
+4 −0 spec/workers/daemons/stats_member_pnl_spec.rb
24 changes: 24 additions & 0 deletions templates/default.conf.template
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,30 @@ server {
proxy_pass http://${DOCKER_HOST_IP}:8091;
}

location /api/v1/kyc/webhook/sumsub {
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
error_page 401 =401 /error/401;
proxy_pass http://${DOCKER_HOST_IP}:${KYC_PORT}/api/webhook/sumsub;
}

location /api/v1/kyc {
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
auth_request /api/v2/auth/;
proxy_http_version 1.1;
auth_request_set $auth_header $upstream_http_authorization;
proxy_set_header Authorization $auth_header;
error_page 401 =401 /error/401;
proxy_set_header X-Original-URI $request_uri;
proxy_pass http://${DOCKER_HOST_IP}:${KYC_PORT}/api/kyc;
proxy_cookie_path / "/; Secure";
}

location /api/v2/barong {
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
Expand Down