Skip to content

Commit 6d3e089

Browse files
committed
Merge branch 'develop'
2 parents 8a50b20 + 361c8a0 commit 6d3e089

6 files changed

Lines changed: 2847 additions & 2 deletions

File tree

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
eth-utils==2.0.0
1+
eth-utils==5.3.1
22
jsonschema==4.21.1
33
safe-pysha3==1.0.4
44
pytest==7.4.4

updates/accounting_rules/v9.json

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
{
2+
"accounting_rules": [
3+
{
4+
"event_type": "deposit",
5+
"event_subtype": "deposit to protocol",
6+
"counterparty": null,
7+
"taxable": false,
8+
"count_entire_amount_spend": false,
9+
"count_cost_basis_pnl": true,
10+
"accounting_treatment": null
11+
}, {
12+
"event_type": "withdrawal",
13+
"event_subtype": "withdraw from protocol",
14+
"counterparty": null,
15+
"taxable": false,
16+
"count_entire_amount_spend": false,
17+
"count_cost_basis_pnl": true,
18+
"accounting_treatment": null
19+
}, {
20+
"event_type": "exchange adjustment",
21+
"event_subtype": "spend",
22+
"counterparty": null,
23+
"taxable": false,
24+
"count_entire_amount_spend": false,
25+
"count_cost_basis_pnl": true,
26+
"accounting_treatment": null
27+
}, {
28+
"event_type": "exchange adjustment",
29+
"event_subtype": "receive",
30+
"counterparty": null,
31+
"taxable": false,
32+
"count_entire_amount_spend": false,
33+
"count_cost_basis_pnl": true,
34+
"accounting_treatment": null
35+
}, {
36+
"event_type": "exchange transfer",
37+
"event_subtype": "spend",
38+
"counterparty": null,
39+
"taxable": false,
40+
"count_entire_amount_spend": false,
41+
"count_cost_basis_pnl": true,
42+
"accounting_treatment": null
43+
}, {
44+
"event_type": "exchange transfer",
45+
"event_subtype": "receive",
46+
"counterparty": null,
47+
"taxable": false,
48+
"count_entire_amount_spend": false,
49+
"count_cost_basis_pnl": true,
50+
"accounting_treatment": null
51+
}, {
52+
"event_type": "exchange transfer",
53+
"event_subtype": "fee",
54+
"counterparty": null,
55+
"taxable": true,
56+
"count_entire_amount_spend": true,
57+
"count_cost_basis_pnl": true,
58+
"accounting_treatment": null
59+
}, {
60+
"event_type": "transaction to self",
61+
"event_subtype": "none",
62+
"counterparty": null,
63+
"taxable": false,
64+
"count_entire_amount_spend": true,
65+
"count_cost_basis_pnl": true,
66+
"accounting_treatment": null
67+
}
68+
]
69+
}

updates/info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"spam_assets":{"latest":5},"rpc_nodes":{"latest":10,"limits":{"9":{"min_version":"1.39.0"},"10":{"min_version":"1.41.0"}}},"contracts":{"latest":0},"global_addressbook":{"latest":0},"accounting_rules":{"latest":8,"limits":{"4":{"min_version":"1.35.0"},"5":{"min_version":"1.38.0"},"8":{"min_version":"1.41.3"}}},"location_asset_mappings":{"latest":12,"limits":{"9":{"min_version":"1.38.0"},"10":{"min_version":"1.39.0"},"11":{"min_version":"1.40.0"}}},"counterparty_asset_mappings":{"latest":1},"location_unsupported_assets":{"latest":3,"limits":{"2":{"min_version":"1.38.0"}}}}
1+
{"spam_assets":{"latest":6},"rpc_nodes":{"latest":10,"limits":{"9":{"min_version":"1.39.0"},"10":{"min_version":"1.41.0"}}},"contracts":{"latest":0},"global_addressbook":{"latest":0},"accounting_rules":{"latest":9,"limits":{"4":{"min_version":"1.35.0"},"5":{"min_version":"1.38.0"},"8":{"min_version":"1.41.3"},"9":{"min_version":"1.42.0"}}},"location_asset_mappings":{"latest":13,"limits":{"9":{"min_version":"1.38.0"},"10":{"min_version":"1.39.0"},"11":{"min_version":"1.40.0"}}},"counterparty_asset_mappings":{"latest":1},"location_unsupported_assets":{"latest":4,"limits":{"2":{"min_version":"1.38.0"}}}}

0 commit comments

Comments
 (0)