fix: don't rethrow on tx error

stacks-network · rafaelcr · Oct 16, 2023 · Oct 16, 2023 · Oct 16, 2023 · Oct 17, 2023
commit fb893d76b8b190ddca69d0ff26c9f20fbe86eeb3
diff --git a/src/operations.js b/src/operations.js
@@ -223,13 +223,13 @@
    const response = await axios.get(url)
    const blockHeight = response.data.burn_block_height
    if (SERVER_GLOBALS.lastSeenBlockHeight > blockHeight) {
      throw new Error(
        `Last seen block ${SERVER_GLOBALS.lastSeenBlockHeight} is greater than returned block height ${blockHeight}`
      )
    }
    SERVER_GLOBALS.lastSeenBlockHeight = blockHeight
  } catch (error) {
    throw new Error(`Error fetching block height from ${url}: ${error}`)
  }
 }

@@ -257,12 +257,12 @@
          tx.blockHeight = txInfo.block_height
        }
      } catch (error) {
        if (error.response.status === 429) {
          logger.warn(`Rate limit hit for ${bskConfig.network.coreApiUrl}, resuming transaction check later`)
           return results
         }
         logger.error(`Error checking transaction at ${txUrl}: ${error}`)
-        throw error
+        continue
       }
     }
     if (tx.blockHeight + 7 > blockHeight) {
@@ -281,11 +281,11 @@
        if (
          bskConfig.network.blockstackAPIUrl === 'https://core.blockstack.org'
        ) {
          await directlyPublishZonefile(tx.zonefile)
          // this is horrible. I know. but the reasons have to do with load balancing
          // on node.blockstack.org and Atlas peering.
          await directlyPublishZonefile(tx.zonefile)
          results.push({
            txHash: tx.txHash,
            status: true,
            blockHeight: tx.blockHeight
@@ -299,8 +299,8 @@
          })
        }
      } catch (err) {
        logger.error(`Error publishing zonefile for tx ${tx.txHash}: ${err}`)
        results.push({
          txHash: tx.txHash,
          status: false,
          blockHeight: tx.blockHeight
@@ -323,21 +323,21 @@
 ): Promise<boolean> {
  // speak directly to node.blockstack

  const b64Zonefile = Buffer.from(zonefile).toString('base64')

  const postData =
    '<?xml version=\'1.0\'?>' +
    '<methodCall><methodName>put_zonefiles</methodName>' +
    `<params><param><array><data><value>
         <string>${b64Zonefile}</string></value>
         </data></array></param></params>` +
    '</methodCall>'
  const resp = await fetch('https://node.blockstack.org:6263/RPC2', {
    method: 'POST',
    body: postData
  })

  const respText = await resp.text()

  if (!(resp.status >= 200 && resp.status <= 299)) {
    logger.error(
@@ -351,33 +351,33 @@
    )
  }

  const start = respText.indexOf('<string>') + '<string>'.length
  const stop = respText.indexOf('</string>')
  const dataResp = respText.slice(start, stop)
  let jsonResp
  try {
    jsonResp = JSON.parse(dataResp)
  } catch (err) {
    logger.error(
      `Failed to parse JSON response from node.blockstack: ${respText}`
    )
    throw err
  }

  if ('error' in jsonResp) {
    logger.error(`Error in publishing zonefile: ${JSON.stringify(jsonResp)}`)
    throw new Error(jsonResp.error)
  }

  if (!jsonResp.saved || jsonResp.saved.length < 1) {
    throw new Error('Invalid "saved" response from node.blockstack')
  }

  if (jsonResp.saved[0] === 1) {
    return true
  } else if (jsonResp.saved[0] === 0) {
    throw new Error('Zonefile not saved')
  }

  throw new Error('Invalid "saved" response from node.blockstack')
 }
diff --git a/src/http.js b/src/http.js
    })
    .then(() => app)
    .catch(error => {
      logger.error(`Unable to start server: ${error}`)
    })
 }
diff --git a/src/index.js b/src/index.js
    console.log('Subdomain registrar started on', config.port)
  })
 }).catch(error => {
  winston.error(`Unable to initialize subdomain registrar: ${error}`)
 })
diff --git a/src/lookups.js b/src/lookups.js
      || err.response.status !== 200) {
      return false
    }
    logger.error(`Error checking registered subdomain from ${nameInfoUrl}: ${err}`)
    throw err
  }
 }
	})
	.then(() => app)
	.catch(error => {
	logger.error(`Unable to start server: ${error}`)
Check warning on line 368 in src/http.js Codecov / codecov/patch src/http.js#L368 `Added line #L368 was not covered by tests`
	})
	}
	console.log('Subdomain registrar started on', config.port)
	})
	}).catch(error => {
	winston.error(`Unable to initialize subdomain registrar: ${error}`)
Check warning on line 51 in src/index.js Codecov / codecov/patch src/index.js#L51 `Added line #L51 was not covered by tests`
	})
	\|\| err.response.status !== 200) {
	return false
	}
	logger.error(`Error checking registered subdomain from ${nameInfoUrl}: ${err}`)
	throw err
Check warning on line 18 in src/lookups.js Codecov / codecov/patch src/lookups.js#L17-L18 `Added lines #L17 - L18 were not covered by tests`
	}
	}