From f7f9597aa036d3233c3d2fedb35cb5ab3b09caab Mon Sep 17 00:00:00 2001 From: nduchak <41945483+nduchak@users.noreply.github.com> Date: Mon, 4 Mar 2019 17:46:02 +0200 Subject: [PATCH] Release 2.3.2 (#274) * Realign/2.3.1 (#270) * Adjust version to `2.2.1-next` Adjust `changelog` * More for `CHANGELOG` * fix typo * fix linter error * trigger jenkins * bump version in package and CHANGELOG * Add info to `CHANGELOG` * force Jenkins * bump version in package update CHANGELOG * Adjust CHANGELOG * fix text * forgotten generated docs * bump version * CHANGELOG * trigger Jenkins * Fix/example app (#271) * Fix min gasPrice for contract Change node version in `.env` to `v2.0.0` * Fix `aepp` example app * Force image pull before builds * debug Jenkins * fix contract tests * bump version add 2.3.2 to CHANGELOG * adjust CHANGELOG * Trigger Jenkins * debug Jenkins * revert debug --- .env | 2 +- CHANGELOG.md | 22 +++++++++++++++++-- Jenkinsfile | 1 + es/ae/contract.js | 2 +- es/tx/tx.js | 2 +- .../identity/src/components/Home.vue | 13 ++++++----- package.json | 2 +- test/integration/transaction.js | 2 +- 8 files changed, 33 insertions(+), 13 deletions(-) diff --git a/.env b/.env index b2afa88a4b..69d3641d98 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -TAG=minerva +TAG=v2.0.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index b4544402fa..1c33c71323 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,24 @@ All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/). +## [2.3.2] +### Added +- none + +### Changed +- Change default `gasPrice` from `1e6` to `1e9z +- Fix `AEPP` example app +- Force `image` pull before `builds` + + ### Removed +- none + + ### Breaking Changes +- none + + ### Notes and known Issues +- none + ## [2.3.1] ### Added - `Oracle` fee calculation @@ -544,5 +562,5 @@ log follows the conventions of [keepachangelog.com](http://keepachangelog.com/). [2.2.1-next]: https://github.com/aeternity/aepp-sdk-js/compare/2.1.1-0.1.0-next...2.2.1-next [2.3.0-next]: https://github.com/aeternity/aepp-sdk-js/compare/2.2.1-next...2.3.0-next [2.3.0]: https://github.com/aeternity/aepp-sdk-js/compare/2.3.0-next...2.3.0 -[2.3.0]: https://github.com/aeternity/aepp-sdk-js/compare/2.3.0...2.3.1 - +[2.3.1]: https://github.com/aeternity/aepp-sdk-js/compare/2.3.0...2.3.1 +[2.3.2]: https://github.com/aeternity/aepp-sdk-js/compare/2.3.1...2.3.2 diff --git a/Jenkinsfile b/Jenkinsfile index 384e173a7d..4a471efa04 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,6 +23,7 @@ pipeline { withCredentials([usernamePassword(credentialsId: 'genesis-wallet', usernameVariable: 'WALLET_PUB', passwordVariable: 'WALLET_PRIV')]) { + sh 'docker-compose -H localhost:2376 pull node' sh 'docker-compose -H localhost:2376 build' sh 'docker-compose -H localhost:2376 run sdk pnpm run test-jenkins' } diff --git a/es/ae/contract.js b/es/ae/contract.js index 12b547b872..24be4766ee 100644 --- a/es/ae/contract.js +++ b/es/ae/contract.js @@ -229,7 +229,7 @@ const Contract = Ae.compose({ defaults: { deposit: 0, vmVersion: 1, - gasPrice: 1000000, // min gasPrice 1e6 + gasPrice: 1000000000, // min gasPrice 1e9 amount: 0, gas: 1600000 - 21000, options: '' diff --git a/es/tx/tx.js b/es/tx/tx.js index 3a017fc19e..21e03b6c38 100644 --- a/es/tx/tx.js +++ b/es/tx/tx.js @@ -34,7 +34,7 @@ import { buildContractId, oracleQueryId } from './builder/helpers' const ORACLE_VM_VERSION = 0 const CONTRACT_VM_VERSION = 1 -const MIN_GAS_PRICE = 1000000 // min gasPrice 1e6 +const MIN_GAS_PRICE = 1000000000 // min gasPrice 1e9 // TODO This values using as default for minerva node const CONTRACT_MINERVA_VM_ABI = 196609 const CONTRACT_MINERVA_VM = 3 diff --git a/examples/connect-two-ae/identity/src/components/Home.vue b/examples/connect-two-ae/identity/src/components/Home.vue index 46ce1ad2fb..4554a89320 100644 --- a/examples/connect-two-ae/identity/src/components/Home.vue +++ b/examples/connect-two-ae/identity/src/components/Home.vue @@ -48,12 +48,14 @@ export default { components: {}, data () { return { - pub: 'ak_6A2vcm1Sz6aqJezkLCssUXcyZTX7X8D5UwbuS2fRJr9KkYpRU', - priv: 'a7a695f999b1872acb13d5b63a830a8ee060ba688a478a08c6e65dfad8a01cd70bb4ed7927f97b51e1bcb5e1340d12335b2a2b12c8bc5221d63c4bcb39d41e61', + pub: 'ak_6A2vcm1Sz6aqJezkLCssUXcyZTX7X8D5UwbuS2fRJr9KkYpRU', // Your public key + priv: 'a7a695f999b1872acb13d5b63a830a8ee060ba688a478a08c6e65dfad8a01cd70bb4ed7927f97b51e1bcb5e1340d12335b2a2b12c8bc5221d63c4bcb39d41e61', // Your private key client: null, wallet: null, balance: null, height: null, + url: 'https://sdk-mainnet.aepps.com', + internalUrl: 'https://sdk-mainnet.aepps.com', aeppUrl: '//0.0.0.0:9001' } }, @@ -69,15 +71,14 @@ export default { window.addEventListener('message', console.log, false) Wallet({ - url: 'https://sdk-mainnet.aepps.com', - internalUrl: 'https://sdk-mainnet.aepps.com', + url: this.url, + internalUrl: this.internalUrl, accounts: [MemoryAccount({keypair: {secretKey: this.priv, publicKey: this.pub}})], address: this.pub, onTx: this.confirmDialog, onChain: this.confirmDialog, onAccount: this.confirmDialog, - onContract: this.confirmDialog, - networkId: 'ae_mainnet' + onContract: this.confirmDialog }).then(ae => { this.client = ae console.log('status', this.client.api.getTopBlock()) diff --git a/package.json b/package.json index 415a784fea..4b872fa9e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@aeternity/aepp-sdk", - "version": "2.3.1", + "version": "2.3.2", "description": "SDK for the æternity blockchain", "main": "dist/aepp-sdk.js", "browser": "dist/aepp-sdk.browser.js", diff --git a/test/integration/transaction.js b/test/integration/transaction.js index b487739cbb..cb6ce6f631 100644 --- a/test/integration/transaction.js +++ b/test/integration/transaction.js @@ -49,7 +49,7 @@ contract Identity = ` let contractId const deposit = 4 -const gasPrice = 1000000 +const gasPrice = 1000000000 const gas = 1600000 - 21000 // MAX GAS let _salt