Merge pull request #809 from telosnetwork/806-transfers-to-null-addre…

…ss-are-interpreted-as-contract-deployment-when-they-are-not #806 | Contract Creation transaction fixed
telosnetwork · Aug 6, 2024 · 2e2de91 · 2e2de91
2 parents d9f911a + 9bce31d
commit 2e2de91
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 29 deletions.
diff --git a/src/components/TransactionAction.vue b/src/components/TransactionAction.vue
@@ -2,7 +2,6 @@
 import { computed, ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import { ZERO_ADDRESSES } from 'src/lib/utils';
 import MethodField from 'components/MethodField.vue';
 import AddressField from 'components/AddressField.vue';
 import ValueField from 'components/ValueField.vue';
@@ -26,6 +25,7 @@ const props = defineProps({
             to?: string | null;
             input?: string;
             hash?: string;
+            contractAddress?: string | null;
         },
         required: true,
     },
@@ -46,7 +46,7 @@ onMounted(async () => {
 const setValues = async () => {
     if (propValue.value > 0 && props.trx.input === '0x') {
         transactionCase.value = cases.TLOS_TRANSFER;
-    } else if (props.trx.to === null || props.trx.to === ZERO_ADDRESSES) {
+    } else if (props.trx.to === null || props.trx.contractAddress !== null) {
         transactionCase.value = cases.CONTRACT_CREATION;
     } else {
         transactionCase.value = cases.FUNCTION_CALL;

diff --git a/src/lib/data-export-utils.ts b/src/lib/data-export-utils.ts
@@ -1,33 +1,7 @@
-// import { contractManager, indexerApi, exportApi } from 'src/boot/telosApi'; // FIXME: uncomment this line
-// import { formatTimestamp } from 'src/lib/date-utils'; // FIXME: uncomment this line
-// import { formatWei } from 'src/lib/utils'; // FIXME: uncomment this line
 import { AxiosError } from 'axios';
 import { exportApi } from 'src/boot/telosApi';
 import { EXPORT_DOWNLOAD_TYPES } from 'src/lib/constants';
 
-// import { EvmTransfer } from 'src/antelope/types/EvmTransaction'; // FIXME: uncomment this line
-
-/**
- * Escape a string value which is meant to be entered into a CSV
- *
- * @param value The value to escape
- * @returns The escaped value
- */
-/* // FIXME: uncomment this line
-function escapeCSVValue(value: string) {
-    let escapedVal = value;
-
-    if (
-        escapedVal.includes(',') ||
-        escapedVal.includes('\n') ||
-        escapedVal.includes('"')
-    ) {
-        escapedVal = `"${escapedVal.replace(/"/g, '""')}"`; // Escape quotes
-    }
-
-    return value;
-}*/
-
 /**
  * Download a CSV file of transactions
  *
@@ -101,7 +75,6 @@ export async function downloadCsv(
     }
 
     try {
-        console.log('url: ', url); // FIXME: remove this line
         const { data } = await exportApi.get(url);
         csvContent = data;
     } catch (e) {