From d602d78621417c31f7bc380544598c9fa7f124ab Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Wed, 1 Jan 2025 21:38:00 -0800 Subject: [PATCH] container: hledger-flow: algorand: add network to subaccounts - Creates per-wallet / per-account compliance for IRS Rev. Proc. 2024-28 - Needed for wallets that may share the same subaccount name on the same device but are entirely different wallets that support different networks and/or assets within that network. --- .../algorand/algorand-shared.rules | 26 +++++++++---------- .../algorand/rules.d/spam.rules | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/container/src/hledger-flow/accounts/blockchain-explorers/algorand/algorand-shared.rules b/container/src/hledger-flow/accounts/blockchain-explorers/algorand/algorand-shared.rules index 3d6b432..3e726bc 100644 --- a/container/src/hledger-flow/accounts/blockchain-explorers/algorand/algorand-shared.rules +++ b/container/src/hledger-flow/accounts/blockchain-explorers/algorand/algorand-shared.rules @@ -26,7 +26,7 @@ comment type:%tx_type, subaccount_address:%subaccount_address, sender:%sender, r # TODO: non-static symbol for asset support -account1 assets:%account_name:%subaccount_name:ALGO +account1 assets:%account_name:%subaccount_name:algorand:ALGO amount %amount_ ALGO # NOTE: use custom rules for default non-equity IN/OUT @@ -34,16 +34,16 @@ amount %amount_ ALGO # Default transfers as equity accounts if %direction ^IN$ & %to_self ^false$ - account2 equity:%account_name:%subaccount_name:withdrawal:ALGO + account2 equity:%account_name:%subaccount_name:algorand:withdrawal:ALGO if %direction ^OUT$ & %to_self ^false$ - account2 equity:%account_name:%subaccount_name:deposit:ALGO + account2 equity:%account_name:%subaccount_name:algorand:deposit:ALGO # TODO: when depositing to AlgoFi and/or related defi, use accounts payable instead of equity if %to_self ^true$ - account2 assets:%account_name:%subaccount_name:ALGO + account2 assets:%account_name:%subaccount_name:algorand:ALGO if %direction ^OUT$ & %to_self ^false$ @@ -55,9 +55,9 @@ if %direction ^OUT$ if %direction ^OUT$ & %fee [1-9] - account3 assets:%account_name:%subaccount_name:ALGO + account3 assets:%account_name:%subaccount_name:algorand:ALGO amount3 -%fee ALGO - account4 expenses:%account_name:%subaccount_name:fees:ALGO + account4 expenses:%account_name:%subaccount_name:algorand:fees:ALGO amount4 %fee ALGO comment type:%tx_type, subaccount_address:%subaccount_address, sender:%sender, receiver:%receiver, txid:%id, to_self:%to_self, direction:%direction, taxed_as:SPEND comment3 %round_time +0000,SPEND,%account_name:%subaccount_name:algorand,ALGO,%fee,USD,,FEE @@ -99,7 +99,7 @@ if %direction ^IN$ & %amount_ [1-9] & %sender (^UD33QBPIM4ZO4B2WK5Y5DYT5J5LYY5FA3IF3G4AVYSCWLCSMS5NYDRW6GE$|^UAME4M7T2NWECVNCUDGQX6LJ7OVDLZP234GFQL3TH6YZUPRV3VF5NGRSRI$|^7K5TT4US7M3FM7L3XBJXSXLJGF2WCXPBV2YZJJO2FH46VCZOS3ICJ7E4QU$|^SAHBJDRHHRR72JHTWSXZR5VHQQUVC7S757TJZI656FWSDO3TZZWV3IGJV4$|^B6D7YFR7NUNZAA4E7OIHME4VUX4R554DMDIX3QM7JML33AMXXILRPJJM4M$|^75X4V7CEN6HW3EYSJEJLWDNVX3BOJPPEHU2S34FSEKIN5WEB2OZN2VL5T4$|^2K24MUDRJPOOZBUTE5WW44WCZZUPVWNYWVWG4Z2Z2ZZVCYJPVDWRVHVJEQ$) comment type:%tx_type, subaccount_address:%subaccount_address, sender:%sender, receiver:%receiver, txid:%id, to_self:%to_self, direction:%direction, taxed_as:INCOME - account2 income:%account_name:%subaccount_name:rewards:governance:ALGO + account2 income:%account_name:%subaccount_name:algorand:rewards:governance:ALGO comment2 %round_time +0000,INCOME,%account_name:%subaccount_name:algorand,ALGO,%amount_,USD,,STAKING # ---------------------------------------------------------------------------- # @@ -109,9 +109,9 @@ if %direction ^IN$ if %direction ^OUT$ & %to_self ^false$ & %sender_rewards [1-9] - account7 assets:%account_name:%subaccount_name:ALGO + account7 assets:%account_name:%subaccount_name:algorand:ALGO amount7 %sender_rewards ALGO - account8 income:%account_name:%subaccount_name:rewards:ALGO + account8 income:%account_name:%subaccount_name:algorand:rewards:ALGO amount8 -%sender_rewards ALGO comment type:%tx_type, subaccount_address:%subaccount_address, sender:%sender, receiver:%receiver, txid:%id, to_self:%to_self, direction:%direction, taxed_as:INCOME comment7 %round_time +0000,INCOME,%account_name:%subaccount_name:algorand,ALGO,%sender_rewards,USD,,STAKING @@ -130,9 +130,9 @@ if %direction ^OUT$ if %direction ^IN$ & %to_self ^false$ & %receiver_rewards [1-9] - account5 assets:%account_name:%subaccount_name:ALGO + account5 assets:%account_name:%subaccount_name:algorand:ALGO amount5 %receiver_rewards ALGO - account6 income:%account_name:%subaccount_name:rewards:ALGO + account6 income:%account_name:%subaccount_name:algorand:rewards:ALGO amount6 -%receiver_rewards ALGO comment type:%tx_type, subaccount_address:%subaccount_address, sender:%sender, receiver:%receiver, txid:%id, to_self:%to_self, direction:%direction, taxed_as:INCOME comment5 %round_time +0000,INCOME,%account_name:%subaccount_name:algorand,ALGO,%receiver_rewards,USD,,STAKING @@ -150,9 +150,9 @@ if %direction ^IN$ if %to_self ^true$ & %sender_rewards [1-9] - account3 assets:%account_name:%subaccount_name:ALGO + account3 assets:%account_name:%subaccount_name:algorand:ALGO amount3 %sender_rewards ALGO - account4 income:%account_name:%subaccount_name:rewards:ALGO + account4 income:%account_name:%subaccount_name:algorand:rewards:ALGO amount4 -%sender_rewards ALGO comment type:%tx_type, subaccount_address:%subaccount_address, sender:%sender, receiver:%receiver, txid:%id, to_self:%to_self, direction:%direction, taxed_as:INCOME comment3 %round_time +0000,INCOME,%account_name:%subaccount_name:algorand,ALGO,%sender_rewards,USD,,STAKING diff --git a/container/src/hledger-flow/accounts/blockchain-explorers/algorand/rules.d/spam.rules b/container/src/hledger-flow/accounts/blockchain-explorers/algorand/rules.d/spam.rules index a910992..f691cc9 100644 --- a/container/src/hledger-flow/accounts/blockchain-explorers/algorand/rules.d/spam.rules +++ b/container/src/hledger-flow/accounts/blockchain-explorers/algorand/rules.d/spam.rules @@ -25,7 +25,7 @@ if %direction ^IN$ & %to_self ^false$ & %amount_ [1-9] & %sender (^OW6YS3ZPSIZA4W3IKS6GDESOVIXGFE3I5MA5CBLQB7XQHJLAQRXBGYYI5A$|^FGU3MBZAUFYVYO2JC33UBHGNDEOFNA5LSMXERVUO6MJEBGH6RN3OYACOTM$|^ALERTFAKEKMGANB2VGCH5FWTDGVUEOX4C4DV2WFIERWFWSFBPX6FS2KALE$|^53PFEZRQJV5CAZUR2R6V2KEIF52HSXJIM3HPEI6CMD6SEAO55LTMHNITHA$|^JTQH3HPNMRXWVZAIFNYMNSYWTBIEVGY2RJXBSGIJ5GQDF6NCWSMKOB4444$|^AIRDROP26U5YYAYXAZILARW44ZDEGKSUI2IFZPOFTF3APEB77VVS5YXH7M$|^WARN666I6ITOTBIFMYOOYDAT2JA63QQO2Y6MJCNER5YAF4L6MQO7W6SCAM$|^X6JHSKTOBFZE5WMGODPZFYEF6VHLEDICXF7GHMO62CUNWGOGN5OZXPKKMI$|^5ZTFAAE5XSZXQSE2VSYNP2IDQTODCAWJD5YXMPIRYRDVKE3XZSL7FXHCSU$|^RULDAS634B3B4R3UZP3UXKJ5IEEQZYRBP34JUAZOTEJY7XTMAHBKPRARGY$) - account2 income:%account_name:%subaccount_name:spam:ALGO + account2 income:%account_name:%subaccount_name:algorand:spam:ALGO comment type:%tx_type, subaccount_address:%subaccount_address, sender:%sender, receiver:%receiver, txid:%id, to_self:%to_self, direction:%direction, taxed_as:INCOME comment2 %round_time +0000,INCOME,%account_name:%subaccount_name:algorand,ALGO,%amount_,USD,,SPAM