From 1adef73d0e4f3cec1ade0da762e8d10a66ac0fc2 Mon Sep 17 00:00:00 2001 From: AlexanderNtk <96421433+AlexanderNtk@users.noreply.github.com> Date: Fri, 28 Jun 2024 16:05:50 +0500 Subject: [PATCH 01/10] Workflow updated --- .github/workflows/build-artifact.yaml | 236 ++++++++++++++++++++++++++ .github/workflows/config-check.yaml | 4 +- .github/workflows/sync_repos.yaml | 52 ++++++ .github/workflows/testnet-deploy.yaml | 1 + pingpub.commit | 1 + 5 files changed, 292 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/build-artifact.yaml create mode 100644 .github/workflows/sync_repos.yaml create mode 100644 pingpub.commit diff --git a/.github/workflows/build-artifact.yaml b/.github/workflows/build-artifact.yaml new file mode 100644 index 0000000000..b54824ef7e --- /dev/null +++ b/.github/workflows/build-artifact.yaml @@ -0,0 +1,236 @@ + +name: Build Artifacts + +on: + push: + branches: [ sge ] + # pull_request: + # branches: [ master ] + workflow_dispatch: + +jobs: + build_packages: + strategy: + matrix: + include: + - env: mainnet + cfg: "chains/mainnet/sge.json" + - env: testnet + cfg: "chains/testnet/sge.json" + - env: staging + cfg: "chains/testnet/sge_stage.json" + runs-on: ubuntu-latest + steps: + - name: Environment + run: export NODE_OPTIONS="--max_old_space_size=4096" + + - name: Git Checkout Latest + uses: actions/checkout@v4 + + - name: Update config + run: | + if [ ${{ matrix.env }} != "mainnet" ]; then cp ${{ matrix.cfg }} chains/mainnet/sge.json; fi + + - name: Install + run: yarn install --ignore-engines + + - name: Build + run: yarn build + + - name: Pack + run: | + mv dist/ pingpub + tar -czf pingpub_${{ matrix.env }}.tar.gz ./pingpub/ + + - uses: actions/upload-artifact@v4 + id: upload + with: + name: pingpub_${{ matrix.env }}.tar.gz + path: pingpub_${{ matrix.env }}.tar.gz + retention-days: 1 + + build_image_staging: + needs: build_packages + runs-on: ubuntu-latest + outputs: + PINGPUB_AMI_STAGING: ${{ steps.extract.outputs.PINGPUB_AMI }} + permissions: + id-token: write + contents: read + steps: + - name: Checkout aws-infra + uses: actions/checkout@v4 + with: + repository: 'saage-tech/aws-infra' + token: ${{ secrets.READ_ST }} + + - name: Download + uses: actions/download-artifact@v4 + + - name: Assume role + uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_STAGING }} + aws-region: ${{ secrets.AWS_REGION_STAGING }} + + - name: Packer Init + run: | + cp pingpub_staging.tar.gz/pingpub_staging.tar.gz ./packer/blockexplorer/files/pingpub.tar.gz + cd packer/blockexplorer + packer init . + + - name: Packer Build + working-directory: packer/blockexplorer + run: | + packer build -var-file=staging.pkvars.hcl blockexplorer.pkr.hcl + + - name: Extract AMI_ID + id: extract + working-directory: packer/blockexplorer + run : | + AMI_ID=$(jq -r '.builds[-1].artifact_id' packer-manifest.json | cut -d ":" -f2) + echo "PINGPUB_AMI=$AMI_ID" >> $GITHUB_OUTPUT + echo $AMI_ID + + build_image_testnet: + needs: build_packages + runs-on: ubuntu-latest + outputs: + PINGPUB_AMI_TESTNET: ${{ steps.extract.outputs.PINGPUB_AMI }} + permissions: + id-token: write + contents: read + steps: + - name: Checkout aws-infra + uses: actions/checkout@v4 + with: + repository: 'saage-tech/aws-infra' + token: ${{ secrets.READ_ST }} + + - name: Download + uses: actions/download-artifact@v4 + + - name: Assume role + uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_TESTNET }} + aws-region: ${{ secrets.AWS_REGION_TESTNET }} + + - name: Packer Init + run: | + cp pingpub_testnet.tar.gz/pingpub_testnet.tar.gz ./packer/blockexplorer/files/pingpub.tar.gz + cd packer/blockexplorer + packer init . + + - name: Packer Build + working-directory: packer/blockexplorer + run: | + packer build -var-file=testnet.pkvars.hcl blockexplorer.pkr.hcl + + - name: Extract AMI_ID + id: extract + working-directory: packer/blockexplorer + run : | + AMI_ID=$(jq -r '.builds[-1].artifact_id' packer-manifest.json | cut -d ":" -f2) + echo "PINGPUB_AMI=$AMI_ID" >> $GITHUB_OUTPUT + echo $AMI_ID + + build_image_mainnet: + needs: build_packages + runs-on: ubuntu-latest + outputs: + PINGPUB_AMI_MAINNET: ${{ steps.extract.outputs.PINGPUB_AMI }} + permissions: + id-token: write + contents: read + steps: + - name: Checkout aws-infra + uses: actions/checkout@v4 + with: + repository: 'saage-tech/aws-infra' + token: ${{ secrets.READ_ST }} + + - name: Download + uses: actions/download-artifact@v4 + + - name: Assume role + uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_MAINNET }} + aws-region: ${{ secrets.AWS_REGION_MAINNET }} + + - name: Packer Init + run: | + cp pingpub_mainnet.tar.gz/pingpub_mainnet.tar.gz ./packer/blockexplorer/files/pingpub.tar.gz + cd packer/blockexplorer + packer init . + + - name: Packer Build + working-directory: packer/blockexplorer + run: | + packer build -var-file=mainnet.pkvars.hcl blockexplorer.pkr.hcl + + - name: Extract AMI_ID + id: extract + working-directory: packer/blockexplorer + run : | + ls -la + AMI_ID=$(jq -r '.builds[-1].artifact_id' packer-manifest.json | cut -d ":" -f2) + echo "PINGPUB_AMI=$AMI_ID" >> $GITHUB_OUTPUT + echo $AMI_ID + + update_ami: + needs: [ build_image_staging, build_image_testnet, build_image_mainnet ] + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - name: Checkout terragrunt code + uses: actions/checkout@v4 + with: + repository: 'saage-tech/terragrunt-live-sgenetwork' + token: ${{ secrets.UPDATE_ST }} + + - name: Replace AMI IDs + env: + MAINNET_AMI: ${{ needs.build_image_mainnet.outputs.PINGPUB_AMI_MAINNET }} + TESTNET_AMI: ${{ needs.build_image_testnet.outputs.PINGPUB_AMI_TESTNET }} + STAGING_AMI: ${{ needs.build_image_staging.outputs.PINGPUB_AMI_STAGING }} + run: | + ls -la $GITHUB_WORKSPACE + cd ${GITHUB_WORKSPACE}/staging/us-east-1/blockchain/pingpub/instance/pingpub-priv + sed -i "s/aws_instance_ami =.*/aws_instance_ami = ${STAGING_AMI}/g" terragrunt.hcl + cd ${GITHUB_WORKSPACE}/testnet/us-east-1/public-testnet-20221028/pingpub/instances/pingpub-priv + sed -i "s/aws_instance_ami =.*/aws_instance_ami = ${TESTNET_AMI}/g" terragrunt.hcl + cd ${GITHUB_WORKSPACE}/mainnet/ap-northeast-2/blockchain/pingpub/instance/pingpub-priv + sed -i "s/aws_instance_ami =.*/aws_instance_ami = ${MAINNET_AMI}/g" terragrunt.hcl + + - name: Check terragrunt HCL mainnet + uses: gruntwork-io/terragrunt-action@v2 + with: + tf_version: v1.3.3 + tg_version: v0.42.3 + tg_dir: mainnet/ap-northeast-2/blockchain/pingpub/instance/pingpub-priv + tg_command: 'hclfmt' + + - name: Check terragrunt HCL testnet + uses: gruntwork-io/terragrunt-action@v2 + with: + tf_version: v1.3.3 + tg_version: v0.42.3 + tg_dir: testnet/us-east-1/public-testnet-20221028/pingpub/instances/pingpub-priv + tg_command: 'hclfmt' + + - name: Check terragrunt HCL staging + uses: gruntwork-io/terragrunt-action@v2 + with: + tf_version: v1.3.3 + tg_version: v0.42.3 + tg_dir: staging/us-east-1/blockchain/pingpub/instance/pingpub-priv + tg_command: 'hclfmt' + + - name: Commit changes + uses: stefanzweifel/git-auto-commit-action@v5 + with: + commit_message: Automated Change - PingPub update + push_options: --force \ No newline at end of file diff --git a/.github/workflows/config-check.yaml b/.github/workflows/config-check.yaml index a9bad362ac..91dd2c1bf4 100644 --- a/.github/workflows/config-check.yaml +++ b/.github/workflows/config-check.yaml @@ -2,8 +2,8 @@ name: Config Checker on: - # push: - # branches: [ master ] + push: + branches: [ master, sge ] pull_request: # branches: [ master ] paths: diff --git a/.github/workflows/sync_repos.yaml b/.github/workflows/sync_repos.yaml new file mode 100644 index 0000000000..f1151e1abe --- /dev/null +++ b/.github/workflows/sync_repos.yaml @@ -0,0 +1,52 @@ +name: Sync repo + +on: + schedule: + - cron: "0 1 * * 3" + workflow_dispatch: + +jobs: + get_state: + runs-on: ubuntu-latest + outputs: + EXPLORER: ${{ steps.status.outputs.EXPLORER }} + UPDATE: ${{ steps.status.outputs.UPDATE }} + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Get commits + id: status + run: | + echo "EXPLORER=$(git ls-remote -h https://github.com/ping-pub/explorer.git master | cut -f1)" >> $GITHUB_OUTPUT + grep '^${EXPLORER}$' pingpub.commit && echo "UPDATE=0" >> $GITHUB_OUTPUT || export echo "UPDATE=1" >> $GITHUB_OUTPUT + + repo_sync: + needs: get_state + runs-on: ubuntu-latest + if: needs.get_state.outputs.UPDATE == 0 #Should be changed later + steps: + - name: Clone SGE Repo + uses: actions/checkout@v4 + with: + ref: 'sge' + + - name: Clone Original Repo + uses: actions/checkout@v4 + with: + repository: 'ping-pub/explorer' + ref: 'master' + path: 'original' + + - name: Update files + run: | + rm original/chains/mainnet/cosmos.json original/chains/mainnet/neutron.json original/chains/mainnet/nolus.json + rm original/chains/mainnet/osmosis.json original/chains/testnet/crossfi.json + cp -r ./original/* ./ + rm -rf original/ + echo $UPDATE > pingpub.commit + + - name: Commit changes + uses: stefanzweifel/git-auto-commit-action@v5 + with: + branch: 'sge' \ No newline at end of file diff --git a/.github/workflows/testnet-deploy.yaml b/.github/workflows/testnet-deploy.yaml index 55391d0122..02887afacb 100644 --- a/.github/workflows/testnet-deploy.yaml +++ b/.github/workflows/testnet-deploy.yaml @@ -14,6 +14,7 @@ jobs: steps: - name: print run: echo ${GITHUB_REF#refs/heads/} + - name: Git Checkout Latest uses: actions/checkout@v2 diff --git a/pingpub.commit b/pingpub.commit new file mode 100644 index 0000000000..743890ce4d --- /dev/null +++ b/pingpub.commit @@ -0,0 +1 @@ +a6691efb017acd4fe9b90431b7573043ce8b509b \ No newline at end of file From 1318cf24f2647098b20f916b3abebaa64bf3fe78 Mon Sep 17 00:00:00 2001 From: AlexanderNtk <96421433+AlexanderNtk@users.noreply.github.com> Date: Fri, 28 Jun 2024 16:18:46 +0500 Subject: [PATCH 02/10] Chains config added --- chains/mainnet/cosmos.json | 31 --------------------- chains/mainnet/neutron.json | 30 -------------------- chains/mainnet/nolus.json | 27 ------------------ chains/mainnet/osmosis.json | 32 ---------------------- chains/testnet/crossfi.json | 11 -------- chains/{ => testnet}/mainnet/axelar.json | 0 chains/testnet/mainnet/sge.json | 35 ++++++++++++++++++++++++ chains/testnet/testnet/sge.json | 29 ++++++++++++++++++++ chains/testnet/testnet/sge_stage.json | 25 +++++++++++++++++ 9 files changed, 89 insertions(+), 131 deletions(-) delete mode 100644 chains/mainnet/cosmos.json delete mode 100644 chains/mainnet/neutron.json delete mode 100644 chains/mainnet/nolus.json delete mode 100644 chains/mainnet/osmosis.json delete mode 100644 chains/testnet/crossfi.json rename chains/{ => testnet}/mainnet/axelar.json (100%) create mode 100644 chains/testnet/mainnet/sge.json create mode 100644 chains/testnet/testnet/sge.json create mode 100644 chains/testnet/testnet/sge_stage.json diff --git a/chains/mainnet/cosmos.json b/chains/mainnet/cosmos.json deleted file mode 100644 index 2bd610640d..0000000000 --- a/chains/mainnet/cosmos.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "chain_name": "cosmos", - "registry_name": "cosmoshub", - "api": [ - {"provider": "notional", "address": "https://api-cosmoshub-ia.cosmosia.notional.ventures"}, - {"provider": "blockapsis", "address": "https://lcd-cosmoshub.blockapsis.com:443"}, - {"provider": "WhisperNode🤐", "address": "https://lcd-cosmoshub.whispernode.com:443"}, - {"provider": "pupmos", "address": "https://api-cosmoshub.pupmos.network"}, - {"provider": "publicnode", "address": "https://cosmos-rest.publicnode.com"}, - {"provider": "staketab", "address": "https://cosmos-rest.staketab.org"}, - {"provider": "nodestake", "address": "https://api.cosmos.nodestake.top"}, - {"provider": "Golden Ratio Staking", "address": "https://rest-cosmoshub.goldenratiostaking.net"} - ], - "rpc": [ - {"provider": "icycro", "address": "https://cosmos-rpc.icycro.org"}, - {"provider": "dragonstake", "address": "https://rpc.cosmos.dragonstake.io"}, - {"provider": "Golden Ratio Staking", "address": "https://rpc-cosmoshub.goldenratiostaking.net"} - ], - "sdk_version": "0.45.1", - "coin_type": "118", - "min_tx_fee": "800", - "addr_prefix": "cosmos", - "logo": "/logos/cosmos.svg", - "assets": [{ - "base": "uatom", - "symbol": "ATOM", - "exponent": "6", - "coingecko_id": "cosmos", - "logo": "/logos/cosmos.svg" - }] -} diff --git a/chains/mainnet/neutron.json b/chains/mainnet/neutron.json deleted file mode 100644 index 864e67f10b..0000000000 --- a/chains/mainnet/neutron.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "chain_name": "neutron", - "api": [ - {"provider": "Polkachu", "address": "https://neutron-api.polkachu.com"}, - {"provider": "NodeStake", "address": "https://api.neutron.nodestake.top"}, - {"provider": "Allnodes", "address": "https://neutron-rest.publicnode.com"} - ], - "rpc": [ - {"provider": "Polkachu", "address": "https://neutron-rpc.polkachu.com"}, - {"provider": "NodeStake", "address": "https://rpc.neutron.nodestake.top"}, - {"provider": "Allnodes", "address": "https://neutron-rpc.publicnode.com:443"} - ], - "provider_chain": { - "api": ["https://api-cosmoshub-ia.cosmosia.notional.ventures"] - }, - "features": ["dashboard", "blocks", "ibc", "cosmwasm", "uptime", "parameters", "state-sync", "consensus", "supply", "widget"], - "sdk_version": "0.45.1", - "coin_type": "118", - "min_tx_fee": "8000", - "assets": [{ - "base": "untrn", - "symbol": "NTRN", - "exponent": "6", - "coingecko_id": "neutron", - "logo": "/logos/neutron.svg" - }], - "addr_prefix": "neutron", - "theme_color": "#161723", - "logo": "/logos/neutron.svg" -} diff --git a/chains/mainnet/nolus.json b/chains/mainnet/nolus.json deleted file mode 100644 index 81bdd48470..0000000000 --- a/chains/mainnet/nolus.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "chain_name": "nolus", - "coingecko": "nolus", - "api": [ - {"provider": "Nolus", "address": "https://pirin-cl.nolus.network:1317"}, - {"provider": "LavenderFive", "address": "https://nolus-api.lavenderfive.com:443"}, - {"provider": "Allnodes", "address": "https://nolus-rest.publicnode.com"} - ], - "rpc": [ - {"provider": "Nolus", "address": "https://pirin-cl.nolus.network:26657"}, - {"provider": "LavenderFive", "address": "https://nolus-rpc.lavenderfive.com:443"}, - {"provider": "Allnodes", "address": "https://nolus-rpc.publicnode.com:443"} - ], - "snapshot_provider": "", - "sdk_version": "v0.47.6", - "coin_type": "118", - "min_tx_fee": "0", - "addr_prefix": "nolus", - "logo": "/logos/nolus.svg", - "assets": [{ - "base": "unls", - "symbol": "NLS", - "exponent": "6", - "coingecko_id": "nolus", - "logo": "/logos/nolus.svg" - }] -} diff --git a/chains/mainnet/osmosis.json b/chains/mainnet/osmosis.json deleted file mode 100644 index 35669f39a9..0000000000 --- a/chains/mainnet/osmosis.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "chain_name": "osmosis", - "coingecko": "osmosis", - "api": ["https://lcd.osmosis.zone","https://api-osmosis-ia.cosmosia.notional.ventures", "https://osmosis-api.polkachu.com", "https://lcd-osmosis.blockapsis.com"], - "rpc": ["https://rpc.osmosis.zone", "https://rpc-osmosis-ia.cosmosia.notional.ventures:443", "https://osmosis-rpc.polkachu.com:443", "https://osmosis.validator.network:443", "https://rpc-osmosis.blockapsis.com:443"], - "snapshot_provider": "", - "sdk_version": "0.46.1", - "coin_type": "118", - "min_tx_fee": "800", - "addr_prefix": "osmo", - "logo": "/logos/osmosis.jpg", - "theme_color": "#812cd6", - "assets": [{ - "base": "uosmo", - "symbol": "OSMO", - "exponent": "6", - "coingecko_id": "osmosis", - "logo": "/logos/osmosis.jpg" - },{ - "base": "uion", - "symbol": "ION", - "exponent": "6", - "coingecko_id": "ion", - "logo": "/logos/osmosis.jpg" - },{ - "base": "usomm", - "symbol": "SOMM", - "exponent": "6", - "coingecko_id": "somm", - "logo": "" - }] -} diff --git a/chains/testnet/crossfi.json b/chains/testnet/crossfi.json deleted file mode 100644 index 5414f3f202..0000000000 --- a/chains/testnet/crossfi.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "chain_name": "crossfi-testnet-1", - "api": ["https://crossfi-testnet-api.forpeaky.xyz"], - "rpc": ["https://crossfi-testnet-rpc.forpeaky.xyz"], - "coingecko": "", - "snapshot_provider": "", - "sdk_version": "0.47.1", - "coin_type": "118", - "min_tx_fee": "500", - "addr_prefix": "crossfi" - } \ No newline at end of file diff --git a/chains/mainnet/axelar.json b/chains/testnet/mainnet/axelar.json similarity index 100% rename from chains/mainnet/axelar.json rename to chains/testnet/mainnet/axelar.json diff --git a/chains/testnet/mainnet/sge.json b/chains/testnet/mainnet/sge.json new file mode 100644 index 0000000000..e7aa59816c --- /dev/null +++ b/chains/testnet/mainnet/sge.json @@ -0,0 +1,35 @@ +{ + "chain_name": "sge", + "alias": "sge", + "api": [ + "https://api.sgenetwork.io/", + "https://rest.cosmos.directory/sge", + "https://sge-api.lavenderfive.com", + "https://sge-api.polkachu.com", + "https://api.sge.nodestake.top", + "https://sge-api.sr20de.xyz" + ], + "rpc": [ + "https://rpc.sgenetwork.io/", + "https://rpc.cosmos.directory/sge", + "https://sge-rpc.lavenderfive.com", + "https://sge-rpc.polkachu.com", + "https://rpc.sge.nodestake.top", + "https://sge-rpc.sr20de.xyz" + ], + "snapshot_provider": "", + "addr_prefix": "sge", + "coin_type": "494", + "min_tx_fee": "8000", + "assets": [ + { + "base": "usge", + "symbol": "SGE", + "exponent": "6", + "coingecko_id": "sge", + "logo": "/logos/sge.png" + } + ], + "logo": "/logos/sge.png", + "sdk_version": "0.45.8" +} diff --git a/chains/testnet/testnet/sge.json b/chains/testnet/testnet/sge.json new file mode 100644 index 0000000000..4e41d2932a --- /dev/null +++ b/chains/testnet/testnet/sge.json @@ -0,0 +1,29 @@ +{ + "chain_name": "sge", + "alias": "sge", + "api": [ + "https://api.testnet.sgenetwork.io", + "https://sge.api.t.stavr.tech", + "https://testnet-sge-rest.cosmos-apis.com/" + ], + "rpc": [ + "https://rpc.testnet.sgenetwork.io", + "https://sge.rpc.t.stavr.tech", + "https://testnet-sge-rpc.cosmos-apis.com/" + ], + "snapshot_provider": "", + "addr_prefix": "sge", + "coin_type": "494", + "min_tx_fee": "8000", + "assets": [ + { + "base": "usge", + "symbol": "SGE", + "exponent": "6", + "coingecko_id": "sge", + "logo": "/logos/sge.png" + } + ], + "logo": "/logos/sge.png", + "sdk_version": "0.45.8" +} diff --git a/chains/testnet/testnet/sge_stage.json b/chains/testnet/testnet/sge_stage.json new file mode 100644 index 0000000000..f2c2a06323 --- /dev/null +++ b/chains/testnet/testnet/sge_stage.json @@ -0,0 +1,25 @@ +{ + "chain_name": "sge", + "alias": "sge", + "api": [ + "https://api.staging.sgenetwork.io" + ], + "rpc": [ + "https://rpc.staging.sgenetwork.io" + ], + "snapshot_provider": "", + "addr_prefix": "sge", + "coin_type": "494", + "min_tx_fee": "8000", + "assets": [ + { + "base": "usge", + "symbol": "SGE", + "exponent": "6", + "coingecko_id": "sge", + "logo": "/logos/sge.png" + } + ], + "logo": "/logos/sge.png", + "sdk_version": "0.45.8" +} From cbbb6e7a7976ae4763d5c7231fd25086820cc495 Mon Sep 17 00:00:00 2001 From: AlexanderNtk Date: Fri, 28 Jun 2024 11:25:22 +0000 Subject: [PATCH 03/10] Apply automatic changes --- README.md | 2 +- chains/README.md | 4 +- chains/mainnet/axelar.json | 74 ++++++++++++++ index.html | 2 +- pingpub.commit | 2 +- src/layouts/components/NavBarWallet.vue | 16 ++- src/modules/[chain]/faucet/index.vue | 2 +- src/modules/[chain]/staking/[validator].vue | 12 ++- src/modules/wallet/keplr.vue | 1 + src/modules/wallet/unisat.vue | 104 ++++++++++++++++++++ src/router/index.ts | 2 +- src/stores/useBlockchain.ts | 4 +- src/stores/useDistributionStore.ts | 17 +++- src/stores/useWalletStore.ts | 7 +- 14 files changed, 231 insertions(+), 18 deletions(-) create mode 100644 chains/mainnet/axelar.json create mode 100644 src/modules/wallet/unisat.vue diff --git a/README.md b/README.md index 342d5900e3..051bc973d9 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Your donation will help us make better products. Thanks in advance. ## Hire us -You can hire us by submiting an issue and fund the issue on [IssueHunter](https://issuehunt.io/r/ping-pub/explorer) +You can hire us by submitting an issue and fund the issue on [IssueHunter](https://issuehunt.io/r/ping-pub/explorer) ## Contributors diff --git a/chains/README.md b/chains/README.md index 7b651cfadd..dbb910de04 100644 --- a/chains/README.md +++ b/chains/README.md @@ -1,10 +1,10 @@ # Directory Layout -** if you want to list your blockhain on ping.pub, please submit your configure on https://github.com/ping-pub/ping.pub.git ** +** if you want to list your blockchain on ping.pub, please submit your configuration on https://github.com/ping-pub/ping.pub.git ** - Submit configs for mainnet, go to https://github.com/ping-pub/explorer/tree/master/chains/mainnet -- Submit configs for testnet, go to https://github.com/ping-pub/explorer/tree/master/chains/testnet, thess configs will be enabled when you visit the domain starts withs `testnet.*`, for example `https://testnet.ping.pub` +- Submit configs for testnet, go to https://github.com/ping-pub/explorer/tree/master/chains/testnet, these configs will be enabled when you visit the domain that starts with `testnet.*`, for example `https://testnet.ping.pub` # Sample of Config diff --git a/chains/mainnet/axelar.json b/chains/mainnet/axelar.json new file mode 100644 index 0000000000..28bd6d986b --- /dev/null +++ b/chains/mainnet/axelar.json @@ -0,0 +1,74 @@ +{ + "chain_name": "axelar", + "api": [ + "https://rest.axelar.lava.build/lava-referer-97409c72-1a82-4861-8651-119c15151cbe" + ], + "rpc": [ + "https://tm.axelar.lava.build/lava-referer-97409c72-1a82-4861-8651-119c15151cbe" + ], + "snapshot_provider": "", + "sdk_version": "0.45.6", + "coin_type": "118", + "min_tx_fee": "800", + "addr_prefix": "axelar", + "logo": "/logos/axelar.svg", + "theme_color": "#161723", + "assets": [ + { + "base": "uaxl", + "symbol": "AXL", + "exponent": "6", + "coingecko_id": "axelar", + "logo": "/logos/axelar.svg" + }, + { + "base": "uusdc", + "symbol": "axlUSDC", + "exponent": "6", + "coingecko_id": "usd-coin", + "logo": "/logos/usdc.svg" + }, + { + "base": "uusdt", + "symbol": "axlUSDT", + "exponent": "6", + "coingecko_id": "tether", + "logo": "/logos/usdt.svg" + }, + { + "base": "dai-wei", + "symbol": "axlDAI", + "exponent": "18", + "coingecko_id": "dai", + "logo": "/logos/dai.svg" + }, + { + "base": "weth-wei", + "symbol": "axlWETH", + "exponent": "18", + "coingecko_id": "ethereum", + "logo": "/logos/weth.svg" + }, + { + "base": "wmatic-wei", + "symbol": "axlWMATIC", + "exponent": "18", + "coingecko_id": "matic-network", + "logo": "/logos/wmatic.svg" + }, + { + "base": "wavax-wei", + "symbol": "axlWAVAX", + "exponent": "18", + "coingecko_id": "avalanche-2", + "logo": "/logos/wavax.svg" + }, + { + "base": "dot-planck", + "symbol": "axlDOT", + "exponent": "10", + "coingecko_id": "polkadot", + "logo": "/logos/dot.svg" + } + ] +} diff --git a/index.html b/index.html index 3c1c9f9468..156b08af67 100644 --- a/index.html +++ b/index.html @@ -38,7 +38,7 @@ }); gtag('config', 'G-SSBKVF3GMX'); - + diff --git a/pingpub.commit b/pingpub.commit index 743890ce4d..8b13789179 100644 --- a/pingpub.commit +++ b/pingpub.commit @@ -1 +1 @@ -a6691efb017acd4fe9b90431b7573043ce8b509b \ No newline at end of file + diff --git a/src/layouts/components/NavBarWallet.vue b/src/layouts/components/NavBarWallet.vue index 2d0c69d535..fc52e61674 100644 --- a/src/layouts/components/NavBarWallet.vue +++ b/src/layouts/components/NavBarWallet.vue @@ -1,8 +1,10 @@ diff --git a/src/modules/[chain]/faucet/index.vue b/src/modules/[chain]/faucet/index.vue index e82d768d7e..263f27433c 100644 --- a/src/modules/[chain]/faucet/index.vue +++ b/src/modules/[chain]/faucet/index.vue @@ -24,7 +24,7 @@ const checklist = computed(() => { const bs = balances.value.length > 0 && balances.value.findIndex((v:any) => v.amount <= 10) === -1; return [ { title: 'Rest Endpoint', status: endpoint && endpoint[0].address !== '' }, - { title: 'Has Faucet Configured', status: chainStore.current?.faucet !== undefined }, + { title: 'Faucet Configured', status: chainStore.current?.faucet !== undefined }, { title: 'Faucet Account', status: faucet.value !== ''}, { title: 'Faucet Balance', status: bs}, ]; diff --git a/src/modules/[chain]/staking/[validator].vue b/src/modules/[chain]/staking/[validator].vue index d253d092f9..a4f883c8ee 100644 --- a/src/modules/[chain]/staking/[validator].vue +++ b/src/modules/[chain]/staking/[validator].vue @@ -1,7 +1,9 @@ + + diff --git a/src/router/index.ts b/src/router/index.ts index 7dc4a6d0ab..7030ae872b 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -14,7 +14,7 @@ const router = createRouter({ router.beforeEach((to) => { const { chain } = to.params if(chain){ - const blockchain = useBlockchain() + const blockchain= useBlockchain() if(chain !== blockchain.chainName) { blockchain.setCurrent(chain.toString()) } diff --git a/src/stores/useBlockchain.ts b/src/stores/useBlockchain.ts index ac1ae2ccb7..e6a15c55fe 100644 --- a/src/stores/useBlockchain.ts +++ b/src/stores/useBlockchain.ts @@ -16,10 +16,11 @@ import { CosmosRestClient } from '@/libs/client'; import { useBankStore, useBaseStore, + useDistributionStore, useGovStore, useMintStore, useStakingStore, - useWalletStore, + useWalletStore } from '.'; import { useBlockModule } from '@/modules/[chain]/block/block'; import { DEFAULT } from '@/libs'; @@ -151,6 +152,7 @@ export const useBlockchain = defineStore('blockchain', { useGovStore().initial(); useMintStore().initial(); useBlockModule().initial(); + useDistributionStore().initial(); }, randomEndpoint(chainName: string) : Endpoint | undefined { diff --git a/src/stores/useDistributionStore.ts b/src/stores/useDistributionStore.ts index d2dc0a8fa1..8e3984176f 100644 --- a/src/stores/useDistributionStore.ts +++ b/src/stores/useDistributionStore.ts @@ -3,7 +3,14 @@ import { useBlockchain } from './useBlockchain'; export const useDistributionStore = defineStore('distributionStore', { state: () => { - return {}; + return { + params: {} as { + community_tax: string; + base_proposer_reward: string; + bonus_proposer_reward: string; + withdraw_addr_enabled: boolean; + }, + }; }, getters: { blockchain() { @@ -11,6 +18,14 @@ export const useDistributionStore = defineStore('distributionStore', { }, }, actions: { + initial() { + this.fetchParams(); + }, + async fetchParams() { + const response = await this.blockchain.rpc?.getDistributionParams(); + if (response?.params) this.params = response.params; + return this.params; + }, async fetchCommunityPool() { return this.blockchain.rpc?.getDistributionCommunityPool(); }, diff --git a/src/stores/useWalletStore.ts b/src/stores/useWalletStore.ts index 5962287cce..2843e72e30 100644 --- a/src/stores/useWalletStore.ts +++ b/src/stores/useWalletStore.ts @@ -128,8 +128,11 @@ export const useWalletStore = defineStore('walletStore', { if(value) this.wallet = value }, suggestChain() { - // const router = useRouter() - router.push({path: '/wallet/keplr'}) + if (window.location.pathname === '/SIDE-Testnet') { + router.push({path: '/wallet/unisat'}) + } else { + router.push({path: '/wallet/keplr'}) + } } }, }); \ No newline at end of file From e6a3e820377519120214b19114835199a39052f1 Mon Sep 17 00:00:00 2001 From: AlexanderNtk <96421433+AlexanderNtk@users.noreply.github.com> Date: Fri, 28 Jun 2024 17:51:46 +0500 Subject: [PATCH 04/10] Path fix --- chains/{testnet => }/mainnet/sge.json | 0 chains/testnet/mainnet/axelar.json | 74 --------------------- chains/testnet/{testnet => }/sge.json | 0 chains/testnet/{testnet => }/sge_stage.json | 0 4 files changed, 74 deletions(-) rename chains/{testnet => }/mainnet/sge.json (100%) delete mode 100644 chains/testnet/mainnet/axelar.json rename chains/testnet/{testnet => }/sge.json (100%) rename chains/testnet/{testnet => }/sge_stage.json (100%) diff --git a/chains/testnet/mainnet/sge.json b/chains/mainnet/sge.json similarity index 100% rename from chains/testnet/mainnet/sge.json rename to chains/mainnet/sge.json diff --git a/chains/testnet/mainnet/axelar.json b/chains/testnet/mainnet/axelar.json deleted file mode 100644 index 28bd6d986b..0000000000 --- a/chains/testnet/mainnet/axelar.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "chain_name": "axelar", - "api": [ - "https://rest.axelar.lava.build/lava-referer-97409c72-1a82-4861-8651-119c15151cbe" - ], - "rpc": [ - "https://tm.axelar.lava.build/lava-referer-97409c72-1a82-4861-8651-119c15151cbe" - ], - "snapshot_provider": "", - "sdk_version": "0.45.6", - "coin_type": "118", - "min_tx_fee": "800", - "addr_prefix": "axelar", - "logo": "/logos/axelar.svg", - "theme_color": "#161723", - "assets": [ - { - "base": "uaxl", - "symbol": "AXL", - "exponent": "6", - "coingecko_id": "axelar", - "logo": "/logos/axelar.svg" - }, - { - "base": "uusdc", - "symbol": "axlUSDC", - "exponent": "6", - "coingecko_id": "usd-coin", - "logo": "/logos/usdc.svg" - }, - { - "base": "uusdt", - "symbol": "axlUSDT", - "exponent": "6", - "coingecko_id": "tether", - "logo": "/logos/usdt.svg" - }, - { - "base": "dai-wei", - "symbol": "axlDAI", - "exponent": "18", - "coingecko_id": "dai", - "logo": "/logos/dai.svg" - }, - { - "base": "weth-wei", - "symbol": "axlWETH", - "exponent": "18", - "coingecko_id": "ethereum", - "logo": "/logos/weth.svg" - }, - { - "base": "wmatic-wei", - "symbol": "axlWMATIC", - "exponent": "18", - "coingecko_id": "matic-network", - "logo": "/logos/wmatic.svg" - }, - { - "base": "wavax-wei", - "symbol": "axlWAVAX", - "exponent": "18", - "coingecko_id": "avalanche-2", - "logo": "/logos/wavax.svg" - }, - { - "base": "dot-planck", - "symbol": "axlDOT", - "exponent": "10", - "coingecko_id": "polkadot", - "logo": "/logos/dot.svg" - } - ] -} diff --git a/chains/testnet/testnet/sge.json b/chains/testnet/sge.json similarity index 100% rename from chains/testnet/testnet/sge.json rename to chains/testnet/sge.json diff --git a/chains/testnet/testnet/sge_stage.json b/chains/testnet/sge_stage.json similarity index 100% rename from chains/testnet/testnet/sge_stage.json rename to chains/testnet/sge_stage.json From f13752d8a342e2497d81d4ee7637a3e6c4520df8 Mon Sep 17 00:00:00 2001 From: AlexanderNtk <96421433+AlexanderNtk@users.noreply.github.com> Date: Mon, 1 Jul 2024 16:31:51 +0500 Subject: [PATCH 05/10] Secrets naming --- .github/workflows/build-artifact.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-artifact.yaml b/.github/workflows/build-artifact.yaml index b54824ef7e..f7a1c455cb 100644 --- a/.github/workflows/build-artifact.yaml +++ b/.github/workflows/build-artifact.yaml @@ -62,7 +62,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'saage-tech/aws-infra' - token: ${{ secrets.READ_ST }} + token: ${{ secrets.UPDATE_TGL }} - name: Download uses: actions/download-artifact@v4 @@ -105,7 +105,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'saage-tech/aws-infra' - token: ${{ secrets.READ_ST }} + token: ${{ secrets.UPDATE_TGL }} - name: Download uses: actions/download-artifact@v4 @@ -148,7 +148,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'saage-tech/aws-infra' - token: ${{ secrets.READ_ST }} + token: ${{ secrets.UPDATE_TGL }} - name: Download uses: actions/download-artifact@v4 @@ -189,7 +189,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'saage-tech/terragrunt-live-sgenetwork' - token: ${{ secrets.UPDATE_ST }} + token: ${{ secrets.UPDATE_TGL }} - name: Replace AMI IDs env: @@ -233,4 +233,4 @@ jobs: uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: Automated Change - PingPub update - push_options: --force \ No newline at end of file + #push_options: --force \ No newline at end of file From 2cbd0488f7b79857726dacf20d76ff63659280aa Mon Sep 17 00:00:00 2001 From: AlexanderNtk Date: Wed, 3 Jul 2024 01:32:14 +0000 Subject: [PATCH 06/10] Apply automatic changes --- src/modules/[chain]/faucet/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/[chain]/faucet/index.vue b/src/modules/[chain]/faucet/index.vue index 263f27433c..cd1e12bc6e 100644 --- a/src/modules/[chain]/faucet/index.vue +++ b/src/modules/[chain]/faucet/index.vue @@ -122,7 +122,7 @@ onMounted(() => {

Enable Faucet

- 1. Submit chain configuation + 1. Submit chain configuration
{{ it.title }}: {{ it.status ? '✅' : '❌' }} 
From 25f0b54f6d3c82a0b7b80ece38cc01caad9ca467 Mon Sep 17 00:00:00 2001 From: AlexanderNtk <96421433+AlexanderNtk@users.noreply.github.com> Date: Thu, 4 Jul 2024 15:07:55 +0500 Subject: [PATCH 07/10] Delete chains/mainnet/axelar.json Removed Alexar network --- chains/mainnet/axelar.json | 74 -------------------------------------- 1 file changed, 74 deletions(-) delete mode 100644 chains/mainnet/axelar.json diff --git a/chains/mainnet/axelar.json b/chains/mainnet/axelar.json deleted file mode 100644 index 28bd6d986b..0000000000 --- a/chains/mainnet/axelar.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "chain_name": "axelar", - "api": [ - "https://rest.axelar.lava.build/lava-referer-97409c72-1a82-4861-8651-119c15151cbe" - ], - "rpc": [ - "https://tm.axelar.lava.build/lava-referer-97409c72-1a82-4861-8651-119c15151cbe" - ], - "snapshot_provider": "", - "sdk_version": "0.45.6", - "coin_type": "118", - "min_tx_fee": "800", - "addr_prefix": "axelar", - "logo": "/logos/axelar.svg", - "theme_color": "#161723", - "assets": [ - { - "base": "uaxl", - "symbol": "AXL", - "exponent": "6", - "coingecko_id": "axelar", - "logo": "/logos/axelar.svg" - }, - { - "base": "uusdc", - "symbol": "axlUSDC", - "exponent": "6", - "coingecko_id": "usd-coin", - "logo": "/logos/usdc.svg" - }, - { - "base": "uusdt", - "symbol": "axlUSDT", - "exponent": "6", - "coingecko_id": "tether", - "logo": "/logos/usdt.svg" - }, - { - "base": "dai-wei", - "symbol": "axlDAI", - "exponent": "18", - "coingecko_id": "dai", - "logo": "/logos/dai.svg" - }, - { - "base": "weth-wei", - "symbol": "axlWETH", - "exponent": "18", - "coingecko_id": "ethereum", - "logo": "/logos/weth.svg" - }, - { - "base": "wmatic-wei", - "symbol": "axlWMATIC", - "exponent": "18", - "coingecko_id": "matic-network", - "logo": "/logos/wmatic.svg" - }, - { - "base": "wavax-wei", - "symbol": "axlWAVAX", - "exponent": "18", - "coingecko_id": "avalanche-2", - "logo": "/logos/wavax.svg" - }, - { - "base": "dot-planck", - "symbol": "axlDOT", - "exponent": "10", - "coingecko_id": "polkadot", - "logo": "/logos/dot.svg" - } - ] -} From 0839c6771f9787a6b3f12e689484d2e26dd7849e Mon Sep 17 00:00:00 2001 From: AlexanderNtk <96421433+AlexanderNtk@users.noreply.github.com> Date: Thu, 4 Jul 2024 15:09:09 +0500 Subject: [PATCH 08/10] brackets --- .github/workflows/build-artifact.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-artifact.yaml b/.github/workflows/build-artifact.yaml index f7a1c455cb..271e9cf5a5 100644 --- a/.github/workflows/build-artifact.yaml +++ b/.github/workflows/build-artifact.yaml @@ -199,11 +199,11 @@ jobs: run: | ls -la $GITHUB_WORKSPACE cd ${GITHUB_WORKSPACE}/staging/us-east-1/blockchain/pingpub/instance/pingpub-priv - sed -i "s/aws_instance_ami =.*/aws_instance_ami = ${STAGING_AMI}/g" terragrunt.hcl + sed -i "s/aws_instance_ami =.*/aws_instance_ami = \"${STAGING_AMI}\"/g" terragrunt.hcl cd ${GITHUB_WORKSPACE}/testnet/us-east-1/public-testnet-20221028/pingpub/instances/pingpub-priv - sed -i "s/aws_instance_ami =.*/aws_instance_ami = ${TESTNET_AMI}/g" terragrunt.hcl + sed -i "s/aws_instance_ami =.*/aws_instance_ami = \"${TESTNET_AMI}\"/g" terragrunt.hcl cd ${GITHUB_WORKSPACE}/mainnet/ap-northeast-2/blockchain/pingpub/instance/pingpub-priv - sed -i "s/aws_instance_ami =.*/aws_instance_ami = ${MAINNET_AMI}/g" terragrunt.hcl + sed -i "s/aws_instance_ami =.*/aws_instance_ami = \"${MAINNET_AMI}\"/g" terragrunt.hcl - name: Check terragrunt HCL mainnet uses: gruntwork-io/terragrunt-action@v2 From c5221a3d0c451af59e483b60b0d43e5a3d911de8 Mon Sep 17 00:00:00 2001 From: AlexanderNtk <96421433+AlexanderNtk@users.noreply.github.com> Date: Thu, 4 Jul 2024 15:34:16 +0500 Subject: [PATCH 09/10] added debug --- .github/workflows/build-artifact.yaml | 1 + chains/testnet/sge.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-artifact.yaml b/.github/workflows/build-artifact.yaml index 271e9cf5a5..a8aead34aa 100644 --- a/.github/workflows/build-artifact.yaml +++ b/.github/workflows/build-artifact.yaml @@ -30,6 +30,7 @@ jobs: - name: Update config run: | if [ ${{ matrix.env }} != "mainnet" ]; then cp ${{ matrix.cfg }} chains/mainnet/sge.json; fi + cat chains/mainnet/sge.json - name: Install run: yarn install --ignore-engines diff --git a/chains/testnet/sge.json b/chains/testnet/sge.json index 4e41d2932a..3b9b23f96b 100644 --- a/chains/testnet/sge.json +++ b/chains/testnet/sge.json @@ -3,7 +3,7 @@ "alias": "sge", "api": [ "https://api.testnet.sgenetwork.io", - "https://sge.api.t.stavr.tech", + "https://sge.api.t.stavr.tech", "https://testnet-sge-rest.cosmos-apis.com/" ], "rpc": [ From 0ae7cba5e1ed9910b665b6c5c1ab12728e26d8ae Mon Sep 17 00:00:00 2001 From: AlexanderNtk <96421433+AlexanderNtk@users.noreply.github.com> Date: Fri, 5 Jul 2024 14:21:17 +0500 Subject: [PATCH 10/10] Updated chains config, removed ga --- .github/workflows/build-artifact.yaml | 7 ++++++- chains/README.md | 4 ++-- chains/testnet/sge.json | 10 ++++------ chains/testnet/sge_stage.json | 4 ++-- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-artifact.yaml b/.github/workflows/build-artifact.yaml index a8aead34aa..a12953f21c 100644 --- a/.github/workflows/build-artifact.yaml +++ b/.github/workflows/build-artifact.yaml @@ -30,8 +30,13 @@ jobs: - name: Update config run: | if [ ${{ matrix.env }} != "mainnet" ]; then cp ${{ matrix.cfg }} chains/mainnet/sge.json; fi - cat chains/mainnet/sge.json + rm chains/testnet/* + cp chains/mainnet/sge.json chains/testnet/sge.json + - name: Remove Google Analytics + run: | + sed -i '25,40d' index.html + - name: Install run: yarn install --ignore-engines diff --git a/chains/README.md b/chains/README.md index dbb910de04..7b651cfadd 100644 --- a/chains/README.md +++ b/chains/README.md @@ -1,10 +1,10 @@ # Directory Layout -** if you want to list your blockchain on ping.pub, please submit your configuration on https://github.com/ping-pub/ping.pub.git ** +** if you want to list your blockhain on ping.pub, please submit your configure on https://github.com/ping-pub/ping.pub.git ** - Submit configs for mainnet, go to https://github.com/ping-pub/explorer/tree/master/chains/mainnet -- Submit configs for testnet, go to https://github.com/ping-pub/explorer/tree/master/chains/testnet, these configs will be enabled when you visit the domain that starts with `testnet.*`, for example `https://testnet.ping.pub` +- Submit configs for testnet, go to https://github.com/ping-pub/explorer/tree/master/chains/testnet, thess configs will be enabled when you visit the domain starts withs `testnet.*`, for example `https://testnet.ping.pub` # Sample of Config diff --git a/chains/testnet/sge.json b/chains/testnet/sge.json index 3b9b23f96b..0ed609176a 100644 --- a/chains/testnet/sge.json +++ b/chains/testnet/sge.json @@ -2,14 +2,12 @@ "chain_name": "sge", "alias": "sge", "api": [ - "https://api.testnet.sgenetwork.io", - "https://sge.api.t.stavr.tech", - "https://testnet-sge-rest.cosmos-apis.com/" + { "provider": "sge-network", "address": "https://lcd-1317.testnet.sgenetwork.io"}, + { "provider": "stavr.tech", "address": "https://sge.api.t.stavr.tech" } ], "rpc": [ - "https://rpc.testnet.sgenetwork.io", - "https://sge.rpc.t.stavr.tech", - "https://testnet-sge-rpc.cosmos-apis.com/" + { "provider": "sge-network", "address": "https://lcd-26657.testnet.sgenetwork.io" }, + { "provider": "stavr.tech", "address": "https://sge.rpc.t.stavr.tech" } ], "snapshot_provider": "", "addr_prefix": "sge", diff --git a/chains/testnet/sge_stage.json b/chains/testnet/sge_stage.json index f2c2a06323..b4005d5a62 100644 --- a/chains/testnet/sge_stage.json +++ b/chains/testnet/sge_stage.json @@ -2,10 +2,10 @@ "chain_name": "sge", "alias": "sge", "api": [ - "https://api.staging.sgenetwork.io" + { "provider": "sge-network", "address": "https://lcd-1317.staging.sgenetwork.io"} ], "rpc": [ - "https://rpc.staging.sgenetwork.io" + { "provider": "sge-network", "address": "https://lcd-26657.staging.sgenetwork.io"} ], "snapshot_provider": "", "addr_prefix": "sge",