Merge pull request #192 from Permissionless-Software-Foundation/ct-unstable

fix(token data): Returning CID and not actual content
This commit is contained in:
Chris Troutner
2022-05-07 20:50:11 -07:00
committed by GitHub
4 changed files with 18 additions and 16 deletions
+7 -7
View File
@@ -9,7 +9,7 @@
"version": "2.0.0", "version": "2.0.0",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@psf/bch-js": "6.2.9", "@psf/bch-js": "6.2.14",
"apidoc": "^0.26.0", "apidoc": "^0.26.0",
"axios": "^0.21.1", "axios": "^0.21.1",
"bitcore-lib-cash": "^8.23.1", "bitcore-lib-cash": "^8.23.1",
@@ -833,9 +833,9 @@
} }
}, },
"node_modules/@psf/bch-js": { "node_modules/@psf/bch-js": {
"version": "6.2.9", "version": "6.2.14",
"resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.2.9.tgz", "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.2.14.tgz",
"integrity": "sha512-7oj1+DqiSqOvl5Pn4PdLG+1hSptWqLHLEqen7UvkCL1KSR4qqVaI3m/j3SCHb6nWEZ4HceZalav2AM1LYHDEWg==", "integrity": "sha512-tHF2DyBRgYHTvdhVY58dOzbCOuKQrhc9QvYyj+K4c7mfsVgprjU+FTcM9ZFcE3A+0G/92VBP4/kkfccqfdLlWA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@chris.troutner/bip32-utils": "1.0.5", "@chris.troutner/bip32-utils": "1.0.5",
@@ -16055,9 +16055,9 @@
} }
}, },
"@psf/bch-js": { "@psf/bch-js": {
"version": "6.2.9", "version": "6.2.14",
"resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.2.9.tgz", "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.2.14.tgz",
"integrity": "sha512-7oj1+DqiSqOvl5Pn4PdLG+1hSptWqLHLEqen7UvkCL1KSR4qqVaI3m/j3SCHb6nWEZ4HceZalav2AM1LYHDEWg==", "integrity": "sha512-tHF2DyBRgYHTvdhVY58dOzbCOuKQrhc9QvYyj+K4c7mfsVgprjU+FTcM9ZFcE3A+0G/92VBP4/kkfccqfdLlWA==",
"requires": { "requires": {
"@chris.troutner/bip32-utils": "1.0.5", "@chris.troutner/bip32-utils": "1.0.5",
"@psf/bip21": "2.0.1", "@psf/bip21": "2.0.1",
+1 -1
View File
@@ -31,7 +31,7 @@
"node": ">=10.15.1" "node": ">=10.15.1"
}, },
"dependencies": { "dependencies": {
"@psf/bch-js": "6.2.9", "@psf/bch-js": "6.2.14",
"apidoc": "^0.26.0", "apidoc": "^0.26.0",
"axios": "^0.21.1", "axios": "^0.21.1",
"bitcore-lib-cash": "^8.23.1", "bitcore-lib-cash": "^8.23.1",
+4 -2
View File
@@ -271,7 +271,8 @@ class PsfSlpIndexer {
// try to get immutable data // try to get immutable data
try { try {
const immutableData = await _this.getCIDData(tokenStats.documentUri) // const immutableData = await _this.getCIDData(tokenStats.documentUri)
const immutableData = tokenStats.documentUri
tokenData.immutableData = immutableData tokenData.immutableData = immutableData
} catch (error) { } catch (error) {
tokenData.immutableData = '' tokenData.immutableData = ''
@@ -367,8 +368,9 @@ class PsfSlpIndexer {
if (!cid) { if (!cid) {
throw new Error('CID could not be found in OP_RETURN data') throw new Error('CID could not be found in OP_RETURN data')
} }
const result = cid
const result = await _this.getCIDData(cid) // const result = await _this.getCIDData(cid)
// console.log(`response.data: ${JSON.stringify(response.data, null, 2)}`) // console.log(`response.data: ${JSON.stringify(response.data, null, 2)}`)
return result return result
+6 -6
View File
@@ -706,8 +706,8 @@ describe('#PsfSlpIndexer', () => {
assert.property(result, 'mutableData') assert.property(result, 'mutableData')
assert.isObject(result.genesisData) assert.isObject(result.genesisData)
assert.isObject(result.immutableData) // assert.isObject(result.immutableData)
assert.isObject(result.mutableData) // assert.isObject(result.mutableData)
const genesisData = result.genesisData const genesisData = result.genesisData
assert.property(genesisData, 'ticker') assert.property(genesisData, 'ticker')
@@ -745,7 +745,7 @@ describe('#PsfSlpIndexer', () => {
assert.isObject(result.genesisData) assert.isObject(result.genesisData)
assert.isObject(result.mutableData) assert.isObject(result.mutableData)
assert.equal(result.immutableData, '') // assert.equal(result.immutableData, '')
const genesisData = result.genesisData const genesisData = result.genesisData
assert.property(genesisData, 'ticker') assert.property(genesisData, 'ticker')
@@ -782,8 +782,8 @@ describe('#PsfSlpIndexer', () => {
assert.property(result, 'mutableData') assert.property(result, 'mutableData')
assert.isObject(result.genesisData) assert.isObject(result.genesisData)
assert.isObject(result.immutableData) // assert.isObject(result.immutableData)
assert.equal(result.mutableData, '') // assert.equal(result.mutableData, '')
const genesisData = result.genesisData const genesisData = result.genesisData
assert.property(genesisData, 'ticker') assert.property(genesisData, 'ticker')
@@ -904,7 +904,7 @@ describe('#PsfSlpIndexer', () => {
const documentHash = 'c37ba29f40ecc61662ea56324fdb72a5f1e66add2078854c2144765b9030358a' const documentHash = 'c37ba29f40ecc61662ea56324fdb72a5f1e66add2078854c2144765b9030358a'
const result = await uut.getMutableData(documentHash) const result = await uut.getMutableData(documentHash)
assert.isObject(result) assert.isString(result)
}) })
}) })
}) })