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

Tx Receipt Type Changes #4238

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open

Tx Receipt Type Changes #4238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
ac3fe74
initial work on stuff
blurpesec Dec 8, 2021
16cb28f
fixed ts errors. working - afaik
blurpesec Dec 16, 2021
50cd57b
multi-asset display in txhistory
blurpesec Dec 17, 2021
8476395
fix small received\/sent bug
blurpesec Jan 2, 2022
5f918b2
fixed duplicate entries bug
blurpesec Jan 2, 2022
66825b5
fix for asset ticker vs sent&received mismatch
blurpesec Jan 6, 2022
798e794
token transfers list in txstatus
blurpesec Jan 14, 2022
6ca959c
fixed a bunch of test
blurpesec Jan 21, 2022
4ebabd7
fix most tests
blurpesec Jan 24, 2022
5d94a8f
fixed final tests!!
blurpesec Jan 24, 2022
f335f6a
clean up unneeded comments and console debugs
blurpesec Jan 25, 2022
fef7a86
fixed display asset bug
blurpesec Jan 25, 2022
617d180
added handling for unknown internal transaction in exchange txTypes
blurpesec Jan 27, 2022
edd0486
clean up a bit
blurpesec Jan 27, 2022
189b4d1
fixed some of the requested changes
blurpesec Jan 29, 2022
29ba32d
fixed account slice test
blurpesec Jan 29, 2022
45b397a
fixed some tests
blurpesec Feb 1, 2022
1da189f
fixed more tests and working tx history story
blurpesec Feb 2, 2022
156d74b
removed unneeded selector
blurpesec Feb 2, 2022
a009993
added testing for tokentransfertable and recenttransactionstable amon…
blurpesec Feb 3, 2022
769c056
revert nitpicky change
blurpesec Feb 3, 2022
75f9972
added test && worked on requested changes
blurpesec Feb 4, 2022
3932bb1
fix some of the remaining requested changes
blurpesec Feb 7, 2022
9ee0c73
did some recent transactions
blurpesec Feb 8, 2022
5dfffce
run yarn format - prettier
blurpesec Feb 8, 2022
229ac82
fixed requested changes
blurpesec Feb 9, 2022
273fac6
ran prettier
blurpesec Feb 9, 2022
cc80e93
remove format from precommit
blurpesec Feb 9, 2022
d76407c
fixed some remaining requested changes
blurpesec Feb 11, 2022
3b9be02
fixed some remaining requested changes
blurpesec Feb 11, 2022
c58b3ca
ran yarn format
blurpesec Feb 11, 2022
b72d155
fixed prettier issues
blurpesec Feb 11, 2022
f9b6685
add another test for the codecov failure
blurpesec Feb 11, 2022
5f9dcb5
removed unreachable code
blurpesec Feb 11, 2022
d39b674
clean up
blurpesec Feb 11, 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
74 changes: 37 additions & 37 deletions __tests__/fixtures/persisted.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "v2.0.0",
"mtime": 1606324295478,
"mtime": 1234567891011,
"accounts": {
"ef94a882-3af7-5887-89f0-be9833c6b071": {
"address": "0x71810d732c6f0a799000f583e77fc301d4d8c1c8",
Expand All @@ -27,7 +27,7 @@
"balance": {
"_hex": "0x00"
},
"mtime": 1606324232650
"mtime": 1234567891011
}
],
"transactions": [],
Expand Down Expand Up @@ -67,7 +67,7 @@
"balance": {
"_hex": "0x0de0b6b3a7640000"
},
"mtime": 1606324232650
"mtime": 1234567891011
},
{
"uuid": "356a192b-7913-504c-9457-4d18c28d46e6",
Expand All @@ -89,7 +89,7 @@
"balance": {
"_hex": "0x00"
},
"mtime": 1606324232650
"mtime": 1234567891011
}
],
"transactions": [],
Expand Down Expand Up @@ -123,7 +123,7 @@
"balance": {
"_hex": "0x00"
},
"mtime": 1606324232650
"mtime": 1234567891011
}
],
"transactions": [],
Expand Down Expand Up @@ -160,7 +160,7 @@
"balance": {
"_hex": "0x902358479aa7a3"
},
"mtime": 1606324232650
"mtime": 1234567891011
},
{
"ticker": "AMB",
Expand Down Expand Up @@ -190,7 +190,7 @@
"balance": {
"_hex": "0x016345785d8a0000"
},
"mtime": 1606324232650
"mtime": 1234567891011
},
{
"ticker": "ABT",
Expand All @@ -216,7 +216,7 @@
"balance": {
"_hex": "0x0d810265adbf539d"
},
"mtime": 1606324232650
"mtime": 1234567891011
},
{
"ticker": "ANT (old)",
Expand Down Expand Up @@ -251,7 +251,7 @@
"balance": {
"_hex": "0x4bfb1b7e01438000"
},
"mtime": 1606324232650
"mtime": 1234567891011
},
{
"ticker": "cDAI",
Expand All @@ -272,7 +272,7 @@
"balance": {
"_hex": "0x068b7f8a9b"
},
"mtime": 1606324232650
"mtime": 1234567891011
},
{
"ticker": "LINK (Chainlink)",
Expand All @@ -298,7 +298,7 @@
"balance": {
"_hex": "0x3590c346e35b"
},
"mtime": 1606324232650
"mtime": 1234567891011
},
{
"ticker": "unisETH",
Expand All @@ -323,7 +323,7 @@
"balance": {
"_hex": "0x58c83319ffacc3"
},
"mtime": 1606324232650
"mtime": 1234567891011
},
{
"ticker": "DAI",
Expand Down Expand Up @@ -355,7 +355,7 @@
"balance": {
"_hex": "0x025bfb3601c32f1d"
},
"mtime": 1606324232650
"mtime": 1234567891011
},
{
"ticker": "BAT",
Expand All @@ -382,7 +382,7 @@
"balance": {
"_hex": "0x571f0b44ebf42873"
},
"mtime": 1606324232650
"mtime": 1234567891011
},
{
"ticker": "KICK",
Expand Down Expand Up @@ -413,7 +413,7 @@
"balance": {
"_hex": "0x50d809593800"
},
"mtime": 1606324232650
"mtime": 1234567891011
},
{
"uuid": "356a192b-7913-504c-9457-4d18c28d46e6",
Expand All @@ -435,7 +435,7 @@
"balance": {
"_hex": "0x03f0a45449eeb6"
},
"mtime": 1606324232650
"mtime": 1234567891011
}
],
"transactions": [],
Expand Down Expand Up @@ -467,7 +467,7 @@
"balance": {
"_hex": "0x24cb4cc5cdb644"
},
"mtime": 1606324232650
"mtime": 1234567891011
},
{
"ticker": "ABT",
Expand All @@ -493,7 +493,7 @@
"balance": {
"_hex": "0x027dc459dc5275a28e"
},
"mtime": 1606324232650
"mtime": 1234567891011
},
{
"ticker": "sETH",
Expand All @@ -510,7 +510,7 @@
"balance": {
"_hex": "0x24cb4cc5cdb644"
},
"mtime": 1606324232650
"mtime": 1234567891011
},
{
"ticker": "ANT (old)",
Expand Down Expand Up @@ -545,7 +545,7 @@
"balance": {
"_hex": "0x0bc18e1999fb5e8e"
},
"mtime": 1606324232650
"mtime": 1234567891011
},
{
"ticker": "cDAI",
Expand All @@ -566,7 +566,7 @@
"balance": {
"_hex": "0x01742f03e4"
},
"mtime": 1606324232650
"mtime": 1234567891011
},
{
"ticker": "BAT",
Expand All @@ -593,7 +593,7 @@
"balance": {
"_hex": "0x27f7fa156dd364d2"
},
"mtime": 1606324232650
"mtime": 1234567891011
},
{
"ticker": "KICK",
Expand Down Expand Up @@ -624,7 +624,7 @@
"balance": {
"_hex": "0x50d809593800"
},
"mtime": 1606324232650
"mtime": 1234567891011
},
{
"uuid": "356a192b-7913-504c-9457-4d18c28d46e6",
Expand All @@ -646,7 +646,7 @@
"balance": {
"_hex": "0x00"
},
"mtime": 1606324232650
"mtime": 1234567891011
}
],
"transactions": [],
Expand Down Expand Up @@ -680,7 +680,7 @@
"balance": {
"_hex": "0x00"
},
"mtime": 1606324232650
"mtime": 1234567891011
}
],
"transactions": [],
Expand Down Expand Up @@ -708,7 +708,7 @@
"balance": {
"_hex": "0x00"
},
"mtime": 1606324232650
"mtime": 1234567891011
}
],
"transactions": [],
Expand Down Expand Up @@ -736,7 +736,7 @@
"balance": {
"_hex": "0x00"
},
"mtime": 1606324232650
"mtime": 1234567891011
}
],
"transactions": [],
Expand Down Expand Up @@ -764,7 +764,7 @@
"balance": {
"_hex": "0x00"
},
"mtime": 1606324232650
"mtime": 1234567891011
}
],
"transactions": [],
Expand Down Expand Up @@ -792,7 +792,7 @@
"balance": {
"_hex": "0x60b89bc0a8c18097"
},
"mtime": 1606324232650
"mtime": 1234567891011
}
],
"transactions": [],
Expand Down Expand Up @@ -820,7 +820,7 @@
"balance": {
"_hex": "0x4563451c7ecac000"
},
"mtime": 1606324232650
"mtime": 1234567891011
}
],
"transactions": [],
Expand Down Expand Up @@ -848,7 +848,7 @@
"balance": {
"_hex": "0x00"
},
"mtime": 1606324232651
"mtime": 1234567891011
}
],
"transactions": [],
Expand Down Expand Up @@ -1014,7 +1014,7 @@
"balance": {
"_hex": "0x00"
},
"mtime": 1606322464395
"mtime": 1234567891011
}
],
"transactions": [],
Expand Down Expand Up @@ -1166,7 +1166,7 @@
"balance": {
"_hex": "0x00"
},
"mtime": 1606322464395
"mtime": 1234567891011
}
],
"transactions": [],
Expand Down Expand Up @@ -1318,7 +1318,7 @@
"balance": {
"_hex": "0x00"
},
"mtime": 1606322464395
"mtime": 1234567891011
}
],
"transactions": [],
Expand Down Expand Up @@ -1470,7 +1470,7 @@
"balance": {
"_hex": "0x00"
},
"mtime": 1606322464395
"mtime": 1234567891011
}
],
"transactions": [],
Expand Down Expand Up @@ -1622,7 +1622,7 @@
"balance": {
"_hex": "0x00"
},
"mtime": 1606322464395
"mtime": 1234567891011
}
],
"transactions": [],
Expand Down Expand Up @@ -1774,7 +1774,7 @@
"balance": {
"_hex": "0x00"
},
"mtime": 1606322464395
"mtime": 1234567891011
}
],
"transactions": [],
Expand Down
10 changes: 4 additions & 6 deletions jest_config/__fixtures__/erc20NonWeb3TxConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"balance": {
"_hex": "0x54ab1b2ceea88000"
},
"mtime": 1590733930901
"mtime": 1234567891011
},
{
"ticker": "RopstenETH",
Expand All @@ -119,7 +119,7 @@
"balance": {
"_hex": "0x0e22e84c2c724c00"
},
"mtime": 1590733930901
"mtime": 1234567891011
}
],
"transactions": [
Expand Down Expand Up @@ -452,7 +452,6 @@
},
{
"asset": {
"value": "Ropsten",
"ticker": "RopstenETH",
"name": "Ropsten",
"decimal": 18,
Expand All @@ -463,7 +462,7 @@
"balance": {
"_hex": "0x0e23a74a9bd96c00"
},
"mtime": 1590722655749
"mtime": 1234567891011
},
"baseAsset": {
"ticker": "RopstenETH",
Expand Down Expand Up @@ -558,7 +557,6 @@
},
{
"asset": {
"value": "Ropsten",
"ticker": "RopstenETH",
"name": "Ropsten",
"decimal": 18,
Expand All @@ -569,7 +567,7 @@
"balance": {
"_hex": "0x0e2347cb6425dc00"
},
"mtime": 1590726646380
"mtime": 1234567891011
},
"baseAsset": {
"ticker": "RopstenETH",
Expand Down
Loading