Skip to content

Commit 2818a34

Browse files
pjkundertpjkundert
committed
Include correct Crypto Currency name for core cryptocurrencies
1 parent 103e096 commit 2818a34

File tree

2 files changed

+34
-30
lines changed

2 files changed

+34
-30
lines changed

‎slip39/invoice/artifact.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,9 @@ def taxi( c ):
574574
# And the per-currency Sub-totals (for each page)
575575
[
576576
[
577-
self.currencies_account[c], c, self.currencies_proxy[c].name,
577+
self.currencies_account[c].address,
578+
c,
579+
self.currencies_account[c].name if c == self.currencies_account[c].symbol else self.currencies_proxy[c].name,
578580
] + [
579581
round( page[-1][toti( c )], deci( c )),
580582
round( page[-1][taxi( c )], deci( c )),
@@ -593,7 +595,9 @@ def taxi( c ):
593595
# And the per-currency Totals (up to current page)
594596
[
595597
[
596-
self.currencies_account[c], c, self.currencies_proxy[c].name,
598+
self.currencies_account[c].address,
599+
c,
600+
self.currencies_account[c].name if c == self.currencies_account[c].symbol else self.currencies_proxy[c].name,
597601
round( page[-1][toti( c )], deci( c )),
598602
round( page[-1][taxi( c )], deci( c )),
599603
]

‎slip39/invoice/artifact_test.py‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -202,25 +202,25 @@ def test_tabulate():
202202
|--------+---------------+---------+---------+---------+---------+--------+----------+------------+----------+-------------+-------------+-------------+--------------+--------------+--------------+-------------+-------------+-------------+-------------+--------------+--------------+--------------+-------------|
203203
| 0 | Worthless | 1 | 12,346 | no tax | 0 | 12,346 | 12,346 | ZEENUS | ZEENUS | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
204204
205-
| Account | Crypto | Currency | Subtotal 1/1 | Subtotal 1/1 Taxes |
206-
|-------------------------------------------------+----------+---------------+----------------+----------------------|
207-
| BTC: bc1qk0a9hr7wjfxeenz9nwenw9flhq0tmsf6vsgnn2 | BTC | Wrapped BTC | 0 | 0 |
208-
| ETH: 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | ETH | Wrapped Ether | 0 | 0 |
209-
| ETH: 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | HOT | HoloToken | 0 | 0 |
210-
| ETH: 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | USDC | USD Coin | 0 | 0 |
211-
| ETH: 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | WBTC | Wrapped BTC | 0 | 0 |
212-
| ETH: 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | WETH | Wrapped Ether | 0 | 0 |
213-
| XRP: rUPzi4ZwoYxi7peKCqUkzqEuSrzSRyLguV | XRP | XRP | 0 | 0 |
205+
| Account | Crypto | Currency | Subtotal 1/1 | Subtotal 1/1 Taxes |
206+
|--------------------------------------------+----------+---------------+----------------+----------------------|
207+
| bc1qk0a9hr7wjfxeenz9nwenw9flhq0tmsf6vsgnn2 | BTC | Bitcoin | 0 | 0 |
208+
| 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | ETH | Ethereum | 0 | 0 |
209+
| 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | HOT | HoloToken | 0 | 0 |
210+
| 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | USDC | USD Coin | 0 | 0 |
211+
| 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | WBTC | Wrapped BTC | 0 | 0 |
212+
| 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | WETH | Wrapped Ether | 0 | 0 |
213+
| rUPzi4ZwoYxi7peKCqUkzqEuSrzSRyLguV | XRP | Ripple | 0 | 0 |
214214
215-
| Account | Crypto | Currency | Total 1/1 | Total 1/1 Taxes |
216-
|-------------------------------------------------+----------+---------------+-------------+-------------------|
217-
| BTC: bc1qk0a9hr7wjfxeenz9nwenw9flhq0tmsf6vsgnn2 | BTC | Wrapped BTC | 0 | 0 |
218-
| ETH: 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | ETH | Wrapped Ether | 0 | 0 |
219-
| ETH: 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | HOT | HoloToken | 0 | 0 |
220-
| ETH: 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | USDC | USD Coin | 0 | 0 |
221-
| ETH: 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | WBTC | Wrapped BTC | 0 | 0 |
222-
| ETH: 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | WETH | Wrapped Ether | 0 | 0 |
223-
| XRP: rUPzi4ZwoYxi7peKCqUkzqEuSrzSRyLguV | XRP | XRP | 0 | 0 |""" # noqa: E501
215+
| Account | Crypto | Currency | Total 1/1 | Total 1/1 Taxes |
216+
|--------------------------------------------+----------+---------------+-------------+-------------------|
217+
| bc1qk0a9hr7wjfxeenz9nwenw9flhq0tmsf6vsgnn2 | BTC | Bitcoin | 0 | 0 |
218+
| 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | ETH | Ethereum | 0 | 0 |
219+
| 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | HOT | HoloToken | 0 | 0 |
220+
| 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | USDC | USD Coin | 0 | 0 |
221+
| 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | WBTC | Wrapped BTC | 0 | 0 |
222+
| 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | WETH | Wrapped Ether | 0 | 0 |
223+
| rUPzi4ZwoYxi7peKCqUkzqEuSrzSRyLguV | XRP | Ripple | 0 | 0 |""" # noqa: E501
224224

225225
# No conversions of non-0 values; default Invoice currency is USD. Longest digits should be 2
226226
# Instead of querying BTC, ETH prices, provide a conversion (so our invoice pricing is static)
@@ -250,14 +250,14 @@ def test_tabulate():
250250
| 1 | Worthless | 1 | 12,345.68 | no tax | 0.00 | 12,346.00 | 12,346.00 | ZEENUS | ZEENUS | 0.28 | 417.88 | 0.28 | 0.01 | 19.90 | 0.01 |
251251
| 2 | Simple | 1 | 12,345.68 | no tax | 0.00 | 12,345.68 | 12,345.68 | USD | USDC | 8.51 | 12,763.56 | 8.51 | 0.01 | 19.90 | 0.01 |
252252
253-
| Account | Crypto | Currency | Subtotal 1/1 | Subtotal 1/1 Taxes |
254-
|-------------------------------------------------+----------+---------------+----------------+----------------------|
255-
| ETH: 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | ETH | Wrapped Ether | 8.50904 | 0.013267 |
256-
| ETH: 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | USDC | USD Coin | 12,763.6 | 19.9 |
257-
| ETH: 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | WETH | Wrapped Ether | 8.50904 | 0.013267 |
253+
| Account | Crypto | Currency | Subtotal 1/1 | Subtotal 1/1 Taxes |
254+
|--------------------------------------------+----------+---------------+----------------+----------------------|
255+
| 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | ETH | Ethereum | 8.50904 | 0.013267 |
256+
| 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | USDC | USD Coin | 12,763.6 | 19.9 |
257+
| 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | WETH | Wrapped Ether | 8.50904 | 0.013267 |
258258
259-
| Account | Crypto | Currency | Total 1/1 | Total 1/1 Taxes |
260-
|-------------------------------------------------+----------+---------------+--------------+-------------------|
261-
| ETH: 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | ETH | Wrapped Ether | 8.50904 | 0.013267 |
262-
| ETH: 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | USDC | USD Coin | 12,763.6 | 19.9 |
263-
| ETH: 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | WETH | Wrapped Ether | 8.50904 | 0.013267 |""" # noqa: E501
259+
| Account | Crypto | Currency | Total 1/1 | Total 1/1 Taxes |
260+
|--------------------------------------------+----------+---------------+--------------+-------------------|
261+
| 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | ETH | Ethereum | 8.50904 | 0.013267 |
262+
| 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | USDC | USD Coin | 12,763.6 | 19.9 |
263+
| 0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E | WETH | Wrapped Ether | 8.50904 | 0.013267 |""" # noqa: E501

0 commit comments

Comments
 (0)