Skip to content

Merge into erc20_support #23

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

Open
wants to merge 35 commits into
base: erc20_support
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
bf5fe96
Merge pull request #8 from stratisproject/main
StratisIain Apr 18, 2025
9017d4a
new wallet connector
igorgoldobin Apr 22, 2025
ca13030
fixes for claims and withdrawals
igorgoldobin Apr 22, 2025
8e60294
hide negative amount
igorgoldobin Apr 22, 2025
0df13e4
ci: add Azure Static Web Apps workflow file
StratisIain Apr 22, 2025
d3d972a
Use correct workflow for mainnet
zeptin Apr 28, 2025
5b1468e
Use correct workflow for main branch
zeptin Apr 28, 2025
7262578
Add network switching
zeptin Apr 30, 2025
e0cbfb7
Merge pull request #12 from zeptin/feature/wallet-connect-refactor
zeptin Apr 30, 2025
dda9dc7
Merge pull request #11 from zeptin/workflow-20250428-main
zeptin May 1, 2025
0223dd3
Modify withdrawal confirmations
zeptin May 2, 2025
a1704c9
Remove workflows for branch
zeptin May 2, 2025
3d10a56
Merge branch 'main' into feature/wallet-connect-refactor
zeptin May 5, 2025
22b30d2
Merge branch 'feature/wallet-connect-refactor' of https://github.com/…
zeptin May 5, 2025
3ffacb3
Merge pull request #13 from zeptin/withdrawal-20250501
zeptin May 5, 2025
2a8dff9
Merge pull request #14 from stratisproject/feature/wallet-connect-ref…
zeptin May 5, 2025
32cebf5
Updated MN contract ABI with ERC20 support; use total ERC20 balance i…
SergeevDmitry May 6, 2025
d891f72
Merge pull request #15 from stratisproject/fixes
zeptin May 6, 2025
1a906ca
Fixes for network switching with unconnected wallet
zeptin May 12, 2025
09457f7
Merge pull request #16 from zeptin/unconnected
zeptin May 12, 2025
36a0c04
fix: package.json & package-lock.json to reduce vulnerabilities
snyk-bot May 13, 2025
10ebfa5
Fix user stats polling interval
zeptin May 14, 2025
157534b
Merge pull request #17 from stratisproject/snyk-fix-dd01084887b896953…
zeptin May 14, 2025
3b4160b
Merge pull request #18 from zeptin/polling-20250514
zeptin May 14, 2025
554e9a1
Downgrade ethers and fix package management
zeptin May 14, 2025
d41b081
Remove package lock
zeptin May 14, 2025
b7416f6
Merge pull request #19 from zeptin/ethers-20250514
zeptin May 14, 2025
b30536d
Switch off RPC calls
zeptin May 14, 2025
73ad8d3
Merge pull request #20 from zeptin/rpc-20250514
zeptin May 14, 2025
b850607
Fixes for network change stats and countdown
zeptin May 15, 2025
96a952d
Merge pull request #21 from zeptin/fix-20250515
zeptin May 15, 2025
1313515
Merge pull request #10 from zeptin/workflow-20250428-mainnet
StratisIain May 21, 2025
4b38984
Merge pull request #24 from stratisproject/main
StratisIain May 21, 2025
3b674b1
Reduced number of network requests
SergeevDmitry May 21, 2025
f00d827
Merge pull request #25 from stratisproject/fixes
zeptin May 22, 2025
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 .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@ module.exports = {
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-empty-function': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/ban-ts-comment': 'off',
},
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ name: Azure Static Web Apps CI/CD
on:
push:
branches:
- main
- release/mainnet
pull_request:
types: [opened, synchronize, reopened, closed]
branches:
- release/mainnet

jobs:
build_and_deploy_job:
Expand All @@ -19,12 +23,24 @@ jobs:
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_LEMON_PEBBLE_09AC82D03 }}
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLACK_MUSHROOM_01B439B03 }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
action: "upload"
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
app_location: "/" # App source code path
api_location: "" # Api source code path - optional
output_location: "build" # Built app content directory - optional
###### End of Repository/Build Configurations ######
###### End of Repository/Build Configurations ######

close_pull_request_job:
if: github.event_name == 'pull_request' && github.event.action == 'closed'
runs-on: ubuntu-latest
name: Close Pull Request Job
steps:
- name: Close Pull Request
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLACK_MUSHROOM_01B439B03 }}
action: "close"
46 changes: 46 additions & 0 deletions .github/workflows/azure-static-web-apps-gray-moss-08c566e03.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Azure Static Web Apps CI/CD

on:
push:
branches:
- main
pull_request:
types: [opened, synchronize, reopened, closed]
branches:
- main

jobs:
build_and_deploy_job:
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
runs-on: ubuntu-latest
name: Build and Deploy Job
steps:
- uses: actions/checkout@v3
with:
submodules: true
lfs: false
- name: Build And Deploy
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_GRAY_MOSS_08C566E03 }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
action: "upload"
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
app_location: "/" # App source code path
api_location: "" # Api source code path - optional
output_location: "" # Built app content directory - optional
###### End of Repository/Build Configurations ######

close_pull_request_job:
if: github.event_name == 'pull_request' && github.event.action == 'closed'
runs-on: ubuntu-latest
name: Close Pull Request Job
steps:
- name: Close Pull Request
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_GRAY_MOSS_08C566E03 }}
action: "close"
Loading
Loading