Skip to content

clean up codebase #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nahss wants to merge 1 commit into
base: main
Choose a base branch
from
Open

clean up codebase #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "requestss",
"name": "requests",
"version": "0.1.0",
"private": true,
"dependencies": {
Expand Down
53 changes: 16 additions & 37 deletions src/utils/request.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const compileProgram = async (programSource) => {

// CREATE REQUEST: ApplicationCreateTxn
export const createRequestAction = async (senderAddress, request) => {
console.log("Adding request...");


let params = await algodClient.getTransactionParams().do();

Expand Down Expand Up @@ -122,32 +122,27 @@ export const createRequestAction = async (senderAddress, request) => {

// Sign & submit the transaction
let signedTxn = await myAlgoConnect.signTransaction(txn.toByte());
console.log("Signed transaction with txID: %s", txId);

await algodClient.sendRawTransaction(signedTxn.blob).do();

// Wait for transaction to be confirmed
let confirmedTxn = await algosdk.waitForConfirmation(algodClient, txId, 4);

// Get the completed Transaction
console.log(
"Transaction " +
txId +
" confirmed in round " +
confirmedTxn["confirmed-round"]
);


// Get created application id and notify about completion
let transactionResponse = await algodClient
.pendingTransactionInformation(txId)
.do();
let appId = transactionResponse["application-index"];
console.log("Created new app-id: ", appId);

return appId;
};

// DONATE: Group transaction consisting of ApplicationCallTxn and PaymentTxn
export const donateRequestAction = async (senderAddress, request, amount) => {
console.log("Donating...");


let params = await algodClient.getTransactionParams().do();

Expand Down Expand Up @@ -185,7 +180,7 @@ export const donateRequestAction = async (senderAddress, request, amount) => {
let signedTxn = await myAlgoConnect.signTransaction(
txnArray.map((txn) => txn.toByte())
);
console.log("Signed group transaction");

let tx = await algodClient
.sendRawTransaction(signedTxn.map((txn) => txn.blob))
.do();
Expand All @@ -194,17 +189,11 @@ export const donateRequestAction = async (senderAddress, request, amount) => {
let confirmedTxn = await algosdk.waitForConfirmation(algodClient, tx.txId, 4);

// Notify about completion
console.log(
"Group transaction " +
tx.txId +
" confirmed in round " +
confirmedTxn["confirmed-round"]
);
};


// EDIT REQUEST: Edit existing request
export const editRequestAction = async (senderAddress, request) => {
console.log("Editing request...", request);


let params = await algodClient.getTransactionParams().do();

Expand Down Expand Up @@ -233,24 +222,19 @@ export const editRequestAction = async (senderAddress, request) => {

// Sign & submit the transaction
let signedTxn = await myAlgoConnect.signTransaction(txn.toByte());
console.log("Signed transaction with txID: %s", txId);

await algodClient.sendRawTransaction(signedTxn.blob).do();

// Wait for transaction to be confirmed
let confirmedTxn = await algosdk.waitForConfirmation(algodClient, txId, 4);

// Get the completed Transaction
console.log(
"Transaction " +
txId +
" confirmed in round " +
confirmedTxn["confirmed-round"]
);

};

// DELETE REQUEST: ApplicationDeleteTxn
export const deleteRequestAction = async (senderAddress, index) => {
console.log("Deleting application...");


let params = await algodClient.getTransactionParams().do();

Expand All @@ -266,31 +250,26 @@ export const deleteRequestAction = async (senderAddress, index) => {

// Sign & submit the transaction
let signedTxn = await myAlgoConnect.signTransaction(txn.toByte());
console.log("Signed transaction with txID: %s", txId);

await algodClient.sendRawTransaction(signedTxn.blob).do();

// Wait for transaction to be confirmed
const confirmedTxn = await algosdk.waitForConfirmation(algodClient, txId, 4);

// Get the completed Transaction
console.log(
"Transaction " +
txId +
" confirmed in round " +
confirmedTxn["confirmed-round"]
);


// Get application id of deleted application and notify about completion
let transactionResponse = await algodClient
.pendingTransactionInformation(txId)
.do();
let appId = transactionResponse["txn"]["txn"].apid;
console.log("Deleted app-id: ", appId);

};

// GET REQUESTS: Use indexer
export const getRequestsAction = async () => {
console.log("Fetching requests...");

window.sdk = algosdk;
let note = new TextEncoder().encode(requestNote);
let encodedNote = Buffer.from(note).toString("base64");
Expand All @@ -313,7 +292,7 @@ export const getRequestsAction = async () => {
}
}
}
console.log("Requests fetched.");

return requests;
};

Expand Down