Skip to content

Commit

Permalink
chore: remove warnings
Browse files Browse the repository at this point in the history
Signed-off-by: Tim Schmidt <[email protected]>
  • Loading branch information
Sheng-Long committed Jul 10, 2024
1 parent 455ca74 commit d01f8aa
Show file tree
Hide file tree
Showing 14 changed files with 122 additions and 260 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,6 @@ async function executeFileTransactions(
} | null = null;
processedChunks.value = 0;
let hasFailed = false;
const group = transaction.transactionId?.validStart?.seconds.toString() || '';
validateTransaction(transaction);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,14 @@ import AppInput from '@renderer/components/ui/AppInput.vue';
import AppCustomIcon from '@renderer/components/ui/AppCustomIcon.vue';
import useTransactionGroupStore, { GroupItem } from '@renderer/stores/storeTransactionGroup';
import { TRANSACTION_MAX_SIZE } from '@main/shared/constants';
import { addGroupItem, editGroupItem, getGroup } from '@renderer/services/transactionGroupsService';
import { addGroupItem, editGroupItem } from '@renderer/services/transactionGroupsService';
import { addGroup, getGroupItem } from '@renderer/services/transactionGroupsService';
import { uint8ArrayToHex } from '@renderer/services/electronUtilsService';
import {
submitTransaction,
addApprovers,
addObservers,
ApiTransaction,
ApiGroupItem,
submitTransactionGroup,
getTransactionsToSign,
getApiGroups,
getApiGroupById,
IGroup,
} from '@renderer/services/organization';
Expand Down Expand Up @@ -94,7 +90,7 @@ const transactionResult = ref<{
} | null>();
const chunksAmount = ref<number | null>(null);
const chunkSize = ref(1024);
const chunkInterval = ref(0.1);
// const chunkInterval = ref(0.1);
const userPassword = ref('');
const signatureKey = ref<Key | KeyList | null>(null);
const isConfirmShown = ref(false);
Expand All @@ -114,9 +110,9 @@ const newGroupId = ref('');
const flattenedSignatureKey = computed(() =>
signatureKey.value ? flattenKeyList(signatureKey.value).map(pk => pk.toStringRaw()) : [],
);
const externalPublicKeysReq = computed(() =>
flattenedSignatureKey.value.filter(pk => !user.publicKeys.includes(pk)),
);
// const externalPublicKeysReq = computed(() =>
// flattenedSignatureKey.value.filter(pk => !user.publicKeys.includes(pk)),
// );
const localPublicKeysReq = computed(() =>
flattenedSignatureKey.value.filter(pk => user.publicKeys.includes(pk)),
);
Expand Down Expand Up @@ -412,11 +408,7 @@ async function sendSignedTransactionsToOrganization() {
);
//TODO: fix to getting actual transactions
const group: IGroup = await getApiGroupById(
user.selectedOrganization.serverUrl,
network.network,
id,
);
const group: IGroup = await getApiGroupById(user.selectedOrganization.serverUrl, id);
toast.success('Transaction submitted successfully');
props.onSubmitted && props.onSubmitted(id, body);
Expand Down Expand Up @@ -503,7 +495,6 @@ async function executeFileTransactions(
} | null = null;
processedChunks.value = 0;
let hasFailed = false;
const group = transaction.transactionId?.validStart?.seconds.toString() || '';
validateTransaction(transaction);
Expand Down Expand Up @@ -638,86 +629,86 @@ async function executeFileTransactions(
}
}
async function chunkFileTransactionForOrganization(
transaction: FileUpdateTransaction | FileAppendTransaction,
chunks: Uint8Array[],
) {
if (!transaction.contents) return [transaction.toBytes()];
if (!isUserLoggedIn(user.personal)) {
throw new Error('User is not logged in');
}
validateTransaction(transaction);
const transactions: Uint8Array[] = [];
const isUpdateTransaction = transaction instanceof FileUpdateTransaction;
// async function chunkFileTransactionForOrganization(
// transaction: FileUpdateTransaction | FileAppendTransaction,
// chunks: Uint8Array[],
// ) {
// if (!transaction.contents) return [transaction.toBytes()];
isChunkingModalShown.value = true;
processedChunks.value = 0;
// if (!isUserLoggedIn(user.personal)) {
// throw new Error('User is not logged in');
// }
if (isUpdateTransaction) {
const updateTransaction = new FileUpdateTransaction()
.setTransactionId(transaction.transactionId!)
.setTransactionValidDuration(180)
.setMaxTransactionFee(transaction.maxTransactionFee || new Hbar(2))
.setFileId(transaction.fileId!)
.setContents(chunks[0]);
transaction.fileMemo && updateTransaction.setFileMemo(transaction.fileMemo);
transaction.keys && transaction.keys.length > 0 && updateTransaction.setKeys(transaction.keys);
transaction.expirationTime && updateTransaction.setExpirationTime(transaction.expirationTime);
transactions[0] = await signTransaction(
updateTransaction.toBytes(),
localPublicKeysReq.value,
user.personal.id,
userPassword.value,
);
// validateTransaction(transaction);
// const transactions: Uint8Array[] = [];
// const isUpdateTransaction = transaction instanceof FileUpdateTransaction;
// isChunkingModalShown.value = true;
// processedChunks.value = 0;
// if (isUpdateTransaction) {
// const updateTransaction = new FileUpdateTransaction()
// .setTransactionId(transaction.transactionId!)
// .setTransactionValidDuration(180)
// .setMaxTransactionFee(transaction.maxTransactionFee || new Hbar(2))
// .setFileId(transaction.fileId!)
// .setContents(chunks[0]);
// transaction.fileMemo && updateTransaction.setFileMemo(transaction.fileMemo);
// transaction.keys && transaction.keys.length > 0 && updateTransaction.setKeys(transaction.keys);
// transaction.expirationTime && updateTransaction.setExpirationTime(transaction.expirationTime);
// transactions[0] = await signTransaction(
// updateTransaction.toBytes(),
// localPublicKeysReq.value,
// user.personal.id,
// userPassword.value,
// );
processedChunks.value++;
}
// processedChunks.value++;
// }
for (let i = isUpdateTransaction ? 1 : 0; i < chunks.length; i++) {
if (!transaction.transactionId) throw new Error('Transaction ID is missing');
if (!transaction.transactionId.accountId)
throw new Error('Account ID in Transaction ID is missing');
// for (let i = isUpdateTransaction ? 1 : 0; i < chunks.length; i++) {
// if (!transaction.transactionId) throw new Error('Transaction ID is missing');
// if (!transaction.transactionId.accountId)
// throw new Error('Account ID in Transaction ID is missing');
const transactionId = createTransactionId(
transaction.transactionId.accountId,
transaction.transactionId.validStart?.plusNanos(i * chunkInterval.value * 1000000000) ||
new Date(),
);
// const transactionId = createTransactionId(
// transaction.transactionId.accountId,
// transaction.transactionId.validStart?.plusNanos(i * chunkInterval.value * 1000000000) ||
// new Date(),
// );
const appendTransaction = new FileAppendTransaction()
.setTransactionId(transactionId)
.setTransactionValidDuration(180)
.setMaxTransactionFee(transaction.maxTransactionFee || new Hbar(2))
.setFileId(transaction.fileId!)
.setContents(chunks[i])
.setMaxChunks(1)
.setChunkSize(chunkSize.value);
transactions.push(
await signTransaction(
appendTransaction.toBytes(),
localPublicKeysReq.value,
user.personal.id,
userPassword.value,
),
);
// const appendTransaction = new FileAppendTransaction()
// .setTransactionId(transactionId)
// .setTransactionValidDuration(180)
// .setMaxTransactionFee(transaction.maxTransactionFee || new Hbar(2))
// .setFileId(transaction.fileId!)
// .setContents(chunks[i])
// .setMaxChunks(1)
// .setChunkSize(chunkSize.value);
// transactions.push(
// await signTransaction(
// appendTransaction.toBytes(),
// localPublicKeysReq.value,
// user.personal.id,
// userPassword.value,
// ),
// );
processedChunks.value++;
}
// processedChunks.value++;
// }
isChunkingModalShown.value = false;
// isChunkingModalShown.value = false;
return transactions;
}
// return transactions;
// }
async function sendSignedFileTransactionToOrganization(transactionBytes?: Uint8Array) {
console.log(transactionBytes);
console.log('Send to back end signed along with required', externalPublicKeysReq.value);
}
// async function sendSignedFileTransactionToOrganization(transactionBytes?: Uint8Array) {
// console.log(transactionBytes);
// console.log('Send to back end signed along with required', externalPublicKeysReq.value);
// }
// async function sendSignedTransactionToOrganization() {
// isConfirmShown.value = false;
Expand Down Expand Up @@ -804,10 +795,10 @@ async function sendSignedFileTransactionToOrganization(transactionBytes?: Uint8A
// toast.success('Transaction signed successfully');
// }
async function sendSignedChunksToOrganization(transactions: Uint8Array[]) {
console.log(transactions);
console.log('Send to back end signed along with required', externalPublicKeysReq.value);
}
// async function sendSignedChunksToOrganization(transactions: Uint8Array[]) {
// console.log(transactions);
// console.log('Send to back end signed along with required', externalPublicKeysReq.value);
// }
function validateTransaction(transaction: FileUpdateTransaction | FileAppendTransaction) {
if (!transaction.transactionId) throw new Error('Transaction ID is missing');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,6 @@ async function sendSignedTransactionToOrganization() {
console.log(await uint8ArrayToHex(props.transactionBytes));
console.log(signatureHex);
/* Submit the transaction to the back end */
const { id, body } = await submitTransaction(
user.selectedOrganization.serverUrl,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { Prisma } from '@prisma/client';
import useUserStore from '@renderer/stores/storeUser';
import useNetworkStore from '@renderer/stores/storeNetwork';
import useTransactionGroupStore, { GroupItem } from '@renderer/stores/storeTransactionGroup';
import useTransactionGroupStore from '@renderer/stores/storeTransactionGroup';
import { useToast } from 'vue-toast-notification';
import { useRoute, useRouter } from 'vue-router';
Expand Down Expand Up @@ -49,7 +49,6 @@ import TransactionIdControls from '@renderer/components/Transaction/TransactionI
import TransactionHeaderControls from '@renderer/components/Transaction/TransactionHeaderControls.vue';
import UsersGroup from '@renderer/components/Organization/UsersGroup.vue';
import ApproversList from '@renderer/components/Approvers/ApproversList.vue';
import { TransactionDraft } from '@prisma/client';
/* Stores */
const user = useUserStore();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { useRoute, useRouter } from 'vue-router';
import useAccountId from '@renderer/composables/useAccountId';
import { createTransactionId } from '@renderer/services/transactionService';
import { getDraft, updateDraft } from '@renderer/services/transactionDraftsService';
import { getDraft } from '@renderer/services/transactionDraftsService';
import { getAccountInfo } from '@renderer/services/mirrorNodeDataService';
import { getAll } from '@renderer/services/accountsService';
Expand Down Expand Up @@ -54,16 +54,16 @@ const payerData = useAccountId();
const transactionProcessor = ref<InstanceType<typeof TransactionProcessor> | null>(null);
const transaction = ref<Transaction | null>(null);
const savedDraft = ref<{
id: string;
created_at: Date;
updated_at: Date;
user_id: string;
type: string;
transactionBytes: string;
isTemplate: boolean | null;
details: string | null;
}>();
// const savedDraft = ref<{
// id: string;
// created_at: Date;
// updated_at: Date;
// user_id: string;
// type: string;
// transactionBytes: string;
// isTemplate: boolean | null;
// details: string | null;
// }>();
const validStart = ref(new Date());
const maxTransactionFee = ref<Hbar>(new Hbar(2));
const transactionMemo = ref('');
Expand Down Expand Up @@ -151,12 +151,6 @@ const handleCreate = async e => {
}
};
const handleDraftAdded = async (id: string) => {
if (savedDraft.value?.isTemplate) return;
await updateDraft(id, { details: JSON.stringify({ transfers: transfers.value }) });
};
const handleLoadFromDraft = async () => {
if (!router.currentRoute.value.query.draftId && !route.query.groupIndex) return;
let draftTransactionBytes: string | null = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,8 @@ import useTransactionGroupStore from '@renderer/stores/storeTransactionGroup';
import { useRouter, useRoute } from 'vue-router';
import useUserStore from '@renderer/stores/storeUser';
import { isUserLoggedIn } from '@renderer/utils/userStoreHelpers';
import {
getEntityIdFromTransactionReceipt,
isAccountId,
getPropagationButtonLabel,
} from '@renderer/utils';
import { Key, KeyList, PublicKey, Transaction } from '@hashgraph/sdk';
import { getEntityIdFromTransactionReceipt, getPropagationButtonLabel } from '@renderer/utils';
import { KeyList, PublicKey } from '@hashgraph/sdk';
import { useToast } from 'vue-toast-notification';
/* Stores */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<script setup lang="ts">
import { computed, inject, onMounted, ref } from 'vue';
import AppButton from '@renderer/components/ui/AppButton.vue';
import useTransactionGroupStore from '@renderer/stores/storeTransactionGroup';
import { useRouter, useRoute } from 'vue-router';
import { useRouter } from 'vue-router';
import useUserStore from '@renderer/stores/storeUser';
import {
isLoggedInOrganization,
isLoggedInWithPassword,
isUserLoggedIn,
} from '@renderer/utils/userStoreHelpers';
import { KeyList, PublicKey, Transaction } from '@hashgraph/sdk';
import { Transaction } from '@hashgraph/sdk';
import { useToast } from 'vue-toast-notification';
import useDisposableWs from '@renderer/composables/useDisposableWs';
import useNetwork from '@renderer/stores/storeNetwork';
Expand All @@ -30,13 +29,11 @@ import AppModal from '@renderer/components/ui/AppModal.vue';
import AppCustomIcon from '@renderer/components/ui/AppCustomIcon.vue';
/* Stores */
const transactionGroup = useTransactionGroupStore();
const user = useUserStore();
const network = useNetwork();
/* Composables */
const router = useRouter();
const route = useRoute();
const toast = useToast();
const ws = useDisposableWs();
Expand All @@ -54,11 +51,7 @@ const userPasswordModalRef = inject<USER_PASSWORD_MODAL_TYPE>(USER_PASSWORD_MODA
async function handleFetchGroup(id: string | number) {
if (isLoggedInOrganization(user.selectedOrganization) && !isNaN(Number(id))) {
try {
group.value = await getApiGroupById(
user.selectedOrganization.serverUrl,
network.network,
Number(id),
);
group.value = await getApiGroupById(user.selectedOrganization.serverUrl, Number(id));
if (group.value?.groupItems != undefined) {
for (const item of group.value.groupItems) {
shouldApprove.value =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ async function fetchTransactions() {
}
}
groups.value = await getApiGroups(user.selectedOrganization.serverUrl, network.network);
groups.value = await getApiGroups(user.selectedOrganization.serverUrl);
} finally {
isLoading.value = false;
}
Expand Down
Loading

0 comments on commit d01f8aa

Please sign in to comment.