fullstack/bch-api
1
0
Fork 0
mirror of https://github.com/fullstack-cash/bch-api.git synced 2026-09-22 09:12:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #104 from christroutner/unstable

Browse Source 
SLPDB v1 Refactor
This commit is contained in:
Chris Troutner
2020-02-16 19:11:12 -08:00
committed by GitHub
parent 8d45a20609 01ec490a9b
commit 6940d53e08
3 changed files with 275 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/v3/slp.js
+254 -70
View File
@@ -390,11 +390,52 @@ async function balancesForAddress (req, res, next) {
const query = {
v: 3,
q: {
db: ['a'],
find: {
address: bchjs.SLP.Address.toSLPAddress(address),
token_balance: { $gte: 0 }
},
db: ['g'],
aggregate: [
{
$match: {
'graphTxn.outputs': {
$elemMatch: {
address: bchjs.SLP.Address.toSLPAddress(address),
status: 'UNSPENT',
slpAmount: { $gte: 0 }
}
}
}
},
{
$unwind: '$graphTxn.outputs'
},
{
$match: {
'graphTxn.outputs.address': bchjs.SLP.Address.toSLPAddress(
address
),
'graphTxn.outputs.status': 'UNSPENT',
'graphTxn.outputs.slpAmount': { $gte: 0 }
}
},
{
$project: {
amount: '$graphTxn.outputs.slpAmount',
address: '$graphTxn.outputs.address',
txid: '$graphTxn.txid',
vout: '$graphTxn.outputs.vout',
tokenId: '$tokenDetails.tokenIdHex'
}
},
{
$group: {
_id: '$tokenId',
balanceString: {
$sum: '$amount'
},
slpAddress: {
$first: '$address'
}
}
}
],
limit: 10000
}
}
@@ -403,20 +444,20 @@ async function balancesForAddress (req, res, next) {
const b64 = Buffer.from(s).toString('base64')
const url = `${process.env.SLPDB_URL}q/${b64}`
const tokenRes = await axios.get(url)
const options = generateCredentials()
const tokenRes = await axios.get(url, options)
// console.log(`tokenRes.data.g: ${JSON.stringify(tokenRes.data.g, null, 2)}`)
const tokenIds = []
if (tokenRes.data.a.length > 0) {
tokenRes.data.a = tokenRes.data.a.map(token => {
token.tokenId = token.tokenDetails.tokenIdHex
if (tokenRes.data.g.length > 0) {
tokenRes.data.g = tokenRes.data.g.map(token => {
token.tokenId = token._id
tokenIds.push(token.tokenId)
token.balance = parseFloat(token.token_balance)
token.slpAddress = token.address
delete token.tokenDetails
delete token.satoshis_balance
delete token.token_balance
token.balance = parseFloat(token.balanceString)
delete token._id
delete token.address
return token
})
@@ -443,12 +484,15 @@ async function balancesForAddress (req, res, next) {
const b642 = Buffer.from(s2).toString('base64')
const url2 = `${process.env.SLPDB_URL}q/${b642}`
const tokenRes2 = await axios.get(url2)
const tokenRes2 = await axios.get(url2, options)
// console.log(`tokenRes2.data: ${JSON.stringify(tokenRes2.data, null, 2)}`)
return tokenRes2.data
})
const details = await axios.all(promises)
tokenRes.data.a = tokenRes.data.a.map(token => {
tokenRes.data.g = tokenRes.data.g.map(token => {
details.forEach(detail => {
if (detail.t[0].tokenDetails.tokenIdHex === token.tokenId) {
token.decimalCount = detail.t[0].tokenDetails.decimals
@@ -457,8 +501,9 @@ async function balancesForAddress (req, res, next) {
return token
})
return res.json(tokenRes.data.a)
return res.json(tokenRes.data.g)
}
return res.json('No balance for this address')
} catch (err) {
wlogger.error('Error in slp.ts/balancesForAddress().', err)
@@ -544,17 +589,60 @@ async function balancesForAddressBulk (req, res, next) {
}
}
const options = generateCredentials()
// Collect an array of promises, one for each request to slpserve.
// This is a nested array of promises.
const balancesPromises = addresses.map(async address => {
const query = {
v: 3,
q: {
db: ['a'],
find: {
address: bchjs.SLP.Address.toSLPAddress(address),
token_balance: { $gte: 0 }
},
db: ['g'],
aggregate: [
{
$match: {
'graphTxn.outputs': {
$elemMatch: {
address: bchjs.SLP.Address.toSLPAddress(address),
status: 'UNSPENT',
slpAmount: { $gte: 0 }
}
}
}
},
{
$unwind: '$graphTxn.outputs'
},
{
$match: {
'graphTxn.outputs.address': bchjs.SLP.Address.toSLPAddress(
address
),
'graphTxn.outputs.status': 'UNSPENT',
'graphTxn.outputs.slpAmount': { $gte: 0 }
}
},
{
$project: {
amount: '$graphTxn.outputs.slpAmount',
address: '$graphTxn.outputs.address',
txid: '$graphTxn.txid',
vout: '$graphTxn.outputs.vout',
tokenId: '$tokenDetails.tokenIdHex'
}
},
{
$group: {
_id: '$tokenId',
balanceString: {
$sum: '$amount'
},
slpAddress: {
$first: '$address'
}
}
}
],
limit: 10000
}
}
@@ -563,22 +651,17 @@ async function balancesForAddressBulk (req, res, next) {
const b64 = Buffer.from(s).toString('base64')
const url = `${process.env.SLPDB_URL}q/${b64}`
const tokenRes = await axios.get(url)
const tokenRes = await axios.get(url, options)
// console.log(`tokenRes.data: ${JSON.stringify(tokenRes.data, null, 2)}`)
const tokenIds = []
if (tokenRes.data.a.length > 0) {
tokenRes.data.a = tokenRes.data.a.map(token => {
token.tokenId = token.tokenDetails.tokenIdHex
if (tokenRes.data.g.length > 0) {
tokenRes.data.g = tokenRes.data.g.map(token => {
token.tokenId = token._id
tokenIds.push(token.tokenId)
token.balance = parseFloat(token.token_balance)
token.balanceString = token.token_balance
token.slpAddress = token.address
delete token.tokenDetails
delete token.satoshis_balance
delete token.token_balance
token.balance = parseFloat(token.balanceString)
delete token._id
delete token.address
return token
})
}
@@ -607,23 +690,26 @@ async function balancesForAddressBulk (req, res, next) {
const b642 = Buffer.from(s2).toString('base64')
const url2 = `${process.env.SLPDB_URL}q/${b642}`
const tokenRes2 = await axios.get(url2)
const tokenRes2 = await axios.get(url2, options)
// console.log(`tokenRes2.data: ${JSON.stringify(tokenRes2.data, null, 2)}`)
return tokenRes2.data
})
// Wait for all the promises to resolve.
const details = await axios.all(promises)
const details = await Promise.all(promises)
tokenRes.data.a = tokenRes.data.a.map(token => {
tokenRes.data.g = tokenRes.data.g.map(token => {
details.forEach(detail => {
if (detail.t[0].tokenDetails.tokenIdHex === token.tokenId) {
token.decimalCount = detail.t[0].tokenDetails.decimals
}
})
return token
})
return tokenRes.data.a
return tokenRes.data.g
})
// Wait for all the promises to resolve.
@@ -672,12 +758,48 @@ async function balancesForTokenSingle (req, res, next) {
const query = {
v: 3,
q: {
find: {
'tokenDetails.tokenIdHex': tokenId,
token_balance: { $gte: 0 }
},
limit: 10000,
project: { address: 1, satoshis_balance: 1, token_balance: 1, _id: 0 }
db: ['g'],
aggregate: [
{
$match: {
'graphTxn.outputs': {
$elemMatch: {
status: 'UNSPENT',
slpAmount: { $gte: 0 }
}
},
'tokenDetails.tokenIdHex': tokenId
}
},
{
$unwind: '$graphTxn.outputs'
},
{
$match: {
'graphTxn.outputs.status': 'UNSPENT',
'graphTxn.outputs.slpAmount': { $gte: 0 },
'tokenDetails.tokenIdHex': tokenId
}
},
{
$project: {
token_balance: '$graphTxn.outputs.slpAmount',
address: '$graphTxn.outputs.address',
txid: '$graphTxn.txid',
vout: '$graphTxn.outputs.vout',
tokenId: '$tokenDetails.tokenIdHex'
}
},
{
$group: {
_id: '$address',
token_balance: {
$sum: '$token_balance'
}
}
}
],
limit: 10000
}
}
@@ -685,17 +807,23 @@ async function balancesForTokenSingle (req, res, next) {
const b64 = Buffer.from(s).toString('base64')
const url = `${process.env.SLPDB_URL}q/${b64}`
const options = generateCredentials()
// Get data from SLPDB.
const tokenRes = await axios.get(url)
const resBalances = tokenRes.data.a.map((addy, index) => {
const tokenRes = await axios.get(url, options)
// console.log(`tokenRes.data: ${JSON.stringify(tokenRes.data, null, 2)}`)
const resBalances = tokenRes.data.g.map((addy, index) => {
delete addy.satoshis_balance
addy.tokenBalance = parseFloat(addy.token_balance)
addy.slpAddress = addy.address
addy.tokenBalanceString = addy.token_balance
addy.slpAddress = addy._id
addy.tokenId = tokenId
delete addy.address
delete addy._id
delete addy.token_balance
return addy
})
return res.json(resBalances)
} catch (err) {
wlogger.error('Error in slp.ts/balancesForTokenSingle().', err)
@@ -769,43 +897,98 @@ async function balancesForAddressByTokenID (req, res, next) {
const query = {
v: 3,
q: {
db: ['a'],
find: {
address: slpAddr,
token_balance: { $gte: 0 }
},
limit: 10
db: ['g'],
aggregate: [
{
$match: {
'graphTxn.outputs': {
$elemMatch: {
address: slpAddr,
status: 'UNSPENT',
slpAmount: { $gte: 0 }
}
}
}
},
{
$unwind: '$graphTxn.outputs'
},
{
$match: {
'graphTxn.outputs.address': slpAddr,
'graphTxn.outputs.status': 'UNSPENT',
'graphTxn.outputs.slpAmount': { $gte: 0 }
}
},
{
$project: {
amount: '$graphTxn.outputs.slpAmount',
address: '$graphTxn.outputs.address',
txid: '$graphTxn.txid',
vout: '$graphTxn.outputs.vout',
tokenId: '$tokenDetails.tokenIdHex'
}
},
{
$group: {
_id: '$tokenId',
balanceString: {
$sum: '$amount'
},
slpAddress: {
$first: '$address'
}
}
}
],
limit: 10000
}
}
const options = generateCredentials()
const s = JSON.stringify(query)
const b64 = Buffer.from(s).toString('base64')
const url = `${process.env.SLPDB_URL}q/${b64}`
// Get data from SLPDB.
const tokenRes = await axios.get(url)
let resVal
res.status(200)
if (tokenRes.data.a.length > 0) {
tokenRes.data.a.forEach(async token => {
if (token.tokenDetails.tokenIdHex === tokenId) {
const tokenRes = await axios.get(url, options)
console.log(`tokenRes.data: ${JSON.stringify(tokenRes.data, null, 2)}`)
let resVal = {
cashAddress: bchjs.SLP.Address.toCashAddress(slpAddr),
legacyAddress: bchjs.SLP.Address.toLegacyAddress(slpAddr),
slpAddress: slpAddr,
tokenId: tokenId,
balance: 0,
balanceString: '0'
}
if (tokenRes.data.g.length > 0) {
tokenRes.data.g.forEach(async token => {
if (token._id === tokenId) {
resVal = {
tokenId: tokenRes.data.a[0].tokenDetails.tokenIdHex,
balance: parseFloat(tokenRes.data.a[0].token_balance)
}
} else {
resVal = {
tokenId: tokenId,
balance: 0
cashAddress: bchjs.SLP.Address.toCashAddress(slpAddr),
legacyAddress: bchjs.SLP.Address.toLegacyAddress(slpAddr),
slpAddress: slpAddr,
tokenId: token._id,
balance: parseFloat(token.balanceString),
balanceString: token.balanceString
}
}
})
} else {
resVal = {
cashAddress: bchjs.SLP.Address.toCashAddress(slpAddr),
legacyAddress: bchjs.SLP.Address.toLegacyAddress(slpAddr),
slpAddress: slpAddr,
tokenId: tokenId,
balance: 0
balance: 0,
balanceString: '0'
}
}
res.status(200)
return res.json(resVal)
} catch (err) {
wlogger.error('Error in slp.ts/balancesForAddressByTokenID().', err)
@@ -1388,7 +1571,8 @@ function generateCredentials () {
const options = {
headers: {
authorization: readyCredential
}
},
timeout: 15000
}
return options
test/v3/mocks/slp-mocks.js
+7 -37
View File
@@ -71,48 +71,19 @@ const mockSingleTokenError = {
}
const mockSingleAddress = {
a: [
g: [
{
_id: '5c93ed62a19119333d1595bc',
tokenDetails: {
tokenIdHex:
'6b081fcd1f78b187be1464313dac8ff257251b727a42b613552a4040870aeb29'
},
address: 'slptest:pz0qcslrqn7hr44hsszwl4lw5r6udkg6zqv7sq3kk7',
satoshis_balance: 546,
token_balance: '4616984'
_id: 'f05faf13a29c7f5e54ab921750aafb6afaa953db863bd2cf432e918661d4132f',
balanceString: '0.002382',
slpAddress: 'simpleledger:qpujxqra3jmdlzzapwmmt7uspr7q0c9ff5me5fdrdn'
}
],
t: [
{
tokenDetails: {
decimals: 8,
decimals: 6,
tokenIdHex:
'6b081fcd1f78b187be1464313dac8ff257251b727a42b613552a4040870aeb29',
timestamp: '2019-02-25 10:05',
transactionType: 'GENESIS',
versionType: 1,
documentUri: 'https://developer.bitcoin.com',
documentSha256Hex: '',
symbol: 'DEV',
name: 'DEVCOIN',
batonVout: 2,
containsBaton: true,
genesisOrMintQuantity: '500000000',
sendOutputs: null
},
tokenStats: {
block_created: 571272,
block_last_active_send: 574758,
block_last_active_mint: 571272,
qty_valid_txns_since_genesis: 172,
qty_valid_token_utxos: 170,
qty_valid_token_addresses: 170,
qty_token_minted: '1000000000',
qty_token_burned: '4.99999995',
qty_token_circulating_supply: '999999995.00000005',
qty_satoshis_locked_up: 92820,
minting_baton_status: 'ALIVE'
'f05faf13a29c7f5e54ab921750aafb6afaa953db863bd2cf432e918661d4132f'
}
}
]
@@ -274,8 +245,7 @@ const mockTokenStats = {
}
const mockBalance = {
slpAddress: 'simpleledger:qp9d8mn8ypryfvea2mev0ggc3wg6plpn4suuaeuss3',
satoshis_balance: 546,
_id: 'simpleledger:qp9d8mn8ypryfvea2mev0ggc3wg6plpn4suuaeuss3',
token_balance: '1000'
}
test/v3/slp.js
+14 -8
View File
@@ -505,12 +505,15 @@ describe('#SLP', () => {
// console.log(`result: ${util.inspect(result)}`)
assert.isArray(result)
assert.hasAllKeys(result[0], [
'tokenId',
'balance',
'slpAddress',
'decimalCount'
])
assert.property(result[0], 'tokenId')
assert.property(result[0], 'balanceString')
assert.property(result[0], 'slpAddress')
assert.property(result[0], 'balance')
assert.property(result[0], 'decimalCount')
assert.isNumber(result[0].balance)
assert.isNumber(result[0].decimalCount)
})
})
@@ -972,7 +975,7 @@ describe('#SLP', () => {
nock(`${process.env.SLPDB_URL}`)
.get(uri => uri.includes('/'))
.reply(200, {
a: [mockData.mockBalance]
g: [mockData.mockBalance]
})
}
@@ -982,7 +985,10 @@ describe('#SLP', () => {
const result = await balancesForTokenSingle(req, res)
// console.log(`result: ${util.inspect(result)}`)
assert.hasAllKeys(result[0], ['tokenId', 'slpAddress', 'tokenBalance'])
assert.isArray(result)
assert.property(result[0], 'tokenId')
assert.property(result[0], 'slpAddress')
assert.property(result[0], 'tokenBalanceString')
})
})