Terminology update & functional change

This commit is contained in:
Jarred
2023-01-06 16:36:50 -06:00
parent 8cb5b5c97a
commit 4ae02e356c
4 changed files with 40 additions and 33 deletions

View File

@@ -37,20 +37,20 @@ function fetchFile(domain) {
parseXrplToml(data)
} else {
makeLogEntry('TOML FILE: Not found')
makeLogEntry('WALLET CAN NOT BE VERIFIED: TOML file was not found.')
makeLogEntry('ACCOUNT CAN NOT BE VERIFIED: TOML file was not found.')
return
}
});
}).on("error", (err) => {
if (err.code == 'ENOTFOUND') {
makeLogEntry('WALLET CAN NOT BE VERIFIED: Network error while fetching TOML file.')
makeLogEntry('ACCOUNT CAN NOT BE VERIFIED: Network error while fetching TOML file.')
}
return
});
}
function fetchWallet() {
makeLogEntry('\nCHECKING DOMAIN OF WALLET...')
makeLogEntry('\nCHECKING DOMAIN OF ACCOUNT...')
const url = "wss://xrplcluster.com"
if (typeof socket !== "undefined" && socket.readyState < 2) {
socket.close()
@@ -67,25 +67,25 @@ function fetchWallet() {
if (data.status === 'success') {
if (data.result.account_data.Domain) {
try {
makeLogEntry('WALLET ADDRESS: Valid')
makeLogEntry('ACCOUNT ADDRESS: Valid')
decodeHex(data.result.account_data.Domain)
} catch {
makeLogEntry('error decoding domain field: ' + data.result.account_data.Domain)
}
} else {
makeLogEntry('WALLET ADDRESS: Valid')
makeLogEntry('ACCOUNT ADDRESS: Valid')
makeLogEntry('DOMAIN DECODED: Domain field not found')
makeLogEntry('CHECKING DOMAIN: Error')
makeLogEntry('TOML FILE: Not found')
makeLogEntry('WALLET CAN NOT BE VERIFIED: Wallet has no domain field.')
makeLogEntry('ACCOUNT CAN NOT BE VERIFIED: Account has no domain field.')
return
}
} else {
makeLogEntry('WALLET ADDRESS: Invalid')
makeLogEntry('ACCOUNT ADDRESS: Invalid')
makeLogEntry('DOMAIN DECODED: Domain field not found')
makeLogEntry('CHECKING DOMAIN: Error')
makeLogEntry('TOML FILE: Not found')
makeLogEntry('WALLET CAN NOT BE VERIFIED: Wallet address is not valid.')
makeLogEntry('ACCOUNT CAN NOT BE VERIFIED: Account address is not valid.')
return
}
} catch (e) {
@@ -104,7 +104,7 @@ async function parseXrplToml(data) {
try {
parsed = TOML(data)
} catch (e) {
makeLogEntry('WALLET CAN NOT BE VERIFIED: TOML file can not be read.')
makeLogEntry('ACCOUNT CAN NOT BE VERIFIED: TOML file can not be read.')
return
}
@@ -126,9 +126,9 @@ async function parseXrplToml(data) {
}
}
if (found) {
makeLogEntry('WALLET IS PRESENT: Wallet domain verified')
makeLogEntry('ACCOUNT IS PRESENT: Account domain verified')
} else {
makeLogEntry('WALLET IS NOT PRESENT: Wallet domain can not be verified')
makeLogEntry('ACCOUNT IS NOT PRESENT: Account domain can not be verified')
}
return
}

View File

@@ -1,7 +1,7 @@
const TOML_PATH = "/.well-known/xrp-ledger.toml"
const TIPS = '<p>Check if the file is actually hosted at the URL above, check your server\'s HTTPS settings and certificate, and make sure your server provides the required <a href="xrp-ledger-toml.html#cors-setup">CORS header.</a></p>'
const TIPS_1 = '<p>Make sure you are entering a valid XRP address.</p>'
const TIPS_2 = '<p>Make sure the wallet address has the domain field.</p>'
const TIPS_1 = '<p>Make sure you are entering a valid XRP Ledger address.</p>'
const TIPS_2 = '<p>Make sure the account has the Domain field set.</p>'
const CLASS_GOOD = "badge badge-success"
const CLASS_BAD = "badge badge-danger"
@@ -284,7 +284,7 @@ function makeLogEntryWallet(text, raw) {
function fetchWallet() {
wallet = $('#verify-domain').val()
const checkingLog = makeLogEntryWallet('Checking domain of wallet')
const checkingLog = makeLogEntryWallet('Checking domain of account')
const url = "wss://xrplcluster.com"
if (typeof socket !== "undefined" && socket.readyState < 2) {
socket.close()
@@ -356,34 +356,35 @@ async function parseXRPLTomlWallet(data) {
let list_wrap = $("<p>"+name+"</p>")
let list_ol = $("<ol>").appendTo(list_wrap)
for (i=0; i<list.length; i++) {
let entry_wrap = $("<li>").appendTo(list_ol)
let entry_def = $("<ul class='mb-3'>").appendTo(entry_wrap)
let entry_def = $("<ul>").appendTo(list_ol)
let entry = list[i]
for (j=0; j<fields.length; j++) {
let fieldname = fields[j]
if (entry[fieldname] !== undefined) {
if (entry['address'] === wallet) {
let field_def = $("<li><strong>"+fieldname+": </strong>").appendTo(entry_def)
$(" <span class='"+fieldname+"'>").text(entry[fieldname]).appendTo(field_def)
found=true;
}
}
if (entry['address'] === wallet) {
entry_def.append('<li class="badge badge-success">Domain Validated <i class="fa fa-check-circle"></i></li>')
found=true;
}
}
makeLogEntryWallet(list_wrap, true)
if(found) {
makeLogEntryWallet(list_wrap, true)
makeLogEntryWallet('Account has been found in TOML file and validated.').resolve('DOMAIN VALIDATED <i class="fa fa-check-circle"></i>').addClass(CLASS_GOOD)
} else {
makeLogEntryWallet('Account not found in TOML file. Domain can not be verified.').resolve('ERROR').addClass(CLASS_BAD)
let entry_def = $("<ul>").appendTo(list_ol)
let field_def = $("<li><strong>address: </strong>").appendTo(entry_def)
$(" <span class='address'>").text('Not found ').appendTo(field_def).append(' <li class="badge badge-danger">ERROR</li>')
makeLogEntryWallet(list_wrap, true)
makeLogEntryWallet('Account not found in TOML file. Domain can not be verified.').resolve('VALIDATION FAILED').addClass(CLASS_BAD)
}
}
if (parsed.ACCOUNTS) {
if (!Array.isArray(parsed.ACCOUNTS)) {
makeLogEntryWallet("Accounts:").resolve("Wrong type - should be table-array").addClass(CLASS_BAD)
makeLogEntryWallet("Account:").resolve("Wrong type - should be table-array").addClass(CLASS_BAD)
} else {
listEntriesWallet("Accounts:", parsed.ACCOUNTS, ACCOUNT_FIELDS)
listEntriesWallet("Account:", parsed.ACCOUNTS, ACCOUNT_FIELDS)
}
}
}