Skip to content

Commit

Permalink
Updated bitvavo headers
Browse files Browse the repository at this point in the history
  • Loading branch information
@dickwolff
dickwolff committed Jul 30, 2024
1 parent d45da7e commit a6f1de9
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 41 deletions.
70 changes: 35 additions & 35 deletions samples/bitvavo-export.csv
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
Timezone,Date,Time,Type,Currency,Amount,Price (EUR),EUR received / paid,Fee currency,Fee amount,Status,Transaction ID,Address
Europe/Amsterdam,2023-11-30,11:37:41,withdrawal,ETH,-0.010713949999999999,,,ETH,1,Completed,552f318e-061a-42f7-b543-e657e99576e0,0xaeC107aC155cA21A896888fe486de410c422424a
Europe/Amsterdam,2023-11-30,11:36:46.620,buy,ETH,0.0053543,1862.8,-10.00,EUR,0.02600996,Completed,953ddfc4-3127-4210-9654-4edb61dcc851,
Europe/Amsterdam,2023-11-30,11:33:24,deposit,EUR,10,,,EUR,0,Completed,fee8dd13-c076-447d-9a56-25e7e95aac23,NL12***34
Europe/Amsterdam,2023-11-30,11:32:10.174,buy,ETH,0.00258836,1863,-4.83,EUR,0.00788532,Completed,1fda028d-726f-4d48-ad18-e814c2dc9d9a,
Europe/Amsterdam,2023-11-30,11:31:40.720,buy,ETH,0.00277129,1863,-5.18,EUR,0.01708673,Completed,9844e9b6-d22f-4175-b821-56e152dcee9a,
Europe/Amsterdam,2023-11-30,11:30:47,deposit,EUR,10,,,EUR,0,Completed,f6c5c439-5d9d-43d2-ae95-a8a44e275d4a,NL12***34
Europe/Amsterdam,2023-11-30,11:24:44.529,buy,BTC,0.00054923,34580,-19.03,EUR,0.0376266,Completed,c302fd2c-ad10-444a-8d2c-0972d447f350,
Europe/Amsterdam,2023-11-30,11:16:50.947,buy,BTC,0.00017214,34544,-5.96,EUR,0.01359584,Completed,d905ab8b-b5fb-4ba1-b571-d4a8fa1dc06f,
Europe/Amsterdam,2023-11-30,11:15:55,deposit,EUR,25,,,EUR,0,Completed,29265166-93c8-4394-98b0-1cf847106e5b,NL12***34
Europe/Amsterdam,2023-05-19,11:10:52,withdrawal,BTC,-0.0009999,,,BTC,0.0002,Completed,8cf76bc7-5ed5-41c6-92b8-640b27493f36,1MNmb4nKSKwNh9JxpxcXbjLGswRjvBcWqM
Europe/Amsterdam,2023-05-19,10:29:44.141,buy,BTC,0.0009999,24940,-25.00,EUR,0.062494,Completed,4578d26a-eab0-48b5-bd09-32a2a004f31a,
Europe/Amsterdam,2023-05-19,10:29:03,deposit,EUR,25,,,EUR,0,Completed,96f925d1-fd15-4788-ae60-853c6829a8eb,NL12***34
Europe/Amsterdam,2023-02-20,15:16:18,withdrawal,BTC,-0.00053279,,,BTC,0.00003,Completed,dc4e09d7-db18-4331-8baf-a71b9a481d43,1MNmb4nKSKwNh9JxpxcXbjLGswRjvBcWqM
Europe/Amsterdam,2023-02-20,15:15:53.581,buy,BTC,0.00053279,23309,-12.45,EUR,0.03119789,Completed,cb9eef6f-178f-4593-8b84-1c106bc281ac,
Europe/Amsterdam,2023-02-20,15:15:46.637,sell,ETH,-0.00781401,1597.5,12.45,EUR,0.032880975,Completed,59dcec17-45e5-4acc-95ea-ed39cc1b7280,
Europe/Amsterdam,2023-02-20,15:10:02,withdrawal,BTC,-0.00053657,,,BTC,0.00003,Completed,08650a9f-e8b5-4e1c-896a-787811673f94,1MNmb4nKSKwNh9JxpxcXbjLGswRjvBcWqM
Europe/Amsterdam,2023-02-20,15:06:42.711,buy,ETH,0.00781401,1595.7,-12.50,EUR,0.031184243,Completed,3a1270d4-c086-4796-a36e-4c616268f741,
Europe/Amsterdam,2023-02-20,15:06:21.043,buy,BTC,0.00053657,23238,-12.50,EUR,0.03118634,Completed,d9f54a35-baff-4056-8d89-9718c98792ce,
Europe/Amsterdam,2023-02-20,15:05:33,deposit,EUR,25,,,EUR,0,Completed,6e9884d7-bb81-4c24-9e5c-1b6b08ff3d52,NL12***34
Europe/Amsterdam,2023-01-30,07:36:16,withdrawal,EUR,-24.63,,,EUR,0,Completed,d331b54f-c9d9-4061-a244-aa6fba4d35e9,NL12***34
Europe/Amsterdam,2023-01-30,07:33:18.461,sell,XLM,-286.98,0.086047,24.63,EUR,0.06376806,Completed,1aadd126-2b25-4257-87f9-57ceafaed70b,
Europe/Amsterdam,2023-01-30,07:28:30,deposit,XLM,286.98,,,,,Completed,51f92df8-6abb-42de-b07f-4b46f2af3603,
Europe/Amsterdam,2023-01-09,17:19:11,withdrawal,USDT,-32.156874000000003,,,USDT,5.4,Completed,1d0165bb-065f-4f0d-ba44-fb137534e010,0xaeC107aC155cA21A896888fe486de410c422424a
Europe/Amsterdam,2023-01-09,17:16:29.831,buy,USDT,32.156874,0.9306,-30.00,EUR,0.0748130556,Completed,810752da-c633-41ae-9c61-9fb13ed6e742,
Europe/Amsterdam,2023-01-09,17:16:19,deposit,EUR,30,,,EUR,0,Completed,695b7e39-872c-4a4e-bcbb-2f1620391351,NL12***34
Europe/Amsterdam,2022-11-14,10:48:36,staking,ETH,0.00001819,,,,,Distributed,6661d3a1-2fcc-43f8-a387-dc966671e51c,
Europe/Amsterdam,2022-11-14,10:48:36,staking,BTC,0.0000009,,,,,Distributed,193c76df-d27b-4ecf-b92c-47b5703239c2,
Europe/Amsterdam,2022-11-14,10:48:35,staking,ADA,0.120549,,,,,Distributed,382b7971-12c3-41dc-a408-846e8bb71268,
Europe/Amsterdam,2022-11-07,18:27:00,staking,ETH,0.00001819,,,,,Distributed,7910e358-24f4-44eb-8855-d9f3c1270e02,
Europe/Amsterdam,2022-11-07,18:27:00,staking,BTC,0.0000009,,,,,Distributed,6d258206-16a7-42d7-ab66-e9f6bc92e199,
Europe/Amsterdam,2022-11-07,18:26:59,staking,ADA,0.120452,,,,,Distributed,bd082471-7517-4fe0-9962-6edfb24501a3,
Europe/Amsterdam,2022-10-31,14:59:07,staking,ETH,0.00001727,,,,,Distributed,c8b3831c-7835-4eda-9014-fc22d01354f3,
Europe/Amsterdam,2022-10-31,14:59:07,staking,BTC,0.00000084,,,,,Distributed,62e4bd11-d9d3-45f6-afd5-65e364896edb,
Europe/Amsterdam,2022-10-31,14:59:07,staking,ADA,0.120356,,,,,Distributed,34e04cee-8d33-4276-8719-bed55a99f4e7,
Timezone,Date,Time,Type,Currency,Amount,Quote Currency,Quote Price,Received / Paid Currency,Received / Paid Amount,Fee currency,Fee amount,Status,Transaction ID,Address
Europe/Amsterdam,2023-11-30,11:37:41,withdrawal,ETH,-0.010713949999999999,,,,,ETH,1,Completed,552f318e-061a-42f7-b543-e657e99576e0,0xaeC107aC155cA21A896888fe486de410c422424a
Europe/Amsterdam,2023-11-30,11:36:46.620,buy,ETH,0.0053543,EUR,1862.8,EUR,-10.00,EUR,0.02600996,Completed,953ddfc4-3127-4210-9654-4edb61dcc851,
Europe/Amsterdam,2023-11-30,11:33:24,deposit,EUR,10,,,,,EUR,0,Completed,fee8dd13-c076-447d-9a56-25e7e95aac23,NL12***34
Europe/Amsterdam,2023-11-30,11:32:10.174,buy,ETH,0.00258836,EUR,1863,EUR,-4.83,EUR,0.00788532,Completed,1fda028d-726f-4d48-ad18-e814c2dc9d9a,
Europe/Amsterdam,2023-11-30,11:31:40.720,buy,ETH,0.00277129,EUR,1863,EUR,-5.18,EUR,0.01708673,Completed,9844e9b6-d22f-4175-b821-56e152dcee9a,
Europe/Amsterdam,2023-11-30,11:30:47,deposit,EUR,10,,,,,EUR,0,Completed,f6c5c439-5d9d-43d2-ae95-a8a44e275d4a,NL12***34
Europe/Amsterdam,2023-11-30,11:24:44.529,buy,BTC,0.00054923,EUR,34580,EUR,-19.03,EUR,0.0376266,Completed,c302fd2c-ad10-444a-8d2c-0972d447f350,
Europe/Amsterdam,2023-11-30,11:16:50.947,buy,BTC,0.00017214,EUR,34544,EUR,-5.96,EUR,0.01359584,Completed,d905ab8b-b5fb-4ba1-b571-d4a8fa1dc06f,
Europe/Amsterdam,2023-11-30,11:15:55,deposit,EUR,25,,,,,EUR,0,Completed,29265166-93c8-4394-98b0-1cf847106e5b,NL12***34
Europe/Amsterdam,2023-05-19,11:10:52,withdrawal,BTC,-0.0009999,,,,,BTC,0.0002,Completed,8cf76bc7-5ed5-41c6-92b8-640b27493f36,1MNmb4nKSKwNh9JxpxcXbjLGswRjvBcWqM
Europe/Amsterdam,2023-05-19,10:29:44.141,buy,BTC,0.0009999,EUR,24940,EUR,-25.00,EUR,0.062494,Completed,4578d26a-eab0-48b5-bd09-32a2a004f31a,
Europe/Amsterdam,2023-05-19,10:29:03,deposit,EUR,25,,,,,EUR,0,Completed,96f925d1-fd15-4788-ae60-853c6829a8eb,NL12***34
Europe/Amsterdam,2023-02-20,15:16:18,withdrawal,BTC,-0.00053279,,,,,BTC,0.00003,Completed,dc4e09d7-db18-4331-8baf-a71b9a481d43,1MNmb4nKSKwNh9JxpxcXbjLGswRjvBcWqM
Europe/Amsterdam,2023-02-20,15:15:53.581,buy,BTC,0.00053279,EUR,23309,EUR,-12.45,EUR,0.03119789,Completed,cb9eef6f-178f-4593-8b84-1c106bc281ac,
Europe/Amsterdam,2023-02-20,15:15:46.637,sell,ETH,-0.00781401,EUR,1597.5,EUR,12.45,EUR,0.032880975,Completed,59dcec17-45e5-4acc-95ea-ed39cc1b7280,
Europe/Amsterdam,2023-02-20,15:10:02,withdrawal,BTC,-0.00053657,,,,,BTC,0.00003,Completed,08650a9f-e8b5-4e1c-896a-787811673f94,1MNmb4nKSKwNh9JxpxcXbjLGswRjvBcWqM
Europe/Amsterdam,2023-02-20,15:06:42.711,buy,ETH,0.00781401,EUR,1595.7,EUR,-12.50,EUR,0.031184243,Completed,3a1270d4-c086-4796-a36e-4c616268f741,
Europe/Amsterdam,2023-02-20,15:06:21.043,buy,BTC,0.00053657,EUR,23238,EUR,-12.50,EUR,0.03118634,Completed,d9f54a35-baff-4056-8d89-9718c98792ce,
Europe/Amsterdam,2023-02-20,15:05:33,deposit,EUR,25,,,,,EUR,0,Completed,6e9884d7-bb81-4c24-9e5c-1b6b08ff3d52,NL12***34
Europe/Amsterdam,2023-01-30,07:36:16,withdrawal,EUR,-24.63,,,,,EUR,0,Completed,d331b54f-c9d9-4061-a244-aa6fba4d35e9,NL12***34
Europe/Amsterdam,2023-01-30,07:33:18.461,sell,XLM,-286.98,EUR,0.086047,EUR,24.63,EUR,0.06376806,Completed,1aadd126-2b25-4257-87f9-57ceafaed70b,
Europe/Amsterdam,2023-01-30,07:28:30,deposit,XLM,286.98,,,,,,,Completed,51f92df8-6abb-42de-b07f-4b46f2af3603,
Europe/Amsterdam,2023-01-09,17:19:11,withdrawal,USDT,-32.156874000000003,,,,,USDT,5.4,Completed,1d0165bb-065f-4f0d-ba44-fb137534e010,0xaeC107aC155cA21A896888fe486de410c422424a
Europe/Amsterdam,2023-01-09,17:16:29.831,buy,USDT,32.156874,EUR,0.9306,EUR,-30.00,EUR,0.0748130556,Completed,810752da-c633-41ae-9c61-9fb13ed6e742,
Europe/Amsterdam,2023-01-09,17:16:19,deposit,EUR,30,,,,,EUR,0,Completed,695b7e39-872c-4a4e-bcbb-2f1620391351,NL12***34
Europe/Amsterdam,2022-11-14,10:48:36,staking,ETH,0.00001819,,,,,ETH,,Distributed,6661d3a1-2fcc-43f8-a387-dc966671e51c,
Europe/Amsterdam,2022-11-14,10:48:36,staking,BTC,0.0000009,,,,,BTC,,Distributed,193c76df-d27b-4ecf-b92c-47b5703239c2,
Europe/Amsterdam,2022-11-14,10:48:35,staking,ADA,0.120549,,,,,ADA,,Distributed,382b7971-12c3-41dc-a408-846e8bb71268,
Europe/Amsterdam,2022-11-07,18:27:00,staking,ETH,0.00001819,,,,,ETH,,Distributed,7910e358-24f4-44eb-8855-d9f3c1270e02,
Europe/Amsterdam,2022-11-07,18:27:00,staking,BTC,0.0000009,,,,,BTC,,Distributed,6d258206-16a7-42d7-ab66-e9f6bc92e199,
Europe/Amsterdam,2022-11-07,18:26:59,staking,ADA,0.120452,,,,,ADA,,Distributed,bd082471-7517-4fe0-9962-6edfb24501a3,
Europe/Amsterdam,2022-10-31,14:59:07,staking,ETH,0.00001727,,,,,ETH,,Distributed,c8b3831c-7835-4eda-9014-fc22d01354f3,
Europe/Amsterdam,2022-10-31,14:59:07,staking,BTC,0.00000084,,,,,BTC,,Distributed,62e4bd11-d9d3-45f6-afd5-65e364896edb,
Europe/Amsterdam,2022-10-31,14:59:07,staking,ADA,0.120356,,,,,ADA,,Distributed,34e04cee-8d33-4276-8719-bed55a99f4e7,
8 changes: 5 additions & 3 deletions src/converters/bitvavoConverter.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export class BitvavoConverter extends AbstractConverter {
fee: record.feeAmount,
quantity: record.amount,
type: GhostfolioOrderType[record.type],
unitPrice: record.price,
unitPrice: record.quotePrice,
currency: "EUR",
dataSource: "YAHOO",
date: date.format("YYYY-MM-DDTHH:mm:ssZ"),
Expand Down Expand Up @@ -130,8 +130,10 @@ export class BitvavoConverter extends AbstractConverter {
"type",
"currency",
"amount",
"price",
"amountReceivedPaid",
"quoteCurrency",
"quotePrice",
"receivedPaidCurrency",
"receivedPaidAmount",
"feeCurrency",
"feeAmount",
"status",
Expand Down
6 changes: 4 additions & 2 deletions src/models/bitvavoRecord.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ export class BitvavoRecord {
type: string;
currency: string;
amount: number;
price: number;
amountReceivedPaid: number;
quoteCurrency: string;
quotePrice: number;
receivedPaidCurrency: string
receivedPaidAmount: number;
feeCurrency: string;
feeAmount: number;
status: string;
Expand Down
2 changes: 1 addition & 1 deletion src/watcher.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ chokidar

// Prep header set.
const headers: Map<string, string> = new Map<string, string>();
headers.set(`Timezone,Date,Time,Type,Currency,Amount,Price (EUR),EUR received / paid,Fee currency,Fee amount,Status,Transaction ID,Address`, "bitvavo");
headers.set(`Timezone,Date,Time,Type,Currency,Amount,Quote Currency,Quote Price,Received / Paid Currency,Received / Paid Amount,Fee currency,Fee amount,Status,Transaction ID,Address`, "bitvavo");
headers.set(`Transaction Time (CET),Transaction Category,Transaction Type,Asset Id,Asset Name,Asset Currency,Transaction Currency,Currency Pair,Exchange Rate,Transaction Amount,Trade Amount,Trade Price,Trade Quantity,Cash Balance Amount,Profit And Loss Amount,Profit And Loss Currency`, "bux");
headers.set(`Datum,Tijd,Valutadatum,Product,ISIN,Omschrijving,FX,Mutatie,,Saldo,,Order Id`, "degiro");
headers.set(`Date,Type,Details,Amount,Units,Realized Equity Change,Realized Equity,Balance,Position ID,Asset type,NWA`, "etoro");
Expand Down

0 comments on commit a6f1de9

Please sign in to comment.