Skip to content

Commit

Permalink
Merge branch 'dev' into 724fdependabot/npm_and_yarn/openapitools/open…
Browse files Browse the repository at this point in the history
…api-generator-cli-2.13.4
  • Loading branch information
shawakash authored May 26, 2024
2 parents 37fdd55 + 38142aa commit b2fa04a
Show file tree
Hide file tree
Showing 709 changed files with 62,216 additions and 73,620 deletions.
6 changes: 6 additions & 0 deletions .changeset/brave-insects-own.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@paybox/api": patch
"@paybox/backend-common": patch
---

feat: adds bitcoin keys support to account and fixes the tinysepka build issue
10 changes: 10 additions & 0 deletions .changeset/empty-cars-turn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
"@paybox/blockchain": patch
"@paybox/common": patch
"@paybox/api": patch
"@paybox/backend-common": patch
"@paybox/notif-worker": patch
"@paybox/zeus": patch
---

feat: adds token create endpoint and moves from pk to normal
6 changes: 6 additions & 0 deletions .changeset/feat: silver-baboons-hope.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@paybox/common": patch
"@paybox/api": patch
---

feat: adds associated token account create endpoint
5 changes: 5 additions & 0 deletions .changeset/loud-dolphins-love.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@paybox/backend-common": patch
---

feat: adds indexes on db tables and inits a rust api backend
1 change: 0 additions & 1 deletion .changeset/quiet-phones-boil.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

---

feat: adding a solana token program
6 changes: 1 addition & 5 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
// This configuration only applies to the package manager root.
/** @type {import("eslint").Linter.Config} */
module.exports = {
ignorePatterns: ["apps/**", "packages/**"],
ignorePatterns: ["apps/**", "packages/**", "backend/**"],
extends: ["@repo/eslint-config/library.js"],
parser: "@typescript-eslint/parser",
parserOptions: {
project: true,
},
};
5 changes: 5 additions & 0 deletions .github/workflows/backend-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ on:
push:
branches:
- dev
paths:
- 'backend/api/**'
pull_request:
branches:
- dev
paths:
- 'backend/api/**'
jobs:
deploy:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -48,6 +52,7 @@ jobs:
printf 'MOONPAY_WEBHOOK_KEY=%s\n' "${{secrets.MOONPAY_WEBHOOK_KEY}}" >> .env
printf 'MOONPAY_API_KEY=%s\n' "${{secrets.MOONPAY_API_KEY}}" >> .env
printf 'MOONPAY_SECRET_KEY=%s\n' "${{secrets.MOONPAY_SECRET_KEY}}" >> .env
printf 'SITE_SECRET_KEY=%s\n' "${{secrets.SITE_SECRET_KEY}}" >> .env
cd ../..
- name: docker login
Expand Down
43 changes: 43 additions & 0 deletions .github/workflows/backend-indexer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Deploy backend-indexer

on:
push:
branches:
- dev
paths:
- 'backend/indexer/**'
pull_request:
branches:
- dev
paths:
- 'backend/indexer/**'
jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: "mv docker/indexer/Dockerfile ."

- name: add secrets
env:
DOCKER_USER: ${{secrets.DOCKERHUB_USERNAME}}
DOCKER_PASSWORD: ${{secrets.DOCKERHUB_TOKEN}}
run: |
cd backend/indexer
touch .env
printf 'INDEXER_PORT=%s\n' "${{secrets.INDEXER_PORT}}" >> .env
printf 'INDEXER_KAFKA_URL=%s\n' "${{secrets.INDEXER_KAFKA_URL}}" >> .env
printf 'INDEXER_KAFKA_ID=%s\n' "${{secrets.INDEXER_KAFKA_ID}}" >> .env
cd ../..
- name: docker login
env:
DOCKER_USER: ${{secrets.DOCKERHUB_USERNAME}}
DOCKER_PASSWORD: ${{secrets.DOCKERHUB_TOKEN}}
run: |
docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
- name: Build the Docker image
run: docker build . --tag shawakash/paybox-indexer:${{ github.sha }}

- name: Docker Push
run: docker push shawakash/paybox-indexer:${{ github.sha }}
4 changes: 4 additions & 0 deletions .github/workflows/backend-mail.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ on:
push:
branches:
- dev
paths:
- 'backend/mail/**'
pull_request:
branches:
- dev
paths:
- 'backend/mail/**'
jobs:
deploy:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/backend-mote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ on:
push:
branches:
- dev
paths:
- 'backend/mote/**'
pull_request:
branches:
- dev
paths:
- 'backend/mote/**'
jobs:
deploy:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/backend-notif-worker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ on:
push:
branches:
- dev
paths:
- 'backend/notif-worker/**'
pull_request:
branches:
- dev
paths:
- 'backend/notif-worker/**'
jobs:
deploy:
runs-on: ubuntu-latest
Expand Down
41 changes: 41 additions & 0 deletions .github/workflows/backend-rs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Deploy backend-rs-api

on:
push:
branches:
- dev
paths:
- "backend/rs_api/**"
pull_request:
branches:
- dev
paths:
- "backend/rs_api/**"
jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: "mv docker/rs_api/Dockerfile ."

- name: add secrets
env:
DOCKER_USER: ${{secrets.DOCKERHUB_USERNAME}}
DOCKER_PASSWORD: ${{secrets.DOCKERHUB_TOKEN}}
run: |
cd backend/rs_api
touch .env
printf 'PORT=%s\n' "8080" >> .env
cd ../..
- name: docker login
env:
DOCKER_USER: ${{secrets.DOCKERHUB_USERNAME}}
DOCKER_PASSWORD: ${{secrets.DOCKERHUB_TOKEN}}
run: |
docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
- name: Build the Docker image
run: docker build . --tag shawakash/paybox-rs-api:${{ github.sha }}

- name: Docker Push
run: docker push shawakash/paybox-rs-api:${{ github.sha }}
4 changes: 4 additions & 0 deletions .github/workflows/backend-ws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ on:
push:
branches:
- dev
paths:
- 'backend/ws/**'
pull_request:
branches:
- dev
paths:
- 'backend/ws/**'
jobs:
deploy:
runs-on: ubuntu-latest
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request:
branches:
- dev

g
jobs:

openapi_image:
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Push @paybox/common Docker image
run: docker push shawakash/paybox-common:${{ github.sha }}

chains_image:
blockchain_image:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
Expand All @@ -94,11 +94,11 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build @paybox/chains Docker image
run: docker build -t shawakash/paybox-chains:${{ github.sha }} -f ./docker/chains/Dockerfile .
- name: Build @paybox/blockchain Docker image
run: docker build -t shawakash/paybox-blockchain:${{ github.sha }} -f ./docker/blockchain/Dockerfile .

- name: Push @paybox/chains Docker image
run: docker push shawakash/paybox-chains:${{ github.sha }}
run: docker push shawakash/paybox-blockchain:${{ github.sha }}

recoil_image:
runs-on: ubuntu-latest
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/hasura_migrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ on:
paths:
- 'backend/hasura/**'
branches:
- hasura_workflow
- dev
pull_request:
branches:
- dev
- hasura_workflow
paths:
- 'backend/hasura/**'

Expand Down
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,23 @@ yarn-error.log*
# Misc
.DS_Store
*.pem

# Generated by Cargo
# will have compiled files and executables
debug/
target/

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries

# These are backup files generated by rustfmt
**/*.rs.bk

# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb


# Added by cargo

/target

.env
Binary file modified .idea/copilot/chatSessions/00000000000.xd
Binary file not shown.
4 changes: 2 additions & 2 deletions .idea/copilot/chatSessions/xd.lck

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 43 additions & 22 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions .yarnrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ node-version "21.6.1"
# Set whether Yarn should generate a yarn.lock file
generate-lockfile true

# Set the cache folder location
cache-folder ".yarn/cache"

# Disable telemetry reporting
enableTelemetry 0
Loading

0 comments on commit b2fa04a

Please sign in to comment.