Merge pull request #135 from aeternity/release/2.7.0

Release 2.7.0

Author: mradkov

.env

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

.travis.yml

@@ -0,0 +1,57 @@
+branches:
+  only:
+    - master
+    - develop
+
+dist: xenial
+
+addons:
+  apt:
+    packages:
+      - build-essential
+      - curl
+      - libltdl7
+      - git
+
+services:
+  - docker
+
+language: node_js
+node_js: '10'
+
+cache:
+  timeout: 604800 # 7 days
+  directories:
+    - "$HOME/.npm"
+
+env:
+  global:
+    - TEST_NODE=http://localhost:3013
+    - TEST_URL=http://localhost:3013
+    - TEST_DEBUG_URL=http://localhost:3113
+    - TEST_WS_URL=ws://localhost:3014/channel
+    - TEST_NETWORK_ID=ae_devnet
+    - COMPILER_URL=http://localhost:3080
+    - FORCE_COMPATIBILITY=false
+
+before_install:
+  - docker-compose up -d node compiler
+
+install:
+  - npm ci
+
+jobs:
+  include:
+    - stage: Tests
+      if: type != "cron"
+      name: Test
+      script:
+        - npm run test
+    - stage: Tests
+      if: type = "cron"
+      env:
+        - NODE_TAG=master
+        - COMPILER_TAG=latest
+        - FORCE_COMPATIBILITY=true
+      script:
+        - npm run test

CHANGELOG.md

@@ -1,3 +1,36 @@
+# [2.7.0](https://github.com/aeternity/aepp-cli-js/compare/2.6.0...2.7.0) (2020-06-10)
+
+
+### Bug Fixes
+
+* **AENS:** Change tld from `aet` to `chain` ([#115](https://github.com/aeternity/aepp-cli-js/issues/115)) ([8279579](https://github.com/aeternity/aepp-cli-js/commit/8279579))
+* **Contract:** Fix compiler test's ([b748003](https://github.com/aeternity/aepp-cli-js/commit/b748003))
+* **tests:** Regenerate lock files to fix build on CI ([#128](https://github.com/aeternity/aepp-cli-js/issues/128)) ([23168ae](https://github.com/aeternity/aepp-cli-js/commit/23168ae))
+* Fix test for AENS ([fae6ce8](https://github.com/aeternity/aepp-cli-js/commit/fae6ce8))
+
+
+### Features
+
+* **Account:** Add `verify-message` command to `account` module ([f26de1e](https://github.com/aeternity/aepp-cli-js/commit/f26de1e))
+* **Account:** Add message sign command ([d05e611](https://github.com/aeternity/aepp-cli-js/commit/d05e611))
+* **Account:** Adjust printing and json serialization for `sign-message` result ([7399377](https://github.com/aeternity/aepp-cli-js/commit/7399377))
+* **Account:** Spend by name. Extend `account spend` command with ability to put recipient address or name ([#117](https://github.com/aeternity/aepp-cli-js/issues/117)) ([043d1a2](https://github.com/aeternity/aepp-cli-js/commit/043d1a2))
+* **AENS:** Add bid, transfer, revoke and fullClaim commands ([a5eb23a](https://github.com/aeternity/aepp-cli-js/commit/a5eb23a))
+* **AENS:** Add test for auction ([9f4f6b2](https://github.com/aeternity/aepp-cli-js/commit/9f4f6b2))
+* **AENS:** extend name ttl command ([63c99ae](https://github.com/aeternity/aepp-cli-js/commit/63c99ae))
+* **AENS:** Fix `transfer` command. Add more test for transfer AENS names ([547af5a](https://github.com/aeternity/aepp-cli-js/commit/547af5a))
+* **AENS:** Fix BC for all of AENS commands. ([77d2d3c](https://github.com/aeternity/aepp-cli-js/commit/77d2d3c))
+* **AENS:** Implement name update command ([b65c5e6](https://github.com/aeternity/aepp-cli-js/commit/b65c5e6))
+* **CLI:** Refactor constant(Use constant from sdk). Refactor error handling in AENS module. Add `pre-claim` command. Refactor claim command ([7038629](https://github.com/aeternity/aepp-cli-js/commit/7038629))
+* **Contract:** Add test for calling contract using cointract descriptor file or source code and address ([3f77138](https://github.com/aeternity/aepp-cli-js/commit/3f77138))
+* **Contract:** contract `call` command ([ae723d5](https://github.com/aeternity/aepp-cli-js/commit/ae723d5))
+* **Contract:** Contract high level commands ([#116](https://github.com/aeternity/aepp-cli-js/issues/116)) ([8848a7b](https://github.com/aeternity/aepp-cli-js/commit/8848a7b))
+* **Contract:** Enable test's for contract ([ed48a83](https://github.com/aeternity/aepp-cli-js/commit/ed48a83))
+* **Oracle:** Oracle commands ([#134](https://github.com/aeternity/aepp-cli-js/issues/134)) ([05b079a](https://github.com/aeternity/aepp-cli-js/commit/05b079a))
+* **Tests:** Fix Breaking Changes and adjust tests ([#126](https://github.com/aeternity/aepp-cli-js/issues/126)) ([60b7910](https://github.com/aeternity/aepp-cli-js/commit/60b7910))
+
+
+
 # [2.6.0](https://github.com/aeternity/aepp-cli-js/compare/2.5.0...2.6.0) (2019-10-07)
 
 

Jenkinsfile

@@ -29,8 +29,8 @@ const { Account } = require('./commands')
 
 // ## Initialize `options`
 program
-  .option('-u, --url [hostname]', 'Node to connect to', utils.constant.EPOCH_URL)
-  .option('-U, --internalUrl [internal]', 'Node to connect to(internal)', utils.constant.EPOCH_INTERNAL_URL)
+  .option('-u, --url [hostname]', 'Node to connect to', utils.constant.NODE_URL)
+  .option('-U, --internalUrl [internal]', 'Node to connect to(internal)', utils.constant.NODE_INTERNAL_URL)
   .option('-P, --password [password]', 'Wallet Password')
   .option('-f --force', 'Ignore epoch version compatibility check')
   .option('--json', 'Print result in json format')
@@ -41,17 +41,20 @@ program
 //
 // Example: `aecli account spend ./myWalletKeyFile ak_1241rioefwj23f2wfdsfsdsdfsasdf 100 --password testpassword`
 //
+// Example: `aecli account spend ./myWalletKeyFile aensAccountName.chain 100 --password testpassword`
+//
 // You can set transaction `ttl(Time to leave)`. If not set use default.
 //
 // Example: `aecli account spend ./myWalletKeyFile ak_1241rioefwj23f2wfdsfsdsdfsasdf 100 --password testpassword --ttl 20` --> this tx will leave for 20 blocks
 program
-  .command('spend <wallet_path> <receiver> <amount>')
+  .command('spend <wallet_path> <receiverIdOrName> <amount>')
   .option('--networkId [networkId]', 'Network id (default: ae_mainnet)')
   .option('--payload [payload]', 'Transaction payload.', '')
   .option('-F, --fee [fee]', 'Spend transaction fee.')
   .option('-T, --ttl [ttl]', 'Validity of the spend transaction in number of blocks (default forever)', utils.constant.TX_TTL)
   .option('-N, --nonce [nonce]', 'Override the nonce that the transaction is going to be sent with')
-  .action(async (walletPath, receiver, amount, ...arguments) => await Account.spend(walletPath, receiver, amount, utils.cli.getCmdFromArguments(arguments)))
+  .option('-D, --denomination [denomination]', 'Denomination of amount', utils.constant.DENOMINATION)
+  .action(async (walletPath, receiverIdOrName, amount, ...arguments) => await Account.spend(walletPath, receiverIdOrName, amount, utils.cli.getCmdFromArguments(arguments)))
 
 
 // ## Initialize `transfer` command
@@ -71,6 +74,7 @@ program
   .option('-F, --fee [fee]', 'Spend transaction fee.')
   .option('-T, --ttl [ttl]', 'Validity of the spend transaction in number of blocks (default forever)', utils.constant.TX_TTL)
   .option('-N, --nonce [nonce]', 'Override the nonce that the transaction is going to be sent with')
+  .option('-D, --denomination [denomination]', 'Denomination of amount', utils.constant.DENOMINATION)
   .action(async (walletPath, receiver, percentage, ...arguments) => await Account.transferFunds(walletPath, receiver, percentage, utils.cli.getCmdFromArguments(arguments)))
 
 
@@ -86,6 +90,30 @@ program
   .action(async (walletPath, tx, ...arguments) => await Account.sign(walletPath, tx, utils.cli.getCmdFromArguments(arguments)))
 
 
+// ## Initialize `sign-message` command
+//
+// You can use this command to sign message
+//
+// Example: `aecli account sign-message ./myWalletKeyFile Hello --password testpassword`
+program
+  .command('sign-message <wallet_path> [data...]')
+  .option('--filePath [path]', 'Specify the path to the file for signing(ignore command message argument and use file instead)')
+  .description('Create a transaction to another wallet')
+  .action(async (walletPath, data, ...arguments) => await Account.signMessage(walletPath, data, utils.cli.getCmdFromArguments(arguments)))
+
+
+// ## Initialize `verify-message` command
+//
+// You can use this command to sign message
+//
+// Example: `aecli account verify-message ./myWalletKeyFile asd1dasfadfsdasdasdasHexSig... Hello --password testpassword`
+program
+  .command('verify-message <wallet_path> <hexSignature> [data...]')
+  .option('--filePath [path]', 'Specify the path to the file(ignore comm and message argument and use file instead)')
+  .description('Create a transaction to another wallet')
+  .action(async (walletPath, hexSignature, data, ...arguments) => await Account.verifyMessage(walletPath, hexSignature, data, utils.cli.getCmdFromArguments(arguments)))
+
+
 // ## Initialize `balance` command
 //
 // You can use this command to retrieve balance of account

bin/aecli-account.js

@@ -29,8 +29,8 @@ const { Chain } = require('./commands')
 
 // # Initialize `options`
 program
-  .option('-u --url [hostname]', 'Node to connect to', utils.constant.EPOCH_URL)
-  .option('--internalUrl [internal]', 'Node to connect to(internal)', utils.constant.EPOCH_INTERNAL_URL)
+  .option('-u --url [hostname]', 'Node to connect to', utils.constant.NODE_URL)
+  .option('--internalUrl [internal]', 'Node to connect to(internal)', utils.constant.NODE_INTERNAL_URL)
   .option('-L --limit [playlimit]', 'Limit for play command', utils.constant.PLAY_LIMIT)
   .option('-f --force', 'Ignore node version compatibility check')
   .option('--json', 'Print result in json format')
@@ -95,7 +95,7 @@ program
 // Example: `aecli tx spend ak_2a1j2Mk9YSmC1gioUq4PWRm3bsv887MbuRVwyv4KaUGoR1eiKi ak_AgV756Vfo99juwzNVgnjP1gXX1op1QN3NXTxvkPnHJPUDE8NT 100`
 program
   .command('broadcast <tx>')
-  .option('--waitMined', 'Transaction payload.')
+  .option('-W, --no-waitMined', 'Force waiting until transaction will be mined')
   .option('--verify', 'Verify Transaction before broadcast.')
   .description('Send transaction to the chain')
   .action(async (tx, ...arguments) => await Chain.broadcast(tx, utils.cli.getCmdFromArguments(arguments)))

bin/aecli-chain.js

@@ -28,8 +28,8 @@ const { Contract } = require('./commands')
 
 // ## Initialize `options`
 program
-  .option('-u --url [hostname]', 'Node to connect to', utils.constant.EPOCH_URL)
-  .option('--internalUrl [internal]', 'Node to connect to(internal)', utils.constant.EPOCH_INTERNAL_URL)
+  .option('-u --url [hostname]', 'Node to connect to', utils.constant.NODE_URL)
+  .option('--internalUrl [internal]', 'Node to connect to(internal)', utils.constant.NODE_INTERNAL_URL)
   .option('--compilerUrl [compilerUrl]', 'Compiler URL', utils.constant.COMPILER_URL)
   .option('-f --force', 'Ignore node version compatibility check')
   .option('--json', 'Print result in json format')
@@ -86,6 +86,63 @@ program
   .action(async (data, ...arguments) => await Contract.decodeCallData(data, utils.cli.getCmdFromArguments(arguments)))
 
 
+// ## Initialize `call` command
+//
+// You can use this command to execute a function's of contract
+//
+// Example:
+//    `aecli contract call ./myWalletFile --password testpass sumFunc int 1 2 --descrPath ./contractDescriptorFile.json ` --> Using descriptor file
+//    `aecli contract call ./myWalletFile --password testpass sumFunc int 1 2 --contractAddress ct_1dsf35423fdsg345g4wsdf35ty54234235 ` --> Using contract address
+//
+// Also you have ability to make `static` call using `--callStatic` flag
+// Example:
+//    `aecli contract call ./myWalletFile --password testpass sumFunc int 1 2 --descrPath ./contractDescriptorFile.json --callStatic` --> Static call using descriptor
+//    `aecli contract call ./myWalletFile --password testpass sumFunc int 1 2 --contractAddress ct_1dsf35423fdsg345g4wsdf35ty54234235 --callStatic` --> Static call using contract address
+// You can preset gas, nonce and ttl for that call. If not set use default.
+// Example: `aecli contract call ./myWalletFile --password tstpass sumFunc int 1 2 --descrPath ./contractDescriptorFile.json  --gas 2222222 --nonce 4 --ttl 1243`
+program
+  .command('call <wallet_path> <fn> [args...]')
+  .option('-W, --no-waitMined', 'Force waiting until transaction will be mined')
+  .option('--networkId [networkId]', 'Network id (default: ae_mainnet)')
+  .option('-P, --password [password]', 'Wallet Password')
+  .option('-G --gas [gas]', 'Amount of gas to call the contract', utils.constant.GAS)
+  .option('-d --descrPath [descrPath]', 'Path to contract descriptor file')
+  .option('--backend [backend]', 'Compiler backend("fate" | "aevm")', utils.constant.COMPILER_BACKEND)
+  .option('-s --callStatic', 'Call static', false)
+  .option('-t --topHash', 'Hash of block to make call')
+  .option('--contractAddress [contractAddress]', 'Contract address to call')
+  .option('--contractSource [contractSource]', 'Contract source code')
+  .option('-F, --fee [fee]', 'Spend transaction fee.')
+  .option('-T, --ttl [ttl]', 'Validity of the spend transaction in number of blocks (default forever)', utils.constant.TX_TTL)
+  .option('-N, --nonce [nonce]', 'Override the nonce that the transaction is going to be sent with')
+  .description('Execute a function of the contract')
+  .action(async (walletPath, fn, args, ...arguments) => await Contract.call(walletPath, fn, args, utils.cli.getCmdFromArguments(arguments)))
+
+//
+// ## Initialize `deploy` command
+//
+// You can use this command to deploy contract on the chain
+//
+// Example: `aecli contract deploy ./myWalletFile --password testpass ./contractSourceCodeFile 1 2` -> "1 2" -> Init state params
+//
+// You can preset gas and initState for deploy
+//
+// Example: `aecli contract deploy ./myWalletFile --password tstpass ./contractSourceCodeFile --gas 2222222`
+program
+  .command('deploy <wallet_path> <contract_path> <callData>')
+  .option('--networkId [networkId]', 'Network id (default: ae_mainnet)')
+  .option('-W, --no-waitMined', 'Force waiting until transaction will be mined')
+  .option('-P, --password [password]', 'Wallet Password')
+  .option('-G --gas [gas]', 'Amount of gas to deploy the contract', utils.constant.GAS)
+  .option('-G --gasPrice [gas]', 'Amount of gas to deploy the contract', utils.constant.GAS_PRICE)
+  .option('--backend [backend]', 'Compiler backend("fate" | "aevm")', utils.constant.COMPILER_BACKEND)
+  .option('-F, --fee [fee]', 'Spend transaction fee.')
+  .option('-T, --ttl [ttl]', 'Validity of the spend transaction in number of blocks (default forever)', utils.constant.TX_TTL)
+  .option('-N, --nonce [nonce]', 'Override the nonce that the transaction is going to be sent with')
+  .description('Deploy a contract on the chain')
+  .action(async (walletPath, path, callData, ...arguments) => await Contract.deploy(walletPath, path, callData, utils.cli.getCmdFromArguments(arguments)))
+
+
 // Handle unknown command's
 program.on('command:*', () => utils.errors.unknownCommandHandler(program)())
 

bin/aecli-contract.js

@@ -29,8 +29,8 @@ const { Inspect } = require('./commands')
 
 // ## Initialize `options`
 program
-  .option('-u --url [hostname]', 'Node to connect to', utils.constant.EPOCH_URL)
-  .option('--internalUrl [internal]', 'Node to connect to(internal)', utils.constant.EPOCH_INTERNAL_URL)
+  .option('-u --url [hostname]', 'Node to connect to', utils.constant.NODE_URL)
+  .option('--internalUrl [internal]', 'Node to connect to(internal)', utils.constant.NODE_INTERNAL_URL)
   .option('-f --force', 'Ignore node version compatibility check')
   .option('--json', 'Print result in json format')
 
@@ -52,7 +52,7 @@ program
 program
   .arguments('<hash>')
   .description('Hash or Name to inspect (eg: ak_..., mk_..., name.test)')
-  .action(async (hash, cmd) => await Inspect.inspect(hash, cmd))
+  .action(async (hash, cmd) => Inspect.inspect(hash, cmd))
 
 // Parse arguments or show `help` if argument's is empty
 program.parse(process.argv)