Loc-Chain/loc-chain-backend
3
0
Fork 0
mirror of https://github.com/hackku21/loc-chain-backend.git synced 2024-10-27 20:34:03 +00:00
Code Issues Projects Releases Wiki Activity

Prevent circular refresh from peer-triggered refresh

Browse Source
This commit is contained in:
Garrett Mills 2021-04-10 15:36:06 -05:00
parent 8b3905fd5c
commit 0aac7161df
Signed by: garrettmills
GPG Key ID: D2BF5FBA8298F246
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/http/controllers/api/Blockchain.controller.ts
View File

@ -38,7 +38,8 @@ export class Blockchain extends Controller {
* most recent submission, that has NOT been accepted yet. * most recent submission, that has NOT been accepted yet.
*/ */
public async readBlockchainSubmission() { public async readBlockchainSubmission() {
return many((await this.blockchain.getSubmitChain()).map(x => { const resultOfPeerRefresh = !!this.request.query.resultOfPeerRefresh
return many((await this.blockchain.getSubmitChain(resultOfPeerRefresh)).map(x => {
// @ts-ignore // @ts-ignore
delete x.firebaseID delete x.firebaseID
return x return x

21
src/app/units/Blockchain.ts
View File

@ -172,10 +172,11 @@ export class Blockchain extends Unit {
/** /**
* From a peer, fetch the submission blockchain, if it is valid. * From a peer, fetch the submission blockchain, if it is valid.
* @param peer * @param peer
* @param resultOfPeerRefresh
*/ */
public async getPeerSubmit(peer: Peer): Promise<Block[] | undefined> { public async getPeerSubmit(peer: Peer, resultOfPeerRefresh: boolean): Promise<Block[] | undefined> {
try { try {
const result = await axios.get(`${peer.host}api/v1/chain/submit`) const result = await axios.get(`${peer.host}api/v1/chain/submit${resultOfPeerRefresh ? '?resultOfPeerRefresh=true' : ''}`)
const blocks: unknown = result.data?.data?.records const blocks: unknown = result.data?.data?.records
if ( Array.isArray(blocks) && blocks.every(block => { if ( Array.isArray(blocks) && blocks.every(block => {
const match = isBlockResourceItem(block) const match = isBlockResourceItem(block)
@ -222,7 +223,7 @@ export class Blockchain extends Unit {
} }
}) })
this.refresh() this.refresh(false)
} catch (e) { } catch (e) {
this.logging.error(e) this.logging.error(e)
} }
@ -273,7 +274,7 @@ export class Blockchain extends Unit {
).every(Boolean) ).every(Boolean)
} }
public async refresh() { public async refresh(resultOfPeerRefresh: boolean) {
if ( this.isSubmitting ) { if ( this.isSubmitting ) {
return return
} else { } else {
@ -290,7 +291,7 @@ export class Blockchain extends Unit {
for ( const peer of peers ) { for ( const peer of peers ) {
console.log('[PEERS]', peers) console.log('[PEERS]', peers)
const blocks: Block[] | undefined = await this.getPeerSubmit(peer) const blocks: Block[] | undefined = await this.getPeerSubmit(peer, resultOfPeerRefresh)
console.log('[PEER BLOCKS]', blocks) console.log('[PEER BLOCKS]', blocks)
if ( blocks && await this.validate(blocks) ) { if ( blocks && await this.validate(blocks) ) {
const block = blocks.reverse()[0] const block = blocks.reverse()[0]
@ -351,7 +352,7 @@ export class Blockchain extends Unit {
this.isSubmitting = false this.isSubmitting = false
} }
public async getSubmitChain(): Promise<BlockResourceItem[]> { public async getSubmitChain(resultOfPeerRefresh: boolean): Promise<BlockResourceItem[]> {
await this.firebase.trylock('block', 'Blockchain_getSubmitChain') await this.firebase.trylock('block', 'Blockchain_getSubmitChain')
const blocks = await this.read() const blocks = await this.read()
const submit = await this.attemptSubmit() const submit = await this.attemptSubmit()
@ -361,7 +362,9 @@ export class Blockchain extends Unit {
} }
await this.firebase.unlock('block') await this.firebase.unlock('block')
// this.refresh() if ( !resultOfPeerRefresh ) {
this.refresh(resultOfPeerRefresh)
}
return blocks return blocks
} }
@ -403,7 +406,7 @@ export class Blockchain extends Unit {
} }
this.pendingTransactions.push(...txes) this.pendingTransactions.push(...txes)
this.refresh() this.refresh(false)
/*const lastBlock = await this.getLastBlock() /*const lastBlock = await this.getLastBlock()
@ -436,7 +439,7 @@ export class Blockchain extends Unit {
} }
this.pendingTransactions.push(...exposures) this.pendingTransactions.push(...exposures)
this.refresh() this.refresh(false)
/*const lastBlock = await this.getLastBlock() /*const lastBlock = await this.getLastBlock()