Skip to content

Commit

Permalink
Merge branch 'yuri/fix-ls-pools-bugs' of https://github.com/tangle-ne…
Browse files Browse the repository at this point in the history
…twork/dapp into yuri/fix-ls-pools-bugs
  • Loading branch information
yurixander committed Oct 31, 2024
2 parents 015480f + 60750c0 commit e739db7
Show file tree
Hide file tree
Showing 39 changed files with 6,018 additions and 3,125 deletions.
52 changes: 27 additions & 25 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,54 +1,56 @@
# Faucet DApp
NEXT_PUBLIC_AMOUNT="20"
NEXT_PUBLIC_NATIVE_AMOUNT="0.5"
NEXT_PUBLIC_FAUCET_BACKEND_URL="http://127.0.0.1:8000"
NEXT_PUBLIC_TWITTER_CLIENT_ID="<YOUR_TWITTER_CLIENT_ID>"
TWITTER_CLIENT_SECRET="<YOUR_TWITTER_CLIENT_SECRET>"
export NEXT_PUBLIC_AMOUNT="20"
export NEXT_PUBLIC_NATIVE_AMOUNT="0.5"
export NEXT_PUBLIC_FAUCET_BACKEND_URL="http://127.0.0.1:8000"
export NEXT_PUBLIC_TWITTER_CLIENT_ID="<YOUR_TWITTER_CLIENT_ID>"
export TWITTER_CLIENT_SECRET="<YOUR_TWITTER_CLIENT_SECRET>"

# Bridge DApp
# Make sure all the env vars of bridge DApp prefixed with BRIDGE_DAPP
# because webpack will load and expose them to the browser
BRIDGE_DAPP_DOMAIN="http:localhost:3000"
export BRIDGE_DAPP_DOMAIN="http:localhost:3000"

BRIDGE_DAPP_POLKADOT_TEST_ACCOUNT_ADDRESS="<YOUR_BRIDGE_DAPP_POLKADOT_TEST_ACCOUNT_ADDRESS>"
export BRIDGE_DAPP_POLKADOT_TEST_ACCOUNT_ADDRESS="<YOUR_BRIDGE_DAPP_POLKADOT_TEST_ACCOUNT_ADDRESS>"

BRIDGE_DAPP_WALLET_CONNECT_PROJECT_ID="<BRIDGE_DAPP_WALLET_CONNECT_PROJECT_ID>"
export BRIDGE_DAPP_WALLET_CONNECT_PROJECT_ID="<BRIDGE_DAPP_WALLET_CONNECT_PROJECT_ID>"

# If you want to enable the local orbit integration,
# you need to set the local anchor addresses of the local orbit instance
BRIDGE_DAPP_LOCAL_ORBIT_ANCHOR_ADDRESS=""
export BRIDGE_DAPP_LOCAL_ORBIT_ANCHOR_ADDRESS=""

# If you want to support Multicall3 contract for Orbit chains
BRIDGE_DAPP_LOCAL_ORBIT_MULTICALL3_ADDRESS=""
BRIDGE_DAPP_LOCAL_ATHENA_MULTICALL3_DEPLOYMENT_BLOCK=0
BRIDGE_DAPP_LOCAL_HERMES_MULTICALL3_DEPLOYMENT_BLOCK=0
BRIDGE_DAPP_LOCAL_DEMETER_MULTICALL3_DEPLOYMENT_BLOCK=0
export BRIDGE_DAPP_LOCAL_ORBIT_MULTICALL3_ADDRESS=""
export BRIDGE_DAPP_LOCAL_ATHENA_MULTICALL3_DEPLOYMENT_BLOCK=0
export BRIDGE_DAPP_LOCAL_HERMES_MULTICALL3_DEPLOYMENT_BLOCK=0
export BRIDGE_DAPP_LOCAL_DEMETER_MULTICALL3_DEPLOYMENT_BLOCK=0

# Put an empty string to indicate the usage of the TANGLE_RPC_ENDPOINT
# constant as the default Tangle RPC endpoint. Otherwise, "ws://127.0.0.1:9944"
# will be used. Note that this value can be overridden by the user via
# the UI's network selector.
TANGLE_DAPP_USE_LOCAL_RPC_ENDPOINT="true"
export TANGLE_DAPP_USE_LOCAL_RPC_ENDPOINT="true"

VANCHOR_ADDRESSES='["<VANCHOR_ADDRESS>"]'
ACTIVE_SUBGRAPHS="local"
export VANCHOR_ADDRESSES='["<VANCHOR_ADDRESS>"]'
export ACTIVE_SUBGRAPHS="local"

# Testnet Leaderboard
# Format yyyy-mm-dd
TESTNET_LEADERBOARD_END_DATE="2023-12-31"
TESTNET_LEADERBOARD_GUIDELINES_URL=""
TESTNET_LEADERBOARD_REQUEST_POINTS_URL=""
TESTNET_LEADERBOARD_BACKEND_URL=""
export TESTNET_LEADERBOARD_END_DATE="2023-12-31"
export TESTNET_LEADERBOARD_GUIDELINES_URL=""
export TESTNET_LEADERBOARD_REQUEST_POINTS_URL=""
export TESTNET_LEADERBOARD_BACKEND_URL=""

# ZK Explorer
ZK_EXPLORER_GITHUB_CLIENT_ID=""
ZK_EXPLORER_API_BASE_URL="/api"
export ZK_EXPLORER_GITHUB_CLIENT_ID=""
export ZK_EXPLORER_API_BASE_URL="/api"

# OFAC
OFAC_COUNTRY_CODES='["<OFAC_COUNTRY_CODE>"]'
OFAC_REGIONS='["<OFAC_REGION>"]'
export OFAC_COUNTRY_CODES='["<OFAC_COUNTRY_CODE>"]'
export OFAC_REGIONS='["<OFAC_REGION>"]'

# Nx 18 enables using plugins to infer targets by default
# This is disabled for existing workspaces to maintain compatibility
# For more info, see: https://nx.dev/concepts/inferred-tasks
NX_ADD_PLUGINS=false
export NX_ADD_PLUGINS=false

export ESLINT_USE_FLAT_CONFIG=false
18 changes: 9 additions & 9 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
blank_issues_enabled: true
contact_links:
- name: Webb Telegram
url: https://t.me/webbprotocol
about: Please ask questions here.
- name: Webb Discord Server
url: https://discord.com/invite/cv8EfJu3Tn
about: Please ask and answer questions here.
- name: Webb Feedback Discussion
url: https://github.com/webb-tools/feedback/discussions/categories/webb-dapp-feedback
about: Please provide feedback and discussion here.
- name: Webb Telegram
url: https://t.me/tangletnet
about: Please ask questions here.
- name: Webb Discord Server
url: https://discord.com/invite/cv8EfJu3Tn
about: Please ask and answer questions here.
- name: Webb Feedback Discussion
url: https://github.com/webb-tools/feedback/discussions/categories/webb-dapp-feedback
about: Please provide feedback and discussion here.
7 changes: 3 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ _Provide a detailed description of proposed changes._

_Put an `x` in the boxes that apply._

- [x] `apps/tangle-dapp`
- [ ] `apps/tangle-dapp`
- [ ] `apps/tangle-cloud`
- [ ] `libs/webb-ui-components`

### Associated issue(s)
Expand All @@ -21,8 +22,6 @@ _Specify any issues that can be closed from these changes (e.g. `Closes #233`)._

_If possible provide screenshots and/or a screen recording of proposed change._



---

### Optional Checklist
Expand All @@ -34,4 +33,4 @@ _If possible provide screenshots and/or a screen recording of proposed change._
- [ ] For UI changes, I've checked both light and dark mode.
- [ ] I've checked the console for any errors that might have been accidentally introduced by my changes.
- [ ] If important TODOs were left, I've created corresponding issues for them.
- [ ] If new flows or features were introduced, I've updated, added, or intend to add corresponding documentation including screenshots and/or screen recordings for them on the [Webb Docs](https://github.com/webb-tools/webb-docs) repository.
- [ ] If new flows or features were introduced, I've updated, added, or intend to add corresponding documentation including screenshots and/or screen recordings for them on the [Webb Docs](https://github.com/tangle-network/webb-docs) repository.
4 changes: 2 additions & 2 deletions .github/actions/create-release/gh-release-script.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ async function publishRelease(releaseInfo) {
headers: {
authorization: `token ${process.env.REPO_TOKEN}`,
},
owner: 'webb-tools',
owner: 'tangle-network',
name: `[${version}] ${repoName}`,
repo: 'webb-dapp',
repo: 'dapp',
tag_name: `${packageName[1]}/${version}`,
body: releaseInfo,
}).catch((err) => {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-bridge-dapp-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
| Name | Link |
|---------------------------------|------------------------|
|<span aria-hidden="true">🔨</span> Latest commit | [${{ github.event.pull_request.head.sha }}](https://github.com/webb-tools/webb-dapp/commit/${{ github.event.pull_request.head.sha }}) |
|<span aria-hidden="true">🔨</span> Latest commit | [${{ github.event.pull_request.head.sha }}](https://github.com/tangle-network/dapp/commit/${{ github.event.pull_request.head.sha }}) |
|<span aria-hidden="true">🔍</span> Latest deploy log | ${{ steps.deploy-netlify.outputs.NETLIFY_LOGS_URL }} |
|<span aria-hidden="true">😎</span> Deploy Preview | [${{ steps.deploy-netlify.outputs.NETLIFY_URL }}](${{ steps.deploy-netlify.outputs.NETLIFY_URL }}) |
---
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-faucet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
| Name | Link |
|---------------------------------|------------------------|
|<span aria-hidden="true">🔨</span> Latest commit | [${{ github.event.pull_request.head.sha }}](https://github.com/webb-tools/webb-dapp/commit/${{ github.event.pull_request.head.sha }}) |
|<span aria-hidden="true">🔨</span> Latest commit | [${{ github.event.pull_request.head.sha }}](https://github.com/tangle-network/dapp/commit/${{ github.event.pull_request.head.sha }}) |
|<span aria-hidden="true">🔍</span> Latest deploy log | ${{ steps.deploy-details.outputs.NETLIFY_LOGS_URL }} |
|<span aria-hidden="true">😎</span> Deploy Preview | [${{ steps.deploy-details.outputs.NETLIFY_URL }}](${{ steps.deploy-details.outputs.NETLIFY_URL }}) |
---
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-stats-dapp-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
| Name | Link |
|---------------------------------|------------------------|
|<span aria-hidden="true">🔨</span> Latest commit | [${{ github.event.pull_request.head.sha }}](https://github.com/webb-tools/webb-dapp/commit/${{ github.event.pull_request.head.sha }}) |
|<span aria-hidden="true">🔨</span> Latest commit | [${{ github.event.pull_request.head.sha }}](https://github.com/tangle-dapp/dapp/commit/${{ github.event.pull_request.head.sha }}) |
|<span aria-hidden="true">🔍</span> Latest deploy log | ${{ steps.deploy-netlify.outputs.NETLIFY_LOGS_URL }} |
|<span aria-hidden="true">😎</span> Deploy Preview | [${{ steps.deploy-netlify.outputs.NETLIFY_URL }}](${{ steps.deploy-netlify.outputs.NETLIFY_URL }}) |
---
Expand Down
70 changes: 11 additions & 59 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
Build-Publish:
name: Build-Publish
needs: pre-ci
if: "!startsWith(github.event.head_commit.message, '[SKIP CI]') && startsWith(github.event.head_commit.message, '[RELEASE]') && github.repository == 'webb-tools/webb-dapp'"
if: "!startsWith(github.event.head_commit.message, '[SKIP CI]') && startsWith(github.event.head_commit.message, '[RELEASE]') && github.repository == 'tangle-network/dapp'"
runs-on: ubuntu-latest
steps:
#Check out
Expand All @@ -43,42 +43,15 @@ jobs:
cache: yarn

#Identify changes
- uses: marceloprado/has-changed-path@v1
id: changed-hubble
with:
paths: apps/bridge-dapp

# Temporary disable as the backend has been changed and it breaks the build
# - uses: marceloprado/has-changed-path@v1
# id: changed-stats
# with:
# paths: apps/stats-dapp

- uses: marceloprado/has-changed-path@v1
id: changed-faucet
with:
paths: apps/faucet

- uses: marceloprado/has-changed-path@v1
id: changed-hubble-stats
with:
paths: apps/hubble-stats

- uses: marceloprado/has-changed-path@v1
id: changed-tangle-dapp
with:
paths: apps/tangle-dapp

- name: create env file for faucet
run: |
touch .env
echo NEXT_PUBLIC_FAUCET_BACKEND_URL=${{ secrets.NEXT_PUBLIC_FAUCET_BACKEND_URL }} >> .env
echo NEXT_PUBLIC_TWITTER_CLIENT_ID=${{ secrets.NEXT_PUBLIC_TWITTER_CLIENT_ID }} >> .env
echo TWITTER_CLIENT_SECRET=${{ secrets.TWITTER_CLIENT_SECRET }} >> .env
touch .env
echo BRIDGE_DAPP_DOMAIN=${{ secrets.BRIDGE_DAPP_DOMAIN }} >> .env
echo BRIDGE_DAPP_WALLET_CONNECT_PROJECT_ID=${{ secrets.BRIDGE_DAPP_WALLET_CONNECT_PROJECT_ID }} >> .env
- uses: marceloprado/has-changed-path@v1
id: changed-tangle-cloud
with:
paths: apps/tangle-cloud

- name: Install deps
run: yarn install
Expand All @@ -91,37 +64,16 @@ jobs:
run: yarn nx run-many --all --target=build

# Create github release
- name: Release hubble
if: steps.changed-hubble.outputs.changed == 'true'
uses: ./.github/actions/create-release
with:
package-path: apps/bridge-dapp
repo-token: ${{ secrets.REPO_TOKEN }}

- name: Release stats
if: steps.changed-stats.outputs.changed == 'true'
uses: ./.github/actions/create-release
with:
package-path: apps/stats-dapp
repo-token: ${{ secrets.REPO_TOKEN }}

- name: Release faucet
if: steps.changed-faucet.outputs.changed == 'true'
uses: ./.github/actions/create-release
with:
package-path: apps/faucet
repo-token: ${{ secrets.REPO_TOKEN }}

- name: Release hubble stats
if: steps.changed-hubble-stats.outputs.changed == 'true'
- name: Release tangle dapp
if: steps.changed-tangle-dapp.outputs.changed == 'true'
uses: ./.github/actions/create-release
with:
package-path: apps/hubble-stats
package-path: apps/tangle-dapp
repo-token: ${{ secrets.REPO_TOKEN }}

- name: Release tangle dapp
if: steps.changed-tangle-dapp.outputs.changed == 'true'
- name: Release tangle cloud
if: steps.changed-tangle-cloud.outputs.changed == 'true'
uses: ./.github/actions/create-release
with:
package-path: apps/tangle-dapp
package-path: apps/tangle-cloud
repo-token: ${{ secrets.REPO_TOKEN }}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,4 @@ apps/stats-dapp/graphql.schema.json
/cache/

# TypeScript build info
/**/tsconfig.tsbuildinfo
/**/tsconfig.tsbuildinfo
68 changes: 38 additions & 30 deletions .lycheeignore
Original file line number Diff line number Diff line change
@@ -1,42 +1,50 @@
https://metamask.zendesk.com/hc/en-us/articles/360015489331-How-to-import-an-account#:~:text=Click%20the%20circle%20icon%20at
https://metamask.zendesk.com/hc/en-us/articles/360015488891-How-to-reset-an-account
https://twitter.com/webbprotocol
https://github.com/webb-tools/webb-dapp/compare/v0.0.3...HEAD
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.3
https://github.com/webb-tools/webb-dapp/compare/v0.0.1...HEAD
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.1
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.2
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.3
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.4
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.5
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.6
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.7
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.8
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.9
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.10
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.11
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.12
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.13
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.14
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.15
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.16
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.17
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.18
https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.19
https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.0
https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.1
https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.2
https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.3
https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.4
https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.5
https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.6
https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.7
https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.8
https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.9
https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.10
https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.11
https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.12
https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.13
https://github.com/webb-tools/webb-dapp/compare/v0.0.1...HEAD
https://github.com/webb-tools/webb-dapp/compare/v0.0.3...HEAD
https://github.com/tangle-network/dapp/compare/v0.0.3...HEAD
https://github.com/tangle-network/dapp/releases/tag/v0.0.3
https://github.com/tangle-network/dapp/compare/v0.0.1...HEAD
https://github.com/tangle-network/dapp/releases/tag/v0.0.1
https://github.com/tangle-network/dapp/releases/tag/v0.0.2
https://github.com/tangle-network/dapp/releases/tag/v0.0.3
https://github.com/tangle-network/dapp/releases/tag/v0.0.4
https://github.com/tangle-network/dapp/releases/tag/v0.0.5
https://github.com/tangle-network/dapp/releases/tag/v0.0.6
https://github.com/tangle-network/dapp/releases/tag/v0.0.7
https://github.com/tangle-network/dapp/releases/tag/v0.0.8
https://github.com/tangle-network/dapp/releases/tag/v0.0.9
https://github.com/tangle-network/dapp/releases/tag/v0.0.10
https://github.com/tangle-network/dapp/releases/tag/v0.0.11
https://github.com/tangle-network/dapp/releases/tag/v0.0.12
https://github.com/tangle-network/dapp/releases/tag/v0.0.13
https://github.com/tangle-network/dapp/releases/tag/v0.0.14
https://github.com/tangle-network/dapp/releases/tag/v0.0.15
https://github.com/tangle-network/dapp/releases/tag/v0.0.16
https://github.com/tangle-network/dapp/releases/tag/v0.0.17
https://github.com/tangle-network/dapp/releases/tag/v0.0.18
https://github.com/tangle-network/dapp/releases/tag/v0.0.19
https://github.com/tangle-network/dapp/releases/tag/v1.0.0
https://github.com/tangle-network/dapp/releases/tag/v1.0.1
https://github.com/tangle-network/dapp/releases/tag/v1.0.2
https://github.com/tangle-network/dapp/releases/tag/v1.0.3
https://github.com/tangle-network/dapp/releases/tag/v1.0.4
https://github.com/tangle-network/dapp/releases/tag/v1.0.5
https://github.com/tangle-network/dapp/releases/tag/v1.0.6
https://github.com/tangle-network/dapp/releases/tag/v1.0.7
https://github.com/tangle-network/dapp/releases/tag/v1.0.8
https://github.com/tangle-network/dapp/releases/tag/v1.0.9
https://github.com/tangle-network/dapp/releases/tag/v1.0.10
https://github.com/tangle-network/dapp/releases/tag/v1.0.11
https://github.com/tangle-network/dapp/releases/tag/v1.0.12
https://github.com/tangle-network/dapp/releases/tag/v1.0.13
https://stats.tangle.tools
# Something happened with conventional commits link, temporary disabled to fix the CI
https://www.conventionalcommits.org/en/v1.0.0/
Expand Down
Loading

0 comments on commit e739db7

Please sign in to comment.