Merge pull request #107 from aeternity/release/2.6.0

Release 2.6.0

Author: nduchak

.env

@@ -1,3 +1,2 @@
-TAG=v5.0.0-rc.1
-COMPILER_TAG=v3.2.0
-
+TAG=v5.0.0-rc.3
+COMPILER_TAG=v4.0.0-rc5

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,29 @@
+**Note: for support questions, please use the [forum](https://forum.aeternity.com)**. This repository's issues are reserved for feature requests and bug reports.
+
+* **I'm submitting a ...**
+  - [ ] bug report
+  - [ ] feature request
+  - [ ] support request => Please do not submit support request here, see note at the top of this template.
+
+
+* **Do you want to request a *feature* or report a *bug*?**
+
+* **What is the current behavior?**
+
+* **If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem**
+
+* **What is the expected behavior?**
+
+* **What is the motivation / use case for changing the behavior?**
+
+* **Please tell us about your environment:**
+  
+  - Node Version: v0.0.0
+  - Protocol Version: 1
+  - Compiler version: v0.0.0
+  - VM Version: aevm | fate
+  - SDK Version: v0.0.0
+  - Environment: browser | nodejs
+
+
+* **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. forum, telegram, etc)

CHANGELOG.md

@@ -1,3 +1,13 @@
+# [2.6.0](https://github.com/aeternity/aepp-cli-js/compare/2.5.0...2.6.0) (2019-10-07)
+
+
+### Features
+
+* **Lima:** Add support for lima ([#105](https://github.com/aeternity/aepp-cli-js/issues/105)) ([f7b061a](https://github.com/aeternity/aepp-cli-js/commit/f7b061a))
+* **Compiler:** Add `backend` option to compiler(Can be `fate` or `aevm`. `fate` by default)
+* **AENS:** Add `nameFee` option to `claim` command
+
+
 # 2.5.0 (2019-08-28)
 
 

README.md

@@ -2,7 +2,7 @@
 [![npm](https://img.shields.io/npm/v/@aeternity/aepp-sdk.svg)](https://www.npmjs.com/package/@aeternity/aepp-cli)
 [![npm](https://img.shields.io/npm/l/@aeternity/aepp-sdk.svg)](https://www.npmjs.com/package/@aeternity/aepp-cli)
 
-# ️⚠️ [WIP] aepp-cli-js
+# aepp-cli-js
 Command Line Interface for the æternity blockchain.
 
 ## Disclaimer
@@ -16,8 +16,6 @@ check out the [develop branch].
 
 
 ## Installation
-> ️⚠️ **TODO**: The package is not yet published, so you can only install it by cloning this project.
->
 You can install this `CLI` using your preferred tool (`yarn` or `npm`). Here's an `npm` example
 ```
 npm install --global @aeternity/aepp-cli

bin/aecli-contract.js

@@ -41,6 +41,7 @@ program
 // Example: `aecli contract compile ./mycontract.contract`
 program
   .command('compile <file>')
+  .option('--backend [backend]', 'Compiler backend("fate" | "aevm")', utils.constant.COMPILER_BACKEND)
   .description('Compile a contract')
   .action(async (file, ...arguments) => await Contract.compile(file, utils.cli.getCmdFromArguments(arguments)))
 
@@ -52,6 +53,7 @@ program
 // Example: `aecli contract encodeData ./mycontract.contract testFn 1 2`
 program
   .command('encodeData <source> <fn> [args...]')
+  .option('--backend [backend]', 'Compiler backend("fate" | "aevm")', utils.constant.COMPILER_BACKEND)
   .description('Encode contract call data')
   .action(async (source, fn, args, ...arguments) => await Contract.encodeData(source, fn, args, utils.cli.getCmdFromArguments(arguments)))
 
@@ -63,6 +65,7 @@ program
 // Example: `aecli contract decodeData cb_asdasdasdasdasdas int`
 program
   .command('decodeData <data> <returnType>')
+  .option('--backend [backend]', 'Compiler backend("fate" | "aevm")', utils.constant.COMPILER_BACKEND)
   .description('Decode contract data')
   .action(async (data, returnType, ...arguments) => await Contract.decodeData(data, returnType, utils.cli.getCmdFromArguments(arguments)))
 
@@ -78,6 +81,7 @@ program
   .option('--sourcePath [sourcePath]', 'Path to contract source')
   .option('--code [code]', 'Compiler contract code')
   .option('--fn [fn]', 'Function name')
+  .option('--backend [backend]', 'Compiler backend("fate" | "aevm")', utils.constant.COMPILER_BACKEND)
   .description('Decode contract call data')
   .action(async (data, ...arguments) => await Contract.decodeCallData(data, utils.cli.getCmdFromArguments(arguments)))
 

bin/aecli-tx.js

@@ -81,6 +81,7 @@ program
   .command('name-claim <accountId> <salt> <domain> <nonce>')
   .option('-T, --ttl [ttl]', 'Validity of the transaction in number of blocks (default forever)', utils.constant.TX_TTL)
   .option('-F, --fee [fee]', 'Transaction fee.')
+  .option('--nameFee [nameFee]', 'Name fee.', utils.constant.NAME_FEE)
   .description('Build name claim transaction.')
   .action(async (accountId, salt, domain, nonce, ...arguments) => await Transaction.nameClaim(accountId, salt, domain, nonce, utils.cli.getCmdFromArguments(arguments)))
 
@@ -122,6 +123,7 @@ program
   .option('--deposit [deposit]', 'Deposit', 0)
   .option('-G --gas [gas]', 'Amount of gas to deploy the contract', utils.constant.GAS)
   .option('--vmVersion [vmVersion]', 'VM version', utils.constant.VM_VERSION)
+  .option('--abiVersion [abiVersion]', 'ABI version', utils.constant.DEFAULT_CONTRACT_PARAMS.abiVersion)
   .description('Build contract create transaction.')
   .action(async (ownerId, contractBytecode, initCallData, nonce, ...arguments) => await Transaction.contractDeploy(ownerId, contractBytecode, initCallData, nonce, utils.cli.getCmdFromArguments(arguments)))
 
@@ -135,6 +137,8 @@ program
   .option('-T, --ttl [ttl]', 'Validity of the transaction in number of blocks (default forever)', utils.constant.TX_TTL)
   .option('-F, --fee [fee]', 'Transaction fee.')
   .option('-G --gas [gas]', 'Amount of gas to deploy the contract', utils.constant.GAS)
+  .option('--abiVersion [abiVersion]', 'VM version', utils.constant.DEFAULT_CONTRACT_PARAMS.abiVersion)
+  .option('--vmVersion [vmVersion]', 'ABI version', utils.constant.VM_VERSION)
   .description('Build contract create transaction.')
   .action(async (callerId, contractId, callData, nonce, ...arguments) => await Transaction.contractCall(callerId, contractId, callData, nonce, utils.cli.getCmdFromArguments(arguments)))
 

bin/commands/contract.js

@@ -30,6 +30,7 @@ import { GAS_PRICE } from '../utils/constant'
 
 // ## Function which compile your `source` code
 export async function compile (file, options) {
+  const { backend } = options
   try {
     const code = readFile(path.resolve(process.cwd(), file), 'utf-8')
     if (!code) throw new Error('Contract file not found')
@@ -38,7 +39,7 @@ export async function compile (file, options) {
 
     await handleApiError(async () => {
       // Call `node` API which return `compiled code`
-      const contract = await client.compileContractAPI(code)
+      const contract = await client.compileContractAPI(code, { backend })
       print(`Contract bytecode:
       ${contract}`)
     })
@@ -49,6 +50,7 @@ export async function compile (file, options) {
 
 // ## Function which compile your `source` code
 export async function encodeData (source, fn, args = [], options) {
+  const { backend } = options
   try {
     const sourceCode = readFile(path.resolve(process.cwd(), source), 'utf-8')
     if (!sourceCode) throw new Error('Contract file not found')
@@ -57,7 +59,7 @@ export async function encodeData (source, fn, args = [], options) {
 
     await handleApiError(async () => {
       // Call `node` API which return `compiled code`
-      const callData = await client.contractEncodeCallDataAPI(sourceCode, fn, args, options)
+      const callData = await client.contractEncodeCallDataAPI(sourceCode, fn, args, { backend })
       if (options.json) {
         print(JSON.stringify({ callData }))
       } else {
@@ -91,7 +93,7 @@ export async function decodeData (data, type, options) {
 
 // ## Function which compile your `source` code
 export async function decodeCallData (data, options) {
-  const { sourcePath, code, fn } = options
+  const { sourcePath, code, fn, backend } = options
   let sourceCode
 
   if (!sourcePath && !code) throw new Error('Contract source(--sourcePath) or contract code(--code) required!')
@@ -109,8 +111,8 @@ export async function decodeCallData (data, options) {
     await handleApiError(async () => {
       // Call `node` API which return `compiled code`
       const decoded = code
-        ? await client.contractDecodeCallDataByCodeAPI(code, data)
-        : await client.contractDecodeCallDataBySourceAPI(sourceCode, fn, data)
+        ? await client.contractDecodeCallDataByCodeAPI(code, data, backend)
+        : await client.contractDecodeCallDataBySourceAPI(sourceCode, fn, data, { backend })
 
       if (options.json) {
         print(JSON.stringify({ decoded }))

bin/commands/transaction.js

@@ -97,7 +97,8 @@ async function namePreClaim (accountId, domain, nonce, options) {
 
 // ## Build `nameClaim` transaction
 async function nameClaim (accountId, nameSalt, domain, nonce, options) {
-  let { ttl, json, fee } = options
+  const vsn = 2
+  let { ttl, json, fee, nameFee } = options
   const nameHash = `nm_${encodeBase58Check(Buffer.from(domain))}`
 
   try {
@@ -106,15 +107,16 @@ async function nameClaim (accountId, nameSalt, domain, nonce, options) {
     // Initialize `Ae`
     const txBuilder = initOfflineTxBuilder()
     const params = {
+      nameFee,
       accountId,
       nameSalt,
       name: nameHash,
       ttl,
       nonce
     }
-    fee = txBuilder.calculateFee(fee, TX_TYPE.nameClaim, { params })
+    fee = txBuilder.calculateFee(fee, TX_TYPE.nameClaim, { params, vsn })
     // Build `claim` transaction's
-    const { tx, txObject } = txBuilder.buildTx({ ...params, fee }, TX_TYPE.nameClaim)
+    const { tx, txObject } = txBuilder.buildTx({ ...params, fee }, TX_TYPE.nameClaim, { vsn })
 
     if (json) {
       print({ tx, txObject })
@@ -276,7 +278,7 @@ async function contractDeploy (ownerId, contractByteCode, initCallData, nonce, o
 
 // ## Build `contractCall` transaction
 async function contractCall (callerId, contractId, callData, nonce, options) {
-  let { ttl, json, fee, gas } = options
+  const { ttl, json, fee, gas } = options
   nonce = parseInt(nonce)
   try {
     // Build `call` transaction's

bin/utils/constant.js

@@ -44,13 +44,16 @@ export const PLAY_INTERVAL = 1000
 // ## CONTRACT
 export const GAS = 1600000 - 21000 // MAX GAS
 export const DEPOSIT = 0
-export const VM_VERSION = 4
+export const VM_VERSION = 5
+export const ABI_VERSION = 3
+export const COMPILER_BACKEND = 'fate'
 export const ORACLE_VM_VERSION = 0
 export const GAS_PRICE = 1000000000
 export const AMOUNT = 0
 
 // ## AENS
 export const NAME_TTL = 50000
+export const NAME_FEE = '1000000000000000000000'
 export const CLIENT_TTL = 1
 
 // ## ACCOUNT
@@ -64,4 +67,4 @@ export const QUERY_TTL = 10
 export const RESPONSE_TTL = 10
 
 // ## Default transaction build param's
-export const DEFAULT_CONTRACT_PARAMS = { vmVersion: VM_VERSION, amount: AMOUNT, deposit: DEPOSIT, gasPrice: GAS_PRICE, abiVersion: 1 }
+export const DEFAULT_CONTRACT_PARAMS = { vmVersion: VM_VERSION, amount: AMOUNT, deposit: DEPOSIT, gasPrice: GAS_PRICE, abiVersion: ABI_VERSION }

bin/utils/helpers.js

@@ -169,7 +169,7 @@ export function isAvailable (name) { return name.status === 'AVAILABLE' }
 
 // Validate `name`
 export function validateName (name) {
-  if (R.last(name.split('.')) !== 'test') { throw new Error('AENS TLDs must end in .test') }
+  if (!['test', 'aet'].includes(R.last(name.split('.')))) { throw new Error('AENS TLDs must end in .test') }
 }
 
 // Grab contract descriptor by path