Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Remove pairs from EVM chain tokelists.json #17637

Merged
merged 15 commits into from
Jan 27, 2022
Merged

Remove pairs from EVM chain tokelists.json #17637

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
88ef93b
Remove pairs from EVM chain tokelists.json
unanoc Jan 26, 2022
7266b6f
Add tokenlist-extended.json
unanoc Jan 26, 2022
c5d9ec2
Add command for adding token to tokenlist-extended.json
unanoc Jan 26, 2022
9e07c27
Remove empty pairs
unanoc Jan 26, 2022
d359dc6
Update config namings
unanoc Jan 26, 2022
e619a19
Add command for adding token to tokenlist.json
unanoc Jan 26, 2022
372213d
Update config and file namings
unanoc Jan 27, 2022
0df2d97
Update tokenlist-extended.json
vikmeup Jan 27, 2022
6da012c
Add token info getting
unanoc Jan 27, 2022
24a6f6d
Merge branch 'tokenlist-changes' of github.com:trustwallet/assets int…
unanoc Jan 27, 2022
f50508f
Fix
unanoc Jan 27, 2022
988625f
Fix
unanoc Jan 27, 2022
01a5dd1
Add duplicates check
vikmeup Jan 27, 2022
1006f1c
Add duplicate check in token list
vikmeup Jan 27, 2022
87f7333
Update commands.go
vikmeup Jan 27, 2022
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
Prev Previous commit
Next Next commit
Add duplicates check
  • Loading branch information
@vikmeup
vikmeup committed Jan 27, 2022
commit 01a5dd1d927ff8356008874023bbabb6d013fcd8
22 changes: 20 additions & 2 deletions blockchains/ethereum/tokenlist-extended.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Trust Wallet: Ethereum",
"logoURI": "https://trustwallet.com/assets/images/favicon.png",
"timestamp": "2022-01-27T11:59:27.778609",
"timestamp": "2022-01-27T14:33:26.183301",
"tokens": [
{
"asset": "c60_t0x8E870D67F660D95d5be530380D0eC0bd388289E1",
Expand All @@ -11,10 +11,28 @@
"symbol": "USDP",
"decimals": 18,
"logoURI": "https://assets.trustwalletapp.com/blockchains/ethereum/assets/0x8E870D67F660D95d5be530380D0eC0bd388289E1/logo.png"
},
{
"asset": "c60_t0x853d955aCEf822Db058eb8505911ED77F175b99e",
"type": "ERC20",
"address": "0x853d955aCEf822Db058eb8505911ED77F175b99e",
"name": "Frax",
"symbol": "FRAX",
"decimals": 18,
"logoURI": "https://assets.trustwalletapp.com/blockchains/ethereum/assets/0x853d955aCEf822Db058eb8505911ED77F175b99e/logo.png"
},
{
"asset": "c60_t0xa47c8bf37f92aBed4A126BDA807A7b7498661acD",
"type": "ERC20",
"address": "0xa47c8bf37f92aBed4A126BDA807A7b7498661acD",
"name": "UST Token",
"symbol": "UST",
"decimals": 18,
"logoURI": "https://assets.trustwalletapp.com/blockchains/ethereum/assets/0xa47c8bf37f92aBed4A126BDA807A7b7498661acD/logo.png"
}
],
"version": {
"major": 4,
"major": 6,
"minor": 0,
"patch": 0
}
Expand Down
15 changes: 12 additions & 3 deletions internal/manager/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,19 @@ package manager

import (
"encoding/json"
"errors"
"fmt"
"time"

libFile "github.com/trustwallet/assets-go-libs/file"
"github.com/trustwallet/assets-go-libs/path"
"github.com/trustwallet/assets-go-libs/validation/info"
"github.com/trustwallet/assets-go-libs/validation/tokenlist"
"github.com/trustwallet/assets/internal/config"
"github.com/trustwallet/go-primitives/asset"
"github.com/trustwallet/go-primitives/coin"
"github.com/trustwallet/go-primitives/types"

"github.com/trustwallet/assets/internal/config"
)

func CreateAssetInfoJSONTemplate(token string) error {
Expand Down Expand Up @@ -72,7 +74,7 @@ func CreateAssetInfoJSONTemplate(token string) error {
return nil
}

func AddTokenToTokenListJSON(chain coin.Coin, token, tokenID, tokenListPath string) error {
func AddTokenToTokenListJSON(chain coin.Coin, assetId, tokenID, tokenListPath string) error {
setup()

var oldTokenList tokenlist.Model
Expand All @@ -86,8 +88,15 @@ func AddTokenToTokenListJSON(chain coin.Coin, token, tokenID, tokenListPath stri
return fmt.Errorf("failed to get token info: %w", err)
}

// check for duplicates
for _, t := range oldTokenList.Tokens {
if t.Asset == assetId {
return errors.New("duplicate asset, already exist")
}
}

oldTokenList.Tokens = append(oldTokenList.Tokens, tokenlist.Token{
Asset: token,
Asset: assetId,
Type: types.TokenType(*assetInfo.Type),
Address: *assetInfo.ID,
Name: *assetInfo.Name,
Expand Down