diff --git a/rs/cross-chain/scripts/generate_blocklist.py b/rs/cross-chain/scripts/generate_blocklist.py
index bc1ffaed1a7..fc38d2ec6b8 100644
--- a/rs/cross-chain/scripts/generate_blocklist.py
+++ b/rs/cross-chain/scripts/generate_blocklist.py
@@ -28,42 +28,14 @@
 # The blocked addresses are stored in this Rust file by default.
 DEFAULT_BLOCKLIST_FILENAME = 'blocklist.rs'
 
-# Invalid addresses in the OFAC SDN list to be commented out.
-INVALID_ADDRESSES = ['TUCsTq7TofTCJRRoHk6RvhMoS2mJLm5Yzq']
-
 # This prefix is needed for each element in the XML tree.
 PREFIX = '{https://sanctionslistservice.ofac.treas.gov/api/PublicationPreview/exports/XML}'
 
-def extract_addresses(currency, xml_file_path):
-    tree = ET.parse(xml_file_path)
-    root = tree.getroot()
-
-    addresses = []
-
-    # Generate the currency-specific suffix.
-    currency_suffix = 'XBT' if currency == 'BTC' else 'ETH'
-
-    # Iterate over all ID elements.
-    for id_item in root.findall(PREFIX + 'sdnEntry/' + PREFIX + 'idList' + '/' + PREFIX + 'id'):
-        # Put the ID components into a dictionary for simpler handling.
-        id_dict = {}
-        for sub_item in id_item:
-            if sub_item.text.strip():
-                id_dict[sub_item.tag] = sub_item.text
-
-        # Read the address, if any.
-        if id_dict[PREFIX + 'idType'] == DIGITAL_CURRENCY_TYPE_PREFIX + currency_suffix:
-            address = id_dict[PREFIX + 'idNumber']
-            addresses.append(address)
-
-    # Remove duplicates.
-    addresses = list(set(addresses))
-    # Sort the addresses.
-    addresses.sort()
-    return addresses
-
-def write_btc_preamble(blocklist_file):
-    blocklist_file.write('''#[cfg(test)]
+# Handlers for different blocklists.
+class BitcoinBlocklistHandler:
+    
+    def preamble(self):
+        return '''#[cfg(test)]
     mod tests;
     
     use bitcoin::Address;
@@ -73,10 +45,22 @@ def write_btc_preamble(blocklist_file):
 
     /// BTC is not accepted from nor sent to addresses on this list.
     /// NOTE: Keep it sorted!
-    pub const BTC_ADDRESS_BLOCKLIST: &[&str] = &[\n''')
+    pub const BTC_ADDRESS_BLOCKLIST: &[&str] = &[\n'''
+
+    def postamble(self):
+        return '''pub fn is_blocked(address: &Address) -> bool {
+    BTC_ADDRESS_BLOCKLIST
+        .binary_search(&address.to_string().as_ref())
+        .is_ok()
+}'''
 
-def write_eth_preamble(blocklist_file):
-    blocklist_file.write('''#[cfg(test)]
+    def format_address(self, address):
+        return '"' + address + '"'
+
+class EthereumBlocklistHandler:
+
+    def preamble(self):
+        return '''#[cfg(test)]
     mod tests;
     
     use ic_ethereum_types::Address;
@@ -92,47 +76,53 @@ def write_eth_preamble(blocklist_file):
 
     /// ETH is not accepted from nor sent to addresses on this list.
     /// NOTE: Keep it sorted!
-    const ETH_ADDRESS_BLOCKLIST: &[Address] = &[\n''')
+    const ETH_ADDRESS_BLOCKLIST: &[Address] = &[\n'''
 
-def write_btc_postamble(blocklist_file):
-    blocklist_file.write('''pub fn is_blocked(address: &Address) -> bool {
-    BTC_ADDRESS_BLOCKLIST
-        .binary_search(&address.to_string().as_ref())
-        .is_ok()
-}''')
-    
-def write_eth_postamble(blocklist_file):
-    blocklist_file.write('''pub fn is_blocked(address: &Address) -> bool {
+    def postamble(self):
+        return '''pub fn is_blocked(address: &Address) -> bool {
     ETH_ADDRESS_BLOCKLIST.binary_search(address).is_ok()
-}''')
+}'''
+
+    def format_address(self, address):
+        return 'ethereum_address!("' + address[2:] + '")'
+
+
+def extract_addresses(currency, xml_file_path):
+    tree = ET.parse(xml_file_path)
+    root = tree.getroot()
+
+    addresses = []
 
-def store_blocklist(currency, addresses, filename):
+    # Generate the currency-specific suffix.
+    currency_suffix = 'XBT' if currency == 'BTC' else 'ETH'
+
+    # Iterate over all ID elements.
+    for id_item in root.findall(PREFIX + 'sdnEntry/' + PREFIX + 'idList' + '/' + PREFIX + 'id'):
+        # Put the ID components into a dictionary for simpler handling.
+        id_dict = {}
+        for sub_item in id_item:
+            if sub_item.text.strip():
+                id_dict[sub_item.tag] = sub_item.text
+
+        # Read the address, if any.
+        if id_dict[PREFIX + 'idType'] == DIGITAL_CURRENCY_TYPE_PREFIX + currency_suffix:
+            address = id_dict[PREFIX + 'idNumber']
+            addresses.append(address)
+
+    # Remove duplicates.
+    addresses = list(set(addresses))
+    # Sort the addresses.
+    addresses.sort()
+    return addresses
+
+def store_blocklist(blocklist_handler, addresses, filename):
     blocklist_file = open(filename, 'w')
-    
-    if currency == 'BTC':
-        write_btc_preamble(blocklist_file)
-        address_prefix = ''
-        address_suffix = ''
-        offset = 0
-    else:   # currency == 'ETH'
-        write_eth_preamble(blocklist_file)
-        address_prefix = 'ethereum_address!('
-        address_suffix = ')'
-        offset = 2
+    blocklist_file.write(blocklist_handler.preamble())
     for address in addresses:
-        if address in INVALID_ADDRESSES:
-            blocklist_file.write('    // ' + address_prefix + '"' + address[offset:] + '"' + address_suffix + ' (Invalid address prefix)\n')
-            print('Invalid address:', address)
-        else:
-            blocklist_file.write('    ' + address_prefix + '"' + address[offset:] + '"' + address_suffix + ',\n')
-            print(address)
+        blocklist_file.write('    ' + blocklist_handler.format_address(address) + ',\n')
+        print(address)
     blocklist_file.write('];\n\n')
-    
-    if currency == 'BTC':
-        write_btc_postamble(blocklist_file)
-    else:
-        write_eth_postamble(blocklist_file)
-    
+    blocklist_file.write(blocklist_handler.postamble())
     blocklist_file.close()
 
 if __name__ == '__main__':  
@@ -144,10 +134,14 @@ def store_blocklist(currency, addresses, filename):
         if currency not in ['BTC', 'ETH']:
             print('Error: The currency must be BTC or ETH.')
         else:
+            if currency == 'BTC':
+                blocklist_handler = BitcoinBlocklistHandler()
+            else:
+                blocklist_handler = EthereumBlocklistHandler()
             file_path = sys.argv[2]
             print('Extracting addresses from ' + file_path + '...')
             addresses = extract_addresses(currency, file_path)
             print('Done. Found ' + str(len(addresses)) + ' addresses.')
             print('Storing the addresses in the file ' + filename + '...')
-            store_blocklist(currency, addresses, filename)
+            store_blocklist(blocklist_handler, addresses, filename)
             print('Done.')