Skip to content

Commit

Permalink
chore: merge upstream (#71)
Browse files Browse the repository at this point in the history
* Abandon old THETA ERC20 - Ethereum (trustwallet#27206)

https://medium.com/theta-network/theta-mainnet-launch-one-week-to-go-41ad1efe7b2c

* Migration for AVA (trustwallet#27207)

* Create logo.png

* Create info.json

* Delete logo.png

* Update info.json

* Add ethereum validator (trustwallet#27208)

* Create logo.png

* Create list.json

* Update logo.png

* Add Rango icon (trustwallet#27213)

* Abandon old Black Whale Token (BLK) BEP20 (trustwallet#27214)

https://bscscan.com/token/0xc0E6AD13BD58413Ed308729b688d601243E1CF77
https://coinmarketcap.com/currencies/black-whale/
https://www.coingecko.com/en/coins/black-whale-2

* Abandon old pGALA BEP20 (trustwallet#27216)

https://twitter.com/pNetworkDeFi/status/1588266897061031936
https://twitter.com/pNetworkDeFi/status/1589530721085181952
https://bscscan.com/address/0x7dDEE176F665cD201F93eEDE625770E2fD911990

* Add Injective assets (trustwallet#27191)

* Create logo .png

* Create logo.png

* Create info.json

* Create logo.png

* Create info.json

* Create info.json

* Create logo.png

* Create info.json

* Create logo.png

* Create info.json

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Create logo.png

* Delete logo .png

* tokens

* tokens

* tokens

* tokens

* tokens

* tokens

---------

Co-authored-by: Denis <[email protected]>

---------

Co-authored-by: curiouschonk <[email protected]>
Co-authored-by: Nazar <[email protected]>
Co-authored-by: vminkotw <[email protected]>
Co-authored-by: Denis <[email protected]>
  • Loading branch information
5 people authored Jan 13, 2024
1 parent 988480f commit 4f50b86
Show file tree
Hide file tree
Showing 38 changed files with 1,020 additions and 78 deletions.
50 changes: 26 additions & 24 deletions .github/workflows/fix-dryrun.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
name: Fix (Dry run)
on:
pull_request:
branches: [ master ]
#Disabled, we have 'check' job, 'fix' job do invisible changes which is not convenient to debug

jobs:
fix-dryrun:
runs-on: ubuntu-latest
steps:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.18

- name: Check out code
uses: actions/checkout@v3

- name: Run fix
run: make fix

- name: Show fix result (diff)
run: |
git config core.ignorecase false
git status
git diff
#name: Fix (Dry run)
#on:
# pull_request:
# branches: [ master ]
#
#jobs:
# fix-dryrun:
# runs-on: ubuntu-latest
# steps:
# - name: Set up Go
# uses: actions/setup-go@v4
# with:
# go-version: 1.18
#
# - name: Check out code
# uses: actions/checkout@v3
#
# - name: Run fix
# run: make fix
#
# - name: Show fix result (diff)
# run: |
# git config core.ignorecase false
# git status
# git diff
94 changes: 48 additions & 46 deletions .github/workflows/fix.yml
Original file line number Diff line number Diff line change
@@ -1,46 +1,48 @@
name: Fix All

on:
push:
branches:
- '*'
workflow_dispatch:

jobs:
fix-all:
runs-on: ubuntu-latest

if: github.repository_owner == 'trustwallet' && github.event.repository.fork == false

steps:
- name: Checkout (trustwallet repo, secret token)
uses: actions/checkout@v3
with:
# Use trust-ci fine-grained PAT to checkout and later commit the code
# Do not use for forked repos
token: ${{ secrets.CI_GITHUB_TOKEN }}
ref: ${{ github.ref }}

- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.18

- name: Run fix
run: make fix

- name: Show fix result (diff)
run: |
git status
git diff
- name: Run check
run: make check

- name: Commit changes
if: success()
uses: stefanzweifel/[email protected]
with:
commit_user_name: trust-ci
commit_user_email: "[email protected]"
commit_message: Auto fix all (sanity and consistency)
#Disabled, we have 'check' job, 'fix' job do invisible changes which is not convenient to debug

#name: Fix All
#
#on:
# push:
# branches:
# - '*'
# workflow_dispatch:
#
#jobs:
# fix-all:
# runs-on: ubuntu-latest
#
# if: github.repository_owner == 'trustwallet' && github.event.repository.fork == false
#
# steps:
# - name: Checkout (trustwallet repo, secret token)
# uses: actions/checkout@v3
# with:
# # Use trust-ci fine-grained PAT to checkout and later commit the code
# # Do not use for forked repos
# token: ${{ secrets.CI_GITHUB_TOKEN }}
# ref: ${{ github.ref }}
#
# - name: Set up Go
# uses: actions/setup-go@v4
# with:
# go-version: 1.18
#
# - name: Run fix
# run: make fix
#
# - name: Show fix result (diff)
# run: |
# git status
# git diff
#
# - name: Run check
# run: make check
#
# - name: Commit changes
# if: success()
# uses: stefanzweifel/[email protected]
# with:
# commit_user_name: trust-ci
# commit_user_email: "[email protected]"
# commit_message: Auto fix all (sanity and consistency)
3 changes: 2 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,8 @@ linters:
- bodyclose
- cyclop
- deadcode
- durationcheck
- depguard
- dogsled
- errcheck
- errorlint
- exhaustive
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"website": "",
"description": "-",
"explorer": "https://etherscan.io/token/0x3883f5e181fccaf8410fa61e12b59bad963fb645",
"status": "active",
"status": "abandoned",
"id": "0x3883f5e181fccaF8410FA61e12b59BAd963fb645"
}
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "ERC20",
"symbol": "AVA",
"decimals": 18,
"status": "active",
"status": "abandoned",
"id": "0x442B153F6F61C0c99A33Aa4170DCb31e1ABDa1D0",
"links": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"name": "Travala.com",
"website": "https://travala.com",
"description": "Travala.com claims to be the leading blockchain-based travel booking platform.",
"explorer": "https://etherscan.io/token/0xa6C0c097741D55ECd9a3A7DeF3A8253fD022ceB9",
"type": "ERC20",
"symbol": "AVA",
"decimals": 18,
"status": "active",
"id": "0xa6C0c097741D55ECd9a3A7DeF3A8253fD022ceB9",
"links": [
{
"name": "twitter",
"url": "https://twitter.com/travalacom"
},
{
"name": "github",
"url": "https://github.com/travala"
},
{
"name": "telegram",
"url": "https://t.me/travala"
},
{
"name": "coinmarketcap",
"url": "https://coinmarketcap.com/currencies/travala/"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions blockchains/ethereum/validators/list.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[
{
"id": "0x2401c39d7ba9E283668a53fcC7B8F5FD9e716fdf",
"name": "Trust Nodes",
"description": "Trust Nodes is Ethereum 2.0 staking service.",
"website": "https://www.kiln.fi"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"name": "Arbitrum",
"type": "INJECTIVE",
"symbol": "ARB",
"decimals": 8,
"website": "https://arbitrum.foundation/",
"description": "$ARB tokens can be used to vote on Arbitrum DAO governance proposals, allowing $ARB holders to collectively shape the future of Arbitrum protocols and chains. Token holders can also delegate their voting power to delegates.",
"explorer": "https://explorer.injective.network/asset/?tokenType=tokenFactory&denom=factory/inj14ejqjyq8um4p3xfqj74yld5waqljf88f9eneuk/inj1d5vz0uzwlpfvgwrwulxg6syy82axa58y4fuszd",
"status": "active",
"id": "inj1d5vz0uzwlpfvgwrwulxg6syy82axa58y4fuszd",
"links": [
{
"name": "twitter",
"url": "https://twitter.com/arbitrum"
},
{
"name": "whitepaper",
"url": "https://docs.arbitrum.foundation/deployment-addresses"
},
{
"name": "discord",
"url": "https://discord.com/arbitrum"
},
{
"name": "coinmarketcap",
"url": "https://coinmarketcap.com/ru/currencies/arbitrum-iou/"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"name": "Talis",
"website": "https://injective.talis.art",
"description": "In the dynamic landscape of NFTs and cryptocurrency, platforms that offer innovative solutions and tools play a crucial role in shaping the ecosystem.",
"explorer": "https://explorer.injective.network/asset/?tokenType=tokenFactory&denom=factory/inj1maeyvxfamtn8lfyxpjca8kuvauuf2qeu6gtxm3/Talis",
"type": "INJECTIVE",
"symbol": "TALIS",
"decimals": 6,
"status": "active",
"id": "inj1maeyvxfamtn8lfyxpjca8kuvauuf2qeu6gtxm3",
"links": [
{
"name": "twitter",
"url": "https://twitter.com/ProtocolTalis"
},
{
"name": "telegram",
"url": "https://t.me/talisprotocol"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"name": "Chiliz",
"website": "https://chiliz.com",
"description": "Chiliz, powering Socios.com, aims to give sports and esports fans the ability to crowd-manage their favorite teams, games, leagues, and events.",
"explorer": "https://explorer.injective.network/asset/?tokenType=tokenFactory&denom=factory/inj14ejqjyq8um4p3xfqj74yld5waqljf88f9eneuk/inj1q6kpxy6ar5lkxqudjvryarrrttmakwsvzkvcyh",
"type": "INJECTIVE",
"symbol": "CHZ",
"decimals": 8,
"status": "active",
"id": "inj1q6kpxy6ar5lkxqudjvryarrrttmakwsvzkvcyh",
"tags": [
"nft"
],
"links": [
{
"name": "telegram",
"url": "https://t.me/chiliz_io"
},
{
"name": "twitter",
"url": "https://twitter.com/chiliZ/"
},
{
"name": "facebook",
"url": "https://facebook.com/chiliZdotcom/"
},
{
"name": "blog",
"url": "https://medium.com/chiliz"
},
{
"name": "whitepaper",
"url": "https://chiliz.com/docs/CHZ_whitepaper.pdf"
},
{
"name": "coingecko",
"url": "https://coingecko.com/en/coins/chiliz/"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"name": "USD Coin",
"website": "https://centre.io/usdc",
"description": "USDC is a fully collateralized US dollar stablecoin, an Ethereum powered coin and is the brainchild of CENTRE, an open source project bootstrapped by contributions from Circle and Coinbase.",
"explorer": "https://explorer.injective.network/asset/?tokenType=tokenFactory&denom=factory/inj14ejqjyq8um4p3xfqj74yld5waqljf88f9eneuk/inj1q6zlut7gtkzknkk773jecujwsdkgq882akqksk",
"type": "INJECTIVE",
"symbol": "USDCET",
"decimals": 6,
"status": "active",
"id": "inj1q6zlut7gtkzknkk773jecujwsdkgq882akqksk",
"tags": [
"defi",
"stablecoin"
],
"links": [
{
"name": "github",
"url": "https://github.com/centrehq"
},
{
"name": "medium",
"url": "https://medium.com/centre-blog"
},
{
"name": "whitepaper",
"url": "https://centre.io/pdfs/centre-whitepaper.pdf"
},
{
"name": "coinmarketcap",
"url": "https://coinmarketcap.com/currencies/usd-coin/"
},
{
"name": "coingecko",
"url": "https://coingecko.com/en/coins/usd-coin/"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"name": "Solana",
"website": "https://solana.com/",
"description": "Solana is the worlds most performant blockchain in the world at 710k transactions per second. 710k TPS is achieved by encoding the passage of time as data.",
"explorer": "https://explorer.injective.network/asset/?tokenType=tokenFactory&denom=factory/inj14ejqjyq8um4p3xfqj74yld5waqljf88f9eneuk/inj1sthrn5ep8ls5vzz8f9gp89khhmedahhdkqa8z3",
"symbol": "SOL",
"type": "INJECTIVE",
"decimals": 8,
"status": "active",
"id": "inj1sthrn5ep8ls5vzz8f9gp89khhmedahhdkqa8z3",
"tags": [
"staking-native"
],
"links": [
{
"name": "github",
"url": "https://github.com/solana-labs"
},
{
"name": "twitter",
"url": "https://twitter.com/solana"
},
{
"name": "reddit",
"url": "https://reddit.com/solana"
},
{
"name": "whitepaper",
"url": "https://github.com/solana-labs/whitepaper"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "BEP20",
"symbol": "GALA",
"decimals": 18,
"status": "active",
"status": "abandoned",
"id": "0x7dDEE176F665cD201F93eEDE625770E2fD911990",
"tags": [
"nft",
Expand Down
Binary file not shown.
Loading

0 comments on commit 4f50b86

Please sign in to comment.