Skip to content

Fix initial website hosting tx when tx already exist #116

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
MayDaReal wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix initial website hosting tx when tx already exist #116

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e52d54
Improve how to manage the initial website hosting transaction on tran…
MayDaReal Feb 2, 2025
d3ae042
Replace function fetchLastRefTx by fetchLastHostingTx to fetch the la…
MayDaReal Feb 23, 2025
6688a2f
Remove french comments
MayDaReal Feb 23, 2025
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
80 changes: 64 additions & 16 deletions commands/deploy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,13 @@ const handler = async function(argv) {
// Check if website is already deployed
if (refIndex !== 0) {
console.log(archethic.nearestEndpoints)
isWebsiteUpdate = true;
const lastRefTx = await fetchLastRefTx(refAddress, archethic);
prevRefTxContent = JSON.parse(lastRefTx.data.content);
const lastHostingTx = await fetchLastHostingTx(refAddress, archethic);
if (lastHostingTx) {
prevRefTxContent = JSON.parse(lastHostingTx.data.content);
isWebsiteUpdate = true;
} else {
console.warn('No existing hosting transaction found. This will be considered as the initial hosting transaction.');
}
}

// Convert directory structure into array of file content
Expand Down Expand Up @@ -313,8 +317,7 @@ async function sendTransactions(transactions, index, endpoint) {
})
}


async function fetchLastRefTx(txnAddress, archethic) {
async function fetchLastHostingTx(txnAddress, archethic) {
if (typeof txnAddress !== "string" && !(txnAddress instanceof Uint8Array)) {
throw "'address' must be a string or Uint8Array";
}
Expand All @@ -329,23 +332,68 @@ async function fetchLastRefTx(txnAddress, archethic) {
txnAddress = uint8ArrayToHex(txnAddress);
}

const query =`
const lastTxQuery = `
query {
lastTransaction(
address: "${txnAddress}"
){
data{
) {
previousAddress
type
data {
content
}
}
}`;

const lastTxResult = await archethic.network.rawGraphQLQuery(lastTxQuery);

if (!lastTxResult.lastTransaction) {
return null;
}

let txn = lastTxResult.lastTransaction;
let lastHostingTx = null;

console.log(`Current transaction address: ${txnAddress}`);
console.log(`Previous transaction address: ${txn.previousAddress}`);
console.log(`Transaction type: ${txn.type}`);

while (txn.previousAddress) {
txnAddress = txn.previousAddress;

const txQuery = `
query {
transaction(
address: "${txnAddress}"
) {
previousAddress
type
data {
content
}
}
}`

return archethic.network.rawGraphQLQuery(query)
.then(r => {
if (r.lastTransaction) {
return r.lastTransaction
}
})
}`;

const result = await archethic.network.rawGraphQLQuery(txQuery);

if (!result || !result.transaction) {
console.log(`Transaction not found for address: ${txnAddress}`);
break;
}

txn = result.transaction;

console.log(`Current transaction address: ${txnAddress}`);
console.log(`Previous transaction address: ${txn.previousAddress}`);
console.log(`Transaction type: ${txn.type}`);

if (txn.type === "hosting") {
lastHostingTx = txn;
break;
}
}

return lastHostingTx;
}

async function logUpdateInfo(aeweb) {
Expand Down