From 0a2d16098cb4c4fa709067867c94664598785dd6 Mon Sep 17 00:00:00 2001
From: Aaron Fiore <founder@evergreencrypto.co>
Date: Fri, 7 Feb 2025 00:49:49 -0800
Subject: [PATCH] hledger-flow: ethereum-based: add DeFi swapper tag

Adds the protocol or platform that conducts the swap.
---
 .../rules.d/lending.d/aave.rules              | 22 +++++++++----------
 .../rules.d/lending.d/compound.rules          | 10 ++++-----
 .../ethereum-based/rules.d/swap.d/1inch.rules |  6 ++---
 .../rules.d/swap.d/airswap.rules              |  8 +++----
 .../rules.d/swap.d/metamask.rules             | 12 +++++-----
 .../rules.d/swap.d/uniswap.rules              |  8 +++----
 6 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/lending.d/aave.rules b/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/lending.d/aave.rules
index a915dea..13a1961 100644
--- a/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/lending.d/aave.rules
+++ b/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/lending.d/aave.rules
@@ -65,7 +65,7 @@
 if %from_address (^0x028171bca77440897b824ca71d1c56cac55b68a3$|^0x3ed3b47dd13ec9a98b44e6204a523e766b225811$|^0x9ff58f4ffb29fa2266ab25e75e2a8b3503311656$|^0xbcca60bb61934080951369a648fb03df4f96263c$|^0xd37ee7e4f452c6638c96536e68090de8cbcdb583$)
 & %amount_ [1-9]
   account2 liabilities:%account_name:%subaccount_name:%blockchain:receivable:loans:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, swapper:aave, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,BORROW,%account_name:%subaccount_name:%blockchain,%symbol,%amount_,,,
 
 if %from_address ^0x0000000000000000000000000000000000000000$
@@ -81,7 +81,7 @@ if %from_address ^0x0000000000000000000000000000000000000000$
 if %to_address (^0x028171bca77440897b824ca71d1c56cac55b68a3$|^0x3ed3b47dd13ec9a98b44e6204a523e766b225811$|^0x9ff58f4ffb29fa2266ab25e75e2a8b3503311656$|^0xbcca60bb61934080951369a648fb03df4f96263c$|^0xd37ee7e4f452c6638c96536e68090de8cbcdb583$)
 & %amount_ [1-9]
   account2 liabilities:%account_name:%subaccount_name:%blockchain:receivable:loans:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, swapper:aave, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,REPAY,%account_name:%subaccount_name:%blockchain,%symbol,%amount_,,,
 
 if %to_address ^0x0000000000000000000000000000000000000000$
@@ -97,7 +97,7 @@ if %to_address ^0xbcca60bb61934080951369a648fb03df4f96263c$
 & %contract_address ^0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48$
 & %amount_ [1-9]
   account2 assets:%account_name:%subaccount_name:%blockchain:payable:loans:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, swapper:aave, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,SELL,%account_name:%subaccount_name:%blockchain,%symbol,%amount_
 
 #
@@ -115,7 +115,7 @@ if %from_address (^0x0000000000000000000000000000000000000000$|^0x028171bca77440
 & %type ^erc-20$
 & %amount_ [1-9]
   account2 assets:%account_name:%subaccount_name:%blockchain:payable:loans:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, swapper:aave, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,BUY,%account_name:%subaccount_name:%blockchain,%symbol,%amount_
 
 if %to_address (^0x0000000000000000000000000000000000000000$|^0x028171bca77440897b824ca71d1c56cac55b68a3$|^0x030ba81f1c18d280636f32af80b9aad02cf0854e$|^0x35f6b052c598d933d69a4eec4d04c73a191fe6c2$|^0x3ed3b47dd13ec9a98b44e6204a523e766b225811$|^0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c$|^0x4da27a545c0c5b758a6ba100e3a049001de870f5$|^0x7d2768de32b0b80b7a3454c06bdac94a69ddc7a9$|^0x9ff58f4fFB29fA2266Ab25e75e2A8b3503311656$)
@@ -123,7 +123,7 @@ if %to_address (^0x0000000000000000000000000000000000000000$|^0x028171bca7744089
 & %type ^erc-20$
 & %amount_ [1-9]
   account2 assets:%account_name:%subaccount_name:%blockchain:payable:loans:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, swapper:aave, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,SELL,%account_name:%subaccount_name:%blockchain,%symbol,%amount_
 
 if %to_address (^0x028171bca77440897b824ca71d1c56cac55b68a3$|^0x030ba81f1c18d280636f32af80b9aad02cf0854e$|^0x35f6b052c598d933d69a4eec4d04c73a191fe6c2$|^0x3ed3b47dd13ec9a98b44e6204a523e766b225811$|^0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c$|^0x4da27a545c0c5b758a6ba100e3a049001de870f5$|^0x7d2768de32b0b80b7a3454c06bdac94a69ddc7a9$|^0x9ff58f4ffb29fa2266ab25e75e2a8b3503311656$)
@@ -134,7 +134,7 @@ if %to_address (^0x028171bca77440897b824ca71d1c56cac55b68a3$|^0x030ba81f1c18d280
 & %fees [1-9]
   account1
   account2
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, subaccount_address:%subaccount_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, swapper:aave, subaccount_address:%subaccount_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2
   comment3 %tx_hash,%date +0000,FEE,%account_name:%subaccount_name:%blockchain,%symbol,%fees
 # NOTE: must keep comment2 blank and comment3 filled
@@ -192,7 +192,7 @@ if %direction ^OUT$
   amount -%amount_ %symbol
   account1 equity:%account_name:%subaccount_name:%blockchain:receivable:loans:%symbol
   account2 equity:%account_name:%subaccount_name:%blockchain:receivable:loans:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, swapper:aave, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,SELL,%account_name:%subaccount_name:%blockchain,%symbol,%amount_
 
 if %direction ^IN$
@@ -203,7 +203,7 @@ if %direction ^IN$
 & %amount_ [1-9]
   account1 equity:%account_name:%subaccount_name:%blockchain:receivable:loans:%symbol
   account2 equity:%account_name:%subaccount_name:%blockchain:receivable:loans:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, swapper:aave, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,BUY,%account_name:%subaccount_name:%blockchain,%symbol,%amount_
 
 if %direction ^OUT$
@@ -215,7 +215,7 @@ if %direction ^OUT$
 & %fees [1-9]
   account1
   account2
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, subaccount_address:%subaccount_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, swapper:aave, subaccount_address:%subaccount_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2
   comment3 %tx_hash,%date +0000,FEE,%account_name:%subaccount_name:%blockchain,%symbol,%fees
 # NOTE: must keep comment2 blank and comment3 filled
@@ -231,7 +231,7 @@ if %to_address ^0x0000000000000000000000000000000000000000$
 & %blockchain ^ethereum$
 & %type ^erc-20$
 & %amount_ [1-9]
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, swapper:aave, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction
   comment2
 
 if %from_address ^0x0000000000000000000000000000000000000000$
@@ -239,7 +239,7 @@ if %from_address ^0x0000000000000000000000000000000000000000$
 & %blockchain ^ethereum$
 & %type ^erc-20$
 & %amount_ [1-9]
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, swapper:aave, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction
   comment2
 
 # vim: sw=2 sts=2 si ai et
diff --git a/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/lending.d/compound.rules b/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/lending.d/compound.rules
index 5c5f758..05eba05 100644
--- a/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/lending.d/compound.rules
+++ b/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/lending.d/compound.rules
@@ -42,14 +42,14 @@ if %from_address (^0x39aa39c021dfbae8fac545936693ac917d5e7563$|^0x4ddc2d19394892
 & %blockchain ^ethereum$
 & %type (^erc-20$|^normal$)
 & %amount_ [1-9]
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, swapper:compound, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,BUY,%account_name:%subaccount_name:%blockchain,%symbol,%amount_
 
 if %to_address (^0x39aa39c021dfbae8fac545936693ac917d5e7563$|^0x4ddc2d193948926d02f9b1fe9e1daa0718270ed5$|^0x5d3a536e4d6dbd6114cc1ead35777bab948e3643$|^0xf650c3d88d12db855b8bf7d11be6c55a4e07dcc9$)
 & %blockchain ^ethereum$
 & %type (^erc-20$|^normal$)
 & %amount_ [1-9]
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, swapper:compound, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,SELL,%account_name:%subaccount_name:%blockchain,%symbol,%amount_
 
 if %to_address (^0x39aa39c021dfbae8fac545936693ac917d5e7563$|^0x4ddc2d193948926d02f9b1fe9e1daa0718270ed5$|^0x5d3a536e4d6dbd6114cc1ead35777bab948e3643$|^0xf650c3d88d12db855b8bf7d11be6c55a4e07dcc9$)
@@ -57,7 +57,7 @@ if %to_address (^0x39aa39c021dfbae8fac545936693ac917d5e7563$|^0x4ddc2d193948926d
 & %type (^normal$)
 & %symbol ^ETH$
 & %fees [1-9]
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, swapper:compound, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment3 %tx_hash,%date +0000,FEE,%account_name:%subaccount_name:%blockchain,%symbol,%fees
 
 #
@@ -80,7 +80,7 @@ if %contract_address ^0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48$
 & %type ^erc-20$
 & %amount_ [1-9]
   account2 liabilities:%account_name:%subaccount_name:%blockchain:receivable:loans:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:BORROW
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, swapper:compound, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:BORROW
   comment2 %date +0000,BORROW,%account_name:%subaccount_name:%blockchain,%symbol,%amount_,USD,,
 
 if %contract_address ^0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48$
@@ -89,7 +89,7 @@ if %contract_address ^0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48$
 & %type ^erc-20$
 & %amount_ [1-9]
   account2 liabilities:%account_name:%subaccount_name:%blockchain:receivable:loans:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:REPAY
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, swapper:compound, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:REPAY
   comment2 %date +0000,REPAY,%account_name:%subaccount_name:%blockchain,%symbol,%amount_,USD,,
 
 #
diff --git a/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/swap.d/1inch.rules b/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/swap.d/1inch.rules
index d0e5a72..767f43a 100644
--- a/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/swap.d/1inch.rules
+++ b/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/swap.d/1inch.rules
@@ -28,7 +28,7 @@ if %from_address ^0x1111111254eeb25477b68fb85ed929f73a960582$
 & %type (^erc-20$)
 & %amount_ [1-9]
   account2 equity:%account_name:%subaccount_name:conversion:%blockchain:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, %blockid,%block_hash, index:%tx_index, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, %blockid,%block_hash, index:%tx_index, swapper:1inch, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,BUY,%account_name:%subaccount_name:%blockchain,%symbol,%amount_
 
 # SELL/FEE
@@ -37,7 +37,7 @@ if %to_address ^0x1111111254eeb25477b68fb85ed929f73a960582$
 & %type (^erc-20$|^normal$)
 & %fees [1-9]
   account2 equity:%account_name:%subaccount_name:conversion:%blockchain:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, %blockid,%block_hash, index:%tx_index, method:%method_id, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, %blockid,%block_hash, index:%tx_index, method:%method_id, swapper:1inch, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,SELL,%account_name:%subaccount_name:%blockchain,%symbol,%amount_
   comment3 %tx_hash,%date +0000,FEE,%account_name:%subaccount_name:%blockchain,%symbol,%fees
 
@@ -56,6 +56,6 @@ if %to_address ^0x1111111254eeb25477b68fb85ed929f73a960582$
 & %blockchain ^ethereum$
 & %type ^erc-20$
 & %fees [1-9]
-  comment blockchain:%blockchain, type:%type, block:%block_number, %blockid,%block_hash, index:%tx_index, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, %blockid,%block_hash, index:%tx_index, swapper:1inch, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
 
 # vim: sw=2 sts=2 si ai et
diff --git a/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/swap.d/airswap.rules b/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/swap.d/airswap.rules
index 198abdd..7371ae6 100644
--- a/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/swap.d/airswap.rules
+++ b/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/swap.d/airswap.rules
@@ -30,7 +30,7 @@ if %from_address (^0x74de5d4fcbf63e00296fd95d33236b9794016631$)
 & %type (^erc-20$|^internal$)
 & %amount_ [1-9]
   account2 equity:%account_name:%subaccount_name:conversion:%blockchain:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, swapper:airswap, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,BUY,%account_name:%subaccount_name:%blockchain,%symbol,%amount_
 
 # BUY (remove unused tags)
@@ -38,7 +38,7 @@ if %from_address (^0x74de5d4fcbf63e00296fd95d33236b9794016631$)
 & %blockchain ^ethereum$
 & %type ^internal$
 & %amount_ [1-9]
-  comment blockchain:%blockchain, type:%type, block:%block_number, subaccount_address:%subaccount_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, swapper:airswap, subaccount_address:%subaccount_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
 
 # SELL/FEE
 if %to_address (^0x74de5d4fcbf63e00296fd95d33236b9794016631$)
@@ -47,7 +47,7 @@ if %to_address (^0x74de5d4fcbf63e00296fd95d33236b9794016631$)
 & %amount_ [1-9]
 & %fees [1-9]
   account2 equity:%account_name:%subaccount_name:conversion:%blockchain:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, swapper:airswap, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,SELL,%account_name:%subaccount_name:%blockchain,%symbol,%amount_
   comment3 %tx_hash,%date +0000,FEE,%account_name:%subaccount_name:%blockchain,%symbol,%fees
 
@@ -67,6 +67,6 @@ if %to_address (^0x74de5d4fcbf63e00296fd95d33236b9794016631$)
 & %type ^internal$
 & %amount_ [1-9]
 & %fees [1-9]
-  comment blockchain:%blockchain, type:%type, block:%block_number, subaccount_address:%subaccount_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, swapper:airswap, subaccount_address:%subaccount_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
 
 # vim: sw=2 sts=2 si ai et
diff --git a/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/swap.d/metamask.rules b/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/swap.d/metamask.rules
index 3bca066..7694925 100644
--- a/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/swap.d/metamask.rules
+++ b/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/swap.d/metamask.rules
@@ -30,7 +30,7 @@ if %from_address (^0x88e6a0c2ddd26feeb64f039a2c41296fcb3f5640$)
 & %type (^erc-20$|^internal$)
 & %amount_ [1-9]
   account2 equity:%account_name:%subaccount_name:conversion:%blockchain:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, swapper:metamask, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,BUY,%account_name:%subaccount_name:%blockchain,%symbol,%amount_
 
 # BUY (remove unused tags)
@@ -38,7 +38,7 @@ if %from_address (^0x88e6a0c2ddd26feeb64f039a2c41296fcb3f5640$)
 & %blockchain ^ethereum$
 & %type ^internal$
 & %amount_ [1-9]
-  comment blockchain:%blockchain, type:%type, block:%block_number, subaccount_address:%subaccount_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, swapper:metamask, subaccount_address:%subaccount_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
 
 # SELL/FEE
 if %to_address (^0x88e6a0c2ddd26feeb64f039a2c41296fcb3f5640$)
@@ -47,7 +47,7 @@ if %to_address (^0x88e6a0c2ddd26feeb64f039a2c41296fcb3f5640$)
 & %amount_ [1-9]
 & %fees [1-9]
   account2 equity:%account_name:%subaccount_name:conversion:%blockchain:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, swapper:metamask, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,SELL,%account_name:%subaccount_name:%blockchain,%symbol,%amount_
   comment3 %tx_hash,%date +0000,FEE,%account_name:%subaccount_name:%blockchain,%symbol,%fees
 
@@ -67,7 +67,7 @@ if %to_address (^0x88e6a0c2ddd26feeb64f039a2c41296fcb3f5640$)
 & %type ^internal$
 & %amount_ [1-9]
 & %fees [1-9]
-  comment blockchain:%blockchain, type:%type, block:%block_number, subaccount_address:%subaccount_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, swapper:metamask, subaccount_address:%subaccount_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
 
 # Polygon
 
@@ -78,7 +78,7 @@ if %from_address ^0x1a1ec25DC08e98e5E93F1104B5e5cdD298707d31$
 & %blockchain ^polygon$
 & %amount_ [1-9]
   account2 equity:%account_name:%subaccount_name:conversion:%blockchain:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, swapper:metamask, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,BUY,%account_name:%subaccount_name:%blockchain,%symbol,%amount_
 
 if %to_address ^0x1a1ec25DC08e98e5E93F1104B5e5cdD298707d31$
@@ -86,7 +86,7 @@ if %to_address ^0x1a1ec25DC08e98e5E93F1104B5e5cdD298707d31$
 & %amount_ [1-9]
 & %fees [1-9]
   account2 equity:%account_name:%subaccount_name:conversion:%blockchain:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, swapper:metamask, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,SELL,%account_name:%subaccount_name:%blockchain,%symbol,%amount_
   comment3 %tx_hash,%date +0000,FEE,%account_name:%subaccount_name:%blockchain,%symbol,%fees
 
diff --git a/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/swap.d/uniswap.rules b/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/swap.d/uniswap.rules
index b30813c..4d08ed2 100644
--- a/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/swap.d/uniswap.rules
+++ b/container/src/hledger-flow/accounts/blockchain-explorers/ethereum-based/rules.d/swap.d/uniswap.rules
@@ -40,7 +40,7 @@ if %from_address (^0x06729eb2424da47898f935267bd4a62940de5105$|^0x61247d8aca1c48
 & %type (^erc-20$|^internal$)
 & %amount_ [1-9]
   account2 equity:%account_name:%subaccount_name:conversion:%blockchain:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, swapper:uniswap, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,BUY,%account_name:%subaccount_name:%blockchain,%symbol,%amount_
 
 # BUY (remove unused tags)
@@ -48,7 +48,7 @@ if %from_address (^0x06729eb2424da47898f935267bd4a62940de5105$|^0x61247d8aca1c48
 & %blockchain ^ethereum$
 & %type ^internal$
 & %amount_ [1-9]
-  comment blockchain:%blockchain, type:%type, block:%block_number, subaccount_address:%subaccount_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, swapper:uniswap, subaccount_address:%subaccount_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
 
 # SELL/FEE
 if %to_address (^0x06729eb2424da47898f935267bd4a62940de5105$|^0x4c54ff7f1c424ff5487a32aad0b48b19cbaf087f$|^0x61247d8aca1c485a50728e1336d9b26c8339e701$|^0x68b3465833fb72a70ecdf485e0e4c7bd8665fc45$|^0x7a250d5630b4cf539739df2c5dacb4c659f2488d$|^0x881d40237659c251811cec9c364ef91dc08d300c$|^0x9a772018fbd77fcd2d25657e5c547baff3fd7d16$|^0xa5e79baee540f000ef6f23d067cd3ac22c7d9fe6$|^0xb4e16d0168e52d35cacd2c6185b44281ec28c9dc$|^0xe592427a0aece92de3edee1f18e0157c05861564$|^0x3fc91a3afd70395cd496c647d5a6cc9d4b2b7fad$|^0xe42318ea3b998e8355a3da364eb9d48ec725eb45$|^0x09d1d767edf8fa23a64c51fa559e0688e526812f$)
@@ -56,7 +56,7 @@ if %to_address (^0x06729eb2424da47898f935267bd4a62940de5105$|^0x4c54ff7f1c424ff5
 & %type (^erc-20$|^normal$)
 & %fees [1-9]
   account2 equity:%account_name:%subaccount_name:conversion:%blockchain:%symbol
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, method:%method_id, swapper:uniswap, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
   comment2 %tx_hash,%date +0000,SELL,%account_name:%subaccount_name:%blockchain,%symbol,%amount_
   comment3 %tx_hash,%date +0000,FEE,%account_name:%subaccount_name:%blockchain,%symbol,%fees
 
@@ -75,6 +75,6 @@ if %to_address (^0x06729eb2424da47898f935267bd4a62940de5105$|^0x4c54ff7f1c424ff5
 & %blockchain ^ethereum$
 & %type ^erc-20$
 & %fees [1-9]
-  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
+  comment blockchain:%blockchain, type:%type, block:%block_number, blockid:%block_hash, index:%tx_index, swapper:uniswap, subaccount_address:%subaccount_address, contract_address:%contract_address, from_address:%from_address, to_address:%to_address, txid:%tx_hash, direction:%direction, taxed_as:MATCH
 
 # vim: sw=2 sts=2 si ai et