fix(AENS): Change tld from aet to chain (#115)

* fix(AENS): Change tld from `aet` to `chain` * refactor(CLI): adjust imports * refactor(CLI): Fix constant imports
aeternity · Oct 16, 2019 · 8279579 · 8279579
1 parent 0dd70d2
commit 8279579
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/.env b/.env
@@ -1,2 +1,2 @@
-TAG=v5.0.0-rc.3
-COMPILER_TAG=v4.0.0-rc5
+TAG=v5.0.0-rc.5
+COMPILER_TAG=v4.0.0
diff --git a/bin/commands/account.js b/bin/commands/account.js
@@ -20,6 +20,7 @@
  */
 
 import { generateKeyPair } from '@aeternity/aepp-sdk/es/utils/crypto'
+
 import { generateSecureWallet, generateSecureWalletFromPrivKey } from '../utils/account'
 import { HASH_TYPES } from '../utils/constant'
 import { exit, initClientByWalletFile } from '../utils/cli'

diff --git a/bin/commands/aens.js b/bin/commands/aens.js
@@ -23,7 +23,7 @@ import { exit, initChain, initClientByWalletFile } from '../utils/cli'
 import { printError, print, printName, printTransaction } from '../utils/print'
 import { handleApiError } from '../utils/errors'
 import { isAvailable, updateNameStatus, validateName } from '../utils/helpers'
-import { isAddressValid } from '@aeternity/aepp-sdk/es/utils/crypto';
+import { isAddressValid } from '@aeternity/aepp-sdk/es/utils/crypto'
 
 // ## Claim `name` function
 async function preClaim (walletPath, domain, options) {
@@ -249,8 +249,8 @@ async function fullClaim (walletPath, domain, options) {
   try {
     // Validate `name`
     validateName(domain)
-    const [_, namespace] = domain.split('.')
-    if (namespace !== 'test' && domain.length - 4 < 13) throw new Error('Full name claiming works only with name longer then 12 symbol(Not trigger auction)')
+    const [aensName, namespace] = domain.split('.')
+    if (namespace === 'chain' && aensName.length < 13) throw new Error('Full name claiming works only with name longer then 12 symbol(Not trigger auction)')
 
     // Get `keyPair` by `walletPath`, decrypt using password and initialize `Ae` client with this `keyPair`
     const client = await initClientByWalletFile(walletPath, options)

diff --git a/bin/utils/constant.js b/bin/utils/constant.js
@@ -17,7 +17,7 @@
 // # Utils `constant` Module
 // That script contains default configuration for `CLI`
 
-import { ABI_VERSIONS, VM_TYPE, VM_VERSIONS } from '@aeternity/aepp-sdk/es/tx/builder/schema'
+import { ABI_VERSIONS, VM_TYPE, VM_VERSIONS, MIN_GAS_PRICE } from '@aeternity/aepp-sdk/es/tx/builder/schema'
 
 export {
   // ## AENS
@@ -27,6 +27,7 @@ export {
   AENS_NAME_DOMAINS,
   // ## TRANSACTION
   TX_TTL,
+  // # CONTRACT
   ABI_VERSIONS,
   VM_VERSIONS,
   VM_TYPE
@@ -59,11 +60,11 @@ export const PLAY_INTERVAL = 1000
 // ## CONTRACT
 export const GAS = 1600000 - 21000 // MAX GAS
 export const DEPOSIT = 0
+export const GAS_PRICE = MIN_GAS_PRICE
 export const VM_VERSION = VM_VERSIONS.FATE
 export const ABI_VERSION = ABI_VERSIONS.FATE
 export const COMPILER_BACKEND = VM_TYPE.FATE
 export const ORACLE_VM_VERSION = 0
-export const GAS_PRICE = 1000000000 // 1e9
 export const AMOUNT = 0
 
 // ## ORACLE

diff --git a/test/cli/aens.test.js b/test/cli/aens.test.js
@@ -25,7 +25,7 @@ plan(10000000000000)
 
 const execute = (arg) => exec(arg, { withNetworkId: true })
 
-function randomName (length, namespace = '.aet') {
+function randomName (length, namespace = '.chain') {
   return randomString(length).toLowerCase() + namespace
 }
 
@@ -54,8 +54,8 @@ describe('CLI AENS Module', function () {
       const { version } = wallet.getNodeInfo()
       const [majorVersion] = version.split('.')
       nameAuctionsSupported = +majorVersion === 5 && version !== '5.0.0-rc.1'
-      name = randomName(12, nameAuctionsSupported ? '.aet' : '.test')
-      name2 = randomName(13, nameAuctionsSupported ? '.aet' : '.test')
+      name = randomName(12, nameAuctionsSupported ? '.chain' : '.test')
+      name2 = randomName(13, nameAuctionsSupported ? '.chain' : '.test')
     } catch (e) {
       console.log(e.toString())
     }

diff --git a/test/cli/inspect.test.js b/test/cli/inspect.test.js
@@ -90,7 +90,7 @@ describe('CLI Inspect Module', function () {
   })
   it('Inspect Name', async () => {
     const invalidName = await execute(['inspect', 'asd', '--json'])
-    const validName = JSON.parse(await execute(['inspect', 'nazdou2222222.aet', '--json']))
+    const validName = JSON.parse(await execute(['inspect', 'nazdou2222222.chain', '--json']))
     invalidName.indexOf('AENS: Invalid name domain').should.not.equal(-1)
     validName.status.should.be.equal('AVAILABLE')
   })

diff --git a/test/cli/tx.js b/test/cli/tx.js
@@ -27,7 +27,7 @@ const testContract = `contract Identity =
   entrypoint main(x : int, y: int) = x + y
 `
 
-function randomName (length = 18, namespace = '.aet') {
+function randomName (length = 18, namespace = '.chain') {
   return randomString(length).toLowerCase() + namespace
 }