Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change api to support Lisk SDK v5 - Closes #3288 #3444

Merged
merged 473 commits into from
Apr 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
473 commits
Select commit Hold shift + click to select a range
6f953f9
Update test transaction constant
Apr 1, 2021
b8573e7
limit search results to 100 to comply with api requirements
UsamaHameed Apr 1, 2021
a9d8e74
Update /utils/api mock data
Apr 1, 2021
0ad2225
Mock constants
Apr 1, 2021
d959b77
Update address and publicKey
Apr 1, 2021
b24f03e
Update avatarWithNameandAddress
Apr 1, 2021
9ce1df5
Update confirmMessage
Apr 1, 2021
ff80516
Mock account middleware actions
Apr 1, 2021
0af836e
Update login screen test
Apr 1, 2021
50e397a
Update balanceTable test
Apr 1, 2021
60e51c5
Update searchBar/transactions
Apr 1, 2021
3a23cc4
Add descriptions to the default values
reyraa Apr 6, 2021
69ca2ba
Merge branch '3452-fix-broken-ui' of github.com:LiskHQ/lisk-desktop i…
reyraa Apr 6, 2021
5de02e3
Merge pull request #3457 from LiskHQ/3452-fix-broken-ui
Apr 6, 2021
fe0c866
fix transaction broadcast
UsamaHameed Apr 6, 2021
08d1932
Update list of txs based on number of confirmed tx
reyraa Apr 6, 2021
0fc1b23
Remove unused module imports
reyraa Apr 6, 2021
4161a78
Fix eslint max length
reyraa Apr 6, 2021
50456c7
Remove empty lines
reyraa Apr 6, 2021
217f46e
Display hyphen if rank not available
reyraa Apr 6, 2021
3937466
add `toJSON` to prototype of Bigint
UsamaHameed Apr 7, 2021
9592388
fix broadcast
UsamaHameed Apr 7, 2021
3f14f51
remove eslint ignore rule
UsamaHameed Apr 7, 2021
28ef77a
separate out cryptographic functions better
UsamaHameed Apr 7, 2021
4495b11
update other occurances
UsamaHameed Apr 7, 2021
3414711
fix addNewPendingTransaction action
UsamaHameed Apr 7, 2021
a0094e6
fix issues with confirming pending transactions
UsamaHameed Apr 7, 2021
e60b692
make getAccounts call properly
UsamaHameed Apr 7, 2021
6277f8e
fix votes api call
UsamaHameed Apr 7, 2021
6f17a0d
Merge branch 'feature-sdk-v5' into 3453-fix-unit-tests
reyraa Apr 7, 2021
e1c62ff
fix wallet/votes and wallet/delegateProfile crashes
UsamaHameed Apr 7, 2021
89adc26
fix issue when votes retrieved are empty
UsamaHameed Apr 7, 2021
052d79c
make null check better
UsamaHameed Apr 8, 2021
8353eb7
create vote transaction with only relevant data
UsamaHameed Apr 8, 2021
37280d3
add module and asset objects
UsamaHameed Apr 8, 2021
97dccf2
refactor votesSubmitted action
UsamaHameed Apr 8, 2021
49b32fb
cleanup transaction/lsk and fix transaction creation functions
UsamaHameed Apr 8, 2021
5c351c2
throw errors instead of returning undefined if cryptographic conversi…
UsamaHameed Apr 9, 2021
d9ac2d8
null check data before checking its length
UsamaHameed Apr 9, 2021
f88ec8c
replace regex for address with validation from lisk elements
UsamaHameed Apr 9, 2021
33002ac
remove console.log
UsamaHameed Apr 9, 2021
fa23341
remove console.log
UsamaHameed Apr 9, 2021
0a11e3b
Merge pull request #3468 from LiskHQ/3459-adapt-tx-broadcast
Apr 9, 2021
5b3fc5d
Merge remote-tracking branch 'origin/feature-sdk-v5' into 3451-fix-tr…
UsamaHameed Apr 9, 2021
fbcf6ac
move function to utils
UsamaHameed Apr 9, 2021
9af700c
move function to utils
UsamaHameed Apr 9, 2021
9a1a9b8
move functions to utils/transaction
UsamaHameed Apr 9, 2021
7b99ba0
create joinModuleAndAssetIds function
UsamaHameed Apr 9, 2021
0fc9a3f
remove todo
UsamaHameed Apr 9, 2021
83ee314
cleanup
UsamaHameed Apr 9, 2021
7b0ae6f
delete unused utils
UsamaHameed Apr 9, 2021
8c7f9e0
move regex to constants
UsamaHameed Apr 9, 2021
17a9421
add todo
UsamaHameed Apr 9, 2021
6120415
remove unnecessary code
UsamaHameed Apr 9, 2021
611c666
remove unnecessary css
UsamaHameed Apr 9, 2021
63a780f
Rewire account info in addBookmark.js
reyraa Apr 9, 2021
228c312
Update addBookmark unit tests
reyraa Apr 9, 2021
3ce765b
Update mock values in recentTransactions unit tests
reyraa Apr 9, 2021
e531526
Rewire account info in select account
reyraa Apr 9, 2021
8726244
Update mock vcalues of selectAccount
reyraa Apr 9, 2021
317ffdf
Update mock values of accounts monitor unit tests
reyraa Apr 9, 2021
82a745f
Get rid of JS based responsiveness
reyraa Apr 9, 2021
0249d25
Update mock values of register delegate summary unit tests
reyraa Apr 9, 2021
38bb3b9
Update mock values and adapt tests
reyraa Apr 9, 2021
1dce2c1
Remove obsolete properties
reyraa Apr 9, 2021
153f845
Remove redundant unit tests
reyraa Apr 9, 2021
2fb7abe
Rewire tx status screen
reyraa Apr 9, 2021
4e6d895
Update mock values and adapt unit tests
reyraa Apr 9, 2021
7655d1e
Adapt mock values to new API changes
reyraa Apr 9, 2021
b0abfc3
Replace recipientAddress with recipient.address
reyraa Apr 9, 2021
39fba61
Convert publicKey to buffer
reyraa Apr 9, 2021
43811d0
Adapt verify message unit tests to new address system
reyraa Apr 9, 2021
9b39eed
Adapt unit test mock values
reyraa Apr 9, 2021
6396001
Add documentation
reyraa Apr 9, 2021
017b0b0
Update endpoint url
reyraa Apr 9, 2021
0e76619
Skip cross-dependent unit tests
reyraa Apr 9, 2021
5d5cc1d
Change id API param to blockId
reyraa Apr 9, 2021
0c8156c
Update endpoint URL
reyraa Apr 9, 2021
242145d
Improve readability
reyraa Apr 9, 2021
dfd7438
Update method names, fix typos
reyraa Apr 9, 2021
11bd2a0
Fix method name
reyraa Apr 9, 2021
8b954c6
Update import statement
reyraa Apr 9, 2021
4a9e3e0
Rewire account info
reyraa Apr 9, 2021
a7ede58
Skip non-adaptable tesst
reyraa Apr 9, 2021
e33ca4d
Rewire data and adapt unit tests
reyraa Apr 9, 2021
0e6e706
Remove Char and Sinon, Update mock values and adapt unit tests
reyraa Apr 9, 2021
1efd427
Adapt mock values and update addresses
reyraa Apr 9, 2021
9badca2
Skip account visual tests until refactored
reyraa Apr 9, 2021
afd823d
Remove obsolete unit tests
reyraa Apr 9, 2021
a8bced9
Update mock values
reyraa Apr 9, 2021
ab60dfe
Rewire account data
reyraa Apr 9, 2021
f525703
Import lockDuration
reyraa Apr 9, 2021
460802b
Adapt unit tests to new component props
reyraa Apr 9, 2021
da887dd
Update mock values
reyraa Apr 9, 2021
e387b2e
Merge branch 'feature-sdk-v5' into 3453-fix-unit-tests
reyraa Apr 9, 2021
df0946e
Fix publicKey validator
reyraa Apr 9, 2021
ac2210a
Add documentation
reyraa Apr 9, 2021
0053395
Use extractAddressFromPassphrase
reyraa Apr 10, 2021
f07ad53
Remove Lisk.constants usage
reyraa Apr 10, 2021
7a58a7b
Update expected value
reyraa Apr 10, 2021
55bb80d
Remove unused modules
reyraa Apr 10, 2021
d679612
Update transactions API params
reyraa Apr 10, 2021
bef2f7a
Improve readability
reyraa Apr 10, 2021
f5e5a6a
fix imports for regex
UsamaHameed Apr 12, 2021
9e0a066
fix getTxAmount imports and exports
UsamaHameed Apr 12, 2021
c2a87b7
fix transform transaction import
UsamaHameed Apr 12, 2021
2fef778
fix getTokenFromAddress imports and exports
UsamaHameed Apr 12, 2021
a7cc8be
read sender address correctly
UsamaHameed Apr 12, 2021
db6428c
fix isIncoming and isOutgoing functions
UsamaHameed Apr 12, 2021
35e0711
fix transaction details modal
UsamaHameed Apr 12, 2021
b419992
fix extractAddress function
UsamaHameed Apr 12, 2021
1c516ca
Remove unused modules
reyraa Apr 12, 2021
c13d44d
Fix broken assertions
reyraa Apr 12, 2021
1330f87
Merge import statements
reyraa Apr 12, 2021
cb1fa97
Fix import statements
reyraa Apr 12, 2021
9ab0a72
make address conversion functions better
UsamaHameed Apr 12, 2021
a5ce953
fix bug with transfer transaction
UsamaHameed Apr 12, 2021
d959f05
fix delegate profile crashes
UsamaHameed Apr 12, 2021
956f95f
fix vote delegate asset conversions
UsamaHameed Apr 12, 2021
56ff877
make transaction types more readable
UsamaHameed Apr 12, 2021
2825e49
create register delegate transaction properly
UsamaHameed Apr 12, 2021
cba4720
add transformer for register delegate
UsamaHameed Apr 12, 2021
4b44e94
add transformer for unlock transaction
UsamaHameed Apr 12, 2021
1564283
cleanup
UsamaHameed Apr 12, 2021
7c7318e
remove `console.log`s
UsamaHameed Apr 12, 2021
1b8cbe3
remove console.log
UsamaHameed Apr 12, 2021
a04fdc0
Merge pull request #3469 from LiskHQ/3451-fix-transaction-fee-calcula…
Apr 12, 2021
78a1b5c
Update titles
reyraa Apr 12, 2021
ceaf389
Use network switcher input as Lisk Service URL
reyraa Apr 12, 2021
d292128
Use liskServiceUrl to determine custom Node
reyraa Apr 12, 2021
16e5a8a
Pass Input value as Lisk Service URL
reyraa Apr 12, 2021
1ed557d
Add liskServiceUrl to login keys
reyraa Apr 12, 2021
964bde4
Check for liskServiceUrl for autologin
reyraa Apr 12, 2021
f37a881
Look for liskServiceUrl in localstorage for autologin
reyraa Apr 12, 2021
6101082
Save liskServiceUrl to run e2e tests against local Service API
reyraa Apr 12, 2021
a239cf3
make null check better
UsamaHameed Apr 8, 2021
821afa5
create vote transaction with only relevant data
UsamaHameed Apr 8, 2021
e69561a
add module and asset objects
UsamaHameed Apr 8, 2021
6a8130e
refactor votesSubmitted action
UsamaHameed Apr 8, 2021
9f9c669
cleanup transaction/lsk and fix transaction creation functions
UsamaHameed Apr 8, 2021
235ac72
move function to utils
UsamaHameed Apr 9, 2021
239eacc
move function to utils
UsamaHameed Apr 9, 2021
c6e7de4
move functions to utils/transaction
UsamaHameed Apr 9, 2021
2bdc6c9
create joinModuleAndAssetIds function
UsamaHameed Apr 9, 2021
9684a35
remove todo
UsamaHameed Apr 9, 2021
725897d
cleanup
UsamaHameed Apr 9, 2021
3d87af9
delete unused utils
UsamaHameed Apr 9, 2021
ad9e23a
move regex to constants
UsamaHameed Apr 9, 2021
05a22d1
add todo
UsamaHameed Apr 9, 2021
0f858a4
remove unnecessary code
UsamaHameed Apr 9, 2021
190ae51
remove unnecessary css
UsamaHameed Apr 9, 2021
a758cad
fix imports for regex
UsamaHameed Apr 12, 2021
8cc3f0b
fix getTxAmount imports and exports
UsamaHameed Apr 12, 2021
9e63ebc
fix transform transaction import
UsamaHameed Apr 12, 2021
0882b1e
fix getTokenFromAddress imports and exports
UsamaHameed Apr 12, 2021
53b7f25
read sender address correctly
UsamaHameed Apr 12, 2021
b10de66
fix isIncoming and isOutgoing functions
UsamaHameed Apr 12, 2021
f9edd6f
fix transaction details modal
UsamaHameed Apr 12, 2021
49be1fc
fix extractAddress function
UsamaHameed Apr 12, 2021
92a8b32
make address conversion functions better
UsamaHameed Apr 12, 2021
162554e
fix bug with transfer transaction
UsamaHameed Apr 12, 2021
7b27e13
fix delegate profile crashes
UsamaHameed Apr 12, 2021
b777180
fix vote delegate asset conversions
UsamaHameed Apr 12, 2021
52062a8
make transaction types more readable
UsamaHameed Apr 12, 2021
0b9d8d6
create register delegate transaction properly
UsamaHameed Apr 12, 2021
54dfaa9
add transformer for register delegate
UsamaHameed Apr 12, 2021
3103c96
add transformer for unlock transaction
UsamaHameed Apr 12, 2021
81a710e
cleanup
UsamaHameed Apr 12, 2021
23d34f4
remove `console.log`s
UsamaHameed Apr 12, 2021
c93db58
remove console.log
UsamaHameed Apr 12, 2021
4975dbf
Fix import path
reyraa Apr 12, 2021
9d73f54
Fix votesRetrieved logic
reyraa Apr 13, 2021
c3359e0
Update account mock value
reyraa Apr 13, 2021
58f791b
Convert public Key to buffer
reyraa Apr 13, 2021
4e4d07e
fix getTxAmount imports
UsamaHameed Apr 13, 2021
16d05ca
add cryptography to window in dev env
UsamaHameed Apr 13, 2021
165ad23
fix alias for jest
UsamaHameed Apr 13, 2021
efc3fa3
Remove duplicated imports
reyraa Apr 13, 2021
de05361
fix genesis address
UsamaHameed Apr 13, 2021
f2e8bb1
convert public key to binary before converting to address
UsamaHameed Apr 13, 2021
ff0c25a
update utils/account tests
UsamaHameed Apr 13, 2021
31be548
Update unit tests
reyraa Apr 13, 2021
54c335c
Remove unused import
reyraa Apr 13, 2021
1c28872
Merge branch '3453-fix-unit-tests' of github.com:LiskHQ/lisk-desktop …
reyraa Apr 13, 2021
31b0137
Fix publick ky extraction
reyraa Apr 13, 2021
017cee2
Update mock account value
reyraa Apr 13, 2021
2b1e214
Fix import statement
reyraa Apr 13, 2021
a3cf903
add test for getTxAmount
UsamaHameed Apr 13, 2021
34d32c9
add transfer transaction test
UsamaHameed Apr 13, 2021
6c1323f
fix register delegate transformer
UsamaHameed Apr 13, 2021
1f52519
add tests for transform transaction
UsamaHameed Apr 13, 2021
8471f25
Get rid of redundant imports
reyraa Apr 13, 2021
f0a4615
Fix lockDuration import statement
reyraa Apr 13, 2021
ab6fb52
Merge branch '3453-fix-unit-tests' of github.com:LiskHQ/lisk-desktop …
reyraa Apr 13, 2021
617ee67
Update addresses to new address system
reyraa Apr 13, 2021
1abaa7b
Improve the null check
reyraa Apr 13, 2021
128dc3d
Update mock tx
reyraa Apr 13, 2021
abebc99
Fix public key validator
reyraa Apr 13, 2021
a5a0aaf
fix fee calculation
UsamaHameed Apr 13, 2021
19965a2
remove mocks
UsamaHameed Apr 13, 2021
e3a0f66
call function a little later so that aliases are resolved
UsamaHameed Apr 13, 2021
6d29ca6
Export initialSupply
reyraa Apr 13, 2021
8b8b77c
Remove comments
reyraa Apr 13, 2021
862a27f
Rename getNetworkNameBasedOnNethash to getNetworkName
reyraa Apr 13, 2021
cbd6c86
Separate npm modules
reyraa Apr 13, 2021
c4d7f3f
Clean up, remove constants mock
reyraa Apr 13, 2021
c1b56bc
Remove eslint-disable
reyraa Apr 13, 2021
df7deb7
Fix broken mocks
reyraa Apr 13, 2021
b7ee65b
Add mock schemas
reyraa Apr 14, 2021
fba7243
Add mock schemas. Delete obsolete tests
reyraa Apr 14, 2021
2947639
Prevent wallet page crash - Closes #3477 (#3480)
Apr 14, 2021
f4dee0d
add no cycle eslint rule
UsamaHameed Apr 14, 2021
2b54633
properly calculate total availablefunds
UsamaHameed Apr 14, 2021
8453fbe
fix unit tests for send form
UsamaHameed Apr 14, 2021
abfc19e
fix addbookmarks modal crashes
UsamaHameed Apr 14, 2021
5c4ae17
determine isDelegate using account data
UsamaHameed Apr 14, 2021
c572867
fix unit tests for send form
UsamaHameed Apr 14, 2021
9c00c66
remove unused component
UsamaHameed Apr 14, 2021
5a84f87
skip test
UsamaHameed Apr 14, 2021
ec04818
add schema mock
UsamaHameed Apr 14, 2021
0ffabc0
skip formbtc test
UsamaHameed Apr 14, 2021
3bb9447
Revert "Split import statements"
UsamaHameed Apr 14, 2021
cfbf42f
remove unused imports
UsamaHameed Apr 14, 2021
57a4618
lint issues
UsamaHameed Apr 14, 2021
a1035b2
revert change
UsamaHameed Apr 14, 2021
71061b3
fix prod config
UsamaHameed Apr 14, 2021
0b7f264
Remove e2e tests temporarily
reyraa Apr 14, 2021
d20bac4
Fix networkSelector validation
Apr 14, 2021
65ca867
fix electron build output name
UsamaHameed Apr 14, 2021
9995e27
Code cleanup
Apr 14, 2021
c94b986
Fix login screen crash
Apr 14, 2021
9c01889
Fix redirect
Apr 14, 2021
56563b1
Store network settings
Apr 14, 2021
da5781e
Merge remote-tracking branch 'origin/3453-fix-unit-tests' into 3475-r…
Apr 14, 2021
3fd0288
Update unit test
Apr 14, 2021
2e98035
Use alias import
Apr 14, 2021
a42d09e
fix electron build output name
UsamaHameed Apr 14, 2021
9e69635
Merge pull request #3463 from LiskHQ/3453-fix-unit-tests
reyraa Apr 14, 2021
b83898b
Merge pull request #3479 from LiskHQ/3475-refactor-network-switcher
reyraa Apr 14, 2021
00fc632
Bump version 2.0.0-alpha.6
reyraa Apr 14, 2021
b1298a0
Merge remote-tracking branch 'refs/remotes/origin/development'
UsamaHameed Apr 15, 2021
558e5aa
ignore test coverage temporarily
UsamaHameed Apr 15, 2021
347651f
fix imports and skip test
UsamaHameed Apr 15, 2021
155838b
fix deepscan issues
UsamaHameed Apr 15, 2021
d6b2143
hopefully fix percy config
UsamaHameed Apr 15, 2021
e64550d
fix deepscan issues
UsamaHameed Apr 15, 2021
6e38b75
remove express external from webpack base config
UsamaHameed Apr 15, 2021
5d20afb
make null check for external links better
UsamaHameed Apr 15, 2021
a37dce8
remove percy stage temporarily
UsamaHameed Apr 15, 2021
0c37e8e
remove slackSend from jenkinsfile
UsamaHameed Apr 15, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
35 changes: 22 additions & 13 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,34 @@
"beforeEach": true,
"afterEach": true,
"ipc": true,
"PRODUCTION": true,
"TEST": true,
"jest": true,
"expect": true
"expect": true,
"PRODUCTION": true
},
"env": {
"es2020": true,
"browser": true,
"node": true
},
"settings": {
"import/resolver" : {
"alias" : {
"map" : [
["@store", "./src/store"],
["@utils", "./src/utils/"],
["@api", "./src/utils/api/"],
["@actions", "./src/store/actions"],
["@constants", "./src/constants/"],
["@shared", "./src/components/shared"],
["@screens", "./src/components/screens/"],
["@toolbox", "./src/components/toolbox/"]
],
"extensions": [".js"]
}
}
},
"rules": {
"import/no-cycle": "error",
"import/named": "off",
"jsx-a11y/alt-text": "off",
"jsx-a11y/anchor-is-valid": "off",
Expand Down Expand Up @@ -70,16 +88,7 @@
"react/prop-types": "off",
"no-plusplus": "off",
"no-underscore-dangle": "off",
"import/no-extraneous-dependencies": ["error", {
"devDependencies": [
"./src/**/*.test.js",
"./test/**/*.js",
"./src/**/*.stories.js",
"./src/tests.js",
"./src/i18n-scanner.js"
]
}
],
"import/no-extraneous-dependencies": "off",
"linebreak-style": 0,
"no-param-reassign": "off",
"complexity": ["error", 10],
Expand Down
133 changes: 1 addition & 132 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,136 +88,7 @@ pipeline {
}
}
}
},
"cypress": {
dir('lisk') {
checkout([$class: 'GitSCM',
branches: [[name: "${params.LISK_CORE_VERSION}" ]],
userRemoteConfigs: [[url: 'https://github.com/LiskHQ/lisk-core']]])
}
dir('lisk-service') {
checkout([$class: 'GitSCM',
branches: [[name: "${params.LISK_SERVICE_VERSION}" ]],
userRemoteConfigs: [[url: 'https://github.com/LiskHQ/lisk-service']]])
sh '''
make build-core
make build-gateway
make build-template
make build-tests
'''
}
withCredentials([string(credentialsId: 'lisk-hub-testnet-passphrase', variable: 'TESTNET_PASSPHRASE'), string(credentialsId: 'lisk-hub-cypress-record-key', variable: 'CYPRESS_RECORD_KEY')]) {
ansiColor('xterm') {
wrap([$class: 'Xvfb', parallelBuild: true, autoDisplayName: true]) {
nvm(getNodejsVersion()) {
sh '''#!/bin/bash -xe

rm -rf $WORKSPACE/$BRANCH_NAME/
cp -rf $WORKSPACE/lisk/docker/ $WORKSPACE/$BRANCH_NAME/
cp $WORKSPACE/test/dev_blockchain.db.gz $WORKSPACE/$BRANCH_NAME/dev_blockchain.db.gz
cd $WORKSPACE/$BRANCH_NAME
cp .env.development .env
sed -i -r -e "s/ENV_LISK_VERSION=.*$/ENV_LISK_VERSION=$LISK_CORE_IMAGE_VERSION/" .env

sed -i -r -e '/ports:/,+2d' docker-compose.yml
# random port assignment
cat <<EOF >docker-compose.override.yml
version: "3"
services:

lisk:
ports:
- 4000:4000
environment:
- LISK_CONSOLE_LOG_LEVEL=debug
EOF

rm -rf $WORKSPACE/$BRANCH_NAME-service/
cp -rf $WORKSPACE/lisk-service/docker/ $WORKSPACE/$BRANCH_NAME-service/

ENV_LISK_VERSION="$LISK_CORE_IMAGE_VERSION" make coldstart
cd -

cd $WORKSPACE/$BRANCH_NAME-service/
# TODO: use random port when the tests support it
cat <<EOF >docker-compose.override.yml
version: "3"
services:

gateway:
ports:
- 127.0.0.1:9901:9901
EOF

cat <<EOF >custom.env
LISK_CORE_HTTP=http://10.127.0.1:4000
LISK_CORE_WS=ws://10.127.0.1:4000
EOF
sed -i '/compose := docker-compose/a\\\t-f docker-compose.override.yml \\\\' Makefile.jenkins
sed -i 's/docker-compose.testnet.yml/docker-compose.custom.yml/' Makefile.jenkins
ENABLE_HTTP_API='http-version1,http-version1-compat,http-status,http-test' \
ENABLE_WS_API='rpc,rpc-v1,blockchain,rpc-test' \
make -f Makefile.jenkins up
ready=1
retries=0
set +e
while [ $ready -ne 0 ]; do
curl --fail --verbose http://127.0.0.1:9901/api/v1/blocks
ready=$?
sleep 10
let retries++
if [ $retries = 6 ]; then
break
fi
done
set -e
if [ $retries -ge 6 ]; then
exit 1
fi
cd -

npm run serve -- $WORKSPACE/app/build -p 5650 -a 127.0.0.1 &>server.log &

export CYPRESS_baseUrl=http://127.0.0.1:5650/#/
export CYPRESS_coreUrl=http://127.0.0.1:4000
export CYPRESS_serviceUrl=http://127.0.0.1:9901
set +e
set -o pipefail
npm run cypress:run -- --record |tee cypress.log
ret=$?

# this is to save on cypress credits
if [ $ret -ne 0 ]; then
FAILED_TESTS="$( awk '/Spec/{f=1}f' cypress.log |grep --only-matching '✖ .*.feature' |awk '{ print "test/cypress/features/"$2 }' |xargs| tr -s ' ' ',' )"
cd $WORKSPACE/$BRANCH_NAME
make coldstart
sleep 10
cd -
npm run cypress:run -- --record --spec $FAILED_TESTS |tee cypress.log
ret=$?
fi
exit $ret
'''
}
}
}
}
},
"percy": {
script {
if(params.SKIP_PERCY){
echo 'Skipping percy run as requested.'
} else {
ansiColor('xterm') {
nvm(getNodejsVersion()) {
withCredentials([string(credentialsId: 'PERCY_TOKEN', variable: 'PERCY_TOKEN')]) {
sh 'npm run percy'
}
}
}
}
}
},
}
)
}
}
Expand All @@ -241,13 +112,11 @@ EOF
fixed {
script {
build_info = getBuildInfo()
liskSlackSend('good', "Recovery: build ${build_info} was successful.")
}
}
failure {
script {
build_info = getBuildInfo()
liskSlackSend('danger', "Build ${build_info} failed (<${env.BUILD_URL}/console|console>, <${env.BUILD_URL}/changes|changes>)")
}
}
cleanup {
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lisk-desktop",
"version": "2.0.0-beta.2",
"version": "2.0.0-alpha.6",
"productName": "Lisk",
"description": "Lisk",
"main": "./build/main.js",
Expand Down
6 changes: 3 additions & 3 deletions app/src/utils.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ipcMain } from 'electron'; // eslint-disable-line import/no-extraneous-dependencies
import Lisk from '@liskhq/lisk-client'; // eslint-disable-line
import { cryptography, transactions } from '@liskhq/lisk-client'; // eslint-disable-line

export const createCommand = (command, fn) => {
ipcMain.on(`${command}.request`, (event, ...args) => {
Expand All @@ -12,7 +12,7 @@ export const createCommand = (command, fn) => {

export const isValidAddress = address => address.length > 2 && address.length < 22 && address[address.length - 1] === 'L';

export const getBufferToHex = buffer => Lisk.cryptography.bufferToHex(buffer);
export const getBufferToHex = buffer => cryptography.bufferToHex(buffer);

export const getTransactionBytes = transaction =>
Lisk.transaction.utils.getTransactionBytes(transaction);
transaction.getBytes(transaction);
19 changes: 0 additions & 19 deletions config/liskSdkFix.js

This file was deleted.

126 changes: 0 additions & 126 deletions config/readBigUInt64BE.js

This file was deleted.

Loading