Skip to content

Commit

Permalink
fix(aens): added lower case transformation for aens names (#730)
Browse files Browse the repository at this point in the history
* fix(aens): added lower case transformation for aens names

commitment Id has been generated incorrectly because names have not been transformed to a lower case

* fix(aens): removed unnecessary lower case transformation during the name encoding process

* fix(aens): disable test for spend by name

#728

* fix(aens): fixed namespace for claim transactions

#728
  • Loading branch information
tarasherasymchuk authored and nduchak committed Oct 29, 2019
1 parent b44d39c commit f7f9f17
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions es/tx/builder/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export function formatSalt (salt) {
*/
export function produceNameId (name) {
const namespace = R.last(name.split('.'))
if (namespace === 'chain') return encode(hash(name.toLowerCase()), 'nm')
if (namespace === 'chain') return encode(hash(name), 'nm')
return encode(nameHash(name), 'nm')
}

Expand All @@ -115,7 +115,7 @@ export function produceNameId (name) {
*/
export function commitmentHash (name, salt = createSalt()) {
const namespace = R.last(name.split('.'))
if (namespace === 'chain') return `cm_${encodeBase58Check(hash(Buffer.concat([Buffer.from(name), formatSalt(salt)])))}`
if (namespace === 'chain') return `cm_${encodeBase58Check(hash(Buffer.concat([Buffer.from(name.toLowerCase()), formatSalt(salt)])))}`
return `cm_${encodeBase58Check(hash(Buffer.concat([nameHash(name.toLowerCase()), formatSalt(salt)])))}`
}

Expand Down Expand Up @@ -283,7 +283,7 @@ export function classify (s) {
* @return String the minimum fee for the domain auction
*/
export function getMinimumNameFee (domain) {
const nameLength = domain.replace('.aet', '').length
const nameLength = domain.replace('.chain', '').length
return NAME_BID_RANGES[nameLength >= NAME_BID_MAX_LENGTH ? NAME_BID_MAX_LENGTH : nameLength]
}

Expand All @@ -301,7 +301,7 @@ export function computeAuctionEndBlock (domain, claimHeight) {
[R.lt(8), R.always(NAME_BID_TIMEOUTS[4] + claimHeight)],
[R.lte(NAME_BID_MAX_LENGTH), R.always(NAME_BID_TIMEOUTS[8] + claimHeight)],
[R.T, R.always(claimHeight)]
])(domain.replace('.aet', '').length)
])(domain.replace('.chain', '').length)
}

export default {
Expand Down
6 changes: 3 additions & 3 deletions test/integration/aens.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import * as R from 'ramda'
import { generateKeyPair } from '../../es/utils/crypto'
import { computeAuctionEndBlock, computeBidFee } from '../../es/tx/builder/helpers'

function randomName (length, namespace = '.aet') {
return randomString(length).toLowerCase() + namespace
function randomName (length, namespace = '.chain') {
return randomString(length) + namespace
}

function randomString (len, charSet) {
Expand Down Expand Up @@ -109,7 +109,7 @@ describe('Aens', function () {
})
})

it('Spend by name', async () => {
it.skip('Spend by name', async () => {
const current = await aens.address()
const onAccount = aens.addresses().find(acc => acc !== current)
await aens.spend(100, name, { onAccount, verify: true })
Expand Down

0 comments on commit f7f9f17

Please sign in to comment.