Skip to content

Commit

Permalink
Merge branch 'develop' into yuri/ls-pool-management-flow
Browse files Browse the repository at this point in the history
  • Loading branch information
yurixander committed Nov 4, 2024
2 parents 3f9795f + 5a7aa61 commit 958f681
Show file tree
Hide file tree
Showing 687 changed files with 238 additions and 57,999 deletions.
30 changes: 0 additions & 30 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,29 +1,3 @@
# Faucet DApp
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
export BRIDGE_DAPP_DOMAIN="http:localhost:3000"

export BRIDGE_DAPP_POLKADOT_TEST_ACCOUNT_ADDRESS="<YOUR_BRIDGE_DAPP_POLKADOT_TEST_ACCOUNT_ADDRESS>"

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
export BRIDGE_DAPP_LOCAL_ORBIT_ANCHOR_ADDRESS=""

# If you want to support Multicall3 contract for Orbit chains
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
Expand All @@ -40,10 +14,6 @@ export TESTNET_LEADERBOARD_GUIDELINES_URL=""
export TESTNET_LEADERBOARD_REQUEST_POINTS_URL=""
export TESTNET_LEADERBOARD_BACKEND_URL=""

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

# OFAC
export OFAC_COUNTRY_CODES='["<OFAC_COUNTRY_CODE>"]'
export OFAC_REGIONS='["<OFAC_REGION>"]'
Expand Down
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ This repository adheres to the [Conventional Commits](https://www.conventionalco

* All rules from [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/).
* Commit body is disabled completely: Since it has not been used in this repository, it is disabled to avoid confusion and maintain consistency.
* Scope should be one of the following: `bridge-dapp`, `faucet`, `hubble-stats`, `stats-dapp`, `tangle-dapp`, `testnet-leaderboard`, `zk-explorer`, `webb-ui`, `icons`, `tools`.
* Scope should be one of the following: `tangle-dapp`, `testnet-leaderboard`, `webb-ui`, `icons`, `tools`.

Here are some examples to follow:

* `feat(bridge-dapp): Fixed a certain bug (#123)`
* `feat(tangle-dapp): Fixed a certain bug (#123)`
* `docs: Added documentation for commit message guidelines`
* `chore: Bump X dependency to latest version`

Expand Down
88 changes: 0 additions & 88 deletions .github/workflows/deploy-bridge-dapp-dev.yml

This file was deleted.

106 changes: 0 additions & 106 deletions .github/workflows/deploy-faucet.yml

This file was deleted.

82 changes: 0 additions & 82 deletions .github/workflows/deploy-stats-dapp-dev.yml

This file was deleted.

3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ tmp
/tools/scripts/protocol-solidity/
/tools/scripts/relayer/
/tools/scripts/webb-dapp/
apps/stats-dapp/graphql.schema.json
.direnv

# Generated by json files
Expand All @@ -102,4 +101,4 @@ apps/stats-dapp/graphql.schema.json
/cache/

# TypeScript build info
/**/tsconfig.tsbuildinfo
/**/tsconfig.tsbuildinfo
1 change: 0 additions & 1 deletion .husky/commit-msg

This file was deleted.

6 changes: 0 additions & 6 deletions .husky/pre-push

This file was deleted.

4 changes: 1 addition & 3 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@
/coverage
/build
/apps/bridge-dapp/build/**/*
/apps/stats-dapp/build/**/*
/node_modules
/.vscode
/**/.next
/**/.netlify
apps/stats-dapp/graphql.schema.json
/**/generated

/.nx/cache
/.nx/cache
3 changes: 3 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import { dirname, join } from 'node:path';

export default {
stories: [],
core: {
disableTelemetry: true,
},
addons: [
getAbsolutePath('@storybook/addon-actions'),
getAbsolutePath('@storybook/addon-essentials'),
Expand Down
Loading

0 comments on commit 958f681

Please sign in to comment.