Skip to content

Add T3B1 defs, update Ethereum defs #4072

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

Closed
wants to merge 11 commits into from
Closed

Add T3B1 defs, update Ethereum defs #4072

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
317bc7d
chore(common): add t3b1 defs
komret Jul 30, 2024
b2b9639
chore(common): update eth and alt defs
komret Jul 30, 2024
a5ed204
chore(common): remove unused defs
komret Jul 31, 2024
c2f710a
chore(common): remove ropsten and rinkeby from fixtures
komret Aug 26, 2024
ad9a666
chore(common): remove ropsten from defs
komret Aug 26, 2024
4cd66ff
chore(common): revert supported versions for T1B1 and T2T1 to correct…
matejcik Aug 27, 2024
1340d3f
fixup! chore(common): remove ropsten and rinkeby from fixtures
matejcik Aug 28, 2024
823bbc7
chore(common): add T3B1 to the list of supported models in support.json
matejcik Aug 28, 2024
1d0e735
chore(core): regenerate networks
matejcik Aug 28, 2024
a167ca4
fixup! chore(common): update eth and alt defs
matejcik Aug 28, 2024
3d2d6cf
fixup! chore(common): remove ropsten and rinkeby from fixtures
matejcik Aug 28, 2024
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
25 changes: 25 additions & 0 deletions common/defs/blockchain_link.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,5 +252,30 @@
"url": [
"https://solana-dev.trezor.io"
]
},
"eth:ETH:1": {
"type": "blockbook",
"url": ["https://eth1.trezor.io", "https://eth2.trezor.io"]

},
"eth:BNB:56": {
"type": "blockbook",
"url": ["https://bsc1.trezor.io"]
},
"eth:ETC:61": {
"type": "blockbook",
"url": ["https://etc1.trezor.io", "https://etc2.trezor.io"]
},
"eth:MATIC:137": {
"type": "blockbook",
"url": ["https://matic1.trezor.io", "https://matic2.trezor.io"]
},
"eth:tHOL:17000": {
"type": "blockbook",
"url": ["https://holesky1.trezor.io", "https://holesky2.trezor.io"]
},
"eth:tSEP:11155111": {
"type": "blockbook",
"url": ["https://sepolia1.trezor.io"]
}
}
3 changes: 0 additions & 3 deletions common/defs/duplicity_overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
"erc20:eth:USDT": false,
"eth:BNB:56": false,
"eth:MATIC:137": false,
Comment on lines 4 to 5
Copy link
Member

@tomasklim tomasklim Jul 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@matejcik what are those duplicity overrides?

do we still need e.g. misc:BNB, it was removed from fw or not yet?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@matejcik what are those duplicity overrides?

these allow some internal checks to proceed in case two coins have the same ticker symbol. Some of them could probably be removed now that most defs are external

do we still need e.g. misc:BNB, it was removed from fw or not yet?

not yet, we still need it

"eth:tETH:3": false,
"eth:tETH:4": false,
"eth:tETH:5": false,
"misc:BNB": false,
"misc:USDT": false
}
28 changes: 10 additions & 18 deletions common/defs/ethereum/networks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,27 @@
"slip44": 60
},
{
"chain": "rop",
"chain_id": 3,
"chain": "hol",
"chain_id": 17000,
"is_testnet": true,
"name": "Ropsten",
Copy link
Member

@tomasklim tomasklim Jul 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ropsten and Rinkeby are both mentioned in sign_tx_eip155.json file. Maybe remove it from tests please 🙏

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

c2f710a

"shortcut": "tETH",
"name": "Holesky",
"shortcut": "tHOL",
"slip44": 1
},
{
"chain": "rin",
"chain_id": 4,
"chain": "sep",
"chain_id": 11155111,
"is_testnet": true,
"name": "Rinkeby",
"shortcut": "tETH",
"name": "Sepolia",
"shortcut": "tSEP",
"slip44": 1
},
{
"chain": "gor",
"chain_id": 5,
"is_testnet": true,
"name": "Görli",
"shortcut": "tETH",
"slip44": 1
},
{
"chain": "bnb",
"chain": "bsc",
"chain_id": 56,
"coingecko_id": "binance-smart-chain",
"is_testnet": false,
"name": "Binance Smart Chain",
"name": "BNB Smart Chain",
"shortcut": "BNB",
"slip44": 714
},
Expand Down
223 changes: 122 additions & 101 deletions common/defs/support.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,8 @@
"eth:ETC:61": "1.11.3",
"eth:ETH:1": "1.11.3",
"eth:MATIC:137": "1.11.3",
"eth:tETH:3": "1.6.2",
"eth:tETH:4": "1.11.3",
"eth:tETH:5": "1.11.3",
"eth:tSEP:11155111": "1.11.3",
"eth:tHOL:17000": "1.11.3",
"misc:MAID": "1.7.2",
"misc:OMNI": "1.7.2",
"misc:USDT": "1.7.2",
Expand Down Expand Up @@ -189,9 +188,8 @@
"eth:ETC:61": "2.6.1",
"eth:ETH:1": "2.6.1",
"eth:MATIC:137": "2.6.1",
"eth:tETH:3": "2.6.1",
"eth:tETH:4": "2.6.1",
"eth:tETH:5": "2.6.1",
"eth:tSEP:11155111": "2.6.4",
"eth:tHOL:17000": "2.6.4",
"misc:ADA": "2.6.1",
"misc:BNB": "2.6.1",
"misc:DSOL": "2.6.4",
Expand Down Expand Up @@ -313,9 +311,8 @@
"eth:ETC:61": "2.5.3",
"eth:ETH:1": "2.5.3",
"eth:MATIC:137": "2.5.3",
"eth:tETH:3": "2.0.7",
"eth:tETH:4": "2.5.3",
"eth:tETH:5": "2.5.3",
"eth:tSEP:11155111": "2.6.4",
"eth:tHOL:17000": "2.6.4",
"misc:ADA": "2.0.8",
"misc:BNB": "2.1.5",
"misc:DSOL": "2.6.4",
Expand Down Expand Up @@ -344,6 +341,120 @@
"misc:LSK": "Incompatible mainnet hard-fork"
}
},
"T3B1": {
"supported": {
"bitcoin:ACM": "2.8.1",
"bitcoin:AXE": "2.8.1",
"bitcoin:BCH": "2.8.1",
"bitcoin:BTC": "2.8.1",
"bitcoin:BTCP": "2.8.1",
"bitcoin:BTX": "2.8.1",
"bitcoin:CPU": "2.8.1",
"bitcoin:CRW": "2.8.1",
"bitcoin:DOGE": "2.8.1",
"bitcoin:ELEMENTS": "2.8.1",
"bitcoin:FIRO": "2.8.1",
"bitcoin:FJC": "2.8.1",
"bitcoin:FLO": "2.8.1",
"bitcoin:FTC": "2.8.1",
"bitcoin:GRS": "2.8.1",
"bitcoin:KMD": "2.8.1",
"bitcoin:KOTO": "2.8.1",
"bitcoin:LTC": "2.8.1",
"bitcoin:MONA": "2.8.1",
"bitcoin:PPC": "2.8.1",
"bitcoin:QTUM": "2.8.1",
"bitcoin:REGTEST": "2.8.1",
"bitcoin:RITO": "2.8.1",
"bitcoin:RVN": "2.8.1",
"bitcoin:SMART": "2.8.1",
"bitcoin:SYS": "2.8.1",
"bitcoin:TAZ": "2.8.1",
"bitcoin:TBCH": "2.8.1",
"bitcoin:TEST": "2.8.1",
"bitcoin:UNO": "2.8.1",
"bitcoin:VIA": "2.8.1",
"bitcoin:VIPS": "2.8.1",
"bitcoin:XPM": "2.8.1",
"bitcoin:XRC": "2.8.1",
"bitcoin:XSN": "2.8.1",
"bitcoin:XVG": "2.8.1",
"bitcoin:ZCR": "2.8.1",
"bitcoin:ZEC": "2.8.1",
"bitcoin:tFIRO": "2.8.1",
"bitcoin:tGRS": "2.8.1",
"bitcoin:tLTC": "2.8.1",
"bitcoin:tPPC": "2.8.1",
"bitcoin:tQTUM": "2.8.1",
"bitcoin:tRVN": "2.8.1",
"bitcoin:tSMART": "2.8.1",
"erc20:bnb:ATOM": "2.8.1",
"erc20:eth:AAVE": "2.8.1",
"erc20:eth:APE": "2.8.1",
"erc20:eth:AXS": "2.8.1",
"erc20:eth:BUSD": "2.8.1",
"erc20:eth:CHZ": "2.8.1",
"erc20:eth:CRO": "2.8.1",
"erc20:eth:DAI": "2.8.1",
"erc20:eth:FRAX": "2.8.1",
"erc20:eth:LEO": "2.8.1",
"erc20:eth:LINK": "2.8.1",
"erc20:eth:MANA": "2.8.1",
"erc20:eth:MATIC": "2.8.1",
"erc20:eth:OKB": "2.8.1",
"erc20:eth:QNT": "2.8.1",
"erc20:eth:SAND": "2.8.1",
"erc20:eth:SHIB": "2.8.1",
"erc20:eth:STETH": "2.8.1",
"erc20:eth:UNI": "2.8.1",
"erc20:eth:USDC": "2.8.1",
"erc20:eth:USDT": "2.8.1",
"erc20:eth:WBTC": "2.8.1",
"erc20:eth:XCN": "2.8.1",
"erc20:matic:WAVAX": "2.8.1",
"eth:BNB:56": "2.8.1",
"eth:ETC:61": "2.8.1",
"eth:ETH:1": "2.8.1",
"eth:MATIC:137": "2.8.1",
"eth:tSEP:11155111": "2.8.1",
"eth:tHOL:17000": "2.8.1",
"misc:ADA": "2.8.1",
"misc:BNB": "2.8.1",
"misc:DSOL": "2.8.1",
"misc:MAID": "2.8.1",
"misc:OMNI": "2.8.1",
"misc:SOL": "2.8.1",
"misc:USDT": "2.8.1",
"misc:XLM": "2.8.1",
"misc:XMR": "2.8.1",
"misc:XRP": "2.8.1",
"misc:XTZ": "2.8.1",
"misc:tADA": "2.8.1",
"misc:tXRP": "2.8.1"
},
"unsupported": {
"bitcoin:BTG": "not for T3B1 (#2793)",
"bitcoin:DASH": "not for T3B1 (#2793)",
"bitcoin:DCR": "not for T3B1 (#2793)",
"bitcoin:DGB": "not for T3B1 (#2793)",
"bitcoin:NMC": "not for T3B1 (#2793)",
"bitcoin:PART": "incompatible fork",
"bitcoin:TBTG": "not for T3B1 (#2793)",
"bitcoin:TDCR": "not for T3B1 (#2793)",
"bitcoin:TRC": "address_type collides with Bitcoin",
"bitcoin:VTC": "not for T3B1 (#2793)",
"bitcoin:tDASH": "not for T3B1 (#2793)",
"bitcoin:tPART": "incompatible fork",
"misc:EOS": "not for T3B1 (#2793)",
"misc:LSK": "Incompatible mainnet hard-fork",
"nem:XEM": "not for T3B1 (#2793)",
"nem:BREEZE": "not for T3B1 (#2793)",
"nem:DIM": "not for T3B1 (#2793)",
"nem:DIMTOK": "not for T3B1 (#2793)",
"nem:PAC:CHS": "not for T3B1 (#2793)",
"nem:PAC:HRT": "not for T3B1 (#2793)"
}
},
"T3T1": {
"supported": {
"bitcoin:ACM": "2.6.1",
Expand Down Expand Up @@ -419,9 +530,8 @@
"eth:ETC:61": "2.6.1",
"eth:ETH:1": "2.6.1",
"eth:MATIC:137": "2.6.1",
"eth:tETH:3": "2.6.1",
"eth:tETH:4": "2.6.1",
"eth:tETH:5": "2.6.1",
"eth:tSEP:11155111": "2.6.1",
"eth:tHOL:17000": "2.6.1",
"misc:ADA": "2.6.1",
"misc:BNB": "2.6.1",
"misc:DSOL": "2.6.4",
Expand Down Expand Up @@ -458,94 +568,5 @@
"nem:PAC:CHS": "not for T3T1 (#2793)",
"nem:PAC:HRT": "not for T3T1 (#2793)"
}
},
"connect": {
"supported": {
"bitcoin:ACM": true,
"bitcoin:AXE": true,
"bitcoin:BCH": true,
"bitcoin:BTC": true,
"bitcoin:BTCP": true,
"bitcoin:BTG": true,
"bitcoin:BTX": true,
"bitcoin:DASH": true,
"bitcoin:DCR": true,
"bitcoin:DGB": true,
"bitcoin:DOGE": true,
"bitcoin:FIRO": true,
"bitcoin:FJC": true,
"bitcoin:FLO": true,
"bitcoin:FTC": true,
"bitcoin:KMD": true,
"bitcoin:KOTO": true,
"bitcoin:LTC": true,
"bitcoin:MONA": true,
"bitcoin:NMC": true,
"bitcoin:PPC": true,
"bitcoin:REGTEST": true,
"bitcoin:RITO": true,
"bitcoin:RVN": true,
"bitcoin:SYS": true,
"bitcoin:TAZ": true,
"bitcoin:TBCH": true,
"bitcoin:TBTG": true,
"bitcoin:TDCR": true,
"bitcoin:TEST": true,
"bitcoin:UNO": true,
"bitcoin:VIA": true,
"bitcoin:VTC": true,
"bitcoin:XPM": true,
"bitcoin:XRC": true,
"bitcoin:XSN": true,
"bitcoin:XVG": true,
"bitcoin:ZCR": true,
"bitcoin:ZEC": true,
"bitcoin:tDASH": true,
"bitcoin:tFIRO": true,
"bitcoin:tLTC": true,
"bitcoin:tPPC": true,
"eth:tETH:3": true,
"misc:ADA": true,
"misc:BNB": true,
"misc:DSOL": true,
"misc:EOS": true,
"misc:SOL": true,
"misc:XLM": true,
"misc:XRP": true,
"misc:XTZ": true,
"misc:tADA": true,
"misc:tXRP": true,
"nem:BREEZE": true,
"nem:DIM": true,
"nem:DIMTOK": true,
"nem:PAC:CHS": true,
"nem:PAC:HRT": true,
"nem:XEM": true
},
"unsupported": {}
},
"suite": {
"supported": {
"bitcoin:BCH": true,
"bitcoin:BTC": true,
"bitcoin:BTG": true,
"bitcoin:DASH": true,
"bitcoin:DGB": true,
"bitcoin:DOGE": true,
"bitcoin:LTC": true,
"bitcoin:NMC": true,
"bitcoin:REGTEST": true,
"bitcoin:TEST": true,
"bitcoin:VTC": true,
"bitcoin:ZEC": true,
"eth:tETH:3": true,
"misc:ADA": true,
"misc:DSOL": true,
"misc:SOL": true,
"misc:XRP": true,
"misc:tADA": true,
"misc:tXRP": true
},
"unsupported": {}
}
}
Loading